[portal-commits] JBoss Portal SVN: r6655 - in trunk: wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2007-03-13 17:10:18 -0400 (Tue, 13 Mar 2007) New Revision: 6655 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp Log: - Minor fixes. - WSRP GUI is now being re-written in JSF. Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-13 17:30:51 UTC (rev 6654) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-13 21:10:18 UTC (rev 6655) @@ -6,111 +6,113 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> - <h:form> +<h:form> - <table width="100%"> +<table width="100%"> - <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> - <tbody class="portlet-section-header"> - <tr> - <th>Portal</th> - <th>Actions</th> - </tr> - </tbody> - <tbody> - <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </c:if> +<c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> + <thead class="portlet-section-header"> + <tr> + <th>Portal</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> - <c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> - <tbody class="portlet-section-header"> - <tr> - <th>Page</th> - <th>Actions</th> - </tr> - </tbody> - <tbody> - <c:forEach items="#{portalobjectmgr.selectedObject.pages}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Layout"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </c:if> +<c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> + <thead class="portlet-section-header"> + <tr> + <th>Page</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.pages}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Layout"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageSecurity" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> - <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> - <tbody class="portlet-section-header"> - <tr> - <th>Window</th> - <th>Actions</th> - </tr> - </tbody> - <tbody> - <c:forEach items="#{portalobjectmgr.selectedObject.windows}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </c:if> +<c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <thead class="portlet-section-header"> + <tr> + <th>Window</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.selectedObject.windows}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> +</c:if> - </table> +</table> - </h:form> +</h:form> </div> Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-03-13 17:30:51 UTC (rev 6654) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-03-13 21:10:18 UTC (rev 6655) @@ -40,9 +40,12 @@ <tr> <th>Cache expiration:</th> - <td><input type="text" name="cache-expiration" - value="<%=info.getExpirationCacheSeconds().intValue()%>"/> seconds - </td> + <% + Integer cache = info.getExpirationCacheSeconds(); + String value = (cache != null) ? "" + cache.intValue() : "UNSET"; + %> + <td><input type="text" name="cache-expiration" value="<%=value%>"/> (seconds before expiration)</td> + </tr> <tr> @@ -174,8 +177,10 @@ <tr> <td colspan="2"> <input type="submit" name="editConsumer" value="Save" class="portlet-form-button"/> - <a href="<portlet:renderURL> - <portlet:param name="<%=WSRPConsumerConfigurationPortlet.OP%>" value="<%=WSRPConsumerConfigurationPortlet.OP_LIST%>"/></portlet:renderURL>"> + <a href="<portlet:actionURL> + <portlet:param name="<%=WSRPConsumerConfigurationPortlet.OP%>" value="<%=WSRPConsumerConfigurationPortlet.OP_LIST%>"/> + <portlet:param name="<%=WSRPConsumerConfigurationPortlet.ID%>" value="<%=consumer.getProducerId()%>"/> + </portlet:actionURL>"> <input type="button" value="Cancel" class="portlet-form-button"/></a> </td> </tr>