Author: chris.laprun(a)jboss.com Date: 2010-02-10 05:26:47 -0500 (Wed, 10 Feb 2010) New Revision: 1610 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml Log: - Cleaned-up templates a little. 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-10 10:23:39 UTC (rev 1609) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-10 10:26:47 UTC (rev 1610) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ 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. @@ -25,38 +25,43 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" xmlns:ui="http://java.sun.com/jsf/facelets"> - <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/styles/style.css" media="screen"/> - <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/skin/wsrp/DefaultSkin/DefaultStylesheet.css" media="screen"/> + <link rel="stylesheet" type="text/css" href="#{facesContext.externalContext.requestContextPath}/styles/style.css" + media="screen"/> + <link rel="stylesheet" type="text/css" + href="#{facesContext.externalContext.requestContextPath}/skin/wsrp/DefaultSkin/DefaultStylesheet.css" + media="screen"/> - + <f:loadBundle basename="Resource" var="i18n"/> + <div class="UIWsrpPortlet"> - <div class="wsrp-consumers-ui"> - <ui:insert name="topnav">Top navigation</ui:insert> + <div class="wsrp-consumers-ui"> + <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" + <div class="tab-container"> + <!-- Status message --> + <h:messages id="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 style="width:98%;margin: 0 auto"> - <div class="wsrp-content-container"> - <ui:remove> - <c:if test="#{!empty title}"> - <h3>${title}</h3> - </c:if> - </ui:remove> - <!-- Status message --> + <ui:insert name="objectpath">Object path if needed</ui:insert> + <div class="wsrp-content-container"> + <ui:remove> + <c:if test="#{!empty title}"> + <h3>${title}</h3> + </c:if> + </ui:remove> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> + + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </div> + + </div> </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-10 10:23:39 UTC (rev 1609) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-10 10:26:47 UTC (rev 1610) @@ -1,6 +1,6 @@ <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ 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. @@ -32,93 +32,81 @@ <h:form id="cons-temp-form" styleClass="cons-temp-form"> <div class="TabsContainer"> - <table class="TabsActionContainer"><tr><td> - <div class="UITab GrayTabStyle"> - <div class="SelectedTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - #{i18n.nav_tabs_consumers} - </div> + <table class="TabsActionContainer"> + <tr> + <td> + <div class="UITab GrayTabStyle"> + <div class="SelectedTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + #{i18n.nav_tabs_consumers} + </div> + </div> + </div> </div> - </div> - </div> - </div> - </td><td> - <div class="UITab GrayTabStyle"> - <div class="NormalTab"> - <div class="LeftTab"> - <div class="RightTab"> - <div class="MiddleTab"> - <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/> - </div> + </div> + </td> + <td> + <div class="UITab GrayTabStyle"> + <div class="NormalTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" + action="producer"/> + </div> + </div> + </div> </div> - </div> - </div> - </div> - </td> - </tr></table> - </div> + </div> + </td> + </tr> + </table> + </div> </h:form> </ui:define> <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 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; + <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 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; - <webui:commandButton id="createConsumerButton" - action="createConsumer" - backingBean="#{consumersMgr}" - value="#{i18n.consumers_create_submit}"/> + <webui:commandButton id="createConsumerButton" + action="createConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.consumers_create_submit}"/> - <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" class="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.path_consumers_root}"/> - </span> - - </div> - </h:form> - + <ui:remove> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </ui:remove> + </h:form> </div> - </div> - </webui:blueHeaderBar> + </div> + </f:subview> + <c:if test="#{empty showAddConsumer}"> + <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> + </div> + </webui:blueHeaderBar> </ui:define>