Author: chris.laprun(a)jboss.com Date: 2007-09-16 14:11:19 -0400 (Sun, 16 Sep 2007) New Revision: 8296 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/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/editProperties.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/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: - JBPORTAL-1642: added create instance icon, better styling of object path, several style improvements (thanks, Meriah!) - JBPORTAL-1650: fixed theme pages. - JBPORTAL-1696, JBPORTAL-1697, JBPORTAL-1698: added proper classes and associated styling. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 18:11:19 UTC (rev 8296) @@ -1,5 +1,15 @@ /* Redefine spacing for tables. */ +a { + color: #446688; + text-decoration: none; +} + +a:hover { + color: #5078aa; + text-decoration: underline; +} + .admin-ui table { border: 0; } @@ -30,14 +40,12 @@ list-style-type: none; display: inline; margin-right: 2px; - border: 1px solid; } .admin-ui ul.pagination li.selected { font-weight: bold; background-color: #eef; - border: 1px solid black; - border-bottom: 3px solid black; + border-bottom: 2px solid #656565; } .pagination a, .pagination a:visited, .pagination a:hover { @@ -49,7 +57,7 @@ .admin-ui ul.topnav { margin-left: 0; padding: 4px 0px 3px; - border-bottom: 1px solid #dfe8ed; + border-bottom: 1px solid #b3c0c7; } .admin-ui ul.topnav li { @@ -58,7 +66,7 @@ margin: 0; padding: 3px 0.5em; margin-left: 5px; - border: 1px solid #dfe8ed; + border: 1px solid #b3c0c7; border-bottom: none; background-color: #f2f4f5; } @@ -78,20 +86,59 @@ /* Object path. */ .admin-ui ul.objectpath { - margin: 0; - padding: 5px 0px 5px 0px; + list-style-type: none; + font-size: 11px; + border: solid 1px #bbb; + border-left: solid 1px #eee; + border-right: solid 1px #eee; + background-color: #d5d5d5; + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + height: 21px; + margin: 0px; + padding: 0px; + padding-left: 2px; } .admin-ui ul.objectpath li { list-style-type: none; - display: inline; - margin-right: 3px; + display: block; + float: left; } +.admin-ui ul li.pathItem { + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +/* +.admin-ui ul.li.pathSeparator { + background-image: url(img/pathSeparator.png); + background-position: center center; + background-repeat: no-repeat; + width: 7px; +} +*/ + .admin-ui ul.objectpath li.selected { font-weight: bold; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; } +.admin-ui ul.objectpath a { + color: #333333; + text-decoration: none; +} + +.admin-ui ul.objectpath a:hover { + color: #5078aa; + text-decoration: none; +} + /* Resize combo lists */ .admin-ui select { padding: 2px 4px 2px 1px; @@ -140,7 +187,7 @@ .admin-ui .portlet-area-body { border: 1px solid #d5d5d5; - border-top: 0; + border-top: 0px; background-color: #fff; padding: 4px; margin: 0; @@ -157,6 +204,170 @@ padding-left: 6px; } +.admin-ui h3.sectionTitle { + font-weight: bold; + color: #656565; + font-size: 11px; + border-top: 1px solid #999; + background-color: #ebf2f5; + padding: 2px; + padding-left: 4px; +} + +.admin-ui .portlet-section-header { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-header th { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-body { + color: #656565; + border: 1px solid #d5d5d5; + border-top: 0px; +} + +.admin-ui .portlet-section-alternate { + background-color: #F2F2F2; + border: 1px solid #d5d5d5; +} + +.admin-ui .portlet-section-selected { + background-color: #CBD4E6; +} + +.admin-ui .actionDetails { + background-image: url( img/actionIcon_Details.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionLayout { + background-image: url( img/actionIcon_Layout.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionSecurity { + background-image: url( img/actionIcon_Security.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionProperties { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 18px; + white-space: nowrap; + height: 22px; +} + +.admin-ui .actionTheme { + background-image: url( img/actionIcon_Theme.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionRename { + background-image: url( img/actionIcon_Rename.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDelete { + background-image: url( img/actionIcon_Delete.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionMakeDefault { + background-image: url( img/actionIcon_MakeDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDefault { + background-image: url( img/actionIcon_IsDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionPreferences { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionCreateInstance { + background-image: url( img/actionIcon_CreateInstance.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + .admin-ui .portlet-content-center { padding: 0; margin: 0; @@ -239,15 +450,15 @@ padding: 1em 0 0 0; } -.admin-ui .objectName:before { - content: "'"; +.admin-ui .objectList { + width: 100%; } -.admin-ui .objectName:after { - content: "'"; +.admin-ui .objectList .objectNameColumn { + width: 25%; } -.admin-ui .objectName { - font-style: italic; +.admin-ui .objectList .objectActionColumn { + width: 75%; } 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -45,7 +45,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> </td> @@ -81,7 +81,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlInternalError.displayName}"/> </td> @@ -117,7 +117,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> </td> 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -46,7 +46,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> </td> @@ -83,7 +83,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlInternalError.displayName}"/> </td> @@ -120,7 +120,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> </td> 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -80,7 +80,7 @@ <h:form> <!-- defines layout of property table --> - <h:dataTable value="#{properties.entries}" + <h:dataTable value="#{properties.entries}" width="100%" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> <f:facet name="header">Name</f:facet> @@ -107,7 +107,7 @@ <f:facet name="header">Delete</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText value="Delete"/> + <h:outputText styleClass="actionDelete" value="Delete"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -1,53 +1,45 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> +<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="layout">Layout</h:outputLabel></td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> - <td> - <h:selectOneMenu id="layout" value="#{theme.layoutName}"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="theme">Theme</h:outputLabel></td> - <td>Name of the look and feel to use</td> - <td> - <h:selectOneMenu id="theme" value="#{theme.themeName}"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="renderSet">RenderSet</h:outputLabel> - </td> - <td>Name of the render engine to use to render pages</td> - <td> - <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Layout</td> + <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Theme</td> + <td>Name of the look and feel to use</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>RenderSet</td> + <td>Name of the render engine to use to render pages</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> \ No newline at end of file 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -4,55 +4,45 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel for="windowRenderer" styleClass="portlet-form-field-label">Window - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render windows</td> - <td> - <h:selectOneMenu id="windowRenderer" styleClass="portlet-form-field" - value="#{theme.windowRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel for="decorationRenderer" styleClass="portlet-form-field-label">Decoration - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render window decorations</td> - <td> - <h:selectOneMenu id="decorationRenderer" styleClass="portlet-form-field" - value="#{theme.decorationRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td><h:outputLabel for="portletRenderer" styleClass="portlet-form-field-label">Portlet - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render portlets</td> - <td> - <h:selectOneMenu id="portletRenderer" styleClass="portlet-form-field" - value="#{theme.portletRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Window Renderer</td> + <td>Name of the render engine to use to render windows</td> + <td> + <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Decoration Renderer</td> + <td>Name of the render engine to use to render window decorations</td> + <td> + <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td>Portlet Renderer</td> + <td>Name of the render engine to use to render portlets</td> + <td> + <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -16,7 +16,7 @@ <h:commandLink action="instances">Portlet Instances</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected actionDelete"> + <li class="selected"> <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete </li> </ul> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -28,19 +28,24 @@ <!-- Separation --> <br/> - <div class="portlet-area-header">Dashboard theme properties</div> - <div class="portlet-area-body"> - The settings defined here will be applied to the dashboards including all the pages and windows unless they - have been assigned with different settings. - <ui:decorate template="common/editTheme.xhtml"> - <ui:param name="theme" value="#{dashboardmgr.theme}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" - styleClass="portlet-form-button"/> - </ui:define> - </ui:decorate> - </div> + <p class="portlet-area-header">Dashboard theme properties</p> + <table cellpadding="0" cellspacing="0" width="100%" class="portlet-area-body"> + <tr> + <th class="portlet-section-title">Configure dashboards settings.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </td> + </tr> + </table> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -11,9 +11,9 @@ <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" - styleClass="portlet-form-button"> + styleClass="portlet-form-button portlet-section-buttonrow"> <f:param name="id" value="#{node.id}"/> </h:commandButton> </ui:define> 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-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -9,8 +9,10 @@ <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Portal"/> @@ -60,8 +62,10 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList" + columnClasses="objectNameColumn, objectActionColumn" + rowClasses="portlet-section-body,portlet-section-alternate" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Page"/> @@ -114,8 +118,10 @@ <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream