Author: olamy
Date: Wed Jun 22 14:47:27 2011
New Revision: 1138491
URL: http://svn.apache.org/viewvc?rev=1138491&view=rev
Log:
fix links on left menu
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1138491&r1=1138490&r2=1138491&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Wed Jun 22 14:47:27 2011
@@ -91,17 +91,17 @@
<h5>Find</h5>
<ul>
<li class="none">
- <my:currentWWUrl action="index" namespace="/"
id="menuSearchLink">Search</my:currentWWUrl>
+ <my:currentWWUrl action="index" namespace="/"
linkId="menuSearchLink">Search</my:currentWWUrl>
</li>
<s:if test="%{#application['uiOptions'].showFindArtifacts}">
<li class="none">
- <my:currentWWUrl action="findArtifact" namespace="/"
id="menuFindArtifactLink">Find Artifact</my:currentWWUrl>
+ <my:currentWWUrl action="findArtifact" namespace="/"
linkId="menuFindArtifactLink">Find Artifact</my:currentWWUrl>
</li>
</s:if>
<li class="none">
- <my:currentWWUrl action="browse" namespace="/"
id="menuBrowseLink">Browse</my:currentWWUrl>
+ <my:currentWWUrl action="browse" namespace="/"
linkId="menuBrowseLink">Browse</my:currentWWUrl>
</li>
</ul>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag?rev=1138491&r1=1138490&r2=1138491&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
Wed Jun 22 14:47:27 2011
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ attribute name="action" %>
<%@ attribute name="namespace" %>
-<%@ attribute name="id" %>
+<%@ attribute name="linkId" required="false" %>
<%@ attribute name="url" %>
<%@ attribute name="useParams" required="false" %>
@@ -36,14 +36,16 @@
</c:set>
<c:if test="${!empty (action) && !empty (namespace)}">
<c:set var="url">
- <s:url action="%{#attr.action}" namespace="%{#attr.namespace}"
id="%{#attr.id}"/>
+ <s:url action="%{#attr.action}" namespace="%{#attr.namespace}"/>
</c:set>
</c:if>
+
<c:set var="text">
<jsp:doBody/>
</c:set>
<!--URL: <c:out value="${url}"/>
-Current URL: <c:out value="${currentUrl}"/> -->
+Current URL: <c:out value="${currentUrl}"/>
+-->
<c:choose>
<c:when test="${currentUrl == url}">
<b>
@@ -51,7 +53,7 @@ Current URL: <c:out value="${currentUrl}
</b>
</c:when>
<c:otherwise>
- <a href="${url}" id="${id}">
+ <a href="${url}">
${text}
</a>
</c:otherwise>
