# HG changeset patch
# User Daniel Dourvaris <daniel@rhodecode.com>
# Date 2018-08-28 17:13:42
# Node ID 01a27b09203e9484af58dd4586217c904c0ba22a
# Parent  8d754972456195b2e611b71b2d9d23848c8d0706

repo: re-order creation/fork forms for better UX and consistency.

diff --git a/rhodecode/templates/admin/repos/repo_add_base.mako b/rhodecode/templates/admin/repos/repo_add_base.mako
--- a/rhodecode/templates/admin/repos/repo_add_base.mako
+++ b/rhodecode/templates/admin/repos/repo_add_base.mako
@@ -40,6 +40,15 @@
         </div>
         <div class="field">
             <div class="label">
+                <label for="repo_type">${_('Type')}:</label>
+            </div>
+            <div class="select">
+                ${h.select('repo_type','hg',c.backends)}
+                <span class="help-block">${_('Set the type of repository to create.')}</span>
+            </div>
+        </div>
+        <div class="field">
+            <div class="label">
                 <label for="repo_description">${_('Description')}:</label>
             </div>
             <div class="textarea editor">
@@ -66,6 +75,15 @@
                  <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
              </div>
         </div>
+        <div class="field">
+            <div class="label">
+                <label for="repo_landing_rev">${_('Landing commit')}:</label>
+            </div>
+            <div class="select">
+                ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
+                <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
+            </div>
+        </div>
         <div id="copy_perms" class="field">
             <div class="label label-checkbox">
                 <label for="repo_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
@@ -76,24 +94,6 @@
             </div>
         </div>
         <div class="field">
-            <div class="label">
-                <label for="repo_type">${_('Type')}:</label>
-            </div>
-            <div class="select">
-                ${h.select('repo_type','hg',c.backends)}
-                <span class="help-block">${_('Set the type of repository to create.')}</span>
-            </div>
-        </div>
-        <div class="field">
-            <div class="label">
-                <label for="repo_landing_rev">${_('Landing commit')}:</label>
-            </div>
-            <div class="select">
-                ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
-                <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
-            </div>
-        </div>
-        <div class="field">
             <div class="label label-checkbox">
                 <label for="repo_private">${_('Private Repository')}:</label>
             </div>
diff --git a/rhodecode/templates/forks/fork.mako b/rhodecode/templates/forks/fork.mako
--- a/rhodecode/templates/forks/fork.mako
+++ b/rhodecode/templates/forks/fork.mako
@@ -85,6 +85,16 @@
 
             <div class="field">
                 <div class="label label-checkbox">
+                    <label for="private">${_('Copy permissions')}:</label>
+                </div>
+                <div class="checkboxes">
+                    ${h.checkbox('copy_permissions',value="True", checked="checked")}
+                    <span class="help-block">${_('Copy permissions from forked repository')}</span>
+                </div>
+            </div>
+
+            <div class="field">
+                <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
@@ -93,16 +103,6 @@
                 </div>
             </div>
 
-            <div class="field">
-                <div class="label label-checkbox">
-                    <label for="private">${_('Copy permissions')}:</label>
-                </div>
-                <div class="checkboxes">
-                    ${h.checkbox('copy_permissions',value="True", checked="checked")}
-                    <span class="help-block">${_('Copy permissions from forked repository')}</span>
-                </div>
-            </div>
-
             <div class="buttons">
                 ${h.submit('',_('Fork this Repository'),class_="btn")}
             </div>