From portal-commits at lists.jboss.org Mon Apr 21 18:11:20 2008
Content-Type: multipart/mixed; boundary="===============6591149459627402173=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10678 - in
 branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf:
 wizard and 1 other directory.
Date: Mon, 21 Apr 2008 18:11:19 -0400
Message-ID: <E1Jo4EJ-0000XC-WD@committer01.frg.pub.inap.atl.jboss.com>

--===============6591149459627402173==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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-w=
ar/jsf/instances.xhtml
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-w=
ar/jsf/portlets.xhtml
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-w=
ar/jsf/wizard/selectPortlet.xhtml
Log:
- Added pagination at the top of the table and table footer with columns fo=
r better readability.

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-=
admin-war/jsf/instances.xhtml
=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
--- 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=3D"#{empty instancemgr.selectedPlugin}">
    <h:form>
+      <ul class=3D"pagination property-container">
+         <c:if test=3D"#{instancemgr.instanceCount > instancemgr.paginatio=
nSize}">
+            <c:forEach begin=3D"0" end=3D"#{(instancemgr.instanceCount - 1=
)/ instancemgr.paginationSize}" step=3D"1"
+                       var=3D"index">
+               <li class=3D"#{index =3D=3D (instancemgr.selectedFrom / ins=
tancemgr.paginationSize)? 'selected' : ''}">
+                  <h:commandLink action=3D"#{instancemgr.selectFrom}">
+                     <f:param name=3D"from" value=3D"#{index * instancemgr=
.paginationSize}"/>
+                     <h:outputText value=3D"#{index * instancemgr.paginati=
onSize}"/>
+                  </h:commandLink>
+               </li>
+            </c:forEach>
+         </c:if>
+      </ul>
       <table id=3D"instancesTable2" class=3D"portlet-def-table datatable">
          <thead class=3D"portlet-section-header">
             <tr>
@@ -55,6 +68,13 @@
                </tr>
             </c:forEach>
          </tbody>
+         <tfoot class=3D"portlet-section-header">
+            <tr>
+               <th>Instance id</th>
+               <th>Instance name</th>
+               <th>Actions</th>
+            </tr>
+         </tfoot>
       </table>
       <ul class=3D"pagination property-container">
          <c:if test=3D"#{instancemgr.instanceCount > instancemgr.paginatio=
nSize}">
@@ -78,7 +98,7 @@
    <h:form>
       <ul class=3D"objectpath">
          <li class=3D"pathItem">
-             <!--#{instancemgr.selectedInstance.portlet.info.security}-->
+            <!--#{instancemgr.selectedInstance.portlet.info.security}-->
             <h:commandLink action=3D"#{instancemgr.selectInstance}">Portle=
t Instances</h:commandLink>
          </li>
          <li class=3D"pathSeparator"><h:graphicImage url=3D"/img/pathSepar=
ator.png" alt=3D">"/></li>
@@ -116,15 +136,16 @@
       </ul>
    </h:form>
    <br/>
+
    <div class=3D"property-container">
-   <ui:include src=3D"common/editPreferences.xhtml">
-      <ui:param name=3D"prefs" value=3D"#{instancemgr.selectedPrefs}"/>
-   </ui:include>
-   <br />
-   <h:form>
-      <h:commandButton value=3D"Save" action=3D"#{instancemgr.updatePrefs}=
" styleClass=3D"portlet-form-button"/>
-      <h:commandButton value=3D"Cancel" action=3D"#{instancemgr.cancelPref=
s}" styleClass=3D"portlet-form-button"/>
-   </h:form>
+      <ui:include src=3D"common/editPreferences.xhtml">
+         <ui:param name=3D"prefs" value=3D"#{instancemgr.selectedPrefs}"/>
+      </ui:include>
+      <br/>
+      <h:form>
+         <h:commandButton value=3D"Save" action=3D"#{instancemgr.updatePre=
fs}" styleClass=3D"portlet-form-button"/>
+         <h:commandButton value=3D"Cancel" action=3D"#{instancemgr.cancelP=
refs}" styleClass=3D"portlet-form-button"/>
+      </h:form>
    </div>
 </c:if>
 =

@@ -142,10 +163,11 @@
       </ul>
    </h:form>
    <br/>
+
    <div class=3D"property-container">
-   <ui:decorate template=3D"/jsf/common/editSecurity.xhtml">
-      <ui:param name=3D"auth" value=3D"#{instancemgr.auth}"/>
-   </ui:decorate>
+      <ui:decorate template=3D"/jsf/common/editSecurity.xhtml">
+         <ui:param name=3D"auth" value=3D"#{instancemgr.auth}"/>
+      </ui:decorate>
    </div>
 </c:if>
 =


Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-=
admin-war/jsf/portlets.xhtml
=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
--- 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=3D"#{empty portletmgr.selectedPlugin}">
    <div class=3D"provider-menu-container">
+      <h:form>
+         <h:outputLabel for=3D"menu">
+            <h:outputText value=3D"View portlets provided by the portlet p=
rovider named: "
+                          styleClass=3D"portlet-form-field-label"/>
+         </h:outputLabel>
+         <h:selectOneMenu id=3D"menu" styleClass=3D"portlet-form-field"
+                          value=3D"#{portletmgr.selectedPortletInvokerId}">
+            <f:selectItems value=3D"#{portletmgr.portletInvokerItems}"/>
+         </h:selectOneMenu>
+         <h:commandButton value=3D"View portlets" styleClass=3D"portlet-fo=
rm-button"/>
+      </h:form>
+   </div>
    <h:form>
-      <h:outputLabel for=3D"menu">
-         <h:outputText value=3D"View portlets provided by the portlet prov=
ider named: "
-                       styleClass=3D"portlet-form-field-label"/>
-      </h:outputLabel>
-      <h:selectOneMenu id=3D"menu" styleClass=3D"portlet-form-field"
-                       value=3D"#{portletmgr.selectedPortletInvokerId}">
-         <f:selectItems value=3D"#{portletmgr.portletInvokerItems}"/>
-      </h:selectOneMenu>
-      <h:commandButton value=3D"View portlets" styleClass=3D"portlet-form-=
button"/>
-   </h:form>
-  </div>
-   <h:form>
-
+      <ul class=3D"pagination property-container">
+         <c:if test=3D"#{portletmgr.portletCount > portletmgr.paginationSi=
ze}">
+            <c:forEach begin=3D"0" end=3D"#{(portletmgr.portletCount - 1) =
/ portletmgr.paginationSize}" step=3D"1"
+                       var=3D"index">
+               <li class=3D"#{index =3D=3D (portletmgr.selectedFrom / port=
letmgr.paginationSize)? 'selected' : ''}">
+                  <h:commandLink action=3D"#{portletmgr.selectFrom}">
+                     <f:param name=3D"from" value=3D"#{index * portletmgr.=
paginationSize}"/>
+                     #{index * portletmgr.paginationSize}
+                  </h:commandLink>
+               </li>
+            </c:forEach>
+         </c:if>
+      </ul>
       <table class=3D"portlet-def-table datatable">
          <thead class=3D"portlet-section-header">
             <tr>
@@ -71,6 +83,15 @@
                </tr>
             </c:forEach>
          </tbody>
+         <tfoot class=3D"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=3D"pagination property-container">
          <c:if test=3D"#{portletmgr.portletCount > portletmgr.paginationSi=
ze}">
@@ -122,10 +143,11 @@
       </ul>
    </h:form>
    <br/>
+
    <div class=3D"property-container">
-   <ui:include src=3D"common/editPreferences.xhtml">
-      <ui:param name=3D"prefs" value=3D"#{portletmgr.selectedPreferences}"=
/>
-   </ui:include>
+      <ui:include src=3D"common/editPreferences.xhtml">
+         <ui:param name=3D"prefs" value=3D"#{portletmgr.selectedPreference=
s}"/>
+      </ui:include>
    </div>
 </c:if>
 =

@@ -143,16 +165,17 @@
       </ul>
    </h:form>
    <br/>
+
    <div class=3D"property-container">
-   <h:form id=3D"add_instance_form" styleClass=3D"createObjectForm">
-      <span class=3D"portlet-font">Create an instance named: </span>
-      <h:inputText id=3D"instanceId" value=3D"#{createInstanceAction.insta=
nceId}" styleClass=3D"portlet-form-input-field"
-                   required=3D"true"/>
-      <br />
-      <h:commandButton action=3D"#{createInstanceAction.execute}" value=3D=
"Create instance"
-                       styleClass=3D"portlet-form-button"/>
-      <h:message for=3D"instanceId" errorClass=3D"portlet-msg-error"/>
-   </h:form>
+      <h:form id=3D"add_instance_form" styleClass=3D"createObjectForm">
+         <span class=3D"portlet-font">Create an instance named: </span>
+         <h:inputText id=3D"instanceId" value=3D"#{createInstanceAction.in=
stanceId}" styleClass=3D"portlet-form-input-field"
+                      required=3D"true"/>
+         <br/>
+         <h:commandButton action=3D"#{createInstanceAction.execute}" value=
=3D"Create instance"
+                          styleClass=3D"portlet-form-button"/>
+         <h:message for=3D"instanceId" errorClass=3D"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
=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
--- 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=3D"pagination property-container">
+               <c:forEach begin=3D"0" end=3D"#{(portletmgr.portletCount - =
1)/portletmgr.paginationSize}" step=3D"1"
+                          var=3D"index">
+                  <li class=3D"#{index =3D=3D portletmgr.selectedFrom ? 's=
elected' : ''}">
+                     <h:commandLink action=3D"#{portletmgr.selectFrom}">
+                        <f:param name=3D"from" value=3D"#{index * portletm=
gr.paginationSize}"/>
+                        <h:outputText value=3D"#{index * portletmgr.pagina=
tionSize}"/>
+                     </h:commandLink>
+                  </li>
+               </c:forEach>
+            </ul>
             <table class=3D"full-width datatable">
                <thead class=3D"portlet-section-header">
                   <tr>
@@ -36,6 +47,11 @@
                      </tr>
                   </c:forEach>
                </tbody>
+               <tfoot class=3D"portlet-section-header">
+                  <tr>
+                     <th>Name</th>
+                  </tr>
+               </tfoot>
             </table>
             <ul class=3D"pagination property-container">
                <c:forEach begin=3D"0" end=3D"#{(portletmgr.portletCount - =
1)/portletmgr.paginationSize}" step=3D"1"


--===============6591149459627402173==--