You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ep...@apache.org on 2007/01/19 10:28:58 UTC
svn commit: r497749 - in /maven/archiva/trunk/archiva-webapp/src/main/webapp:
WEB-INF/jsp/decorators/default.jsp css/maven-base.css
Author: epunzalan
Date: Fri Jan 19 01:28:57 2007
New Revision: 497749
URL: http://svn.apache.org/viewvc?view=rev&rev=497749
Log:
[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.
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-base.css
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=497749&r1=497748&r2=497749
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Fri Jan 19 01:28:57 2007
@@ -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>
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-base.css
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-base.css?view=diff&rev=497749&r1=497748&r2=497749
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-base.css (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/css/maven-base.css Fri Jan 19 01:28:57 2007
@@ -84,7 +84,7 @@
}
#leftColumn {
- height: 300px;
+ height: 315px;
width: 170px;
float: left;
overflow: auto;