Author: bleny Date: 2014-04-24 15:43:02 +0200 (Thu, 24 Apr 2014) New Revision: 1904 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1904 Log: refs #4487 add pagination below the table Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-24 12:26:15 UTC (rev 1903) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-24 13:43:02 UTC (rev 1904) @@ -264,59 +264,64 @@ </s:text> </h3> -<%-- Pagination --%> -<div class="pagination"> - <ul> - <s:url var="fullUrl" includeParams="get"/> - <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="pagination.firstPage > 2"> - <li> - <a href="${paginationUrl}1">1</a> - </li> - <li> - <a href="${paginationUrl}2">2</a> - </li> - <li> - <span>...</span> - </li> - </s:if> +<s:set name="pagination"> + <%-- Pagination --%> + <div class="pagination"> + <ul> + <s:url var="fullUrl" includeParams="get"/> + <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> + <s:if test="pagination.firstPage > 2"> + <li> + <a href="${paginationUrl}1">1</a> + </li> + <li> + <a href="${paginationUrl}2">2</a> + </li> + <li> + <span>...</span> + </li> + </s:if> - <s:iterator var="currentPage" begin="pagination.firstPage" end="pagination.lastPage"> - <li class="<s:if test="#currentPage == pagination.currentPage">active</s:if>"> - <a href="${paginationUrl}${currentPage}"> - <s:property/> - </a> - </li> - </s:iterator> + <s:iterator var="currentPage" begin="pagination.firstPage" end="pagination.lastPage"> + <li class="<s:if test="#currentPage == pagination.currentPage">active</s:if>"> + <a href="${paginationUrl}${currentPage}"> + <s:property/> + </a> + </li> + </s:iterator> - <s:if test="pagination.lastPage < pagination.nbPages - 1"> - <li> - <span>...</span> - </li> - <li> - <a href="${paginationUrl}${pagination.nbPages - 1}"> - <s:property value="pagination.nbPages - 1"/> - </a> - </li> - <li> - <a href="${paginationUrl}${pagination.nbPages}"> - <s:property value="pagination.nbPages"/> - </a> - </li> - </s:if> - </ul> -</div> + <s:if test="pagination.lastPage < pagination.nbPages - 1"> + <li> + <span>...</span> + </li> + <li> + <a href="${paginationUrl}${pagination.nbPages - 1}"> + <s:property value="pagination.nbPages - 1"/> + </a> + </li> + <li> + <a href="${paginationUrl}${pagination.nbPages}"> + <s:property value="pagination.nbPages"/> + </a> + </li> + </s:if> + </ul> + </div> +</s:set> + <s:set var="fullView" value="%{fullView}"/> -<s:if test="authenticatedWaoUser.admin"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> - <span class="only-in-compact-view"> - <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToFullView"/> - </span> - <span class="only-in-full-view"> - <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToCompactView"/> - </span> - </button> -</s:if> + +<button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <span class="only-in-compact-view"> + <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToFullView"/> + </span> + <span class="only-in-full-view"> + <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToCompactView"/> + </span> +</button> + +<s:property value="#pagination" escapeHtml="false"/> + <table id="contacts-list" class="contacts-list large-table <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> <thead> <tr> @@ -582,4 +587,6 @@ </todby> </table> +<s:property value="#pagination" escapeHtml="false"/> + </html>