archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r675852 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Date Fri, 11 Jul 2008 07:51:48 GMT
Author: oching
Date: Fri Jul 11 00:51:47 2008
New Revision: 675852

URL: http://svn.apache.org/viewvc?rev=675852&view=rev
Log:
[MRM-861]
-fixed up the number links in the pagination

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=675852&r1=675851&r2=675852&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 Jul 11 00:51:47 2008
@@ -50,8 +50,14 @@
       <%-- search was made from the indices --%>
       <c:when test="${databaseResults == null}">
         <c:set var="hitsNum">${fn:length(results.hits) + (currentPage * results.limits.pageSize)}</c:set>
-        <p>Hits: ${(hitsNum - results.limits.pageSize) + 1} to ${hitsNum} of ${results.totalHits}</p>
-        
+        <c:choose>
+          <c:when test="${results.totalHits > results.limits.pageSize}">
+            <p>Hits: ${(hitsNum - results.limits.pageSize) + 1} to ${hitsNum} of ${results.totalHits}</p>
+          </c:when>
+          <c:otherwise>
+            <p>Hits: 1 to ${hitsNum} of ${results.totalHits}</p>
+          </c:otherwise>        
+        </c:choose>
         <c:choose>
           <c:when test="${empty results.hits}">
             <p>No results</p>
@@ -84,10 +90,34 @@
 	            </a>      
 	          </c:otherwise>
             </c:choose>
-                         
-            <c:forEach var="i" begin="0" end="${totalPages - 1}">
-			  <c:choose>			    			    
-				<c:when test="${ (i != currentPage) }">
+			
+			<%-- Google-style pagination --%>
+			<c:choose>
+			  <c:when test="${totalPages > 11}">
+			    <c:choose>
+			      <c:when test="${(currentPage - 5) < 0}">
+			        <c:set var="beginVal">0</c:set>
+			        <c:set var="endVal">10</c:set> 
+			      </c:when>			        
+			      <c:when test="${(currentPage + 5) > (totalPages - 1)}">
+			        <c:set var="beginVal">${(totalPages -1) - 10}</c:set>
+			        <c:set var="endVal">${totalPages - 1}</c:set>
+			      </c:when>
+			      <c:otherwise>
+			        <c:set var="beginVal">${currentPage - 5}</c:set>
+			        <c:set var="endVal">${currentPage + 5}</c:set>
+			      </c:otherwise>
+			    </c:choose>  
+			  </c:when>
+			  <c:otherwise>
+			    <c:set var="beginVal">0</c:set>
+			    <c:set var="endVal">${totalPages - 1}</c:set> 
+			  </c:otherwise>
+			</c:choose>
+						
+			<c:forEach var="i" begin="${beginVal}" end="${endVal}">
+              <c:choose>                   			    
+				<c:when test="${i != currentPage}">
 				   <c:set var="specificPageUrl">
 		              <ww:url action="quickSearch" namespace="/">
 		                <ww:param name="q" value="%{'${q}'}"/>
@@ -98,12 +128,12 @@
 				</c:when>
 				<c:otherwise>		
 					<b>${i + 1}</b>   
-				</c:otherwise>
-			  </c:choose> 
+				</c:otherwise>				  			    
+              </c:choose> 
 			</c:forEach>
-			
+				
 			<c:choose>
-			  <c:when test="${ currentPage eq ( totalPages - 1 ) }">
+			  <c:when test="${currentPage == (totalPages - 1)}">
 			    <img src="${imgNextPageDisabledUrl}"/>
               </c:when>
               <c:otherwise>



Mime
View raw message