Author: wesleyhales Date: 2010-02-09 21:07:58 -0500 (Tue, 09 Feb 2010) New Revision: 1601 Modified: 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/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css Log: webui wsrp consumer & producer admin skin Modified: 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 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -32,9 +32,7 @@ <div class="LeftBar"> <div class="RightBar"> <div class="MiddleBar"> - <ui:insert/> - </div> </div> </div> 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-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -36,7 +36,7 @@ <h:commandLink id="#{id}" action="#{backingBean[action]}" value="#{value}" immediate="#{immediate}"> <ui:insert/> - </h:commandLink> + </h:commandLink> </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -27,92 +27,91 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="title" value="#{i18n.consumers_title}"/> - <ui:param name="showAddConsumer" value="true"/> + <ui:param name="title" value="#{i18n.consumers_title}"/> + <ui:param name="showAddConsumer" value="true"/> - <ui:define name="content"> + <ui:define name="content"> + <!-- Consumers list --> + <h:form id="consumer-list-form"> + <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" + rendered="#{!consumersMgr.consumersEmpty}" + rowClasses="EvenRow,OddRow" + styleClass="UIGrid ConsumerGrid" width="100%"> + <h:column> + <f:facet name="header"> + #{i18n.consumers_table_column_consumer} + <div style="font-size: 90%; display:inline; font-weight: normal;"> + [#{i18n.consumers_table_column_consumer_status} <span + class="active">#{i18n.path_consumers_active}</span>, + <span class="inactive">#{i18n.path_consumers_inactive}</span>, + <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] + </div> + </f:facet> - <!-- Consumers list --> - <h:form id="consumer-list-form"> - <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" - rendered="#{!consumersMgr.consumersEmpty}" - rowClasses="EvenRow,OddRow" - styleClass="UIGrid ConsumerGrid" width="100%"> - <h:column> - <f:facet name="header"> - #{i18n.consumers_table_column_consumer} - <div style="font-size: 90%; display:inline; font-weight: normal;"> - [#{i18n.consumers_table_column_consumer_status} <span - class="active">#{i18n.path_consumers_active}</span>, - <span class="inactive">#{i18n.path_consumers_inactive}</span>, - <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] - </div> - </f:facet> - - <h:outputText style="display:block; width:100%;" - styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}" - value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + <h:outputText style="display:block; width:100%;" + styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}" + value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) #{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/> - </h:column> + </h:column> - <h:column> - <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet> + <h:column> + <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet> - <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" - id="configure"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_configure} - </h:commandLink> - | - <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_refresh} - </h:commandLink> - | - <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" - styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}"> - <f:param name="id" value="#{cons.producerId}"/> - <f:param name="activate" value="#{!cons.active}"/> - #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate} - </h:commandLink> - <h:panelGroup - rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> - | - <h:commandLink action="#{consumersMgr.registerConsumer}" id="register" - styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}"> - <f:param name="id" value="#{cons.producerId}"/> - <f:param name="register" value="#{!cons.producerInfo.registered}"/> - #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register} - </h:commandLink> - </h:panelGroup> - | - <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" - actionListener="#{consumersMgr.selectConsumer}"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_delete} - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> + <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" + id="configure"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_configure} + </h:commandLink> + | + <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_refresh} + </h:commandLink> + | + <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" + styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}"> + <f:param name="id" value="#{cons.producerId}"/> + <f:param name="activate" value="#{!cons.active}"/> + #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate} + </h:commandLink> + <h:panelGroup + rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> + | + <h:commandLink action="#{consumersMgr.registerConsumer}" id="register" + styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}"> + <f:param name="id" value="#{cons.producerId}"/> + <f:param name="register" value="#{!cons.producerInfo.registered}"/> + #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register} + </h:commandLink> + </h:panelGroup> + | + <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" + actionListener="#{consumersMgr.selectConsumer}"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_delete} + </h:commandLink> + </h:column> + </h:dataTable> + </h:form> - <h:form> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}"/> - </div> - </div> + <h:form> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}"/> </div> - </td> - </tr> - </table> + </div> + </div> + </td> + </tr> + </table> - </h:form> - </ui:define> + </h:form> + </ui:define> </ui:decorate> \ No newline at end of file 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-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -61,73 +61,73 @@ <h:outputText value=" " rendered="#{producer.registrationRequired}"/> <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> + <div class="full-width float-left bold"> + #{i18n.producer_config_reg_props} + <div class="add-prop-container"> + <div class="add-prop-button"> + <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" + backingBean="#{producer}" + value="#{i18n.producer_config_add_reg_prop}"/></div> + </div> + </div> - </webui:blueHeaderBar> + </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="21"/> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> - <h:selectOneListbox id="producer-list" disabled="true"> - <f:selectItems value="#{producer.supportedPropertyTypes}"/> - </h:selectOneListbox> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> - <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="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="actionDelete" - actionListener="#{producer.selectProperty}"> - <f:param name="propName" value="#{property.nameAsString}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </f:subview> + <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="21"/> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> + <h:selectOneListbox id="producer-list" disabled="true"> + <f:selectItems value="#{producer.supportedPropertyTypes}"/> + </h:selectOneListbox> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> + <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="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="actionDelete" + actionListener="#{producer.selectProperty}"> + <f:param name="propName" value="#{property.nameAsString}"/> + </h:commandLink> + </h:column> + </h:dataTable> + </f:subview> - <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> - <h:outputText value="#{i18n.producer_config_no_reg_props}"/> - </f:subview> + <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> + <h:outputText value="#{i18n.producer_config_no_reg_props}"/> + </f:subview> - </f:subview> + </f:subview> <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <webui:commandButton id="reg-save" action="save" - backingBean="#{producer}" - value="#{i18n.producer_config_save}" /> + <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}"/> + <webui:commandButton id="reg-reload" action="reloadConfiguration" + backingBean="#{producer}" + value="#{i18n.producer_config_cancel}"/> </h:panelGroup> </h:panelGrid> 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-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-10 02:07:58 UTC (rev 1601) @@ -1,160 +1,173 @@ .UIWsrpPortlet .UIControlBar { - /*background: url('background/ControlIcon.gif') repeat-x center -222px;*/ - /*border: 1px solid #b7b7b7;*/ - /*height: 23px;*/ - line-height: 28px; - padding: 4px 10px 0 0; - /*margin: 5px 0px;*/ - font-weight: bold; - text-align: right; +/*background: url('background/ControlIcon.gif') repeat-x center -222px;*/ +/*border: 1px solid #b7b7b7;*/ +/*height: 23px;*/ + line-height: 28px; + padding: 4px 10px 0 0; /*margin: 5px 0px;*/ + font-weight: bold; + text-align: right; } /***************************** Consumer Form Style ************************/ .UIWsrpPortlet .cons-temp-form, -.UIWsrpPortlet .producer-temp-form{ - height: 27px; +.UIWsrpPortlet .producer-temp-form { + height: 27px; } .UIWsrpPortlet .UIGrid { - border: 1px solid #B7B7B7; + border: 1px solid #B7B7B7; } .UIWsrpPortlet .ConsumerGrid thead tr th, .UIWsrpPortlet .ConsumerGrid tbody tr td { - border: 1px solid #B7B7B7; + border: 1px solid #B7B7B7; } .UIWsrpPortlet .create-container { - position: relative; + position: relative; } .UIWsrpPortlet .list-cons-link { - text-decoration: underline; - color: darkblue; + text-decoration: underline; + color: darkblue; } .UIWsrpPortlet .create-container .ActionContainer { - position: absolute; - margin: 7px 0 0 0; + position: absolute; + margin: 7px 0 0 0; } +/***************************** Producer Form Style ************************/ + +.UIWsrpPortlet .add-prop-container { + position: relative; + display: inline +} + +.UIWsrpPortlet .add-prop-button { + position: absolute; + top: -5px; + left: 10px; + font-weight: normal +} + /***************************** Messages Style ************************/ .portlet-msg-success { - color: darkgreen; - background: url('background/SelectIcon.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: darkgreen; + background: url('background/SelectIcon.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } .portlet-msg-warn { - color: orange; - background: url('background/Warning.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: orange; + background: url('background/Warning.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } .portlet-msg-error { - color: darkred; - background: url('background/Error.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: darkred; + background: url('background/Error.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } /***************************** ActionButton Style ************************/ .UIWsrpPortlet .ActionContainer { - width: auto; - display: inline; /*margin: auto;*/ + width: auto; + display: inline; /*margin: auto;*/ } .UIWsrpPortlet .ButtonLeft { - background: url('background/LightBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; + background: url('background/LightBlueStyle.gif') no-repeat left top; + padding: 0px 0px 0px 3px; } .UIWsrpPortlet .ButtonRight { - background: url('background/LightBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px; + background: url('background/LightBlueStyle.gif') no-repeat right top; + padding: 0px 3px 0px 0px; } .UIWsrpPortlet .ButtonMiddle { - line-height: 22px; - text-align: center; - background: url('background/LightBlueStyle.gif') repeat-x bottom; - white-space: nowrap; - display: table-cell; - padding: 0px 12px; + line-height: 22px; + text-align: center; + background: url('background/LightBlueStyle.gif') repeat-x bottom; + white-space: nowrap; + display: table-cell; + padding: 0px 12px; } /***************************** GrayTabStyle ************************/ .UIWsrpPortlet .TabsActionContainer { - position: absolute; - bottom: -1px; - width: auto; + position: absolute; + bottom: -1px; + width: auto; } .UIWsrpPortlet .TabsContainer { - height: 29px; - position: relative; + height: 29px; + position: relative; } .UIHorizontalTabs .UITab { - float: left; /* orientation=lt */ - font-weight: bold; - text-align: center; - width: auto; + float: left; /* orientation=lt */ + font-weight: bold; + text-align: center; + width: auto; } .UIWsrpPortlet .GrayTabStyle { - margin-right: 2px; /* orientation=lt */ + margin-right: 2px; /* orientation=lt */ } .UIWsrpPortlet .GrayTabStyle .NormalTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left top; - padding-left: 4px; - cursor: pointer; + background: url(background/TabEditInline.gif) no-repeat left top; + padding-left: 4px; + cursor: pointer; } .UIWsrpPortlet .GrayTabStyle .NormalTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right top; - padding-right: 4px; + background: url(background/TabEditInline.gif) no-repeat right top; + padding-right: 4px; } .UIWsrpPortlet .GrayTabStyle .NormalTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -25px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; + background: url(background/TabEditInline.gif) repeat-x left -25px; + line-height: 25px; + color: #000; + padding: 0px 8px; + font-weight: normal; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left -50px; - padding-left: 4px; - cursor: pointer; + background: url(background/TabEditInline.gif) no-repeat left -50px; + padding-left: 4px; + cursor: pointer; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right -50px; - padding-right: 4px; + background: url(background/TabEditInline.gif) no-repeat right -50px; + padding-right: 4px; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -75px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; + background: url(background/TabEditInline.gif) repeat-x left -75px; + line-height: 25px; + color: #000; + padding: 0px 8px; + font-weight: normal; } .UIWsrpPortlet .tab-blank { - border-bottom: 1px solid #B7B7B7; + border-bottom: 1px solid #B7B7B7; }