Author: julien(a)jboss.com Date: 2007-06-25 09:29:12 -0400 (Mon, 25 Jun 2007) New Revision: 7526 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css Log: Added Meriah's cosmetic changes Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css =================================================================== --- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-25 13:29:12 UTC (rev 7526) @@ -816,19 +816,19 @@ *********/ input { font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-size: 11px; + font-size: 10px; margin-right: 6px; } .portlet-form-label { - font-size: 11px; + font-size: 10px; color: #656565; } /* Text of the user-input in an input field. not sure if we need this guy? */ .portlet-form-input-field { color: #000000; - font-size: 11px; + font-size: 10px; } /* Form Button Style */ @@ -857,15 +857,16 @@ /* Text for form field labels */ .portlet-form-field-label { font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-size: 12px; + font-size: 10px; color: #000; vertical-align: bottom; + white-space: nowrap } /* Text for a form field */ .portlet-form-field { font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; - font-size: 12px; + font-size: 10px; color: #000; /*margin-top: 10px;*/ } Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-06-25 13:29:12 UTC (rev 7526) @@ -105,7 +105,7 @@ width: 11em; } -/* Style a table for form layout */ +/* Style a table for form layout. */ .admin-ui table.form { } @@ -120,6 +120,56 @@ text-align: left; } +/* Area header. */ + +.admin-ui .portlet-area-header { + border: 1px solid #54708c; + font-weight: bold; + color: #FFFFFF; + font-size: 11px; + background-color: #5986b3; + padding:2px; + padding-left: 4px; +} + +.admin-ui .portlet-area-body { + border: 1px solid #d5d5d5; + border-top: 0px; + background-color: #FFFFFF; + padding:4px; +} + +/* Styles updated and enhanced from the main portal css */ + +.admin-ui .portlet-content-center { + padding: 0px; + margin: 0px +} + +.admin-ui .portlet-body { + padding: 0px; + margin: 0px +} + +.admin-ui .portlet-content-right { + padding: 0px; + margin: 0px +} + +.admin-ui .portlet-footer-left { + padding: 0px; + margin: 0px +} + +.admin-ui .portlet-section-body { + border: 1px solid #999999; + border-top: 0px; +} + +.admin-ui .portlet-table-header { + background-color: #EEEEFF; +} + /* Change dashed line to solid. */ .admin-ui hr { Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -5,6 +5,17 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> +<div class="portlet-area-header">Page Error Handling</div> +<div class="portlet-area-body"> +<!-- defines error handeling section --> +<table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="portlet-section-title">Configure how the system handles errors on page level.</td> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + + <h:form> <table width="100%"> <thead class="portlet-section-header" style="text-align:left;"> @@ -93,7 +104,16 @@ </tr> </tbody> </table> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <div style="padding-top:6px;padding-bottom: 6px;float: right;"> + <h:commandButton value="Update" styleClass="portlet-form-button"/> + </div> </h:form> - + + + </td> + </tr> + </table> + </div> + +</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -6,19 +6,38 @@ xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> -<table class="form"> +<table width="100%"> <tr> - <td valign="top"> - <table class="form"> + <td valign="top" width="50%"> + + <div class="portlet-area-header">Content Definition</div> + <div class="portlet-area-body"> + + <table> <tr> - <td colspan="2"><hr/>You can choose among several types of content to assign on the page: + <td colspan="2">Define a name for the window of content (optional): </td> </tr> <tr> - <td class="label"> - <span class="portlet-form-field-label">Content type:</span> + <td> + <span class="portlet-form-field-label">Window Name:</span> </td> - <td class="widget"> + <td width="100%"> + <h:form id="windowForm"> + <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> + <h:message for="windowName" errorClass="portlet-msg-error"/> + </h:form> + </td> + </tr> + <tr> + <td colspan="2"><hr/>Select the type of content that will be added to the page: + </td> + </tr> + <tr> + <td> + <span class="portlet-form-field-label">Content Type:</span> + </td> + <td> <h:form id="abc"> <h:selectOneMenu id="instanceId" @@ -32,27 +51,12 @@ </td> </tr> <tr> - <td colspan="2"><hr/>You can enter a window name used during content selection (optional): - </td> - </tr> - <tr> - <td class="label"> - <span class="portlet-form-field-label">Window Name:</span> - </td> - <td class="widget"> - <h:form id="windowForm"> - <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> - <h:message for="windowName" errorClass="portlet-msg-error"/> - </h:form> - </td> - </tr> - <tr> <td colspan="2"><hr/>Select content that will be added to the page: </td> </tr> <tr> - <td colspan="2"> - <div style="margin:3em;"> + <td colspan="2" valign="top"> + <div> <jbp:portlet portletId="#{pageManager.selectedEditorPortletId}" portletInvoker="#{pageManager.portletInvoker}" @@ -66,53 +70,65 @@ </td> </tr> </table> + + </div> + </td> - <td valign="top"> + <td valign="top" width="50%"> + + <div class="portlet-area-header">Page Layout</div> + <div class="portlet-area-body"> + <h:form id="layoutForm"> <h:message for="layoutForm" errorClass="portlet-msg-error"/> <input id="blah" type="hidden" name="blah" value=""/> - <table> + <table width="100%"> <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> <tbody> <tr> - <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td> + <td colspan="3" class="portlet-form-field-label"><hr/> #{regionName} Region </td> </tr> <tr> - <td> - <div> + <td valign="top"> + <div style="padding-top:4px;"> <h:commandButton onclick="document.getElementById('blah').value=document.getElementById('windowForm:windowName').value" value="Add" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button" + style="width:40px;"/> </div> </td> - <td> + <td width="100%"> <h:selectManyListbox value="#{pageManager.assignedWindows[regionName]}" - size="7" styleClass="windowList portlet-form-field"> + size="7" styleClass="windowList portlet-form-field" style="width:100%;"> <f:selectItems value="#{pageManager.windowItemsMap[regionName]}"/> </h:selectManyListbox> </td> - <td> - <div> + <td valign="top"> + <div style="padding-top:4px;"> <h:commandButton value="Up" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button" + style="width:50px;"/> </div> - <div> + <div style="padding-top:4px;"> <h:commandButton value="Down" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button" + style="width:50px;"/> </div> - <div style="margin-top: 1em"> + <hr/> + <div style="padding-top:4px;"> <h:commandButton value="Delete" id="l_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button" + style="width:50px;"/> </div> </td> </tr> @@ -147,6 +163,9 @@ </c:if> </table> </h:form> + + </div> + </td> </tr> </table> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -5,6 +5,17 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> +<div class="portlet-area-header">Portal Error Handling</div> +<div class="portlet-area-body"> + +<!-- defines error handeling section --> +<table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="portlet-section-title">Configure how the system handles errors on portal level.</td> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <h:form> <table width="100%"> <thead class="portlet-section-header" style="text-align:left;"> @@ -93,7 +104,14 @@ </tr> </tbody> </table> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <div style="padding-top:6px;padding-bottom: 6px;float: right;"> + <h:commandButton value="Update" styleClass="portlet-form-button"/> + </div> </h:form> + </td> + </tr> + </table> </div> + +</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -1,3 +1,4 @@ + <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -5,85 +6,129 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <h3>Edit properties</h3> +<div class="portlet-area-header">Properties</div> +<div class="portlet-area-body"> - <h:form> - <table width="100%"> - <thead class="portlet-section-header" style="text-align:left;"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Inherited</th> - <th>Value</th> - <th>Delete</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{properties.entries}" var="prop" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:outputText title="#{prop.name}" value="#{prop.displayName}"/> - </td> - <td> - <h:outputText>#{prop.description}</h:outputText> - </td> - <td>#{prop.inherited ? 'Yes' : 'No'}</td> - <td> - <c:choose> - <c:when test="#{prop.type == 'java.lang.Boolean'}"> - <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}" readonly="#{prop.readOnly}"/> - </c:when> - <c:otherwise> - <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" readonly="#{prop.readOnly}"/> - </c:otherwise> - </c:choose> - </td> - <td> - <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText value="Delete"/> - <f:param name="name" value="#{prop.name}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - <h:commandButton value="Update" styleClass="portlet-form-button"/> - </h:form> +<!-- divide the area body into two panes --> +<table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td> - <!-- Separation --> - <hr/> +<!-- defines property creation section --> +<table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="portlet-section-title">Add a property.</td> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> - <h3>Add a new property</h3> + <h:form> - <p>You can either create a predefined property or create one with the name of your choice</p> + <!-- defines layout of property form --> + <table> + <tbody> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select predefined property:</h:outputLabel> + </td> + </tr> + <tr> + <td> + <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{properties.action.selectedProperty}"> + <f:selectItems value="#{properties.propertyItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td align="center">or</td> + </tr> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property name:</h:outputLabel> + </td> + </tr> + <tr> + <td> + <h:inputText id="property" styleClass="portlet-form-input-field" value="#{properties.action.otherPropertyName}" /> + </td> + </tr> + </tbody> + </table> + <!-- ends layout of property form --> + <div class="padding-top:6px;padding-bottom: 6px;float: right;"><h:commandButton value="Add Property" styleClass="portlet-form-button" action="#{properties.action.updateProperty}"/></div></h:form> - <h:form> - <table> - <tbody> - <tr> - <td class="portlet-form-field-label"> - <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select a predefined property: </h:outputLabel> - </td> - <td> - <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{properties.action.selectedProperty}"> - <f:selectItems value="#{properties.propertyItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"> - <h:outputLabel for="property" styleClass="portlet-form-field-label">Or enter a property name: </h:outputLabel> - </td> - <td> - <h:inputText id="property" styleClass="portlet-form-input-field" value="#{properties.action.otherPropertyName}" /> - </td> - </tr> - </tbody> - </table> + </td> + </tr> + </table> + <!-- ends property creation section --> - <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{properties.action.updateProperty}"/> - </h:form> + </td> + <td valign="top" width="100%" style="padding-left:5px;"><!-- creates division of 2 pane area --> - + + <!-- defines property list section --> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="portlet-section-title">Manage currently defined properties.</td> + </tr> + <tr> + <td class="portlet-section-body" valign="top"> + + <h:form> + <!-- defines layout of property table --> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Inherited</th> + <th>Value</th> + <th>Delete</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{properties.entries}" var="prop" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:outputText title="#{prop.name}" value="#{prop.displayName}"/> + </td> + <td> + <h:outputText>#{prop.description}</h:outputText> + </td> + <td>#{prop.inherited ? 'Yes' : 'No'}</td> + <td> + <c:choose> + <c:when test="#{prop.type == 'java.lang.Boolean'}"> + <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}" readonly="#{prop.readOnly}"/> + </c:when> + <c:otherwise> + <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" readonly="#{prop.readOnly}"/> + </c:otherwise> + </c:choose> + </td> + <td> + <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> + <h:outputText value="Delete"/> + <f:param name="name" value="#{prop.name}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + <!-- ends property list --> + <div class="padding-top:6px;padding-bottom: 6px;float: right;"><h:commandButton value="Update" styleClass="portlet-form-button"/></div></h:form> + + </td> + </tr> +</table> +<!-- ends property list section --> + + </td> + </tr> +</table> +<!-- ends area body --> + </div> + +</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -8,30 +8,22 @@ <ui:define name="content"> + <!-- --> <ui:include src="common/editProperties.xhtml"> <ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/> </ui:include> - <!-- Separation --> - <hr/> - <h3>Edit Portal Error Handling</h3> - <p>Configure how the system handles errors on portal level.</p> - + <!-- --> <ui:include src="common/editPortalErrorHandling.xhtml"> <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> </ui:include> - <!-- Separation --> - <hr/> - <h3>Edit Page Error Handling</h3> - <p>Configure how the system handles errors on page level.</p> - + <!-- --> <ui:include src="common/editPageErrorHandling.xhtml"> <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/> </ui:include> <!-- Separation --> - <hr/> <h3>Dashboard theme properties:</h3> <p>The settings defined here will be applied to the dashboards including all the pages and windows unless they have been assigned with different settings</p> <ui:decorate template="common/editTheme.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -9,7 +9,6 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Layout"/> <ui:define name="content"> - <h3>You are editing the page layout</h3> <ui:include src="common/editPageLayout.xhtml"> <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> </ui:include> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-24 23:37:16 UTC (rev 7525) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-25 13:29:12 UTC (rev 7526) @@ -17,11 +17,7 @@ <c:if test="#{portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_PORTAL}"> - <!-- Separation --> - <hr/> - <h3>Edit Portal Error Handling</h3> - <p>Configure how the system handles errors on portal level.</p> - + <!-- --> <ui:include src="common/editPortalErrorHandling.xhtml"> <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/> </ui:include> @@ -31,10 +27,6 @@ <c:if test="#{!(portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_WINDOW)}"> <!-- Separation --> - <hr/> - <h3>Edit Page Error Handling</h3> - <p>Configure how the system handles errors on page level.</p> - <ui:include src="common/editPageErrorHandling.xhtml"> <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/> </ui:include>