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 @@
- +
${h.text('group_name', class_="medium")} @@ -41,6 +41,15 @@
+
+ +
+
+ ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")} +
+
+ +
@@ -55,15 +64,6 @@
-
-
- -
-
- ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")} -
-
-
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 @@
- +
${c.form['repo_group_name'].render(css_class='medium', oid='group_name')|n} @@ -22,7 +22,7 @@
- +
${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 @@
- +
${h.text('repo_name', class_="medium")} @@ -48,22 +48,8 @@
-
- -
-
- ${h.textarea('repo_description')} - <% metatags_url = h.literal('''meta-tags''') %> - ${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n} - -
-
-
- +
${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} @@ -77,6 +63,20 @@
+ +
+
+ ${h.textarea('repo_description',cols=23,rows=5,class_="medium")} + <% metatags_url = h.literal('''meta-tags''') %> + ${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n} + +
+
+
+
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 name="breadcrumbs_links()"> - ${_('New Fork')} - +<%def name="breadcrumbs_links()"> <%def name="menu_bar_nav()"> ${self.menu_items(active='repositories')} @@ -24,7 +22,6 @@
${self.repo_page_title(c.rhodecode_db_repo)} - ${self.breadcrumbs()}
${h.secure_form(h.route_path('repo_fork_create',repo_name=c.rhodecode_db_repo.repo_name), request=request)} @@ -44,21 +41,6 @@
-
- -
-
- ${h.textarea('description')} - <% metatags_url = h.literal('''meta-tags''') %> - ${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n} - -
-
- -
@@ -73,13 +55,28 @@
-
+
+
+ +
+
+ ${h.textarea('description',cols=23,rows=5,class_="medium")} + <% metatags_url = h.literal('''meta-tags''') %> + ${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n} + +
+
+ +
${h.select('landing_rev','',c.landing_revs,class_="medium")} - ${_('Default commit for files page, downloads, whoosh and readme')} + ${_('The default commit for file pages, downloads, full text search index, and README generation.')}