rework menu per user suggestion on dev@

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1294899 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 b9c2abe0d962648dc8c0733895ae453abbabb820..2a6a8be89f723b3c093a192d1c2d53afdcaca2b5 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
@@ -122,9 +122,9 @@ menu.repositories=Repositories
 menu.manage=Manage
 menu.administration=Administration
 menu.repository.groups=Repository Groups
-menu.find=Find
-menu.find.search=Search
-menu.find.browse=Browse
+menu.artifacts=Artifacts
+menu.artifacts.search=Search
+menu.artifacts.browse=Browse
 
 #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 73ec727a93f1b58b0740f49a2d6b05fb0a6cbcb5..4c8dd68c80bef9e005a722521076fd6cc917bceb 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
@@ -19,22 +19,12 @@
   <div id="main-menu">
 
     <ul class="nav nav-list">
-      <li class="nav-header">${$.i18n.prop('menu.find')}</li>
+      <li class="nav-header">${$.i18n.prop('menu.artifacts')}</li>
       <li>
-        <a href="#" id="menu-find-search-a" onclick="displaySearch(this)">${$.i18n.prop('menu.find.search')}</a>
+        <a href="#" id="menu-find-search-a" onclick="displaySearch(this)">${$.i18n.prop('menu.artifacts.search')}</a>
       </li>
       <li>
-        <a href="#" id="menu-find-browse-a" onclick="displayBrowse()">${$.i18n.prop('menu.find.browse')}</a>
-      </li>
-    </ul>
-
-    <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(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>
+        <a href="#" id="menu-find-browse-a" onclick="displayBrowse()">${$.i18n.prop('menu.artifacts.browse')}</a>
       </li>
     </ul>
 
@@ -47,10 +37,20 @@
         <a href="#" id="menu-repositories-list-a" onclick="displayRepositoriesGrid()">${$.i18n.prop('menu.repositories')}</a>
       </li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
-        <a href="#" id="menu-network-proxies-list-a" onclick="displayNetworkProxies()">${$.i18n.prop('menu.network-proxies')}</a>
+        <a href="#" id="menu-proxy-connectors-list-a" onclick="displayProxyConnectors()">${$.i18n.prop('menu.proxy-connectors')}</a>
       </li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
-        <a href="#" id="menu-proxy-connectors-list-a" onclick="displayProxyConnectors()">${$.i18n.prop('menu.proxy-connectors')}</a>
+        <a href="#" id="menu-network-proxies-list-a" onclick="displayNetworkProxies()">${$.i18n.prop('menu.network-proxies')}</a>
+      </li>
+    </ul>
+
+    <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(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>