[portal-commits] JBoss Portal SVN: r9203 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/bin/portal-admin-war/img and 8 other directories.

Author: wesleyhales Date: 2007-11-29 12:49:34 -0500 (Thu, 29 Nov 2007) New Revision: 9203 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-blue.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css Log: JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-29 17:49:34 UTC (rev 9203) @@ -91,3 +91,9 @@ background-repeat:repeat-x; } +.dotted-blue-vert-rt { + background-image:url(../img/border-dotted-vert.gif); + background-position:right top; + background-repeat:repeat-y; +} + Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 17:49:34 UTC (rev 9203) @@ -24,6 +24,12 @@ border-collapse:collapse; } +.admin-ui table.datatable{ + border-right: 1px solid #B3C0C7; + border-left: 1px solid #B3C0C7; + border-bottom: 1px solid #B3C0C7; +} + .admin-ui table tbody{ } @@ -217,6 +223,10 @@ margin: 0; } +.admin-ui .property-body { + border-right: 1px solid #B3C0C7; +} + /* Styles updated and enhanced from the main portal css */ .admin-ui th.portlet-section-title { @@ -537,3 +547,7 @@ width:98%; margin: 0 auto 0 auto; } + +.cms-tab-container th{ + background:none; +} Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -20,7 +20,7 @@ <h:form> -<table width="100%"> +<table class="datatable full-width"> <thead class="portlet-section-header"> <tr> <th>Case</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -20,7 +20,7 @@ <td valign="top" class="portlet-section-body"> <h:form> -<table width="100%"> +<table class="datatable full-width"> <thead class="portlet-section-header"> <tr> <th>Case</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -8,7 +8,7 @@ <c:choose> <c:when test="#{not empty prefs.entries}"> <h:form> - <table width="100%"> + <table class="full-width datatable"> <thead class="portlet-section-header" style="text-align:left;"> <tr> <th>Key</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -16,12 +16,12 @@ <td class="align-top"> <!-- defines property creation section --> - <table class="grey-border full-width"> + <table class="full-width"> <tr> <th class="portlet-section-title">Add a property.</th> </tr> <tr> - <td class="portlet-section-body grey-border"> + <td class="dotted-blue-vert-rt"> <h:form> <!-- defines layout of property form --> @@ -83,7 +83,7 @@ <h:form> <!-- defines layout of property table --> - <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" + <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> <f:facet name="header">Name</f:facet> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core"> <h:form> - <table> + <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> <th>Roles</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -2,7 +2,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> <h:form> - <table width="100%"> + <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> <th>Name</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core"> <h:form> - <table width="100%"> + <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> <th>Name</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -10,7 +10,7 @@ <h:message id="error" for="error" errorClass="portlet-msg-error"/> </div> -<table width="100%"> +<table class="full-width datatable"> <tr> <th class="portlet-section-header" align="center">Personal Dashboard Editor</th> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -30,7 +30,7 @@ <div class="portlet-area-body"> - <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList" + <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList datatable" rowClasses="portlet-section-body,portlet-section-alternate" columnClasses="objectNameColumn, objectActionColumn" headerClass="portlet-section-header"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -12,7 +12,7 @@ <c:if test="#{empty instancemgr.selectedPlugin}"> <h:form> - <table id="instancesTable2" width="100%" class="portlet-def-table"> + <table id="instancesTable2" class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> <th>Id</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -10,7 +10,7 @@ <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList" + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable" rowClasses="portlet-section-body,portlet-section-alternate" columnClasses="objectNameColumn, objectActionColumn" headerClass="portlet-section-header"> @@ -73,7 +73,7 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList" + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList datatable" columnClasses="objectNameColumn, objectActionColumn" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> @@ -136,7 +136,7 @@ <ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList" + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList datatable" rowClasses="portlet-section-body,portlet-section-alternate" columnClasses="objectNameColumn, objectActionColumn" headerClass="portlet-section-header"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -28,7 +28,7 @@ </div> <h:form> - <table class="portlet-def-table"> + <table class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> <th>Name</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -8,7 +8,7 @@ <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> - <table width="100%"> + <table class="datatable full-width"> <tbody class="portlet-section-header"> <tr> <th>Page</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -7,7 +7,7 @@ <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> - <table width="100%"> + <table class="full-width datatable"> <tbody class="portlet-section-header"> <tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -17,7 +17,7 @@ </h:form> <h:form> - <table width="100%"> + <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> <th>Name</th> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -8,7 +8,7 @@ <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> - <table width="100%"> + <table class="full-width datatable"> <tbody class="portlet-section-header"> <tr> Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-blue.gif (from rev 9200, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif) =================================================================== (Binary files differ) Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -4,8 +4,11 @@ <ui:insert name="topnav">Top navigation</ui:insert> <div class="tab-container"> + + <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> </c:if> @@ -16,6 +19,8 @@ <!-- Content --> <ui:insert name="content">Content</ui:insert> + </div> + </div> </div> </ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-29 17:49:34 UTC (rev 9203) @@ -58,7 +58,7 @@ </h:commandLink> <c:if test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}"> - | <h:commandLink action="#{consumersMgr.registerConsumer}"> + | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"> <f:param name="id" value="#{consumer.producerId}"/> <f:param name="register" value="#{!consumer.producerInfo.registered}"/> <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/> Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css (from rev 9200, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css 2007-11-29 17:49:34 UTC (rev 9203) @@ -0,0 +1,99 @@ +.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 { + background-image:url(../img/border-dotted-blue.gif); + background-position:left bottom; + background-repeat:repeat-x; +} + +.dotted-blue-vert-rt { + background-image:url(../img/border-dotted-vert.gif); + background-position:right top; + background-repeat:repeat-y; +} + Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-11-29 16:35:29 UTC (rev 9202) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-11-29 17:49:34 UTC (rev 9203) @@ -1,3 +1,5 @@ +@import url(basestyles.css); + .wsrp-consumers-ui table { border: 0; border-collapse: separate; @@ -100,12 +102,13 @@ /* Override theme styles */ .wsrp-consumers-ui h3.sectionTitle { font-weight: bold; - color: #656565; + color: #31587f; font-size: 11px; - border-top: 1px solid #999; - background-color: #ebf2f5; - padding: 2px; - padding-left: 4px; + padding-bottom: 5px; + background-image:url( img/border-dotted-blue.gif); + background-position:left bottom; + background-repeat:repeat-x; + background-color:#fafafa; } .wsrp-consumers-ui .portlet-section-header { @@ -141,6 +144,33 @@ white-space: nowrap; } +.wsrp-consumers-ui .actionRefresh { + background-image: url( img/actionIcon_Refresh.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionRegister { + background-image: url( img/actionIcon_Register.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.wsrp-consumers-ui .actionDeregister { + background-image: url( img/actionIcon_Deregister.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + .wsrp-consumers-ui .actionDelete { background-image: url( img/actionIcon_Delete.gif ); background-position: left; @@ -336,3 +366,8 @@ left: 3em; width: 95%; } + +.wsrp-consumers-ui .wsrp-content-container { + margin: 0 auto 0 auto; + width: 98%; +}