From 48e840bcb49dda9aed7d9624ca66218510a0fdb6 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 22 Jun 2011 14:47:27 +0000
Subject: [PATCH] fix links on left menu

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1138491 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/jsp/decorators/default.jsp |  6 +++---
 .../src/main/webapp/WEB-INF/tags/currentWWUrl.tag      | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 83a757cd4..6a703361e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -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>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
index 04f389866..d8cb7edd0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
@@ -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>