Author: brett
Date: Sat Aug 26 11:22:23 2006
New Revision: 437201
URL: http://svn.apache.org/viewvc?rev=437201&view=rev
Log:
[MRM-131] fix url rendering bugs
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp?rev=437201&r1=437200&r2=437201&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
Sat Aug 26 11:22:23 2006
@@ -20,7 +20,7 @@
<html>
<head>
<title>Browse Repository</title>
- <ww:head />
+ <ww:head/>
</head>
<body>
@@ -31,11 +31,13 @@
<div id="nameColumn">
<h2>Groups</h2>
<ul>
- <ww:set name="groups" value="groups" />
+ <ww:set name="groups" value="groups"/>
<c:forEach items="${groups}" var="groupId">
- <ww:url id="url" action="browseGroup" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}" />
- </ww:url>
+ <c:set var="url">
+ <ww:url action="browseGroup" namespace="/">
+ <ww:param name="groupId" value="%{'${groupId}'}"/>
+ </ww:url>
+ </c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
</ul>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp?rev=437201&r1=437200&r2=437201&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
Sat Aug 26 11:22:23 2006
@@ -30,6 +30,7 @@
<div id="contentArea">
<div id="nameColumn">
<p>
+ <c:set var="cumulativeGroup" value=""/>
<c:forTokens items="${groupId}" delims="./" var="part">
<c:choose>
<c:when test="${empty(cumulativeGroup)}">
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp?rev=437201&r1=437200&r2=437201&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
Sat Aug 26 11:22:23 2006
@@ -20,7 +20,7 @@
<html>
<head>
<title>Browse Repository</title>
- <ww:head />
+ <ww:head/>
</head>
<body>
@@ -30,13 +30,14 @@
<div id="contentArea">
<div id="nameColumn">
<p>
+ <c:set var="cumulativeGroup" value=""/>
<c:forTokens items="${groupId}" delims="." var="part" varStatus="status">
<c:choose>
<c:when test="${empty(cumulativeGroup)}">
- <c:set var="cumulativeGroup" value="${part}" />
+ <c:set var="cumulativeGroup" value="${part}"/>
</c:when>
<c:otherwise>
- <c:set var="cumulativeGroup" value="${cumulativeGroup}.${part}" />
+ <c:set var="cumulativeGroup" value="${cumulativeGroup}.${part}"/>
</c:otherwise>
</c:choose>
<c:choose>
@@ -44,37 +45,43 @@
<strong>${part}</strong>
</c:when>
<c:otherwise>
- <ww:url id="url" action="browseGroup" namespace="/">
- <ww:param name="groupId" value="%{'${cumulativeGroup}'}" />
- </ww:url>
+ <c:set var="url">
+ <ww:url action="browseGroup" namespace="/">
+ <ww:param name="groupId" value="%{'${cumulativeGroup}'}"/>
+ </ww:url>
+ </c:set>
<a href="${url}">${part}</a> /
</c:otherwise>
</c:choose>
</c:forTokens>
</p>
- <ww:set name="groups" value="groups" />
+ <ww:set name="groups" value="groups"/>
<c:if test="${!empty(groups)}">
<h2>Group / Artifact</h2>
<ul>
<c:forEach items="${groups}" var="groupId">
- <ww:url id="url" action="browseGroup" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}" />
- </ww:url>
+ <c:set var="url">
+ <ww:url action="browseGroup" namespace="/">
+ <ww:param name="groupId" value="%{'${groupId}'}"/>
+ </ww:url>
+ </c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
</ul>
</c:if>
- <ww:set name="artifactIds" value="artifactIds" />
+ <ww:set name="artifactIds" value="artifactIds"/>
<c:if test="${!empty(artifactIds)}">
<h2>Artifacts</h2>
<ul>
<c:forEach items="${artifactIds}" var="artifactId">
- <ww:url id="url" action="browseArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}" />
- <ww:param name="artifactId" value="%{'${artifactId}'}" />
- </ww:url>
+ <c:set var="url">
+ <ww:url action="browseArtifact" namespace="/">
+ <ww:param name="groupId" value="%{'${groupId}'}"/>
+ <ww:param name="artifactId" value="%{'${artifactId}'}"/>
+ </ww:url>
+ </c:set>
<li><a href="${url}">${artifactId}/</a></li>
</c:forEach>
</ul>
