Author: wesleyhales Date: 2010-02-09 18:54:32 -0500 (Tue, 09 Feb 2010) New Revision: 1599 Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml Log: final styles for wsrp consumer admin Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 23:54:32 UTC (rev 1599) @@ -8,4 +8,14 @@ <tag-name>commandButton</tag-name> <source>xhtml/commandButton.xhtml</source> </tag> + + <tag> + <tag-name>commandLink</tag-name> + <source>xhtml/commandLink.xhtml</source> + </tag> + + <tag> + <tag-name>blueHeaderBar</tag-name> + <source>xhtml/blueHeaderBar.xhtml</source> + </tag> </facelet-taglib> \ No newline at end of file Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -0,0 +1,44 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2010, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<ui:composition 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"> + + <div class="UIBarStyle"> + <div class="BarStyle2"> + <div class="LeftBar"> + <div class="RightBar"> + <div class="MiddleBar"> + + <ui:insert/> + + </div> + </div> + </div> + </div> + </div> + +</ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -33,8 +33,10 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="#{id}" action="#{action}" - value="#{value}" immediate="#{immediate}"/> + <h:commandLink id="#{id}" action="#{backingBean[action]}" + value="#{value}" immediate="#{immediate}"> + <ui:insert/> + </h:commandLink> </div> </div> </div> Copied: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml (from rev 1591, components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml) =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -0,0 +1,45 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2010, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<ui:composition 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"> + +<table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="#{id}" action="#{actionString}" + value="#{value}" immediate="#{immediate}"/> + </div> + </div> + </div> + </td> + </tr> +</table> + +</ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -26,7 +26,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -51,14 +52,18 @@ <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p> <h:form id="confirm-delete-form"> - <h:commandLink id="destroy-link" value="#{i18n.confirm_delete_consumer_submit}" - action="#{consumersMgr.destroyConsumer}" - styleClass="portlet-form-button portlet-section-buttonrow"> - <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> - </h:commandLink> - <h:commandButton id="cancel-link" value="#{i18n.confirm_delete_consumer_cancel}" - action="#{consumersMgr.listConsumers}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + <webui:commandButton id="destroy-link" + action="destroyConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_submit}"> + <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> + </webui:commandButton> + + <webui:commandButton id="cancel-link" + action="listConsumers" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -25,7 +25,8 @@ 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"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:define name="topnav"> <h:form id="cons-temp-form" styleClass="cons-temp-form"> @@ -64,87 +65,61 @@ <ui:define name="objectpath"> + <webui:blueHeaderBar> + <div class="full-width"> + <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> + <div class="float-left half-width"> + <!-- Consumer creation --> + <div class="create-container"> + <h:form id="createConsumer" styleClass="createObjectForm"> + <span class="portlet-font">#{i18n.consumers_create_title}</span> + <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" + styleClass="portlet-form-input-field" + label="Consumer Name" required="true"/>&#160;&#160; + <webui:commandButton id="createConsumerButton" + action="createConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.consumers_create_submit}"/> - <div class="UIBarStyle"> - <div class="BarStyle2"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="full-width"> - <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> - <div class="float-left half-width"> + <ui:remove> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </ui:remove> + </h:form> + </div> + </div> + </f:subview> - <!-- Consumer creation --> - <div class="create-container"> - <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font">#{i18n.consumers_create_title}</span> - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" - label="Consumer Name" required="true"/>&#160;&#160; + <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}" - value="#{i18n.consumers_create_submit}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:form id="cons-temp-form1"> + <div class="UIControlBar"> + <c:if test="#{empty title}"> + <span + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} + </span> + </c:if> - <ui:remove> - <h:message for="consumerName" errorClass="portlet-msg-error"/> - </ui:remove> - </h:form> - </div> + <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.path_consumers_root}"/> + </span> + </div> + </h:form> - </div> - </f:subview> + </div> + </div> + </webui:blueHeaderBar> - <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}"> - <h:form id="cons-temp-form1"> - <div class="UIControlBar"> - <c:if test="#{empty title}"> - <span - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> - <h:outputFormat value="#{i18n.path_consumers_consumer}"> - <f:param value="#{consumer.id}"/> - </h:outputFormat> - (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) - #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} - </span> - </c:if> - - <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.path_consumers_root}"/> - </span> - - </div> - </h:form> - - </div> - - </div> - - - </div> - </div> - </div> - </div> - </div> - - - </ui:define> </ui:decorate> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -26,7 +26,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core" - xmlns:webui="http://jboss.org/gatein"> + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -93,20 +93,24 @@ converter="faces.convert.RegistrationProperty.Status"/> </h:column> </h:dataTable> - <h:commandLink id="cons-update-link" action="#{consumer.update}" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="#{consumer.registered}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + + <webui:commandButton action="update" + backingBean="#{consumer}" + id="cons-update-link" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}"/> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - rendered="#{consumer.registrationLocallyModified}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="modify-reg-link" + rendered="#{consumer.registrationLocallyModified}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> @@ -145,10 +149,12 @@ #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="edit-reg-link" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> </c:if> @@ -166,10 +172,11 @@ #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" - value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}" - styleClass="portlet-form-button"/> + <webui:commandLink actionString="confirmEraseRegistration" + id="erase-cons-link" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}"/> + </td> </tr> </c:if> @@ -177,12 +184,14 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <webui:commandButton action="#{consumer.refreshConsumer}" + <webui:commandButton action="refreshConsumer" + backingBean="#{consumer}" id="refresh-cons-link" value="#{i18n.edit_consumer_refresh}" title="#{i18n.edit_consumer_refresh_title}"/> - <webui:commandButton action="#{consumersMgr.listConsumers}" + <webui:commandButton action="listConsumers" + backingBean="#{consumersMgr}" id="list-cons-link" value="#{i18n.edit_consumer_cancel}" immediate="true"/>