Author: chris.laprun(a)jboss.com Date: 2007-11-26 18:18:17 -0500 (Mon, 26 Nov 2007) New Revision: 9117 Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml Removed: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml Log: - JBPORTAL-1714: + Improved templates. + Moved producer-related pages to producer directory. Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2007-11-26 23:01:42 UTC (rev 9116) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2007-11-26 23:18:17 UTC (rev 9117) @@ -111,7 +111,7 @@ </navigation-case> <navigation-case> <from-outcome>producer</from-outcome> - <to-view-id>/WEB-INF/jsf/producer.xhtml</to-view-id> + <to-view-id>/WEB-INF/jsf/producer/producer.xhtml</to-view-id> </navigation-case> </navigation-rule> </faces-config> Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-26 23:01:42 UTC (rev 9116) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -1,10 +0,0 @@ -<ui:composition - xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets"> - - <div class="tab-container"> - <ui:insert name="tab-container-content"/> - </div> - -</ui:composition> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -0,0 +1,21 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core"> + <div class="wsrp-consumers-ui"> + <ui:insert name="topnav">Top navigation</ui:insert> + + <div class="tab-container"> + <ui:insert name="objectpath">Object path if needed</ui:insert> + + <c:if test="#{!empty title}"> + <h3 class="sectionTitle">${title}</h3> + </c:if> + + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </div> + </div> +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-26 23:01:42 UTC (rev 9116) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -1,49 +1,34 @@ -<div class="wsrp-consumers-ui" - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> +<ui:decorate template="../common/template.xhtml" xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> - <h:form> - <ul class="topnav"> - <li id="currentTab">Consumers Configuration</li> - <li><h:commandLink value="Producer Configuration" action="producer"/></li> - <li>Producer Data</li> - </ul> - </h:form> + <ui:define name="topnav"> + <h:form> + <ul class="topnav"> + <li id="currentTab">Consumers Configuration</li> + <li><h:commandLink value="Producer Configuration" action="producer"/></li> + <li>Producer Data</li> + </ul> + </h:form> + </ui:define> - - <ui:decorate template="../common/tabContainer.xhtml"> - <ui:define name="tab-container-content"> - - <h:form> - <ul class="objectpath"> - <li class="#{!empty title ? 'selected' : 'pathItem'}"> - <h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers"/> + <ui:define name="objectpath"> + <h:form> + <ul class="objectpath"> + <li class="#{!empty title ? 'selected' : 'pathItem'}"> + <h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers"/> + </li> + <c:if test="#{empty title}"> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> + Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'}) + #{consumer.refreshNeeded ? '(refresh needed)' : ''} </li> - <c:if test="#{empty title}"> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'}) - #{consumer.refreshNeeded ? '(refresh needed)' : ''} - </li> - </c:if> - </ul> - </h:form> - - <c:if test="#{!empty title}"> - <h3 class="sectionTitle">${title}</h3> - </c:if> - - <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - - <!-- Content --> - <ui:insert name="content">Content</ui:insert> - - </ui:define> - </ui:decorate> -</div> \ No newline at end of file + </c:if> + </ul> + </h:form> + </ui:define> +</ui:decorate> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-26 23:01:42 UTC (rev 9116) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -1,81 +1,77 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:c="http://java.sun.com/jstl/core"> +<ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> - <ui:composition template="consumerTemplate.xhtml"> + <ui:param name="title" value="Manage Consumers"/> - <ui:param name="title" value="Manage Consumers"/> + <ui:define name="content"> - <ui:define name="content"> + <!-- Consumer creation --> + <h:form styleClass="createObjectForm"> + <span class="portlet-font">Create a consumer named: </span> + <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer" + styleClass="portlet-form-button"/> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </h:form> - <!-- Consumer creation --> - <h:form styleClass="createObjectForm"> - <span class="portlet-font">Create a consumer named: </span> - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" - required="true"/> - <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer" - styleClass="portlet-form-button"/> - <h:message for="consumerName" errorClass="portlet-msg-error"/> - </h:form> + <!-- Separation --> + <hr/> - <!-- Separation --> - <hr/> - - <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;"> - <thead class="portlet-section-header"> - <tr> - <th>Consumer - <div style="font-size: 90%; display:inline; font-weight: normal;"> - [status: <span class="active">active</span>, <span class="inactive">inactive</span>, - <span class="needsRefresh">needs refresh</span>] - </div> - </th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <h:form> - <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status"> - <tr> - <td - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'}) + <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;"> + <thead class="portlet-section-header"> + <tr> + <th>Consumer + <div style="font-size: 90%; display:inline; font-weight: normal;"> + [status: <span class="active">active</span>, <span class="inactive">inactive</span>, + <span class="needsRefresh">needs refresh</span>] + </div> + </th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <h:form> + <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status"> + <tr> + <td + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> + <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'}) #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/> - </td> - <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure"> - <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Configure"/> - </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}" - styleClass="actionRefresh"> + </td> + <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Refresh"/> - </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}" - styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}"> + <h:outputText value="Configure"/> + </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}" + styleClass="actionRefresh"> + <f:param name="id" value="#{consumer.producerId}"/> + <h:outputText value="Refresh"/> + </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}" + styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}"> + <f:param name="id" value="#{consumer.producerId}"/> + <f:param name="activate" value="#{!consumer.active}"/> + <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/> + </h:commandLink> + <c:if + test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}"> + | <h:commandLink action="#{consumersMgr.registerConsumer}"> <f:param name="id" value="#{consumer.producerId}"/> - <f:param name="activate" value="#{!consumer.active}"/> - <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/> + <f:param name="register" value="#{!consumer.producerInfo.registered}"/> + <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/> </h:commandLink> - <c:if - test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}"> - | <h:commandLink action="#{consumersMgr.registerConsumer}"> - <f:param name="id" value="#{consumer.producerId}"/> - <f:param name="register" value="#{!consumer.producerInfo.registered}"/> - <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/> - </h:commandLink> - </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}" styleClass="actionDelete"> - <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Delete"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </h:form> - </tbody> - </table> - </ui:define> - </ui:composition> -</div> \ No newline at end of file + </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}" styleClass="actionDelete"> + <f:param name="id" value="#{consumer.producerId}"/> + <h:outputText value="Delete"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </h:form> + </tbody> + </table> + </ui:define> +</ui:decorate> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-11-26 23:01:42 UTC (rev 9116) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -1,12 +1,8 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:c="http://java.sun.com/jstl/core"> - -<ui:composition template="consumerTemplate.xhtml"> - +<ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -150,5 +146,4 @@ </table> </h:form> </ui:define> -</ui:composition> -</div> \ No newline at end of file +</ui:decorate> \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml (from rev 9094, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -0,0 +1,77 @@ +<ui:decorate template="producerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + + <ui:param name="title" value="Producer configuration"/> + + <ui:define name="content"> + <h:form> + <h:panelGrid columns="2" width="100%"> + <h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/> + <h:outputText value="Access to full service description requires consumers to be registered."/> + + <h:selectBooleanCheckbox value="#{producer.registrationRequired}"/> + <h:outputText value="Requires registration."/> + + <h:outputText value=" " rendered="#{producer.registrationRequired}"/> + <h:panelGroup> + <h:panelGrid columns="2" rendered="#{producer.registrationRequired}" width="100%"> + <h:outputLabel value="Registration policy class name:" for="registrationPolicy"/> + <h:inputText id="registrationPolicy" value="#{producer.registrationPolicyClassName}" size="80"/> + + <h:outputLabel value="Registration property validator class name:" for="validator" + rendered="#{producer.defaultRegistrationPolicy}"/> + <h:inputText id="validator" value="#{producer.validatorClassName}" size="80" + rendered="#{producer.defaultRegistrationPolicy}"/> + + </h:panelGrid> + </h:panelGroup> + + <h:outputText value=" " rendered="#{producer.registrationRequired}"/> + <h:panelGroup rendered="#{producer.registrationRequired}"> + <h:outputText styleClass="portlet-area-header" value="Registration properties"/> + <h:panelGroup styleClass="portlet-area-body"> + <c:choose> + <c:when test="#{!empty producer.registrationProperties}"> + <h:dataTable var="property" id="registrationProperties" width="100%" + value="#{producer.registrationProperties}" + rendered="#{producer.registrationRequired}" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header">Name</f:facet> + <h:inputText value="#{property.nameAsString}" size="30"/> + </h:column> + <h:column> + <f:facet name="header">Type</f:facet> + <h:selectOneListbox disabled="true"> + <f:selectItems value="#{producer.supportedPropertyTypes}"/> + </h:selectOneListbox> + </h:column> + <h:column> + <f:facet name="header">Label</f:facet> + <h:inputText value="#{property.label}" size="50"/> + </h:column> + <h:column> + <f:facet name="header">Hint</f:facet> + <h:inputText value="#{property.hint}" size="50"/> + </h:column> + </h:dataTable> + </c:when> + <c:otherwise> + <h:outputText value="No specified required registration properties."/> + </c:otherwise> + </c:choose> + <h:commandLink action="#{producer.addRegistrationProperty}" value="Add property" + styleClass="portlet-form-button"/> + </h:panelGroup> + </h:panelGroup> + + <h:outputText value=" "/> + <h:commandButton action="#{producer.save}" value="Save" styleClass="portlet-form-button"/> + </h:panelGrid> + </h:form> + + </ui:define> +</ui:decorate> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2007-11-26 23:18:17 UTC (rev 9117) @@ -0,0 +1,18 @@ +<ui:decorate template="../common/template.xhtml" xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + + <ui:define name="topnav"> + <h:form> + <ul class="topnav"> + <li><h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers Configuration"/></li> + <li id="currentTab">Producer Configuration</li> + <li>Producer Data</li> + </ul> + </h:form> + </ui:define> + + <ui:define name="objectpath"/> +</ui:decorate> \ No newline at end of file