Author: wesleyhales Date: 2010-02-09 16:18:41 -0500 (Tue, 09 Feb 2010) New Revision: 1591 Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/ 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/ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css Log: styles for wsrp consumer admin Added: 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 (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 21:18:41 UTC (rev 1591) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib> + <namespace>http://jboss.org/gatein</namespace> + <tag> + <tag-name>commandButton</tag-name> + <source>xhtml/commandButton.xhtml</source> + </tag> +</facelet-taglib> \ No newline at end of file Added: 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 (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 21:18:41 UTC (rev 1591) @@ -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="#{action}" + 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/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-09 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-09 21:18:41 UTC (rev 1591) @@ -57,6 +57,11 @@ <param-value>server</param-value> </context-param> + <context-param> + <param-name>facelets.LIBRARIES</param-name> + <param-value>/WEB-INF/tags/webui.taglib.xml</param-value> + </context-param> + <servlet> <servlet-name>FacesServlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 21:18:41 UTC (rev 1591) @@ -36,26 +36,27 @@ <ui:insert name="topnav">Top navigation</ui:insert> <div class="tab-container"> + <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-warn"/> + <div style="width:98%;margin: 0 auto"> - <ui:insert name="objectpath">Object path if needed</ui:insert> <div class="wsrp-content-container"> <ui:remove> <c:if test="#{!empty title}"> - <h3 class="UIControlBar">${title}</h3> + <h3>${title}</h3> </c:if> </ui:remove> <!-- Status message --> - <h:messages 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> </div> - + </div> </div> </ui:composition> \ No newline at end of file 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 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 21:18:41 UTC (rev 1591) @@ -63,26 +63,88 @@ </ui:define> <ui:define name="objectpath"> - <h:form id="cons-temp-form1"> - <div class="UIControlBar"> - <span class="#{!empty title ? 'selected' : 'pathItem'}"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.path_consumers_root}"/> - </span> - <c:if test="#{empty title}"> - <span class="pathSeparator"> - <h:graphicImage url="/img/pathSeparator.png" alt=">"/> - </span> - <span - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - <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> - </div> - </h:form> + + + + + <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"> + + + + <!-- 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; + + <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> + + <ui:remove> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </ui:remove> + </h:form> + </div> + + + </div> + </f:subview> + + <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/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 21:18:41 UTC (rev 1591) @@ -28,37 +28,12 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="title" value="#{i18n.consumers_title}"/> + <ui:param name="showAddConsumer" value="true"/> <ui:define name="content"> - <!-- 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" - required="true"/>&#160;&#160; - <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:message for="consumerName" errorClass="portlet-msg-error"/> - - </h:form> - </div> - <br/> - <!-- Consumers list --> <h:form id="consumer-list-form"> <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" 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 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 21:18:41 UTC (rev 1591) @@ -25,7 +25,8 @@ 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"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -176,13 +177,16 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" - value="#{i18n.edit_consumer_refresh}" - title="#{i18n.edit_consumer_refresh_title}" - styleClass="portlet-form-button"/> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.edit_consumer_cancel}" immediate="true" - styleClass="portlet-form-button"/> + <webui:commandButton action="#{consumer.refreshConsumer}" + id="refresh-cons-link" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}"/> + + <webui:commandButton action="#{consumer.listConsumers}" + id="list-cons-link" + value="#{i18n.edit_consumer_cancel}" + immediate="true"/> + </td> </tr> </table> 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 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 21:18:41 UTC (rev 1591) @@ -1,12 +1,16 @@ .UIWsrpPortlet .UIControlBar { - background: url('background/ControlIcon.gif') repeat-x center -222px; - border: 1px solid #b7b7b7; - height: 23px; - line-height: 23px; - padding: 0px 10px; - margin: 5px 0px; + /*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 { height: 27px; } @@ -26,13 +30,35 @@ .UIWsrpPortlet .create-container .ActionContainer { position: absolute; - top: -2px; + top: 7px; } -.ActionButton { +/***************************** 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; } +.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; +} + +.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; +} + /***************************** ActionButton Style ************************/ .UIWsrpPortlet .ActionContainer { width: auto; Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 19:34:47 UTC (rev 1590) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 21:18:41 UTC (rev 1591) @@ -350,5 +350,5 @@ .wsrp-consumers-ui .wsrp-content-container { margin: 0 auto 0 auto; - width: 98%; + width: 100%; }