[portal-commits] JBoss Portal SVN: r7524 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

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="&#160;#{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="&#160;#{portalObjectScreen}"/> - </c:if> </li> </c:when> <c:otherwise>