12:11 a.m.
Author: chris.laprun(a)jboss.com
Date: 2008-04-21 18:11:19 -0400 (Mon, 21 Apr 2008)
New Revision: 10678
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml
Log:
- Added pagination at the top of the table and table footer with columns for better
readability.
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-04-21
22:06:47 UTC (rev 10677)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-04-21
22:11:19 UTC (rev 10678)
@@ -12,6 +12,19 @@
<c:if test="#{empty instancemgr.selectedPlugin}">
<h:form>
+ <ul class="pagination property-container">
+ <c:if test="#{instancemgr.instanceCount >
instancemgr.paginationSize}">
+ <c:forEach begin="0" end="#{(instancemgr.instanceCount -
1)/ instancemgr.paginationSize}" step="1"
+ var="index">
+ <li class="#{index == (instancemgr.selectedFrom /
instancemgr.paginationSize)? 'selected' : ''}">
+ <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>
+ </ul>
<table id="instancesTable2" class="portlet-def-table
datatable">
<thead class="portlet-section-header">
<tr>
@@ -55,6 +68,13 @@
</tr>
</c:forEach>
</tbody>
+ <tfoot class="portlet-section-header">
+ <tr>
+ <th>Instance id</th>
+ <th>Instance name</th>
+ <th>Actions</th>
+ </tr>
+ </tfoot>
</table>
<ul class="pagination property-container">
<c:if test="#{instancemgr.instanceCount >
instancemgr.paginationSize}">
@@ -78,7 +98,7 @@
<h:form>
<ul class="objectpath">
<li class="pathItem">
- <!--#{instancemgr.selectedInstance.portlet.info.security}-->
+ <!--#{instancemgr.selectedInstance.portlet.info.security}-->
<h:commandLink action="#{instancemgr.selectInstance}">Portlet
Instances</h:commandLink>
</li>
<li class="pathSeparator"><h:graphicImage
url="/img/pathSeparator.png" alt=">"/></li>
@@ -116,15 +136,16 @@
</ul>
</h:form>
<br/>
+
<div class="property-container">
- <ui:include src="common/editPreferences.xhtml">
- <ui:param name="prefs"
value="#{instancemgr.selectedPrefs}"/>
- </ui:include>
- <br />
- <h:form>
- <h:commandButton value="Save"
action="#{instancemgr.updatePrefs}"
styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel"
action="#{instancemgr.cancelPrefs}"
styleClass="portlet-form-button"/>
- </h:form>
+ <ui:include src="common/editPreferences.xhtml">
+ <ui:param name="prefs"
value="#{instancemgr.selectedPrefs}"/>
+ </ui:include>
+ <br/>
+ <h:form>
+ <h:commandButton value="Save"
action="#{instancemgr.updatePrefs}"
styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{instancemgr.cancelPrefs}"
styleClass="portlet-form-button"/>
+ </h:form>
</div>
</c:if>
@@ -142,10 +163,11 @@
</ul>
</h:form>
<br/>
+
<div class="property-container">
- <ui:decorate template="/jsf/common/editSecurity.xhtml">
- <ui:param name="auth" value="#{instancemgr.auth}"/>
- </ui:decorate>
+ <ui:decorate template="/jsf/common/editSecurity.xhtml">
+ <ui:param name="auth" value="#{instancemgr.auth}"/>
+ </ui:decorate>
</div>
</c:if>
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-04-21
22:06:47 UTC (rev 10677)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-04-21
22:11:19 UTC (rev 10678)
@@ -14,20 +14,32 @@
<c:if test="#{empty portletmgr.selectedPlugin}">
<div class="provider-menu-container">
+ <h:form>
+ <h:outputLabel for="menu">
+ <h:outputText value="View portlets provided by the portlet provider
named: "
+ styleClass="portlet-form-field-label"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="menu"
styleClass="portlet-form-field"
+ value="#{portletmgr.selectedPortletInvokerId}">
+ <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="View portlets"
styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
<h:form>
- <h:outputLabel for="menu">
- <h:outputText value="View portlets provided by the portlet provider
named: "
- styleClass="portlet-form-field-label"/>
- </h:outputLabel>
- <h:selectOneMenu id="menu" styleClass="portlet-form-field"
- value="#{portletmgr.selectedPortletInvokerId}">
- <f:selectItems value="#{portletmgr.portletInvokerItems}"/>
- </h:selectOneMenu>
- <h:commandButton value="View portlets"
styleClass="portlet-form-button"/>
- </h:form>
- </div>
- <h:form>
-
+ <ul class="pagination property-container">
+ <c:if test="#{portletmgr.portletCount >
portletmgr.paginationSize}">
+ <c:forEach begin="0" end="#{(portletmgr.portletCount - 1) /
portletmgr.paginationSize}" step="1"
+ var="index">
+ <li class="#{index == (portletmgr.selectedFrom /
portletmgr.paginationSize)? 'selected' : ''}">
+ <h:commandLink action="#{portletmgr.selectFrom}">
+ <f:param name="from" value="#{index *
portletmgr.paginationSize}"/>
+ #{index * portletmgr.paginationSize}
+ </h:commandLink>
+ </li>
+ </c:forEach>
+ </c:if>
+ </ul>
<table class="portlet-def-table datatable">
<thead class="portlet-section-header">
<tr>
@@ -71,6 +83,15 @@
</tr>
</c:forEach>
</tbody>
+ <tfoot class="portlet-section-header">
+ <tr>
+ <th>Portlet name</th>
+ <th>Description</th>
+ <th>Remote</th>
+ <th>Remotable</th>
+ <th>Actions</th>
+ </tr>
+ </tfoot>
</table>
<ul class="pagination property-container">
<c:if test="#{portletmgr.portletCount >
portletmgr.paginationSize}">
@@ -122,10 +143,11 @@
</ul>
</h:form>
<br/>
+
<div class="property-container">
- <ui:include src="common/editPreferences.xhtml">
- <ui:param name="prefs"
value="#{portletmgr.selectedPreferences}"/>
- </ui:include>
+ <ui:include src="common/editPreferences.xhtml">
+ <ui:param name="prefs"
value="#{portletmgr.selectedPreferences}"/>
+ </ui:include>
</div>
</c:if>
@@ -143,16 +165,17 @@
</ul>
</h:form>
<br/>
+
<div class="property-container">
- <h:form id="add_instance_form"
styleClass="createObjectForm">
- <span class="portlet-font">Create an instance named: </span>
- <h:inputText id="instanceId"
value="#{createInstanceAction.instanceId}"
styleClass="portlet-form-input-field"
- required="true"/>
- <br />
- <h:commandButton action="#{createInstanceAction.execute}"
value="Create instance"
- styleClass="portlet-form-button"/>
- <h:message for="instanceId"
errorClass="portlet-msg-error"/>
- </h:form>
+ <h:form id="add_instance_form"
styleClass="createObjectForm">
+ <span class="portlet-font">Create an instance named:
</span>
+ <h:inputText id="instanceId"
value="#{createInstanceAction.instanceId}"
styleClass="portlet-form-input-field"
+ required="true"/>
+ <br/>
+ <h:commandButton action="#{createInstanceAction.execute}"
value="Create instance"
+ styleClass="portlet-form-button"/>
+ <h:message for="instanceId"
errorClass="portlet-msg-error"/>
+ </h:form>
</div>
</c:if>
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-04-21
22:06:47 UTC (rev 10677)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-04-21
22:11:19 UTC (rev 10678)
@@ -17,6 +17,17 @@
</h:form>
<h:form>
+ <ul class="pagination property-container">
+ <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 *
portletmgr.paginationSize}"/>
+ <h:outputText value="#{index *
portletmgr.paginationSize}"/>
+ </h:commandLink>
+ </li>
+ </c:forEach>
+ </ul>
<table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
@@ -36,6 +47,11 @@
</tr>
</c:forEach>
</tbody>
+ <tfoot class="portlet-section-header">
+ <tr>
+ <th>Name</th>
+ </tr>
+ </tfoot>
</table>
<ul class="pagination property-container">
<c:forEach begin="0" end="#{(portletmgr.portletCount -
1)/portletmgr.paginationSize}" step="1"