Author: chris.laprun(a)jboss.com Date: 2007-05-11 23:53:59 -0400 (Fri, 11 May 2007) New Revision: 7247 Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml trunk/wsrp/src/resources/portal-wsrp-war/style.css Log: - JBPORTAL-1397: Everything fixed except for labels and Refresh button issue. Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-05-11 21:01:18 UTC (rev 7246) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-05-12 03:53:59 UTC (rev 7247) @@ -5,73 +5,61 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <h1 class="portlet">Configured WSRP Consumers</h1> - - <hr/> - - <h:messages errorClass="error" infoClass="info"/> - - <h:form> - Create a consumer named: - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"/><h:message styleClass="error" - for="consumerName"/> + <h:form style="padding: 1em 0;"> + Create a consumer named: <h:inputText value="#{consumersMgr.selectedId}" id="consumerName"/> + <h:message styleClass="error" for="consumerName"/> <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer" styleClass="portlet-form-button"/> </h:form> - <table width="100%" class="portlet-table-body"> + <hr style="margin: 1em 0 2em;"/> + + <h:messages errorClass="error" infoClass="info"/> + + <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;"> <thead> <tr class="portlet-table-header"> - <th>Consumer</th> + <th>Consumer + <div style="font-size: 75%; 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> - <tr> - <td colspan="2">Legend: - <span class="active">active</span> - <span class="inactive">inactive</span> - <span class="needsRefresh">needs refresh</span> - </td> - </tr> </thead> <tbody> <h:form> - <c:forEach items="#{consumersMgr.consumers}" var="consumer"> - <tr class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - <td> - <h:commandLink action="#{consumersMgr.configureConsumer}"> - <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText - value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'}) - #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/> - </h:commandLink> + <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> + <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <h:commandLink action="#{consumersMgr.configureConsumer}"> <f:param name="id" value="#{consumer.producerId}"/> <h:outputText value="Configure"/> - </h:commandLink> | - <h:commandLink action="#{consumersMgr.refreshConsumer}"> - <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Refresh"/> - </h:commandLink> | - <h:commandLink action="#{consumersMgr.activateConsumer}"> - <f:param name="id" value="#{consumer.producerId}"/> - <f:param name="activate" value="#{!consumer.active}"/> - <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/> - </h:commandLink> + </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"> + <f:param name="id" value="#{consumer.producerId}"/> + <h:outputText value="Refresh"/> + </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"> + <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="register" value="#{!consumer.producerInfo.registered}"/> - <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/> - </h:commandLink> - </c:if> | - <h:commandLink action="#{consumersMgr.destroyConsumer}"> + | <h:commandLink action="#{consumersMgr.registerConsumer}"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Destroy"/> + <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}"> + <f:param name="id" value="#{consumer.producerId}"/> + <h:outputText value="Destroy"/> + </h:commandLink> </td> </tr> </c:forEach> Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-05-11 21:01:18 UTC (rev 7246) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-05-12 03:53:59 UTC (rev 7247) @@ -148,39 +148,15 @@ </c:choose> </c:if> <tr> - <td> + <td colspan="2" style="padding: 1em 1em 1em 0;"> <h:commandButton action="#{consumer.update}" value="Save" styleClass="portlet-form-button"/> <h:commandLink action="#{consumersMgr.refreshConsumer}" value="Refresh" title="Refresh information from Producer" styleClass="portlet-form-button"> <f:param name="id" value="#{consumer.id}"/> </h:commandLink> + <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" styleClass="portlet-form-button"/> </td> - <td style="text-align: right;"> - <h:commandLink action="#{consumersMgr.listConsumers}" value="Return to list" styleClass="portlet-form-button"/> - </td> </tr> -<tr> - <td> - <h:commandLink action="#{consumersMgr.activateConsumer}" styleClass="portlet-form-button" - value="#{consumer.active ? 'Deactivate' : 'Activate'}"> - <f:param name="id" value="#{consumer.id}"/> - <f:param name="activate" value="#{!consumer.active}"/> - </h:commandLink> - - <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="portlet-form-button" - rendered="#{!consumer.refreshNeeded and consumer.active and consumer.registrationRequired}" - value="#{consumer.registered ? 'Deregister' : 'Register'}"> - <f:param name="id" value="#{consumer.id}"/> - <f:param name="register" value="#{!consumer.registered}"/> - </h:commandLink> - - </td> - <td style="text-align: right;"> - <h:commandLink action="#{consumersMgr.destroyConsumer}" value="Destroy" styleClass="portlet-form-button"> - <f:param name="id" value="#{consumer.id}"/> - </h:commandLink> - </td> -</tr> </table> </h:form> </div> \ No newline at end of file Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml 2007-05-11 21:01:18 UTC (rev 7246) +++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml 2007-05-12 03:53:59 UTC (rev 7247) @@ -41,13 +41,7 @@ <instance-ref>WSRPConsumersConfigurationPortletInstance</instance-ref> <region>center</region> <height>0</height> - </window> - <window> - <window-name>CatalogPortletWindow</window-name> - <instance-ref>CatalogPortletInstance</instance-ref> - <region>left</region> - <height>0</height> - </window> + </window> </page> </deployment> </deployments> Modified: trunk/wsrp/src/resources/portal-wsrp-war/style.css =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-05-11 21:01:18 UTC (rev 7246) +++ trunk/wsrp/src/resources/portal-wsrp-war/style.css 2007-05-12 03:53:59 UTC (rev 7247) @@ -18,7 +18,6 @@ .wsrp-consumer-ui th { text-align: left; border: 0; - border-right: 2px solid; vertical-align: top; } @@ -47,10 +46,6 @@ border-collapse: separate; } -.wsrp-consumer-ui .registration-prop-table th { - border: none; -} - .wsrp-consumer-ui .portlet-form-button { padding: .2em; margin: .3em;