Author: thomas.heute(a)jboss.com
Date: 2007-07-11 02:54:15 -0400 (Wed, 11 Jul 2007)
New Revision: 7716
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
Log:
JBPORTAL-1568: Navigation broken after 120 elements, now it can handle
127*nBelementsPerPage elements.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-07-11
06:51:09 UTC (rev 7715)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-07-11
06:54:15 UTC (rev 7716)
@@ -49,11 +49,11 @@
</table>
<ul class="pagination">
<c:if test="#{instancemgr.instanceCount >
instancemgr.paginationSize}">
- <c:forEach begin="0" end="#{instancemgr.instanceCount -
1}" step="#{instancemgr.paginationSize}"
+ <c:forEach begin="0" end="#{(instancemgr.instanceCount -
1)/ instancemgr.paginationSize}" step="1"
var="index">
<li class="#{index == instancemgr.selectedFrom ?
'selected' : ''}">
- <h:commandLink
action="#{instancemgr.selectFrom}"><f:param name="from"
value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
+ <h:commandLink
action="#{instancemgr.selectFrom}"><f:param name="from"
value="#{index * instancemgr.paginationSize}"/><h:outputText
+ value="#{index *
instancemgr.paginationSize}"/></h:commandLink>
</li>
</c:forEach>
</c:if>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-07-11
06:51:09 UTC (rev 7715)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-07-11
06:54:15 UTC (rev 7716)
@@ -64,12 +64,12 @@
</table>
<ul class="pagination">
<c:if test="#{portletmgr.portletCount >
portletmgr.paginationSize}">
- <c:forEach begin="0" end="#{portletmgr.portletCount -
1}" step="#{portletmgr.paginationSize}"
+ <c:forEach begin="0" end="#{(portletmgr.portletCount
- 1) / portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ?
'selected' : ''}">
<h:commandLink
action="#{portletmgr.selectFrom}"><f:param name="from"
-
value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
+ value="#{index *
portletmgr.paginationSize}"/><h:outputText
+ value="#{index *
portletmgr.paginationSize}"/></h:commandLink>
</li>
</c:forEach>
</c:if>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-07-11
06:51:09 UTC (rev 7715)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-07-11
06:54:15 UTC (rev 7716)
@@ -38,12 +38,12 @@
</tbody>
</table>
<ul class="pagination">
- <c:forEach begin="0" end="#{portletmgr.portletCount -
1}" step="#{portletmgr.paginationSize}"
+ <c:forEach begin="0" end="#{(portletmgr.portletCount -
1)/portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ?
'selected' : ''}">
<h:commandLink action="#{portletmgr.selectFrom}">
- <f:param name="from"
value="#{index}"/>
- <h:outputText value="#{index}"/>
+ <f:param name="from" value="#{index *
portletmgr.paginationSize}"/>
+ <h:outputText value="#{index *
portletmgr.paginationSize}"/>
</h:commandLink>
</li>
</c:forEach>
Show replies by date