Author: chris.laprun(a)jboss.com Date: 2007-06-25 20:46:19 -0400 (Mon, 25 Jun 2007) New Revision: 7544 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/src/bin/portal-core-war/themes/renaissance/portal_style.css trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Fixed issues with styles. - Improved markup. 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-26 00:20:41 UTC (rev 7543) +++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-26 00:46:19 UTC (rev 7544) @@ -221,7 +221,7 @@ * Primary Navigation (Tabbed Nav) * *****************************/ -UL#tabsHeader { +ul#tabsHeader { margin: 0; padding-left: 0px; margin-top: 39px; @@ -230,7 +230,7 @@ /*position: relative; added for submenu hover */ } -UL#tabsHeader li { +ul#tabsHeader li { display: inline; list-style: none; float: left; @@ -245,7 +245,7 @@ white-space: nowrap; } -UL#tabsHeader li:hover { +ul#tabsHeader li:hover { background-image: url( images/tab_right_hover2.gif ); background-repeat: no-repeat; background-position: right top; @@ -253,21 +253,21 @@ } /* hover selectors for main header tabs */ -UL#tabsHeader li.hoverOn { +ul#tabsHeader li.hoverOn { background-image: url( images/tab_right_hover2.gif ); background-repeat: no-repeat; background-position: right top; white-space: nowrap; } -UL#tabsHeader li.hoverOff { +ul#tabsHeader li.hoverOff { background-image: url( images/tab_right.gif ); background-repeat: no-repeat; background-position: top right; white-space: nowrap; } -UL#tabsHeader a { +ul#tabsHeader a { display: inline; float: left; text-decoration: none; @@ -282,7 +282,7 @@ white-space: nowrap; } -UL#tabsHeader a:hover { +ul#tabsHeader a:hover { text-decoration: underline; color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/ background-repeat: no-repeat; @@ -290,7 +290,7 @@ white-space: nowrap; } -UL#tabsHeader #current { +ul#tabsHeader #current { line-height: 22px; background-color: #fff; background-image: url( images/tab_right_current.gif ); @@ -299,7 +299,7 @@ padding-top: -3px; /*border-bottom: 2px solid #fff;*/ } -UL#tabsHeader #current a, #current a:hover { +ul#tabsHeader #current a, #current a:hover { font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: bold; color: #000; /* background-image: url(../images/tab_left_current.gif); */ @@ -308,7 +308,7 @@ } /* Begin Submenu selectors */ -UL#tabsHeader ul { +ul#tabsHeader ul { visibility: hidden; position: absolute; height: 0; @@ -321,7 +321,7 @@ margin-top: 22px; } -UL#tabsHeader ul a { +ul#tabsHeader ul a { font: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; @@ -329,26 +329,26 @@ } -UL#tabsHeader ul a:hover { +ul#tabsHeader ul a:hover { font: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; color: #5078aa; } -UL#tabsHeader #current ul a { +ul#tabsHeader #current ul a { font: 11px; font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: normal; color: #5078aa; } -UL#tabsHeader li:hover ul, - UL#tabsHeader a:hover ul { +ul#tabsHeader li:hover ul, + ul#tabsHeader a:hover ul { visibility: visible; } -UL#tabsHeader ul li { +ul#tabsHeader ul li { background: #DFE8ED; color: #5078aa; padding: 3px; @@ -362,7 +362,7 @@ margin-right: 0px; } -UL#tabsHeader ul li:hover { +ul#tabsHeader ul li:hover { background: #C0D3DC; } @@ -370,7 +370,7 @@ /* -------- These are new selectors for the admin and add page styles ------- */ -UL#tabsHeader #admin { +ul#tabsHeader #admin { display: inline; background-image: url( images/tab_right_admin.gif ); background-repeat: no-repeat; @@ -379,7 +379,7 @@ line-height: 22px; } -UL#tabsHeader #admin a { +ul#tabsHeader #admin a { text-decoration: none; color: #4386b5; /* background-image: url(../images/tab_left_admin.gif);*/ background-repeat: no-repeat; @@ -389,11 +389,11 @@ line-height: 22px; } -UL#tabsHeader #admin a:hover { +ul#tabsHeader #admin a:hover { text-decoration: underline; } -UL#tabsHeader #addpage { +ul#tabsHeader #addpage { display: inline; background-color: none; background-image: none; @@ -401,7 +401,7 @@ padding-top: 1px; } -UL#tabsHeader #addpage a, #addpage a:hover { +ul#tabsHeader #addpage a, #addpage a:hover { font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif; font-weight: bold; color: white; @@ -410,7 +410,7 @@ white-space: nowrap; } -UL#tabsHeader #addpage a:hover { +ul#tabsHeader #addpage a:hover { text-decoration: underline; } @@ -420,12 +420,12 @@ } /* backslash hack for IE5-Mac \*/ -UL#tabsHeader a { +ul#tabsHeader a { float: none; } /* End Mac Hack */ -html>body UL#tabsHeader a { +html>body ul#tabsHeader a { width: auto; } @@ -439,12 +439,12 @@ float: right; font-size: 10px; padding: 6px 12px 0px 0px; - color: #FFFFFF; + color: #fff; z-index: 20; } #dashboardnav a { - color: #FFFFFF; + color: #fff; } #dashboardnav .addcontent { @@ -527,10 +527,14 @@ .portlet-content-center { vertical-align: top; + padding: 0; + margin: 0; } .portlet-body { - background-color: #ffffff; + background-color: #FFFFFF; + padding: 0; + margin: 0; } .portlet-content-right { @@ -540,6 +544,8 @@ background-position: left; width: 5px; min-width: 5px; + padding: 0; + margin: 0; /* width:5px; background-color:#FFFFFF; @@ -554,7 +560,8 @@ background-repeat: no-repeat; background-position: top right; min-width: 9px; - + padding: 0; + margin: 0; /* background-color:#FFFFFF; border-bottom: 1px solid #98b7c6; @@ -970,7 +977,7 @@ } .portlet-section-alternate { - background-color: #E6E8E5; + background-color: #F2F2F2; } .portlet-section-selected { @@ -979,7 +986,7 @@ .portlet-section-subheader { font-weight: bold; - font-size: 12px; + font-size: 10px; } .portlet-section-footer { @@ -998,7 +1005,8 @@ ********************/ /* Table header */ .portlet-table-header { - padding: 0px 5px 5px 5px; + background-color: #eef; + padding: 0 5px 5px 5px; font-weight: bold; color: #656565; font-size: 12px; @@ -1007,7 +1015,7 @@ /* Table footer */ .portlet-table-footer { - padding: 5px 5px 0px 5px; + padding: 5px 5px 0 5px; font-weight: bold; color: #656565; font-size: 12px; Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-06-26 00:20:41 UTC (rev 7543) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-06-26 00:46:19 UTC (rev 7544) @@ -28,7 +28,7 @@ } %> -<div style="height:300px; width:300px; overflow: scroll; border: 1px solid #333333;"> +<div style="height:300px; width:300px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> <table style="width:100%;" cellspacing="0" cellpadding="0"> <% for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();) @@ -59,6 +59,9 @@ </div> <% + + + Portlet portlet = null; try { @@ -72,6 +75,9 @@ { MetaInfo metaInfo = portlet.getInfo().getMeta(); + + + %> <div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> @@ -87,7 +93,13 @@ </div> <% + + + } } + + + %> Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-06-26 00:20:41 UTC (rev 7543) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-06-26 00:46:19 UTC (rev 7544) @@ -1,18 +1,19 @@ /* Redefine spacing for tables. */ .admin-ui table { - border: 0px; - border-collapse: separate; + border: 0; } .admin-ui th { text-align: left; - border: 0px; + border: 0; border-bottom: 1px solid; + padding-bottom: 2px; + padding-top: 2px; + font-size: 11px; } .admin-ui td { - border: 0px; padding-bottom: 2px; padding-top: 2px; } @@ -48,7 +49,7 @@ .admin-ui ul.topnav { margin-left: 0; padding: 4px 0px 3px; - border-bottom: 1px solid; + border-bottom: 1px solid #dfe8ed; } .admin-ui ul.topnav li { @@ -57,13 +58,13 @@ margin: 0; padding: 3px 0.5em; margin-left: 5px; - border: 1px solid #777; + border: 1px solid #dfe8ed; border-bottom: none; - background-color: #eef; + background-color: #f2f4f5; } .admin-ui ul.topnav li:hover { - background-color: #ccf; + background-color: #fff; } .admin-ui ul.topnav li#currentTab { @@ -91,7 +92,10 @@ font-weight: bold; } -/* */ +/* Resize combo lists */ +.admin-ui select { + padding: 2px 4px; +} .admin-ui select.contentType { width: 8em; @@ -102,10 +106,11 @@ } .admin-ui select.windowList { - width: 11em; + width: 95%; + overflow: auto; } -/* Style a table for form layout. */ +/* Style a table for form layout */ .admin-ui table.form { } @@ -125,51 +130,68 @@ .admin-ui .portlet-area-header { border: 1px solid #54708c; font-weight: bold; - color: #FFFFFF; + color: #fff; font-size: 11px; background-color: #5986b3; - padding:2px; + padding: 2px; padding-left: 4px; + margin: 0; } .admin-ui .portlet-area-body { border: 1px solid #d5d5d5; - border-top: 0px; - background-color: #FFFFFF; - padding:4px; + border-top: 0; + background-color: #fff; + padding: 4px; + margin: 0; } /* Styles updated and enhanced from the main portal css */ +.admin-ui th.portlet-section-title { + font-weight: bold; + color: #656565; + font-size: 11px; + border: 1px solid #999; + background-color: #ebf2f5; + padding-left: 6px; +} + .admin-ui .portlet-content-center { - padding: 0px; - margin: 0px + padding: 0; + margin: 0; } .admin-ui .portlet-body { - padding: 0px; - margin: 0px + padding: 0; + margin: 0; } .admin-ui .portlet-content-right { - padding: 0px; - margin: 0px + padding: 0; + margin: 0; } .admin-ui .portlet-footer-left { - padding: 0px; - margin: 0px + padding: 0; + margin: 0; } .admin-ui .portlet-section-body { - border: 1px solid #999999; - border-top: 0px; + border: 1px solid #999; + border-top: 0; } .admin-ui .portlet-table-header { - background-color: #EEEEFF; + background-color: #eef; } +.admin-ui .portlet-section-buttonrow { + margin-top: 6px; + margin-bottom: 6px; + float: right; +} + /* Change dashed line to solid. */ .admin-ui hr { @@ -204,9 +226,15 @@ font-size: 2em; text-align: center; margin-top: 5px; - margin-bottom: 0px; + margin-bottom: 0; } .admin-ui .stepText { text-align: center; } + +.admin-ui .layout-button { + width: 50px; + margin: 2px; + padding: 2px; +} 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-26 00:20:41 UTC (rev 7543) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-06-26 00:46:19 UTC (rev 7544) @@ -1,118 +1,147 @@ <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" - xmlns:c="http://java.sun.com/jstl/core"> + 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" + xmlns:c="http://java.sun.com/jstl/core"> -<div class="portlet-area-header">Page Error Handling</div> +<p class="portlet-area-header">Page Error Handling</p> + <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"> +<tr> + <th class="portlet-section-title">Configure how the system handles errors on page level.</th> +</tr> +<tr> +<td valign="top" class="portlet-section-body"> - <h:form> - <table width="100%"> - <thead class="portlet-section-header" style="text-align:left;"> - <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlAccessDenied.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlAccessDenied.inherit}" value="#{properties.pageControlAccessDenied.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" disabled="#{properties.pageControlAccessDenied.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.pageSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlUnavailable.inherit}" value="#{properties.pageControlUnavailable.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" disabled="#{properties.pageControlUnavailable.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.pageSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlError.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlError.inherit}" value="#{properties.pageControlError.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.pageControlError.value}" disabled="#{properties.pageControlError.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.pageSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlInternalError.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlInternalError.inherit}" value="#{properties.pageControlInternalError.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.pageControlInternalError.value}" disabled="#{properties.pageControlInternalError.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.pageSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlNotFound.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlNotFound.inherit}" value="#{properties.pageControlNotFound.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.pageControlNotFound.value}" disabled="#{properties.pageControlNotFound.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.pageSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.pageControlResourceURI.inherit}" value="#{properties.pageControlResourceURI.inherited}"/>inherit action from parent - </td> - <td> - <h:inputText value="#{properties.pageControlResourceURI.value}" disabled="#{properties.pageControlResourceURI.inherited}"/> - </td> - </tr> - </tbody> - </table> - <div style="padding-top:6px;padding-bottom: 6px;float: right;"> - <h:commandButton value="Update" styleClass="portlet-form-button"/> - </div> - </h:form> +<h:form> +<table width="100%"> +<thead class="portlet-section-header" style="text-align:left;"> + <tr> + <th>Case</th> + <th>Inheritance</th> + <th>Action</th> + </tr> +</thead> +<tbody> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlAccessDenied.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlAccessDenied.inherit}" + value="#{properties.pageControlAccessDenied.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" + disabled="#{properties.pageControlAccessDenied.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlUnavailable.inherit}" + value="#{properties.pageControlUnavailable.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" + disabled="#{properties.pageControlUnavailable.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlError.inherit}" + value="#{properties.pageControlError.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlError.value}" + disabled="#{properties.pageControlError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlInternalError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlInternalError.inherit}" + value="#{properties.pageControlInternalError.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlInternalError.value}" + disabled="#{properties.pageControlInternalError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlNotFound.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlNotFound.inherit}" + value="#{properties.pageControlNotFound.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.pageControlNotFound.value}" + disabled="#{properties.pageControlNotFound.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.pageSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.pageControlResourceURI.inherit}" + value="#{properties.pageControlResourceURI.inherited}"/>inherit action + from parent + </td> + <td> + <h:inputText value="#{properties.pageControlResourceURI.value}" size="60" + disabled="#{properties.pageControlResourceURI.inherited}"/> + </td> +</tr> +</tbody> +</table> +<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +</h:form> - </td> - </tr> - </table> +</td> +</tr> +</table> </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-26 00:20:41 UTC (rev 7543) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-06-26 00:46:19 UTC (rev 7544) @@ -7,168 +7,165 @@ xmlns:c="http://java.sun.com/jstl/core"> <table width="100%"> - <tr> - <td valign="top" width="50%"> +<tr> +<td valign="top" width="50%"> - <div class="portlet-area-header">Content Definition</div> - <div class="portlet-area-body"> + <p class="portlet-area-header">Content Definition</p> - <table> - <tr> - <td colspan="2">Define a name for the window of content (optional): - </td> - </tr> - <tr> - <td> - <span class="portlet-form-field-label">Window Name:</span> - </td> - <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" - value="#{pageManager.selectedContentType}" - styleClass="portlet-form-field contentType" - onchange="document.getElementById('abc').submit()"> - <f:selectItems value="#{pageManager.contentTypeItems}"/> - </h:selectOneMenu> - <h:message for="instanceId" 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" valign="top"> - <div> - <jbp:portlet - portletId="#{pageManager.selectedEditorPortletId}" - portletInvoker="#{pageManager.portletInvoker}" - actionListener="#{pageManager.assignWindow}" - supportedModes="edit_content" - supportedWindowStates="normal" - initialMode="edit_content" - initialWindowState="normal" - renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> - </div> - </td> - </tr> - </table> + <div class="portlet-area-body"> - </div> + <table> + <tr> + <td colspan="2">Define a name for the window of content (optional): + </td> + </tr> + <tr> + <td> + <span class="portlet-form-field-label">Window Name:</span> + </td> + <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" + value="#{pageManager.selectedContentType}" + styleClass="portlet-form-field contentType" + onchange="document.getElementById('abc').submit()"> + <f:selectItems value="#{pageManager.contentTypeItems}"/> + </h:selectOneMenu> + <h:message for="instanceId" 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" valign="top"> + <div> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> + </div> + </td> + </tr> + </table> - </td> - <td valign="top" width="50%"> + </div> - <div class="portlet-area-header">Page Layout</div> - <div class="portlet-area-body"> +</td> +<td valign="top" width="50%"> - <h:form id="layoutForm"> - <h:message for="layoutForm" errorClass="portlet-msg-error"/> - <input id="blah" type="hidden" name="blah" value=""/> - <table width="100%"> - <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> - <tbody> - <tr> - <td colspan="3" class="portlet-form-field-label"><hr/> #{regionName} Region </td> - </tr> - <tr> - <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" - style="width:40px;"/> - </div> - </td> - <td width="100%"> - <h:selectManyListbox - value="#{pageManager.assignedWindows[regionName]}" - size="7" styleClass="windowList portlet-form-field" style="width:100%;"> - <f:selectItems - value="#{pageManager.windowItemsMap[regionName]}"/> - </h:selectManyListbox> - </td> - <td valign="top"> - <div style="padding-top:4px;"> - <h:commandButton - value="Up" id="u_#{regionName}" - actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button" - style="width:50px;"/> - </div> - <div style="padding-top:4px;"> - <h:commandButton - value="Down" id="d_#{regionName}" - actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button" - style="width:50px;"/> - </div> - <hr/> - <div style="padding-top:4px;"> - <h:commandButton - value="Delete" id="l_#{regionName}" - actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button" - style="width:50px;"/> - </div> - </td> - </tr> - </tbody> - </c:forEach> - <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> - <tbody> - <tr> - <td colspan="2" class="portlet-form-field-label" - style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned - windows - </td> - </tr> - <tr> - <td> - <div style="margin-top: 1em"> - <h:commandButton value="Delete" - id="l_unknown" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button"/> - </div> - </td> - <td> - <h:selectManyListbox - value="#{pageManager.assignedWindows['unknown']}" - size="7" styleClass="windowList portlet-form-field"> - <f:selectItems - value="#{pageManager.windowItemsMap['unknown']}"/> - </h:selectManyListbox> - </td> - </tr> - </tbody> - </c:if> - </table> - </h:form> + <p class="portlet-area-header">Page Layout</p> - </div> + <div class="portlet-area-body"> - </td> - </tr> + <h:form id="layoutForm"> + <h:message for="layoutForm" errorClass="portlet-msg-error"/> + <input id="blah" type="hidden" name="blah" value=""/> + <table width="100%"> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> + <tbody> + <tr> + <td colspan="3" class="portlet-form-field-label"> + <hr/> + #{regionName} Region + </td> + </tr> + <tr> + <td valign="top"> + <h:commandButton + onclick="document.getElementById('blah').value=document.getElementById('windowForm:windowName').value" + value="Add" id="a_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + </td> + <td width="100%"> + <h:selectManyListbox + value="#{pageManager.assignedWindows[regionName]}" + size="7" styleClass="windowList portlet-form-field"> + <f:selectItems + value="#{pageManager.windowItemsMap[regionName]}"/> + </h:selectManyListbox> + </td> + <td valign="top"> + <h:commandButton + value="Up" id="u_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + <h:commandButton + value="Down" id="d_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + <hr/> + <h:commandButton + value="Delete" id="l_#{regionName}" + actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button layout-button"/> + </td> + </tr> + </tbody> + </c:forEach> + <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> + <tbody> + <tr> + <td colspan="2" class="portlet-form-field-label" + style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned + windows + </td> + </tr> + <tr> + <td> + <div style="margin-top: 1em"> + <h:commandButton value="Delete" + id="l_unknown" actionListener="#{pageManager.assignWindows}" + styleClass="portlet-form-button"/> + </div> + </td> + <td> + <h:selectManyListbox + value="#{pageManager.assignedWindows['unknown']}" + size="7" styleClass="windowList portlet-form-field"> + <f:selectItems + value="#{pageManager.windowItemsMap['unknown']}"/> + </h:selectManyListbox> + </td> + </tr> + </tbody> + </c:if> + </table> + </h:form> + + </div> + +</td> +</tr> </table> </div> \ No newline at end of file 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-26 00:20:41 UTC (rev 7543) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-06-26 00:46:19 UTC (rev 7544) @@ -1,116 +1,148 @@ <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" - xmlns:c="http://java.sun.com/jstl/core"> + 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" + xmlns:c="http://java.sun.com/jstl/core"> -<div class="portlet-area-header">Portal Error Handling</div> +<p class="portlet-area-header">Portal Error Handling</p> + <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"> +<tr> + <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> +</tr> +<tr> +<td valign="top" class="portlet-section-body"> - <h:form> - <table width="100%"> - <thead class="portlet-section-header" style="text-align:left;"> - <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlAccessDenied.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlAccessDenied.inherit}" value="#{properties.portalControlAccessDenied.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" disabled="#{properties.portalControlAccessDenied.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.portalSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlUnavailable.inherit}" value="#{properties.portalControlUnavailable.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" disabled="#{properties.portalControlUnavailable.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.portalSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlError.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlError.inherit}" value="#{properties.portalControlError.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.portalControlError.value}" disabled="#{properties.portalControlError.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.portalSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlInternalError.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlInternalError.inherit}" value="#{properties.portalControlInternalError.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.portalControlInternalError.value}" disabled="#{properties.portalControlInternalError.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.portalSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlNotFound.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlNotFound.inherit}" value="#{properties.portalControlNotFound.inherited}"/>inherit action from parent - </td> - <td> - <h:selectOneMenu value="#{properties.portalControlNotFound.value}" disabled="#{properties.portalControlNotFound.inherited}" onchange="submit();"> - <f:selectItems value="#{properties.portalSelectItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td> - <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> - </td> - <td> - <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" styleClass="portlet-form-button" onchange="submit();" valueChangeListener="#{properties.portalControlResourceURI.inherit}" value="#{properties.portalControlResourceURI.inherited}"/>inherit action from parent - </td> - <td> - <h:inputText value="#{properties.portalControlResourceURI.value}" disabled="#{properties.portalControlResourceURI.inherited}"/> - </td> - </tr> - </tbody> - </table> - <div style="padding-top:6px;padding-bottom: 6px;float: right;"> - <h:commandButton value="Update" styleClass="portlet-form-button"/> - </div> - </h:form> +<h:form> +<table width="100%"> +<thead class="portlet-section-header" style="text-align:left;"> + <tr> + <th>Case</th> + <th>Inheritance</th> + <th>Action</th> + </tr> +</thead> +<tbody> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlAccessDenied.displayName}"/> </td> - </tr> - </table> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlAccessDenied.inherit}" + value="#{properties.portalControlAccessDenied.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" + disabled="#{properties.portalControlAccessDenied.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlUnavailable.inherit}" + value="#{properties.portalControlUnavailable.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" + disabled="#{properties.portalControlUnavailable.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlError.inherit}" + value="#{properties.portalControlError.inherited}"/>inherit action from + parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlError.value}" + disabled="#{properties.portalControlError.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlInternalError.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlInternalError.inherit}" + value="#{properties.portalControlInternalError.inherited}"/>inherit + action from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlInternalError.value}" + disabled="#{properties.portalControlInternalError.inherited}" + onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlNotFound.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlNotFound.inherit}" + value="#{properties.portalControlNotFound.inherited}"/>inherit action + from parent + </td> + <td> + <h:selectOneMenu value="#{properties.portalControlNotFound.value}" + disabled="#{properties.portalControlNotFound.inherited}" onchange="submit();"> + <f:selectItems value="#{properties.portalSelectItems}"/> + </h:selectOneMenu> + </td> +</tr> +<tr class="portlet-section-body"> + <td> + <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> + </td> + <td> + <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" + styleClass="portlet-form-button" onchange="submit();" + valueChangeListener="#{properties.portalControlResourceURI.inherit}" + value="#{properties.portalControlResourceURI.inherited}"/>inherit + action from parent + </td> + <td> + <h:inputText value="#{properties.portalControlResourceURI.value}" size="60" + disabled="#{properties.portalControlResourceURI.inherited}"/> + </td> +</tr> +</tbody> +</table> +<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +</h:form> +</td> +</tr> +</table> </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-26 00:20:41 UTC (rev 7543) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-06-26 00:46:19 UTC (rev 7544) @@ -1,131 +1,137 @@ - <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" - xmlns:c="http://java.sun.com/jstl/core"> + 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" + xmlns:c="http://java.sun.com/jstl/core"> <div class="portlet-area-header">Properties</div> <div class="portlet-area-body"> <!-- divide the area body into two panes --> <table cellpadding="0" cellspacing="0" width="100%"> - <tr> - <td> +<tr> +<td> -<!-- 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"> + <!-- defines property creation section --> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <th class="portlet-section-title">Add a property.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> - <h:form> + <h:form> - <!-- 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> + <!-- 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 --> + <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow" + action="#{properties.action.updateProperty}"/></h:form> - </td> - </tr> - </table> - <!-- ends property creation section --> + </td> + </tr> + </table> + <!-- ends property creation section --> - </td> - <td valign="top" width="100%" style="padding-left:5px;"><!-- creates division of 2 pane area --> +</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"> + <!-- defines property list section --> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <th class="portlet-section-title">Manage currently defined properties.</th> + </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> + <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 --> + <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> - </td> - </tr> -</table> -<!-- ends property list section --> + </td> + </tr> + </table> + <!-- ends property list section --> - </td> - </tr> +</td> +</tr> </table> <!-- ends area body -->