Author: wesleyhales Date: 2010-02-08 22:44:16 -0500 (Mon, 08 Feb 2010) New Revision: 1574 Added: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java components/wsrp/trunk/admin-gui/src/main/webapp/skin/ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif components/wsrp/trunk/admin-gui/src/main/webapp/styles/ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css Removed: components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css components/wsrp/trunk/admin-gui/src/main/webapp/style.css Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.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/producer/producerTemplate.xhtml Log: initial webui-like skin for wsrp admin Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 03:44:16 UTC (rev 1574) @@ -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. Added: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ResourceBean.java 2010-02-09 03:44:16 UTC (rev 1574) @@ -0,0 +1,96 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wsrp.admin.ui; + +import javax.faces.context.FacesContext; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> + * @version $Revision: 630 $ + */ +public class ResourceBean implements Map<String, String> +{ + + public void clear() { + } + + public boolean containsKey(Object key) { + return true; + } + + public boolean containsValue(Object value) { + return true; + } + + public Set<Entry<String, String>> entrySet() { + return Collections.emptySet(); + } + + public String get(Object key) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + String url = null; + if(null == key){ + url = null; + } else if(null != facesContext){ + url = facesContext.getApplication().getViewHandler().getResourceURL(facesContext, key.toString()); + url = facesContext.getExternalContext().encodeResourceURL(url); + } else { + url = key.toString(); + } + return url; + } + + public boolean isEmpty() { + return false; + } + + public Set<String> keySet() { + return Collections.emptySet(); + } + + public String put(String key, String value) { + return null; + } + + public void putAll(Map<? extends String, ? extends String> t) { + } + + public String remove(Object key) { + return null; + } + + public int size() { + return 0; + } + + public Collection<String> values() { + return Collections.emptySet(); + } + + + +} Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-09 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/faces-config.xml 2010-02-09 03:44:16 UTC (rev 1574) @@ -108,6 +108,11 @@ <value>#{beanContext}</value> </managed-property> </managed-bean> + <managed-bean> + <managed-bean-name>resource</managed-bean-name> + <managed-bean-class>org.gatein.wsrp.admin.ui.ResourceBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> <navigation-rule> <navigation-case> Deleted: components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css 2010-02-09 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css 2010-02-09 03:44:16 UTC (rev 1574) @@ -1,102 +0,0 @@ -.zero { - margin: 0; - padding: 0; -} - -.align-center { - text-align: center; -} - -.align-center-margin { - margin: 0 auto 0 auto; -} - -.float-left { - float: left; -} - -.float-right { - float: right; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-top { - vertical-align: top; -} - -.half-width { - width: 49%; -} - -.quarter-width { - width: 24.9%; -} - -.three-quarter-width { - width: 74.9%; -} - -.full-width { - width: 100%; -} - -.third-width { - width: 32.9%; -} - -.two-third-width { - width: 65.9%; -} - -.third-width-pad5 { - width: 32.5%; - padding: 5px; -} - -.two-third-width-pad5 { - width: 65.5%; - padding: 5px; -} - -.tenpx-top-bottom { - margin: 10px 0 10px 0; -} - -.clear { - clear: both; -} - -.pad5 { - padding: 5px; -} - -.pad10 { - padding: 10px -} - -.grey-border { - border: 1px solid #B3C0C7; -} - -.dotted-blue-border { - font-weight: bold; - color: #315896; - font-size: 11px; - padding: 3px 0 3px 3px; - background-image: url(img/section-subHeader-bg.gif); - background-position: left top; - background-repeat: repeat-x; - border: 1px solid #b9c6d7; -} - -.dotted-blue-vert-rt { - -} - 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 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 03:44:16 UTC (rev 1574) @@ -24,7 +24,13 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" 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: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"/> + + <f:loadBundle basename="Resource" var="i18n"/> + <div class="UIWsrpPortlet"> <div class="wsrp-consumers-ui"> <ui:insert name="topnav">Top navigation</ui:insert> @@ -35,10 +41,11 @@ <ui:insert name="objectpath">Object path if needed</ui:insert> <div class="wsrp-content-container"> - <c:if test="#{!empty title}"> - <h3 class="sectionTitle">${title}</h3> + <ui:remove> + <c:if test="#{!empty title}"> + <h3 class="UIControlBar">${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"/> @@ -49,4 +56,6 @@ </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 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 03:44:16 UTC (rev 1574) @@ -28,43 +28,61 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:define name="topnav"> - <h:form id="cons-temp-form"> - <ul class="topnav"> - <li id="currentTab">#{i18n.nav_tabs_consumers}</li> - <li> - <h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/> - </li> - <ui:remove> - <li> - <h:commandLink id="management-link" value="#{i18n.nav_tabs_producer_management}" - action="management"/> - </li> - </ui:remove> - </ul> + <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> + </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> + </div> + </div> + </div> + </td> + </tr></table> + </div> + </h:form> </ui:define> <ui:define name="objectpath"> <h:form id="cons-temp-form1"> - <ul class="objectpath"> - <li class="#{!empty title ? 'selected' : 'pathItem'}"> + <div class="UIControlBar"> + <span class="#{!empty title ? 'selected' : 'pathItem'}"> <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/> - </li> + </span> <c:if test="#{empty title}"> - <li class="pathSeparator"> + <span class="pathSeparator"> <h:graphicImage url="/img/pathSeparator.png" alt=">"/> - </li> - <li + </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 : ''} - </li> + </span> </c:if> - </ul> + </div> </h:form> </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 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 03:44:16 UTC (rev 1574) @@ -27,87 +27,117 @@ 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="title" value="#{i18n.consumers_title}"/> - <ui:define name="content"> + <ui:define name="content"> - <!-- Consumer creation --> - <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"/> - <h:commandButton id="createConsumerButton" action="#{consumersMgr.createConsumer}" - value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/> - <h:message for="consumerName" errorClass="portlet-msg-error"/> - </h:form> + <!-- 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; - <br/> + <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> - <!-- Consumers list --> - <h:form id="consumer-list-form"> - <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" - rendered="#{!consumersMgr.consumersEmpty}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" - styleClass="datatable objectList" 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:message for="consumerName" errorClass="portlet-msg-error"/> - <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:form> + </div> + <br/> + + <!-- 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}) #{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> - <h:commandButton id="createConsumerButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}" styleClass="portlet-form-button"/> - </h:form> - </ui:define> + <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> + </div> + </td> + </tr> + </table> + + </h:form> + </ui:define> </ui:decorate> \ No newline at end of file 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 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-09 03:44:16 UTC (rev 1574) @@ -29,18 +29,35 @@ <ui:define name="topnav"> <h:form id="producer-temp-form"> - <ul class="topnav"> - <li> - <h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/> - </li> - <li id="currentTab">#{i18n.nav_tabs_producer_config}</li> - <ui:remove> - <li> - <h:commandLink id="prod-manag-link" value="#{i18n.nav_tabs_producer_management}" - action="management"/> - </li> - </ui:remove> - </ul> + + <div class="TabsContainer"> + <table class="TabsActionContainer"><tr><td> + <div class="UITab GrayTabStyle"> + <div class="NormalTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + <h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/> + </div> + </div> + </div> + </div> + </div> + </td><td> + <div class="UITab GrayTabStyle"> + <div class="SelectedTab"> + <div class="LeftTab"> + <div class="RightTab"> + <div class="MiddleTab"> + #{i18n.nav_tabs_producer_config}" + </div> + </div> + </div> + </div> + </div> + </td> + </tr></table> + </div> </h:form> </ui:define> Added: 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 (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 03:44:16 UTC (rev 1574) @@ -0,0 +1,125 @@ +.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; +} + +.UIWsrpPortlet .cons-temp-form { + height: 27px; +} + +.UIWsrpPortlet .UIGrid { + border: 1px solid #B7B7B7; +} + +.UIWsrpPortlet .ConsumerGrid thead tr th, +.UIWsrpPortlet .ConsumerGrid tbody tr td { + border: 1px solid #B7B7B7; +} + +.UIWsrpPortlet .create-container { + position: relative; +} + +.UIWsrpPortlet .create-container .ActionContainer { + position: absolute; + top: -2px; +} + +.ActionButton { + +} + +/***************************** ActionButton Style ************************/ +.UIWsrpPortlet .ActionContainer { + width: auto; + display: inline; /*margin: auto;*/ +} + +.UIWsrpPortlet .ButtonLeft { + 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; +} + +.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; +} + +/***************************** GrayTabStyle ************************/ + +.UIWsrpPortlet .TabsActionContainer { + position: absolute; + bottom: -6px; + width: auto; +} + +.UIWsrpPortlet .TabsContainer { + height: 24px; + position: relative; +} + +.UIHorizontalTabs .UITab { + float: left; /* orientation=lt */ + font-weight: bold; + text-align: center; + width: auto; +} + +.UIWsrpPortlet .GrayTabStyle { + margin-right: 2px; /* orientation=lt */ +} + +.UIWsrpPortlet .GrayTabStyle .NormalTab .LeftTab { + 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; +} + +.UIWsrpPortlet .GrayTabStyle .NormalTab .MiddleTab { + 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; +} + +.UIWsrpPortlet .GrayTabStyle .SelectedTab .RightTab { + 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; +} + +.UIWsrpPortlet .tab-blank { + border-bottom: 1px solid #B7B7B7; +} Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/ControlIcon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/LightBlueStyle.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif =================================================================== (Binary files differ) Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/TabEditInline.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: components/wsrp/trunk/admin-gui/src/main/webapp/style.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/style.css 2010-02-09 03:30:46 UTC (rev 1573) +++ components/wsrp/trunk/admin-gui/src/main/webapp/style.css 2010-02-09 03:44:16 UTC (rev 1574) @@ -1,350 +0,0 @@ -@import url(basestyles.css); - -.wsrp-consumers-ui table { - border: 0; - border-collapse: separate; -} - -.wsrp-consumers-ui form { - margin: 0; - border: 0; -} - -.wsrp-consumers-ui hr { - border-top-style: solid; -} - -/* Top nav. */ - -.wsrp-consumers-ui ul.topnav { - padding: 4px 0 3px; - border-bottom: 1px solid #b3c0c7; - margin: 0; -} - -.wsrp-consumers-ui ul.topnav li { - list-style-type: none; - display: inline; - margin: 0 0 0 5px; - padding: 3px 0.5em; - border: 1px solid #b3c0c7; - border-bottom: none; - background-color: #f2f4f5; -} - -.wsrp-consumers-ui ul.topnav li:hover { - background-color: #fff; -} - -.wsrp-consumers-ui ul.topnav li#currentTab { - background-color: white; - border-bottom: 1px solid white; -} - -.wsrp-consumers-ui ul.topnav li#currentTab a:hover { -} - -.wsrp-consumers-ui div.tab-container { - border-bottom: 1px solid #B3C0C7; - border-right: 1px solid #B3C0C7; - border-left: 1px solid #B3C0C7; - padding: 15px 0 10px 0; -} - -/* Object path. */ - -.wsrp-consumers-ui ul.objectpath { - list-style-type: none; - font-size: 11px; - border: solid 1px #bbb; - border-left: solid 1px #eee; - border-right: solid 1px #eee; - background: url(img/pathBackground.png) repeat-x left; - height: 21px; - margin: 0; - padding: 0 0 0 2px; -} - -.wsrp-consumers-ui ul.objectpath li { - list-style-type: none; - display: block; - float: left; -} - -.wsrp-consumers-ui ul li.pathItem { - padding-top: 4px; - padding-left: 3px; - padding-right: 2px; -} - -.wsrp-consumers-ui ul.objectpath li.selected { - font-weight: bold; - padding-top: 4px; - padding-left: 3px; - padding-right: 2px; -} - -.wsrp-consumers-ui ul.objectpath a { - color: #333333; - text-decoration: none; -} - -.wsrp-consumers-ui ul.objectpath a:hover { - color: #5078aa; - text-decoration: none; -} - -/* Override theme styles */ -.wsrp-consumers-ui h3.sectionTitle { - font-weight: bold; - color: #315896; - font-size: 11px; - padding: 3px 0 3px 3px; - background: url(img/section-subHeader-bg.gif) repeat-x left top; - border: 1px solid #b9c6d7; -} - -.wsrp-consumers-ui .portlet-section-header { - background: url(img/pathBackground.png) repeat-x left; - font-weight: bold; - color: #656565; - font-size: 10px; - border-top: 1px solid #ddd; - border-bottom: 1px solid #999; - padding-left: 4px; -} - -.wsrp-consumers-ui .portlet-section-header th { - background: url(img/pathBackground.png) repeat-x left; - font-weight: bold; - color: #656565; - font-size: 10px; - border-top: 1px solid #ddd; - border-bottom: 1px solid #999; - padding-left: 4px; -} - -.wsrp-consumers-ui .actionConfigure { - padding: 5px 5px 5px 20px; - background: url(img/jbp-icon-set/settings.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionRefresh { - padding: 5px 5px 5px 20px; - background: url(img/jbp-icon-set/refresh.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionRegister { - padding: 5px 5px 5px 24px; - background: url(img/jbp-icon-set/register.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionDeregister { - padding: 5px 5px 5px 24px; - background: url(img/jbp-icon-set/deregister.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionDelete { - padding: 5px 5px 5px 20px; - background: url(img/jbp-icon-set/delete2.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionActivate { - padding: 5px 5px 5px 23px; - background: url(img/jbp-icon-set/activate.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui .actionDeactivate { - padding: 5px 5px 5px 20px; - background: url(img/jbp-icon-set/deactivate.gif) no-repeat left; - line-height: 18px; - white-space: nowrap; -} - -.wsrp-consumers-ui td { - border: 0; - padding-bottom: 2px; - padding-top: 2px; - vertical-align: top; -} - -.wsrp-consumers-ui th { - text-align: left; - border: 0; - vertical-align: top; -} - -.wsrp-consumers-ui .active { - background-color: #C7DDB7; - font-weight: bold; -} - -.wsrp-consumers-ui table.active { - border-bottom: 4px solid #C7DDB7; - border-top: 4px solid #C7DDB7; - background: inherit; - font-weight: normal; -} - -.wsrp-consumers-ui li.active { - font-weight: normal; - padding-top: 4px; - padding-left: 3px; - padding-right: 2px; - background: inherit; -} - -.wsrp-consumers-ui li.active:before { - content: "__"; - padding: 1px; - background-color: #C7DDB7; - color: #C7DDB7; - border: 1px solid #999; -} - -.wsrp-consumers-ui .inactive { - background-color: #EBD1B8; -} - -.wsrp-consumers-ui table.inactive { - border-bottom: 4px solid #EBD1B8; - border-top: 4px solid #EBD1B8; - background: inherit; -} - -.wsrp-consumers-ui li.inactive { - font-weight: normal; - padding-top: 4px; - padding-left: 3px; - padding-right: 2px; - background: inherit; -} - -.wsrp-consumers-ui li.inactive:before { - content: "__"; - padding: 1px; - background-color: #EBD1B8; - color: #EBD1B8; - border: 1px solid #999; -} - -.wsrp-consumers-ui .needsRefresh { - font-style: italic; -} - -.wsrp-consumers-ui .registration-prop-table { - text-align: left; - width: 100%; - margin-bottom: .3em; -} - -.wsrp-consumers-ui .registration-prop-table.active { - border: 1px solid #C7DDB7; -} - -.wsrp-consumers-ui .registration-prop-table.active th { - background: #C7DDB7 none; -} - -.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate { - background: #dcf0d0; -} - -.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive { - border: 1px solid #EBD1B8; -} - -.wsrp-consumers-ui .registration-prop-table.inactive th { - background: #EBD1B8 none; -} - -.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate { - background: #f0f0dd; -} - -.wsrp-consumers-ui .registration-prop-table .nameColumn { - width: 20%; -} - -.wsrp-consumers-ui .registration-prop-table .descColumn { - width: 20%; -} - -.wsrp-consumers-ui .portlet-section-buttonrow { - margin-top: 6px; - margin-bottom: 6px; - float: right; -} - -.wsrp-consumers-ui #handle a.portlet-form-button { - padding: .2em; - margin-left: 3em; -} - -.wsrp-consumers-ui .portlet-form-button { - padding: .2em; - margin: 0 .3em; -} - -.portlet-msg-status:before { - content: "Info: " -} - -.portlet-msg-error:before { - content: "Error: " -} - -.portlet-msg-alert:before { - content: "Warning: " -} - -.wsrp-consumers-ui .portlet-area-header { - border: 1px solid #54708c; - font-weight: bold; - color: #fff; - font-size: 11px; - background-color: #5986b3; - padding: 2px 2px 2px 4px; - margin: 0; - display: block; -} - -.wsrp-consumers-ui .portlet-area-body { - border: 1px solid #d5d5d5; - border-top: 0; - background-color: #fff; - padding: 4px; - margin: 0; - display: block; -} - -.wsrp-consumers-ui .portlet-msg { - border: 1px solid #bbb; - margin: 2em auto; - padding: 1em; - width: 60%; -} - -.wsrp-consumers-ui .portlet-msg-body { - position: relative; - top: -3em; - left: 3em; - width: 95%; -} - -.wsrp-consumers-ui .wsrp-content-container { - margin: 0 auto 0 auto; - width: 98%; -} Copied: components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css (from rev 1569, components/wsrp/trunk/admin-gui/src/main/webapp/basestyles.css) =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-09 03:44:16 UTC (rev 1574) @@ -0,0 +1,102 @@ +.zero { + margin: 0; + padding: 0; +} + +.align-center { + text-align: center; +} + +.align-center-margin { + margin: 0 auto 0 auto; +} + +.float-left { + float: left; +} + +.float-right { + float: right; +} + +.align-left { + text-align: left; +} + +.align-right { + text-align: right; +} + +.align-top { + vertical-align: top; +} + +.half-width { + width: 49%; +} + +.quarter-width { + width: 24.9%; +} + +.three-quarter-width { + width: 74.9%; +} + +.full-width { + width: 100%; +} + +.third-width { + width: 32.9%; +} + +.two-third-width { + width: 65.9%; +} + +.third-width-pad5 { + width: 32.5%; + padding: 5px; +} + +.two-third-width-pad5 { + width: 65.5%; + padding: 5px; +} + +.tenpx-top-bottom { + margin: 10px 0 10px 0; +} + +.clear { + clear: both; +} + +.pad5 { + padding: 5px; +} + +.pad10 { + padding: 10px +} + +.grey-border { + border: 1px solid #B3C0C7; +} + +.dotted-blue-border { + font-weight: bold; + color: #315896; + font-size: 11px; + padding: 3px 0 3px 3px; + background-image: url(../img/section-subHeader-bg.gif); + background-position: left top; + background-repeat: repeat-x; + border: 1px solid #b9c6d7; +} + +.dotted-blue-vert-rt { + +} + Copied: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css (from rev 1569, components/wsrp/trunk/admin-gui/src/main/webapp/style.css) =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 03:44:16 UTC (rev 1574) @@ -0,0 +1,354 @@ +@import url(basestyles.css); + +.wsrp-consumers-ui { + padding: 10px; +} +.wsrp-consumers-ui table { + border: 0; + /*border-collapse: separate;*/ +} + +.wsrp-consumers-ui form { + margin: 0; + border: 0; +} + +.wsrp-consumers-ui hr { + border-top-style: solid; +} + +/* Top nav. */ + +.wsrp-consumers-ui ul.topnav { + padding: 4px 0 3px; + border-bottom: 1px solid #b3c0c7; + margin: 0; +} + +.wsrp-consumers-ui ul.topnav li { + list-style-type: none; + display: inline; + margin: 0 0 0 5px; + padding: 3px 0.5em; + border: 1px solid #b3c0c7; + border-bottom: none; + background-color: #f2f4f5; +} + +.wsrp-consumers-ui ul.topnav li:hover { + background-color: #fff; +} + +.wsrp-consumers-ui ul.topnav li#currentTab { + background-color: white; + border-bottom: 1px solid white; +} + +.wsrp-consumers-ui ul.topnav li#currentTab a:hover { +} + +.wsrp-consumers-ui div.tab-container { + border-bottom: 1px solid #B3C0C7; + border-right: 1px solid #B3C0C7; + border-left: 1px solid #B3C0C7; + border-top: 1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + +/* Object path. */ + +.wsrp-consumers-ui ul.objectpath { + list-style-type: none; + font-size: 11px; + border: solid 1px #bbb; + border-left: solid 1px #eee; + border-right: solid 1px #eee; + background: url(../img/pathBackground.png) repeat-x left; + height: 21px; + margin: 0; + padding: 0 0 0 2px; +} + +.wsrp-consumers-ui ul.objectpath li { + list-style-type: none; + display: block; + float: left; +} + +.wsrp-consumers-ui ul li.pathItem { + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +.wsrp-consumers-ui ul.objectpath li.selected { + font-weight: bold; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +.wsrp-consumers-ui ul.objectpath a { + color: #333333; + text-decoration: none; +} + +.wsrp-consumers-ui ul.objectpath a:hover { + color: #5078aa; + text-decoration: none; +} + +/* Override theme styles */ +.wsrp-consumers-ui h3.sectionTitle { + font-weight: bold; + color: #315896; + font-size: 11px; + padding: 3px 0 3px 3px; + background: url(../img/section-subHeader-bg.gif) repeat-x left top; + border: 1px solid #b9c6d7; +} + +.wsrp-consumers-ui .portlet-section-header { + background: url(../img/pathBackground.png) repeat-x left; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.wsrp-consumers-ui .portlet-section-header th { + background: url(../img/pathBackground.png) repeat-x left; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.wsrp-consumers-ui .actionConfigure { + padding: 5px 5px 5px 20px; + background: url(../img/jbp-icon-set/settings.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionRefresh { + padding: 5px 5px 5px 20px; + background: url(../img/jbp-icon-set/refresh.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionRegister { + padding: 5px 5px 5px 24px; + background: url(../img/jbp-icon-set/register.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionDeregister { + padding: 5px 5px 5px 24px; + background: url(../img/jbp-icon-set/deregister.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionDelete { + padding: 5px 5px 5px 20px; + background: url(../img/jbp-icon-set/delete2.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionActivate { + padding: 5px 5px 5px 23px; + background: url(../img/jbp-icon-set/activate.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionDeactivate { + padding: 5px 5px 5px 20px; + background: url(../img/jbp-icon-set/deactivate.gif) no-repeat left; + line-height: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui td { + border: 0; + padding-bottom: 2px; + padding-top: 2px; + vertical-align: top; +} + +.wsrp-consumers-ui th { + text-align: left; + border: 0; + vertical-align: top; +} + +.wsrp-consumers-ui .active { + background-color: #C7DDB7; + font-weight: bold; +} + +.wsrp-consumers-ui table.active { + border-bottom: 4px solid #C7DDB7; + border-top: 4px solid #C7DDB7; + background: inherit; + font-weight: normal; +} + +.wsrp-consumers-ui li.active { + font-weight: normal; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; + background: inherit; +} + +.wsrp-consumers-ui li.active:before { + content: "__"; + padding: 1px; + background-color: #C7DDB7; + color: #C7DDB7; + border: 1px solid #999; +} + +.wsrp-consumers-ui .inactive { + background-color: #EBD1B8; +} + +.wsrp-consumers-ui table.inactive { + border-bottom: 4px solid #EBD1B8; + border-top: 4px solid #EBD1B8; + background: inherit; +} + +.wsrp-consumers-ui li.inactive { + font-weight: normal; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; + background: inherit; +} + +.wsrp-consumers-ui li.inactive:before { + content: "__"; + padding: 1px; + background-color: #EBD1B8; + color: #EBD1B8; + border: 1px solid #999; +} + +.wsrp-consumers-ui .needsRefresh { + font-style: italic; +} + +.wsrp-consumers-ui .registration-prop-table { + text-align: left; + width: 100%; + margin-bottom: .3em; +} + +.wsrp-consumers-ui .registration-prop-table.active { + border: 1px solid #C7DDB7; +} + +.wsrp-consumers-ui .registration-prop-table.active th { + background: #C7DDB7 none; +} + +.wsrp-consumers-ui .registration-prop-table.active .portlet-section-alternate { + background: #dcf0d0; +} + +.wsrp-consumers-ui .registration-prop-table.inactive, .wsrp-consumers-ui span.inactive { + border: 1px solid #EBD1B8; +} + +.wsrp-consumers-ui .registration-prop-table.inactive th { + background: #EBD1B8 none; +} + +.wsrp-consumers-ui .registration-prop-table.inactive .portlet-section-alternate { + background: #f0f0dd; +} + +.wsrp-consumers-ui .registration-prop-table .nameColumn { + width: 20%; +} + +.wsrp-consumers-ui .registration-prop-table .descColumn { + width: 20%; +} + +.wsrp-consumers-ui .portlet-section-buttonrow { + margin-top: 6px; + margin-bottom: 6px; + float: right; +} + +.wsrp-consumers-ui #handle a.portlet-form-button { + padding: .2em; + margin-left: 3em; +} + +.wsrp-consumers-ui .portlet-form-button { + padding: .2em; + margin: 0 .3em; +} + +.portlet-msg-status:before { + content: "Info: " +} + +.portlet-msg-error:before { + content: "Error: " +} + +.portlet-msg-alert:before { + content: "Warning: " +} + +.wsrp-consumers-ui .portlet-area-header { + border: 1px solid #54708c; + font-weight: bold; + color: #fff; + font-size: 11px; + background-color: #5986b3; + padding: 2px 2px 2px 4px; + margin: 0; + display: block; +} + +.wsrp-consumers-ui .portlet-area-body { + border: 1px solid #d5d5d5; + border-top: 0; + background-color: #fff; + padding: 4px; + margin: 0; + display: block; +} + +.wsrp-consumers-ui .portlet-msg { + border: 1px solid #bbb; + margin: 2em auto; + padding: 1em; + width: 60%; +} + +.wsrp-consumers-ui .portlet-msg-body { + position: relative; + top: -3em; + left: 3em; + width: 95%; +} + +.wsrp-consumers-ui .wsrp-content-container { + margin: 0 auto 0 auto; + width: 98%; +}