Author: tchemit Date: 2014-04-02 19:26:57 +0200 (Wed, 02 Apr 2014) New Revision: 1808 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1808 Log: refs #4490 improve pagination + add boat tips + inactive row style Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-02 17:26:57 UTC (rev 1808) @@ -92,18 +92,29 @@ return SUCCESS; } - public int getFirstPageIndex() { + public long getFirstPageIndex() { int pageIndex = getPager().getPageIndex(); - int result = pageIndex; - if (getPager().getPagesNumber() <= 10 || pageIndex < 10) { - result = 1; + long result = pageIndex; + long pagesNumber = getPager().getPagesNumber(); + if (pagesNumber <= 10 || pageIndex < 10) { + // stick to begin + return 1; } + if (pagesNumber - pageIndex < 10) { + + // just center + result = pagesNumber - 10; + if (result < 1) { + result = 1; + } + return result; + } + if (pageIndex >= 10) { - // on centre sur pageIndex + // center result = pageIndex - 5; } - return result; } @@ -120,8 +131,11 @@ String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); paginationUrl = paginationUrl.replaceAll("&&", "&"); if (!paginationUrl.contains("?")) { - paginationUrl += "?"; + paginationUrl += "?pageIndex="; + } else if (!paginationUrl.endsWith("?")) { + paginationUrl += "&pageIndex="; } + paginationUrl += "pageIndex="; return paginationUrl; } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-02 17:26:57 UTC (rev 1808) @@ -89,7 +89,7 @@ wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire wao.ui.boats.boatLength=Longueur -wao.ui.boats.boatName=nom +wao.ui.boats.boatName=Nom wao.ui.boats.buildYear=Année de construction wao.ui.boats.district=Quatier maritime wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre société Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 17:26:57 UTC (rev 1808) @@ -143,37 +143,44 @@ <ul> <s:url var="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="firstPageIndex > 1"> + <s:if test="firstPageIndex > 2"> <li> - <a href="${paginationUrl}&pageIndex=1">1</a> + <a href="${paginationUrl}1">1</a> </li> <li> + <a href="${paginationUrl}2">2</a> + </li> + <li> <span>...</span> </li> </s:if> <s:iterator var="currentPageIndex" begin="firstPageIndex" end="lastPageIndex"> <li class="<s:if test="#currentPageIndex == pager.pageIndex">active</s:if>"> - <a href="${paginationUrl}&pageIndex=${currentPageIndex}"> + <a href="${paginationUrl}${currentPageIndex}"> <s:property/> </a> </li> </s:iterator> - <s:if test="lastPageIndex < pager.pagesNumber"> + <s:if test="lastPageIndex < pager.pagesNumber - 1"> <li> <span>...</span> </li> <li> - <%--<s:set var="endPageIndex" value="pager.pagesNumber - 1"/>--%> - <a href="${paginationUrl}&pageIndex=${pager.pagesNumber}"> + <a href="${paginationUrl}${pager.pagesNumber - 1}"> + <s:property value="pager.pagesNumber - 1"/> + </a> + </li> + <li> + <a href="${paginationUrl}${pager.pagesNumber}"> <s:property value="pager.pagesNumber"/> </a> </li> </s:if> </ul> </div> -<table id="boat-list" class="large-table boat-list"> +<table id="boats-list" class="large-table boats-list"> <thead> <tr> <th> @@ -192,20 +199,27 @@ <s:text name="wao.ui.boats.district"/> </th> <th> - <s:text name="wao.ui.boats.portOfRegistry"/> + <s:text name="wao.ui.boats.portOfRegistry"/>(<s:text name="wao.ui.boats.portOfRegistry.description"/>) </th> </tr> </thead> <tbody> <s:iterator value="boats" var="boat"> - <tr class="boat-row"> - <td><s:property value="name"/></td> - <td><s:property value="%{''+immatriculation}"/></td> - <td><s:property value="boatLength"/></td> - <td><s:property value="%{''+buildYear}"/></td> + <tr class="boat-row<s:if test="!active"> inactive-boat-row</s:if>"> + <td> + <s:property value="name"/> + </td> + <td><s:property value="%{'' + immatriculation}"/></td> + <td><s:property value="boatLength"/> m</td> + <td><s:property value="%{'' + buildYear}"/></td> <td><s:property value="district.districtCode"/></td> - <td><s:property value="portOfRegistry.portCode"/></td> + <td> + <s:if test="portOfRegistry != null"> + <s:property value="portOfRegistry.portCode"/> + (<s:property value="portOfRegistry.description"/>) + </s:if> + </td> </tr> </s:iterator> </todby> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-02 17:26:57 UTC (rev 1808) @@ -264,3 +264,7 @@ left: -200px } +table.boats-list tbody tr.inactive-boat-row { + background-color: #ffaaaa; +} +