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>