From bleny@users.forge.codelutin.com Thu Apr 24 15:43:03 2014
From: bleny@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject:
 [Wao-commits] r1904 -	trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
Date: Thu, 24 Apr 2014 15:43:03 +0200
Message-ID: <20140424134303.6A30C181485@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2434496573817391544=="

--===============2434496573817391544==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-<%-- Pagination --%>
-<div class=3D"pagination">
-    <ul>
-        <s:url var=3D"fullUrl" includeParams=3D"get"/>
-        <s:set var=3D"paginationUrl" value=3D"%{getPaginationUrl(#fullUrl)}"=
/>
-        <s:if test=3D"pagination.firstPage > 2">
-            <li>
-                <a href=3D"${paginationUrl}1">1</a>
-            </li>
-            <li>
-                <a href=3D"${paginationUrl}2">2</a>
-            </li>
-            <li>
-                <span>...</span>
-            </li>
-        </s:if>
+<s:set name=3D"pagination">
+    <%-- Pagination --%>
+    <div class=3D"pagination">
+        <ul>
+            <s:url var=3D"fullUrl" includeParams=3D"get"/>
+            <s:set var=3D"paginationUrl" value=3D"%{getPaginationUrl(#fullUr=
l)}"/>
+            <s:if test=3D"pagination.firstPage > 2">
+                <li>
+                    <a href=3D"${paginationUrl}1">1</a>
+                </li>
+                <li>
+                    <a href=3D"${paginationUrl}2">2</a>
+                </li>
+                <li>
+                    <span>...</span>
+                </li>
+            </s:if>
=20
-        <s:iterator var=3D"currentPage" begin=3D"pagination.firstPage" end=
=3D"pagination.lastPage">
-            <li class=3D"<s:if test=3D"#currentPage =3D=3D pagination.curren=
tPage">active</s:if>">
-                <a href=3D"${paginationUrl}${currentPage}">
-                    <s:property/>
-                </a>
-            </li>
-        </s:iterator>
+            <s:iterator var=3D"currentPage" begin=3D"pagination.firstPage" e=
nd=3D"pagination.lastPage">
+                <li class=3D"<s:if test=3D"#currentPage =3D=3D pagination.cu=
rrentPage">active</s:if>">
+                    <a href=3D"${paginationUrl}${currentPage}">
+                        <s:property/>
+                    </a>
+                </li>
+            </s:iterator>
=20
-        <s:if test=3D"pagination.lastPage < pagination.nbPages - 1">
-            <li>
-                <span>...</span>
-            </li>
-            <li>
-                <a href=3D"${paginationUrl}${pagination.nbPages - 1}">
-                    <s:property value=3D"pagination.nbPages - 1"/>
-                </a>
-            </li>
-            <li>
-                <a href=3D"${paginationUrl}${pagination.nbPages}">
-                    <s:property value=3D"pagination.nbPages"/>
-                </a>
-            </li>
-        </s:if>
-    </ul>
-</div>
+            <s:if test=3D"pagination.lastPage < pagination.nbPages - 1">
+                <li>
+                    <span>...</span>
+                </li>
+                <li>
+                    <a href=3D"${paginationUrl}${pagination.nbPages - 1}">
+                        <s:property value=3D"pagination.nbPages - 1"/>
+                    </a>
+                </li>
+                <li>
+                    <a href=3D"${paginationUrl}${pagination.nbPages}">
+                        <s:property value=3D"pagination.nbPages"/>
+                    </a>
+                </li>
+            </s:if>
+        </ul>
+    </div>
+</s:set>
+
 <s:set var=3D"fullView" value=3D"%{fullView}"/>
-<s:if test=3D"authenticatedWaoUser.admin">
-    <button type=3D"button" id=3D"switch-compact-full-view" class=3D"btn <s:=
if test=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
-        <span class=3D"only-in-compact-view">
-            <i class=3D"icon-resize-full"></i> <s:text name=3D"wao.ui.action=
.switchToFullView"/>
-        </span>
-        <span class=3D"only-in-full-view">
-            <i class=3D"icon-resize-small"></i> <s:text name=3D"wao.ui.actio=
n.switchToCompactView"/>
-        </span>
-    </button>
-</s:if>
+
+<button type=3D"button" id=3D"switch-compact-full-view" class=3D"btn <s:if t=
est=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
+    <span class=3D"only-in-compact-view">
+        <i class=3D"icon-resize-full"></i> <s:text name=3D"wao.ui.action.swi=
tchToFullView"/>
+    </span>
+    <span class=3D"only-in-full-view">
+        <i class=3D"icon-resize-small"></i> <s:text name=3D"wao.ui.action.sw=
itchToCompactView"/>
+    </span>
+</button>
+
+<s:property value=3D"#pagination" escapeHtml=3D"false"/>
+
 <table id=3D"contacts-list" class=3D"contacts-list large-table <s:if test=3D=
"fullView">full-view</s:if><s:else>compact-view</s:else>">
     <thead>
         <tr>
@@ -582,4 +587,6 @@
     </todby>
 </table>
=20
+<s:property value=3D"#pagination" escapeHtml=3D"false"/>
+
 </html>


--===============2434496573817391544==--