Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o clean up and fix spacing of results.jsp 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@744086 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2009-02-13 11:32:27 +00:00
parent 462af40d1e
commit fa4039e25f
1 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
View File

@ -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>