[portal-commits] JBoss Portal SVN: r7523 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.

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="&#160;#{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">