[MRM-269]

- create an "Administration" menu group and list in it: Index, Managed Repo and Proxied Repo menus.
- adjust the height of the left nav bar in css to accomodate IE browsers clipping the last menu.

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

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 2d5fe33f53a0202845e76ffd8d3cf05a14733f7e..d615baee38db4f63a05ca8a3245b31165a6de32b 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -81,7 +81,6 @@
 
     <h5>Find</h5>
     <ul>
-
       <li class="none">
         <my:currentWWUrl action="index" namespace="/">Search</my:currentWWUrl>
       </li>
@@ -94,6 +93,7 @@
         <my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl>
       </li>
     </ul>
+
     <pss:ifAnyAuthorized permissions="archiva-manage-users,archiva-access-reports,archiva-manage-configuration">
       <h5>Manage</h5>
       <ul>
@@ -116,28 +116,30 @@
           <li class="none">
             <my:currentWWUrl action="configureAppearance" namespace="/admin">Appearance</my:currentWWUrl>
           </li>
-          <li class="expanded">
-            <my:currentWWUrl action="index" namespace="/admin">Administration</my:currentWWUrl>
-
+        </pss:ifAuthorized>
+      </ul>
+    </pss:ifAnyAuthorized>
 
-            <ul>
-              <li class="none">
-                <my:currentWWUrl action="managedRepositories" namespace="/admin">Managed Repositories</my:currentWWUrl>
-              </li>
-              <li class="none">
-                <my:currentWWUrl action="proxiedRepositories" namespace="/admin">Proxied Repositories</my:currentWWUrl>
-              </li>
+    <pss:ifAuthorized permission="archiva-manage-configuration">
+      <h5>Administration</h5>
+      <ul>
+          <li class="expanded">
+            <my:currentWWUrl action="index" namespace="/admin">Index</my:currentWWUrl>
+          </li>
+          <li class="none">
+            <my:currentWWUrl action="managedRepositories" namespace="/admin">Managed Repositories</my:currentWWUrl>
+          </li>
+          <li class="none">
+            <my:currentWWUrl action="proxiedRepositories" namespace="/admin">Proxied Repositories</my:currentWWUrl>
+          </li>
 
                 <%-- TODO: add back after synced repos are implemented
                           <li class="none">
                             <my:currentWWUrl action="syncedRepositories" namespace="/admin">Synced Repositories</my:currentWWUrl>
                           </li>
                 --%>
-            </ul>
-          </li>
-        </pss:ifAuthorized>
       </ul>
-    </pss:ifAnyAuthorized>
+    </pss:ifAuthorized>
 
   </div>
 </div>

diff --git a/archiva-webapp/src/main/webapp/css/maven-base.css b/archiva-webapp/src/main/webapp/css/maven-base.css
index 48ef5400ac6f91aae7d3b8a9810fa92d2b6b6516..b2ffabf703593d611b5edfe4d4da9e18c1159cc0 100644 (file)
--- a/archiva-webapp/src/main/webapp/css/maven-base.css
+++ b/archiva-webapp/src/main/webapp/css/maven-base.css
@@ -84,7 +84,7 @@ div.clear hr {
 }
 
 #leftColumn {
-       height: 300px;
+       height: 315px;
        width: 170px;
     float: left;
     overflow: auto;