6:44 p.m.
Author: chris.laprun(a)jboss.com
Date: 2007-08-28 19:44:23 -0400 (Tue, 28 Aug 2007)
New Revision: 8090
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
Log:
- JBPORTAL-1650: Unified theme pages and added description.
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-08-28
23:42:18 UTC (rev 8089)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-08-28
23:44:23 UTC (rev 8090)
@@ -1,49 +1,53 @@
<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="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>
- <tbody>
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel
for="layout">Layout:</h:outputLabel>
- </td>
- <td>
- <h:selectOneMenu id="layout"
styleClass="portlet-form-field" value="#{theme.layoutName}">
- <f:selectItems
value="#{applicationScope.LayoutService.layoutItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel
for="theme">Theme:</h:outputLabel>
- </td>
- <td>
- <h:selectOneMenu id="theme"
styleClass="portlet-form-field" value="#{theme.themeName}">
- <f:selectItems
value="#{applicationScope.ThemeService.themeItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel
for="renderSet">RenderSet:</h:outputLabel>
- </td>
- <td>
- <h:selectOneMenu id="renderSet"
styleClass="portlet-form-field" value="#{theme.renderSetName}">
- <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- </tbody>
- </table>
+ <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>
+ <br/>
+ <ui:insert name="form_submit"/>
+ </h:form>
</h:panelGroup>
-</div>
\ No newline at end of file
+</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-08-28
23:42:18 UTC (rev 8089)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-08-28
23:44:23 UTC (rev 8090)
@@ -1,48 +1,58 @@
<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="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">
- <fieldset style="border: 1px solid;">
- <legend>Theme properties</legend>
+ <h:form id="themeform">
<table>
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Setting</th>
+ </tr>
+ </thead>
<tbody>
- <tr>
- <td class="portlet-form-field-label"><label
class="portlet-form-field-label">Window Renderer:</label>
- </td>
- <td>
- <h:selectOneMenu styleClass="portlet-form-field"
value="#{theme.windowRendererName}">
+ <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>
- <td class="portlet-form-field-label"><label
class="portlet-form-field-label">Decoration Renderer:</label>
- </td>
- <td>
- <h:selectOneMenu styleClass="portlet-form-field"
value="#{theme.decorationRendererName}">
+ </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 class="portlet-form-field-label"><label
class="portlet-form-field-label">Portlet Renderer:</label>
- </td>
- <td>
- <h:selectOneMenu styleClass="portlet-form-field"
value="#{theme.portletRendererName}">
+ </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>
+ </h:selectOneMenu>
+ </td>
+ </tr>
</tbody>
</table>
- </fieldset>
- <div style="text-align:center;padding: 1em 0 1em 0">
+
+ <br/>
<ui:insert name="form_submit"/>
- </div>
- </h:form>
-</h:panelGroup>
-</div>
\ No newline at end of file
+ </h:form>
+ </h:panelGroup>
+</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-08-28
23:42:18 UTC (rev 8089)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-08-28
23:44:23 UTC (rev 8090)
@@ -3,15 +3,17 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="objectTemplate.xhtml">
- <ui:param name="portalObjectScreen" value="Theme"/>
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Theme"/>
<ui:define name="content">
- <h3>Page theme properties:</h3>
+ <h3>Page theme properties</h3>
<ui:decorate template="common/editTheme.xhtml">
<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"/>
- <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <h:commandButton value="Update" action="objects"
actionListener="#{portalobjectmgr.theme.execute}"
+ styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
+ styleClass="portlet-form-button">
<f:param name="id" value="#{node.id}"/>
</h:commandButton>
</ui:define>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-08-28
23:42:18 UTC (rev 8089)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-08-28
23:44:23 UTC (rev 8090)
@@ -5,20 +5,24 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="Theme"/>
- <ui:define name="content">
- <h3>Portal theme properties:</h3>
- <p>The settings defined here will be applied to the whole portal including
all the pages and windows unless they have been assigned with different
settings</p>
- <br/>
- <ui:decorate template="common/editTheme.xhtml">
- <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"/>
- <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
- <f:param name="id" value="#{node.id}"/>
- </h:commandButton>
- </ui:define>
- </ui:decorate>
- </ui:define>
+ <ui:define name="content">
+ <h3>Portal theme properties</h3>
+
+ <p>These settings are inherited by all the pages and windows of this
portal. You may override these settings by
+ selecting the appropriate value on the respective Theme settings
pages.</p>
+ <br/>
+ <ui:decorate template="common/editTheme.xhtml">
+ <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"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
+ styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
</ui:composition>
</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-08-28
23:42:18 UTC (rev 8089)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-08-28
23:44:23 UTC (rev 8090)
@@ -6,12 +6,14 @@
<ui:composition template="objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="Theme"/>
<ui:define name="content">
- <h3>Window theme properties:</h3>
+ <h3>Window theme properties</h3>
<ui:decorate template="common/editWindowTheme.xhtml">
<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"/>
- <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <h:commandButton value="Update" action="objects"
actionListener="#{portalobjectmgr.theme.execute}"
+ styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
+ styleClass="portlet-form-button">
<f:param name="id" value="#{node.id}"/>
</h:commandButton>
</ui:define>