Author: oching
Date: Fri Feb 13 11:32:27 2009
New Revision: 744086
URL: http://svn.apache.org/viewvc?rev=744086&view=rev
Log:
o clean up and fix spacing of results.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=744086&r1=744085&r2=744086&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Fri Feb 13 11:32:27 2009
@@ -191,7 +191,6 @@
<c:if test="${fromFilterSearch == true}">
<c:set var="prevPageUrl">
<s:url action="filteredSearch" namespace="/">
- <%-- <s:param name="q" value="%{#attr.q}"/> --%>
<s:param name="rowCount" value="%{#attr.rowCount}"/>
<s:param name="groupId" value="%{#attr.groupId}"/>
<s:param name="artifactId" value="%{#attr.artifactId}"/>
@@ -207,7 +206,6 @@
</c:set>
<c:set var="nextPageUrl">
<s:url action="filteredSearch" namespace="/">
-<%-- <s:param name="q" value="%{#attr.q}"/> --%>
<s:param name="rowCount" value="%{#attr.rowCount}"/>
<s:param name="groupId" value="%{#attr.groupId}"/>
<s:param name="artifactId" value="%{#attr.artifactId}"/>
@@ -259,54 +257,53 @@
</c:choose>
<c:forEach var="i" begin="${beginVal}" end="${endVal}">
- <c:if test="${fromFilterSearch == false}">
- <c:choose>
- <c:when test="${i != currentPage}">
- <c:set var="specificPageUrl">
- <s:url action="quickSearch" namespace="/">
- <s:param name="q" value="%{#attr.q}"/>
- <s:param name="currentPage"
value="%{#attr.i}"/>
- <s:param name="searchResultsOnly"
value="%{#attr.searchResultsOnly}"/>
- <s:param name="completeQueryString"
value="%{#attr.completeQueryString}"/>
- </s:url>
- </c:set>
- <a href="${specificPageUrl}">${i + 1}</a>
+ <c:if test="${fromFilterSearch == false}">
+ <c:choose>
+ <c:when test="${i != currentPage}">
+ <c:set var="specificPageUrl">
+ <s:url action="quickSearch" namespace="/">
+ <s:param name="q" value="%{#attr.q}"/>
+ <s:param name="currentPage" value="%{#attr.i}"/>
+ <s:param name="searchResultsOnly"
value="%{#attr.searchResultsOnly}"/>
+ <s:param name="completeQueryString"
value="%{#attr.completeQueryString}"/>
+ </s:url>
+ </c:set>
+ <a href="${specificPageUrl}">${i + 1}</a>
</c:when>
<c:otherwise>
- <b>${i + 1}</b>
- </c:otherwise>
- </c:choose>
- </c:if>
+ <b>${i + 1}</b>
+ </c:otherwise>
+ </c:choose>
+ </c:if>
- <c:if test="${fromFilterSearch == true}">
- <c:choose>
- <c:when test="${i != currentPage}">
- <c:set var="specificPageUrl">
- <s:url action="filteredSearch" namespace="/">
-<%-- <s:param name="q" value="%{#attr.q}"/>
--%>
- <s:param name="rowCount"
value="%{#attr.rowCount}"/>
- <s:param name="groupId"
value="%{#attr.groupId}"/>
- <s:param name="artifactId"
value="%{#attr.artifactId}"/>
- <s:param name="version"
value="%{#attr.version}"/>
- <s:param name="className"
value="%{#attr.className}"/>
- <s:param name="repositoryId"
value="%{#attr.repositoryId}"/>
- <s:param name="filterSearch"
value="%{#attr.filterSearch}"/>
- <s:param name="fromResultsPage"
value="true"/>
- <s:param name="currentPage"
value="%{#attr.i}"/>
- <s:param name="searchResultsOnly"
value="%{#attr.searchResultsOnly}"/>
- <s:param name="completeQueryString"
value="%{#attr.completeQueryString}"/>
- </s:url>
- </c:set>
- <a href="${specificPageUrl}">${i + 1}</a>
+ <c:if test="${fromFilterSearch == true}">
+ <c:choose>
+ <c:when test="${i != currentPage}">
+ <c:set var="specificPageUrl">
+ <s:url action="filteredSearch" namespace="/">
+ <s:param name="rowCount" value="%{#attr.rowCount}"/>
+ <s:param name="groupId" value="%{#attr.groupId}"/>
+ <s:param name="artifactId"
value="%{#attr.artifactId}"/>
+ <s:param name="version" value="%{#attr.version}"/>
+ <s:param name="className" value="%{#attr.className}"/>
+ <s:param name="repositoryId"
value="%{#attr.repositoryId}"/>
+ <s:param name="filterSearch"
value="%{#attr.filterSearch}"/>
+ <s:param name="fromResultsPage" value="true"/>
+ <s:param name="currentPage" value="%{#attr.i}"/>
+ <s:param name="searchResultsOnly"
value="%{#attr.searchResultsOnly}"/>
+ <s:param name="completeQueryString"
value="%{#attr.completeQueryString}"/>
+ </s:url>
+ </c:set>
+ <a href="${specificPageUrl}">${i + 1}</a>
</c:when>
<c:otherwise>
- <b>${i + 1}</b>
+ <b>${i + 1}</b>
</c:otherwise>
- </c:choose>
- </c:if>
+ </c:choose>
+ </c:if>
</c:forEach>
- <c:choose>
+ <c:choose>
<c:when test="${currentPage == (totalPages - 1)}">
<img src="${imgNextPageDisabledUrl}"/>
</c:when>
@@ -323,7 +320,6 @@
<c:choose>
<c:when test="${not empty (record.groupId)}">
<h3 class="artifact-title">
-
<archiva:showArtifactTitle groupId="${record.groupId}"
artifactId="${record.artifactId}"/>
</h3>
<p>
