From c2d20af1b7b6f24e907f65cf6439565fc6bc7812 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 22 Mar 2019 23:49:07 +0100
Subject: [PATCH] ui: navigation, fixed wrapping of new admin navigation items

---
 .../templates/admin/admin_audit_logs.mako     |  9 ++--
 .../templates/admin/auth/auth_settings.mako   |  7 +--
 .../templates/admin/defaults/defaults.mako    |  7 +--
 .../templates/admin/integrations/base.mako    |  6 ---
 .../templates/admin/integrations/global.mako  |  9 ++--
 rhodecode/templates/admin/main.mako           |  7 +--
 .../admin/permissions/permissions.mako        |  6 +--
 .../admin/repo_groups/repo_groups.mako        |  6 ++-
 rhodecode/templates/admin/repos/repos.mako    |  5 +-
 .../templates/admin/settings/settings.mako    |  9 ++--
 .../admin/user_groups/user_groups.mako        |  5 +-
 rhodecode/templates/admin/users/users.mako    |  5 +-
 rhodecode/templates/base/base.mako            | 47 +++++++++++--------
 13 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako
index 1172dd06..39411a8e 100644
--- a/rhodecode/templates/admin/admin_audit_logs.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -22,13 +22,12 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='audit_logs')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <!-- box / title -->
-    <div class="title">
-        ${self.admin_menu()}
-    </div>
-    <!-- end box / title -->
     <div class="table">
         <div id="user_log">
             <%include file="/admin/admin_log_base.mako" />
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
index 8f284d51..f09c8c96 100644
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -18,12 +18,13 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='authentication')}
+</%def>
+
 <%def name="main()">
 
 <div class="box">
-  <div class="title">
-    ${self.admin_menu()}
-  </div>
 
   <div class='sidebar-col-wrapper'>
 
diff --git a/rhodecode/templates/admin/defaults/defaults.mako b/rhodecode/templates/admin/defaults/defaults.mako
index 5bdd9a30..530d1aa6 100644
--- a/rhodecode/templates/admin/defaults/defaults.mako
+++ b/rhodecode/templates/admin/defaults/defaults.mako
@@ -18,11 +18,12 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='defaults')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.admin_menu()}
-    </div>
 
     ##main
     <div class="sidebar-col-wrapper">
diff --git a/rhodecode/templates/admin/integrations/base.mako b/rhodecode/templates/admin/integrations/base.mako
index 59b6f8a3..6d66a669 100644
--- a/rhodecode/templates/admin/integrations/base.mako
+++ b/rhodecode/templates/admin/integrations/base.mako
@@ -31,12 +31,6 @@
   %endif
 </%def>
 
-<%def name="menu_bar_subnav()">
-  %if c.repo:
-    ${self.repo_menu(active='options')}
-  %endif
-</%def>
-
 <%def name="main_content()">
   ${next.body()}
 </%def>
diff --git a/rhodecode/templates/admin/integrations/global.mako b/rhodecode/templates/admin/integrations/global.mako
index e71bd8b0..ce48b277 100644
--- a/rhodecode/templates/admin/integrations/global.mako
+++ b/rhodecode/templates/admin/integrations/global.mako
@@ -2,7 +2,7 @@
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('Settings administration')}
+    ${_('Integrations administration')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -18,6 +18,10 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='integrations')}
+</%def>
+
 <%def name="side_bar_nav()">
     <li class="active">
       <a href="${h.route_path('global_integrations_home')}">Global</a>
@@ -30,9 +34,6 @@
 
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.admin_menu()}
-    </div>
 
     ##main
     <div class='sidebar-col-wrapper'>
diff --git a/rhodecode/templates/admin/main.mako b/rhodecode/templates/admin/main.mako
index 8158a313..108bce38 100644
--- a/rhodecode/templates/admin/main.mako
+++ b/rhodecode/templates/admin/main.mako
@@ -18,6 +18,10 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu()}
+</%def>
+
 <%def name="side_bar_nav()">
 
 </%def>
@@ -28,9 +32,6 @@
 
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.admin_menu()}
-    </div>
 
     ##main
     <div class='sidebar-col-wrapper'>
diff --git a/rhodecode/templates/admin/permissions/permissions.mako b/rhodecode/templates/admin/permissions/permissions.mako
index caaba926..96a16ade 100644
--- a/rhodecode/templates/admin/permissions/permissions.mako
+++ b/rhodecode/templates/admin/permissions/permissions.mako
@@ -18,12 +18,12 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='permissions')}
+</%def>
 
 <%def name="main()">
 <div class="box">
-  <div class="title">
-      ${self.admin_menu()}
-  </div>
 
   <div class="sidebar-col-wrapper scw-small">
     ##main
diff --git a/rhodecode/templates/admin/repo_groups/repo_groups.mako b/rhodecode/templates/admin/repo_groups/repo_groups.mako
index fb884c14..176fc39b 100644
--- a/rhodecode/templates/admin/repo_groups/repo_groups.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_groups.mako
@@ -17,10 +17,14 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repository_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.admin_menu()}
+
         <ul class="links">
             %if h.HasPermissionAny('hg.admin','hg.repogroup.create.true')():
              <li>
diff --git a/rhodecode/templates/admin/repos/repos.mako b/rhodecode/templates/admin/repos/repos.mako
index c205d535..434d30fd 100644
--- a/rhodecode/templates/admin/repos/repos.mako
+++ b/rhodecode/templates/admin/repos/repos.mako
@@ -17,10 +17,13 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repositories')}
+</%def>
+
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.admin_menu()}
         <ul class="links">
             %if h.HasPermissionAny('hg.admin','hg.create.repository')():
              <li>
diff --git a/rhodecode/templates/admin/settings/settings.mako b/rhodecode/templates/admin/settings/settings.mako
index 6dc7cb18..ff7f2cc0 100644
--- a/rhodecode/templates/admin/settings/settings.mako
+++ b/rhodecode/templates/admin/settings/settings.mako
@@ -13,11 +13,15 @@
     &raquo;
     ${_('Settings')}
 </%def>
-
+##
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='settings')}
+</%def>
+
 <%def name="side_bar_nav()">
   % for navitem in c.navlist:
     <li class="${'active' if c.active in navitem.active_list else ''}">
@@ -32,9 +36,6 @@
 
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.admin_menu()}
-    </div>
 
     ##main
     <div class='sidebar-col-wrapper'>
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
index adf51067..4addb59e 100644
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -17,11 +17,14 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='user_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
 
     <div class="title">
-        ${self.admin_menu()}
         <ul class="links">
         %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
           <li>
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 1fd9b85b..20bac143 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -17,12 +17,15 @@
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='users')}
+</%def>
+
 <%def name="main()">
 
 <div class="box">
 
     <div class="title">
-        ${self.admin_menu()}
         <ul class="links">
           <li>
             <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 3532ace1..7e57e953 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -74,41 +74,48 @@
     </div>
 </%def>
 
-<%def name="admin_menu()">
-
-    <ul id="context-pages" class="navigation horizontal-list">
+<%def name="admin_menu(active=None)">
+  <div id="context-bar">
+    <div class="wrapper">
+      <ul id="context-pages" class="navigation horizontal-list">
         <%
         repositories=c.rhodecode_user.repositories_admin
         repository_groups=c.rhodecode_user.repository_groups_admin
         user_groups=c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')()
+        def is_active(selected):
+            if selected == active:
+                return "active"
         %>
         ## super admin case
         % if c.rhodecode_user.is_admin:
-          <li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
-          <li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
-          <li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
-          <li><a href="${h.route_path('users')}">${_('Users')}</a></li>
-          <li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
-          <li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
-          <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
-          <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
-          <li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
-          <li><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
+          <li class="${is_active('audit_logs')}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
+          <li class="${is_active('repositories')}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+          <li class="${is_active('repository_groups')}"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+          <li class="${is_active('users')}"><a href="${h.route_path('users')}">${_('Users')}</a></li>
+          <li class="${is_active('user_groups')}"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+          <li class="${is_active('permissions')}"><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
+          <li class="${is_active('authentication')}"><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
+          <li class="${is_active('integrations')}"><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
+          <li class="${is_active('defaults')}"><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
+          <li class="${is_active('settings')}"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
 
         ## delegated admin
         % elif repositories or repository_groups or user_groups:
 
            %if repositories:
-              <li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+              <li class="${is_active('repositories')} local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
            %endif
            %if repository_groups:
-              <li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+              <li class="${is_active('repository_groups')} local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
            %endif
            %if user_groups:
-              <li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+              <li class="${is_active('user_groups')} local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
            %endif
         % endif
     </ul>
+    </div>
+    <div class="clear"></div>
+  </div>
 </%def>
 
 
@@ -232,7 +239,7 @@
             return "active"
     %>
 
-  <!--- CONTEXT BAR -->
+  <!--- REPO CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
 
@@ -306,7 +313,7 @@
         <strong>${_('This repository has been archived. It is now read-only.')}</strong>
     </div>
     % endif
-  <!--- END CONTEXT BAR -->
+  <!--- REPO END CONTEXT BAR -->
 
 </%def>
 
@@ -344,7 +351,7 @@
 
     %>
 
-  <!--- CONTEXT BAR -->
+  <!--- REPO GROUP CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
       <ul id="context-pages" class="navigation horizontal-list">
@@ -371,7 +378,7 @@
     <div class="clear"></div>
   </div>
 
-  <!--- END CONTEXT BAR -->
+  <!--- REPO GROUP CONTEXT BAR -->
 
 </%def>