JBoss Portal SVN: r7530 - trunk/core/src/resources/portal-core-sar/conf/data.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-25 10:53:05 -0400 (Mon, 25 Jun 2007)
New Revision: 7530
Modified:
trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
Log:
set partial refresh to false as it is still experimental
Modified: trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-06-25 14:52:16 UTC (rev 7529)
+++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml 2007-06-25 14:53:05 UTC (rev 7530)
@@ -209,7 +209,7 @@
-->
<property>
<name>theme.dyna.partial_refresh_enabled</name>
- <value>true</value>
+ <value>false</value>
</property>
<!-- Control policy config -->
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7529 - trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-25 10:52:16 -0400 (Mon, 25 Jun 2007)
New Revision: 7529
Modified:
trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
Log:
JBPORTAL-1502: SCHEMA is a MySQL 5 reserved word
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-06-25 14:48:44 UTC (rev 7528)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-06-25 14:52:16 UTC (rev 7529)
@@ -112,7 +112,7 @@
</id>
<property name="name" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
<property name="type" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
- <property name="schemaLocation" column="SCHEMA" type="java.lang.String"/>
+ <property name="schemaLocation" column="SCHEMA_LOCATION" type="java.lang.String"/>
<component name="description" class="org.jboss.portal.wsrp.registration.LocalizedString">
<property name="value" column="DESC_VALUE"/>
<property name="locale" column="DESC_LOCALE"/>
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7528 - trunk/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-25 10:48:44 -0400 (Mon, 25 Jun 2007)
New Revision: 7528
Modified:
trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
version == GA
Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-06-25 14:47:40 UTC (rev 7527)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-06-25 14:48:44 UTC (rev 7528)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, Version.Qualifier.Suffix.SUFFIX_3), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7527 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-25 10:47:40 -0400 (Mon, 25 Jun 2007)
New Revision: 7527
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/editProperties.xhtml
Log:
added vertical separations between management frames
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-25 13:29:12 UTC (rev 7526)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-25 14:47:40 UTC (rev 7527)
@@ -14,16 +14,19 @@
</ui:include>
<!-- -->
+ <br/>
<ui:include src="common/editPortalErrorHandling.xhtml">
<ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
</ui:include>
<!-- -->
+ <br/>
<ui:include src="common/editPageErrorHandling.xhtml">
<ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
</ui:include>
<!-- Separation -->
+ <br/>
<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/editProperties.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-25 13:29:12 UTC (rev 7526)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-25 14:47:40 UTC (rev 7527)
@@ -15,6 +15,7 @@
<ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/>
</ui:include>
+ <br/>
<c:if test="#{portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_PORTAL}">
<!-- -->
@@ -24,6 +25,7 @@
</c:if>
+ <br/>
<c:if test="#{!(portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_WINDOW)}">
<!-- Separation -->
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7526 - in trunk: core-admin/src/bin/portal-admin-war and 2 other directories.
by portal-commits＠lists.jboss.org
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>
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7525 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: wizard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-24 19:37:16 -0400 (Sun, 24 Jun 2007)
New Revision: 7525
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
Log:
replace literals by constants in facelets
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-06-24 23:35:04 UTC (rev 7524)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-06-24 23:37:16 UTC (rev 7525)
@@ -9,7 +9,7 @@
<ui:define name="content">
<h:form>
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == 2}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
+ <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Page layout"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
@@ -21,7 +21,7 @@
</h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == 1) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Rename"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-06-24 23:35:04 UTC (rev 7524)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-06-24 23:37:16 UTC (rev 7525)
@@ -17,7 +17,7 @@
</tbody>
<tbody>
<h:form>
- <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != 1}">
+ <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}">
<h:outputText value="Up"/>
<f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/>
</h:commandLink>
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7524 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-24 19:35:04 -0400 (Sun, 24 Jun 2007)
New Revision: 7524
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
Log:
when there is a screen name in the path nav, make the portal object clickable to return to the actual portal object screen
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 23:35:04 UTC (rev 7524)
@@ -33,14 +33,27 @@
<c:when test="#{node.id == portalobjectmgr.selectedObject.id}">
<li class="selected">
<c:choose>
- <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
- <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
- <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
- <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ <c:when test="#{portalObjectScreen != null}">
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <f:param name="id" value="#{node.id}"/>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
+ </h:commandLink>
+ <h:outputText value=" #{portalObjectScreen}"/>
+ </c:when>
+ <c:otherwise>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
+ </c:otherwise>
</c:choose>
- <c:if test="#{portalObjectScreen != null}">
- <h:outputText value=" #{portalObjectScreen}"/>
- </c:if>
</li>
</c:when>
<c:otherwise>
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7523 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-24 19:29:20 -0400 (Sun, 24 Jun 2007)
New Revision: 7523
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.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/editPageSecurity.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/editPortalSecurity.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/editProperties.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml
Log:
implement usability improvement that shows the type of the object in the path nav as well as the contextual screen name when there is one
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -9,6 +9,7 @@
<ui:composition template="../objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Delete"/>
<ui:define name="content">
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 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -1,27 +1,18 @@
<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:ct="http://www.julien.com"
- xmlns:jbp="http://www.jboss.org/portal"
- xmlns:c="http://java.sun.com/jstl/core">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <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>
-
- </ui:define>
-
-</ui:composition>
-
+ 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:ct="http://www.julien.com"
+ xmlns:jbp="http://www.jboss.org/portal"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <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>
+ </ui:define>
+ </ui:composition>
</div>
-
-
-
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -4,6 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the page permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
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-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -4,6 +4,7 @@
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:define name="content">
<h3>Page theme properties:</h3>
<ui:decorate template="common/editTheme.xhtml">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -4,6 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the portal permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
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-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -3,26 +3,22 @@
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: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:composition>
-
+ <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:composition>
</div>
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 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -7,6 +7,8 @@
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Properties"/>
+
<ui:define name="content">
<ui:include src="common/editProperties.xhtml">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -1,18 +1,12 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
-
- <ui:include src="common/editSecurity.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
+ <ui:define name="content">
+ <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <ui:include src="common/editSecurity.xhtml"/>
+ </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-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -4,6 +4,7 @@
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:define name="content">
<h3>Window theme properties:</h3>
<ui:decorate template="common/editWindowTheme.xhtml">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -32,16 +32,27 @@
<c:choose>
<c:when test="#{node.id == portalobjectmgr.selectedObject.id}">
<li class="selected">
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
+ <c:if test="#{portalObjectScreen != null}">
+ <h:outputText value=" #{portalObjectScreen}"/>
+ </c:if>
</li>
</c:when>
<c:otherwise>
<li>
<h:commandLink action="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{node.id}"/>
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
</h:commandLink>
</li>
</c:otherwise>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-06-24 23:29:20 UTC (rev 7523)
@@ -5,6 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Rename"/>
<ui:define name="content">
<h3>Renaming:</h3>
<h:form id="renameForm">
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7522 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-24 18:52:06 -0400 (Sun, 24 Jun 2007)
New Revision: 7522
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml
Log:
Dashboard label to Dashboards as it is about managing dashboards
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
@@ -18,7 +18,7 @@
<li>
<h:commandLink value="Portlet Definitions" action="portlets"/>
</li>
- <li id="currentTab">Dashboard</li>
+ <li id="currentTab">Dashboards</li>
</ul>
</h:form>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
@@ -15,7 +15,7 @@
<h:commandLink value="Portlet Definitions" action="portlets"/>
</li>
<li>
- <h:commandLink value="Dashboard" action="dashboards"/>
+ <h:commandLink value="Dashboards" action="dashboards"/>
</li>
</ul>
</h:form>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
@@ -17,7 +17,7 @@
<h:commandLink value="Portlet Definitions" action="portlets"/>
</li>
<li>
- <h:commandLink value="Dashboard" action="dashboards"/>
+ <h:commandLink value="Dashboards" action="dashboards"/>
</li>
</ul>
</h:form>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-06-24 22:52:06 UTC (rev 7522)
@@ -15,7 +15,7 @@
</li>
<li id="currentTab">Portlet Definitions</li>
<li>
- <h:commandLink value="Dashboard" action="dashboards"/>
+ <h:commandLink value="Dashboards" action="dashboards"/>
</li>
</ul>
</h:form>
18 years, 10 months
- 1
- 0
JBoss Portal SVN: r7521 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-24 18:48:02 -0400 (Sun, 24 Jun 2007)
New Revision: 7521
Added:
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/editPortalErrorHandling.xhtml
Removed:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml
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/editProperties.xhtml
Log:
- splitted error handling into portal error handling and page error handling
- moved out the error handling header in order to make it customizable according to the context
- added header for theme editition in dashboard
Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml 2007-06-24 22:30:34 UTC (rev 7520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editErrorHandling.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
@@ -1,213 +0,0 @@
-<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">
-
-
- <f:subview id="errorHandlingView" rendered="#{properties.relatedObject.type == PortalObject.TYPE_CONTEXT or properties.relatedObject.type == PortalObject.TYPE_PORTAL}">
- <!-- Separation -->
- <hr/>
-
- <h3>Edit Portal Error Handling</h3>
-
- <p>Configure how the system handles errors on portal level.</p>
-
- <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>
- <h:commandButton value="Update" styleClass="portlet-form-button"/>
- </h:form>
- </f:subview>
-
- <f:subview id="errorHandlingView" rendered="#{!(properties.relatedObject.type == PortalObject.TYPE_WINDOW)}">
- <!-- Separation -->
- <hr/>
-
- <h3>Edit Page Error Handling</h3>
-
- <p>Configure how the system handles errors on page level.</p>
-
- <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>
- <h:commandButton value="Update" styleClass="portlet-form-button"/>
- </h:form>
- </f:subview>
-
-
-
-
-
-</div>
Added: 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 (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
@@ -0,0 +1,99 @@
+<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">
+
+ <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>
+ <h:commandButton value="Update" styleClass="portlet-form-button"/>
+ </h:form>
+
+</div>
Added: 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 (rev 0)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
@@ -0,0 +1,99 @@
+<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">
+
+ <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>
+ <h:commandButton value="Update" styleClass="portlet-form-button"/>
+ </h:form>
+
+</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 22:30:34 UTC (rev 7520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
@@ -12,10 +12,28 @@
<ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/>
</ui:include>
- <ui:include src="common/editErrorHandling.xhtml">
+ <!-- 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">
<ui:param name="theme" value="#{dashboardmgr.theme}"/>
<ui:define name="form_submit">
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 22:30:34 UTC (rev 7520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-06-24 22:48:02 UTC (rev 7521)
@@ -2,7 +2,8 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="objectTemplate.xhtml">
@@ -12,13 +13,32 @@
<ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/>
</ui:include>
- <ui:include src="common/editErrorHandling.xhtml">
- <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/>
- </ui:include>
+ <c:if test="#{portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_PORTAL}">
- <!-- Separation -->
- <hr/>
+ <!-- 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>
+
+ </c:if>
+
+ <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>
+
+ </c:if>
+
</ui:define>
</ui:composition>
18 years, 10 months
- 1
- 0