Author: wesleyhales Date: 2010-02-09 20:59:32 -0500 (Tue, 09 Feb 2010) New Revision: 1600 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css Log: webui wsrp consumer & producer admin skin 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 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -72,7 +72,7 @@ <!-- Consumer creation --> <div class="create-container"> <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font">#{i18n.consumers_create_title}</span> + <span class="portlet-font bold">#{i18n.consumers_create_title}</span>&#160; <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" label="Consumer Name" required="true"/>&#160;&#160; @@ -109,7 +109,7 @@ </c:if> <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + <h:commandLink id="list-cons-link" class="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/> </span> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -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:param name="title" value="#{i18n.producer_config_title}"/> @@ -58,18 +59,31 @@ </h:panelGroup> <h:outputText value=" " rendered="#{producer.registrationRequired}"/> - <h:panelGroup rendered="#{producer.registrationRequired}"> - <h:outputText styleClass="portlet-area-header" value="#{i18n.producer_config_reg_props}"/> - <h:panelGroup styleClass="portlet-area-body"> - <c:choose> - <c:when test="#{!empty producer.registrationProperties}"> - <h:dataTable id="reg-properties" var="property" width="100%" - value="#{producer.registrationProperties}" - rendered="#{producer.registrationRequired}" - headerClass="portlet-section-header"> + <f:subview rendered="#{producer.registrationRequired}"> + + <webui:blueHeaderBar> + <div class="full-width float-left bold"> + #{i18n.producer_config_reg_props} + <div style="position:relative;display:inline"> + <div style="position:absolute;top:-5px;left: 10px;font-weight:normal"> + <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" + backingBean="#{producer}" + value="#{i18n.producer_config_add_reg_prop}"/></div> + </div> + </div> + + + </webui:blueHeaderBar> + + + <f:subview rendered="#{!empty producer.registrationProperties}" id="reg-props"> + <h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property" + rendered="#{producer.registrationRequired}" + rowClasses="EvenRow,OddRow" + styleClass="UIGrid ConsumerGrid" width="100%"> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> - <h:inputText id="name" value="#{property.nameAsString}" size="30"/> + <h:inputText id="name" value="#{property.nameAsString}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> @@ -79,41 +93,42 @@ </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> - <h:inputText id="label" value="#{property.label}" size="50"/> + <h:inputText id="label" value="#{property.label}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> - <h:inputText id="hint" value="#{property.hint}" size="50"/> + <h:inputText id="hint" value="#{property.hint}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet> <h:commandLink id="confirm-delete" action="confirmPropDeletion" value="#{i18n.producer_config_reg_prop_remove}" - styleClass="portlet-form-button" + styleClass="actionDelete" actionListener="#{producer.selectProperty}"> <f:param name="propName" value="#{property.nameAsString}"/> </h:commandLink> </h:column> </h:dataTable> - </c:when> - <c:otherwise> + </f:subview> + + <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> <h:outputText value="#{i18n.producer_config_no_reg_props}"/> - </c:otherwise> - </c:choose> + </f:subview> - <h:commandLink id="add-reg-prop" action="#{producer.addRegistrationProperty}" - value="#{i18n.producer_config_add_reg_prop}" - styleClass="portlet-form-button"/> - </h:panelGroup> - </h:panelGroup> + </f:subview> + + <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <h:commandButton id="save-producer" action="#{producer.save}" value="#{i18n.producer_config_save}" - styleClass="portlet-form-button"/> - <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" - value="#{i18n.producer_config_cancel}" - styleClass="portlet-form-button"/> + <webui:commandButton id="reg-save" action="save" + backingBean="#{producer}" + value="#{i18n.producer_config_save}" /> + + <webui:commandButton id="reg-reload" action="reloadConfiguration" + backingBean="#{producer}" + value="#{i18n.producer_config_cancel}"/> + </h:panelGroup> </h:panelGrid> </h:form> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -28,7 +28,7 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:define name="topnav"> - <h:form id="producer-temp-form"> + <h:form id="producer-temp-form" styleClass="producer-temp-form"> <div class="TabsContainer"> <table class="TabsActionContainer"><tr><td> @@ -49,7 +49,7 @@ <div class="LeftTab"> <div class="RightTab"> <div class="MiddleTab"> - #{i18n.nav_tabs_producer_config}" + #{i18n.nav_tabs_producer_config} </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-10 01:59:32 UTC (rev 1600) @@ -11,7 +11,8 @@ /***************************** Consumer Form Style ************************/ -.UIWsrpPortlet .cons-temp-form { +.UIWsrpPortlet .cons-temp-form, +.UIWsrpPortlet .producer-temp-form{ height: 27px; } @@ -28,9 +29,14 @@ position: relative; } +.UIWsrpPortlet .list-cons-link { + text-decoration: underline; + color: darkblue; +} + .UIWsrpPortlet .create-container .ActionContainer { position: absolute; - top: 7px; + margin: 7px 0 0 0; } /***************************** Messages Style ************************/ @@ -41,6 +47,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } .portlet-msg-warn { @@ -49,6 +56,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } .portlet-msg-error { @@ -57,6 +65,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } /***************************** ActionButton Style ************************/ @@ -88,12 +97,12 @@ .UIWsrpPortlet .TabsActionContainer { position: absolute; - bottom: -6px; + bottom: -1px; width: auto; } .UIWsrpPortlet .TabsContainer { - height: 24px; + height: 29px; position: relative; } Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-10 01:59:32 UTC (rev 1600) @@ -85,6 +85,10 @@ border: 1px solid #B3C0C7; } +.bold { + font-weight: bold; +} + .dotted-blue-border { font-weight: bold; color: #315896;