templates: align forms for repo creation and repo settings

99% whitespace changes and reordering.

kallithea/templates/admin/repos/repo_add_base.html

@@ -1,5 +1,3 b''
-## -*- coding: utf-8 -*-
-
 ${h.form(url('repos'))}
 <div class="form">
         <div class="form-group">
@@ -8,10 +6,17 b''
                 ${h.text('repo_name',class_='form-control')}
             </div>
         </div>
-        <div id="remote_clone" class="form-group">
+        <div class="form-group">
+            <label class="control-label" for="repo_type">${_('Type')}:</label>
+            <div>
+                ${h.select('repo_type','hg',c.backends,class_='form-control')}
+                <span class="help-block">${_('Type of repository to create.')}</span>
+            </div>
+        </div>
+        <div class="form-group">
             <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
             <div>
-                ${h.text('clone_uri',class_='form-control')}
+                ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))}
                 <span class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')}
                 </span>
@@ -39,16 +44,9 b''
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label" for="repo_type">${_('Type')}:</label>
-            <div>
-                ${h.select('repo_type','hg',c.backends,class_='form-control')}
-                <span class="help-block">${_('Type of repository to create.')}</span>
-            </div>
-        </div>
-        <div class="form-group">
             <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
             <div>
-                ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
+                ${h.select('repo_landing_rev',None,c.landing_revs,class_='form-control')}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
@@ -65,9 +63,18 b''
             </div>
         </div>
 </div>
+${h.end_form()}
+
 <script>
     'use strict';
     $(document).ready(function(){
+        $('#repo_type').select2({
+            'minimumResultsForSearch': -1
+        });
+        $('#repo_group').select2({
+            'dropdownAutoWidth': true
+        });
+
         function setCopyPermsOption(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show();
@@ -77,22 +84,14 b''
             }
         }
 
-        $("#repo_group").select2({
-            'dropdownAutoWidth': true
-        });
-
         setCopyPermsOption($('#repo_group').val());
-        $("#repo_group").on("change", function(e) {
+        $('#repo_group').on("change", function(e) {
             setCopyPermsOption(e.val);
         });
 
-        $("#repo_type").select2({
-            'minimumResultsForSearch': -1
-        });
-        $("#repo_landing_rev").select2({
+        $('#repo_landing_rev').select2({
             'minimumResultsForSearch': -1
         });
         $('#repo_name').focus();
     });
 </script>
-${h.end_form()}

kallithea/templates/admin/repos/repo_edit_settings.html

@@ -20,27 +20,32 b''
             <div class="form-group">
                 <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
                 <div>
-                  <div id="alter_clone_uri">
                         ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))}
                         ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)}
-                  </div>
-                  <span id="alter_clone_uri_help_block" class="help-block">
+                <span class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')}
                   </span>
                 </div>
             </div>
             <div class="form-group">
+            <label class="control-label" for="repo_description">${_('Description')}:</label>
+            <div>
+                ${h.textarea('repo_description',class_='form-control')}
+                <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
+            </div>
+        </div>
+        <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 <div>
-                    ${h.select('repo_group','',c.repo_groups,class_='form-control')}
+                ${h.select('repo_group',None,c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
                 <div>
-                    ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
-                    <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
+                ${h.select('repo_landing_rev',None,c.landing_revs,class_='form-control')}
+                <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
                 </div>
             </div>
             <div class="form-group">
@@ -51,14 +56,6 b''
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label" for="repo_description">${_('Description')}:</label>
-                <div>
-                    ${h.textarea('repo_description',class_='form-control')}
-                    <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
-                </div>
-            </div>
-
-            <div class="form-group">
                 <label class="control-label" for="repo_private">${_('Private repository')}:</label>
                 <div>
                     ${h.checkbox('repo_private',value="True")}
@@ -106,10 +103,10 b''
 <script>
     'use strict';
     $(document).ready(function(){
-        $('#repo_landing_rev').select2({
+        $('#repo_group').select2({
             'dropdownAutoWidth': true
         });
-        $('#repo_group').select2({
+        $('#repo_landing_rev').select2({
             'dropdownAutoWidth': true
         });