# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-01-15 11:46:57
# Node ID cc6995e444a9ddc5b4d9f6f05550abeece66bb22
# Parent  1fb5a87f67249aeef7ada37dab43c2659e133bd3

templates: UX, moved repo group select next to the name as it's very relavant to each other.

diff --git a/docs/admin/repo-perm-steps.rst b/docs/admin/repo-perm-steps.rst
--- a/docs/admin/repo-perm-steps.rst
+++ b/docs/admin/repo-perm-steps.rst
@@ -35,7 +35,7 @@ 2. On the |repo| group settings page you
 
 * :guilabel:`Owner`: Lets you change the group owner. Useful when users are
   moving roles within an organisation.
-* :guilabel:`Group parent`: Lets you add the |repo| group as a sub-group
+* :guilabel:`Repository group`: Lets you add the |repo| group as a sub-group
   of a larger group, i.e. :guilabel:`QA-Repos >> QA-Repos-Berlin`
 * :guilabel:`Enable automatic locking`: For more information,
   see :ref:`repo-locking`
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_add.mako b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_add.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
@@ -33,7 +33,7 @@
         <div class="fields">
              <div class="field">
                 <div class="label">
-                    <label for="group_name">${_('Group Name')}:</label>
+                    <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name', class_="medium")}
@@ -41,6 +41,15 @@
              </div>
 
             <div class="field">
+                 <div class="label">
+                     <label for="group_parent_id">${_('Repository group')}:</label>
+                 </div>
+                 <div class="select">
+                     ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                 </div>
+            </div>
+
+            <div class="field">
                 <div class="label">
                     <label for="group_description">${_('Description')}:</label>
                 </div>
@@ -55,15 +64,6 @@
                 </div>
             </div>
 
-            <div class="field">
-                 <div class="label">
-                     <label for="group_parent_id">${_('Group Parent')}:</label>
-                 </div>
-                 <div class="select">
-                     ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
-                 </div>
-            </div>
-
             <div id="copy_perms" class="field">
                 <div class="label label-checkbox">
                     <label for="group_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako
@@ -12,7 +12,7 @@
             <div class="fields">
                 <div class="field">
                     <div class="label">
-                        <label for="group_name">${_('Group Name')}:</label>
+                        <label for="group_name">${_('Group name')}:</label>
                     </div>
                     <div class="input">
                         ${c.form['repo_group_name'].render(css_class='medium', oid='group_name')|n}
@@ -22,7 +22,7 @@
 
                 <div class="field">
                     <div class="label">
-                        <label for="repo_group">${_('Group parent')}:</label>
+                        <label for="repo_group">${_('Repository group')}:</label>
                     </div>
                     <div class="select">
                         ${c.form['repo_group'].render(css_class='medium', oid='repo_group')|n}
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
@@ -6,7 +6,7 @@
     <div class="fields">
         <div class="field">
             <div class="label">
-                <label for="repo_name">${_('Name')}:</label>
+                <label for="repo_name">${_('Repository name')}:</label>
             </div>
             <div class="input">
                 ${h.text('repo_name', class_="medium")}
@@ -48,22 +48,8 @@
             </div>
         </div>
         <div class="field">
-            <div class="label">
-                <label for="repo_description">${_('Description')}:</label>
-            </div>
-            <div class="textarea editor">
-                ${h.textarea('repo_description')}
-                <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
-                <span id="meta-tags-desc" style="display: none">
-                    <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
-                    ${dt.metatags_help()}
-                </span>
-            </div>
-        </div>
-        <div class="field">
              <div class="label">
-                 <label for="repo_group">${_('Repository Group')}:</label>
+                 <label for="repo_group">${_('Repository group')}:</label>
              </div>
              <div class="select">
                  ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
@@ -77,6 +63,20 @@
         </div>
         <div class="field">
             <div class="label">
+                <label for="repo_description">${_('Description')}:</label>
+            </div>
+            <div class="textarea editor">
+                ${h.textarea('repo_description',cols=23,rows=5,class_="medium")}
+                <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
+                <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                <span id="meta-tags-desc" style="display: none">
+                    <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
+                    ${dt.metatags_help()}
+                </span>
+            </div>
+        </div>
+        <div class="field">
+            <div class="label">
                 <label for="repo_landing_rev">${_('Landing commit')}:</label>
             </div>
             <div class="select">
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
@@ -8,9 +8,7 @@
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('New Fork')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -24,7 +22,6 @@
 <div class="box">
       <div class="title">
           ${self.repo_page_title(c.rhodecode_db_repo)}
-          ${self.breadcrumbs()}
       </div>
 
     ${h.secure_form(h.route_path('repo_fork_create',repo_name=c.rhodecode_db_repo.repo_name), request=request)}
@@ -44,21 +41,6 @@
             </div>
 
             <div class="field">
-                <div class="label label-textarea">
-                    <label for="description">${_('Description')}:</label>
-                </div>
-                <div class="textarea-repo textarea text-area editor">
-                    ${h.textarea('description')}
-                    <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
-                    <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
-                    <span id="meta-tags-desc" style="display: none">
-                        <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
-                        ${dt.metatags_help()}
-                    </span>
-                </div>
-            </div>
-
-            <div class="field">
                  <div class="label">
                      <label for="repo_group">${_('Repository group')}:</label>
                  </div>
@@ -73,13 +55,28 @@
                  </div>
             </div>
 
-             <div class="field">
+            <div class="field">
+                <div class="label label-textarea">
+                    <label for="description">${_('Description')}:</label>
+                </div>
+                <div class="textarea editor">
+                    ${h.textarea('description',cols=23,rows=5,class_="medium")}
+                    <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
+                    <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
+                    <span id="meta-tags-desc" style="display: none">
+                        <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
+                        ${dt.metatags_help()}
+                    </span>
+                </div>
+            </div>
+
+            <div class="field">
                 <div class="label">
                     <label for="landing_rev">${_('Landing commit')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('landing_rev','',c.landing_revs,class_="medium")}
-                    <span class="help-block">${_('Default commit for files page, downloads, whoosh and readme')}</span>
+                    <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
                 </div>
             </div>