add nav header entries

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1242875 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index cd8b3f94edc0d5d02655213190a363257369187c..ef88c63a4a32759785e4345791ca7e772c7869d1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -107,6 +107,8 @@ menu.proxy-connectors=Proxy Connectors
 menu.network-proxies=Network Proxies
 menu.roles=User Roles
 menu.repositories=Repositories
+menu.manage=Manage
+menu.administration=Administration
 
 #user
 user.change.password.required=Change password required

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
index c922035c91dd1aad81ad89adc0afeedaeff350da..74a26d8f77610458e191fe106738844300a62dcb 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
@@ -18,13 +18,18 @@
 -->
   <div id="main-menu" redback-permissions="{permissions: ['archiva-manage-users','archiva-manage-configuration']}" style="display: none">
 
-    <ul class="nav nav-list">
+    <ul class="nav nav-list" redback-permissions="{permissions: ['archiva-manage-users']}">
+      <li class="nav-header">${$.i18n.prop('menu.manage')}</li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
-        <a href="#" id="menu-users-list-a" onclick="displayUsersGrid()">${$.i18n.prop('menu.users')}</a>
+        <a href="#" id="menu-users-list-a" onclick="displayUsersGrid(this)">${$.i18n.prop('menu.users')}</a>
       </li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
         <a href="#" id="menu-roles-list-a" onclick="displayRolesGrid()">${$.i18n.prop('menu.roles')}</a>
       </li>
+    </ul>
+
+    <ul class="nav nav-list" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+      <li class="nav-header">${$.i18n.prop('menu.administration')}</li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
         <a href="#" id="menu-repositories-list-a" onclick="displayRepositoriesGrid()">${$.i18n.prop('menu.repositories')}</a>
       </li>
@@ -35,4 +40,5 @@
         <a href="#" id="menu-proxy-connectors-list-a" onclick="displayProxyConnectors()">${$.i18n.prop('menu.proxy-connectors')}</a>
       </li>
     </ul>
+
   </div>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index 6494ebce15f5b8cd99bdb9a14c1de5553161826a..7e928c67097dd8eb344fa529b5fd6e97ca6c9328 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
@@ -234,7 +234,8 @@ $(function() {
   /**
    * called from the menu to display tabs with users grid
     */
-  displayUsersGrid=function() {
+  displayUsersGrid=function(menuEntry) {
+    $(menuEntry).parent().addClass("active");
     screenChange();
     $("#main-content").html(mediumSpinnerImg());
     jQuery("#main-content").attr("data-bind",'template: {name:"usersGrid"}');