Author: emuckenhuber Date: 2007-12-04 04:53:44 -0500 (Tue, 04 Dec 2007) New Revision: 9268 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml Log: align pathitem in objectTemplate with object objectNavigation Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-12-04 03:18:51 UTC (rev 9267) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-12-04 09:53:44 UTC (rev 9268) @@ -3,6 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> @@ -31,6 +32,14 @@ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> </c:if> <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}"> + <c:choose> + <c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> + <!-- If window is of contentType widget --> + <h:panelGroup rendered="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> + <span class="objectName">#{node.name}</span> #{node.typeName} + </h:panelGroup> + </c:when> + <c:otherwise> <h:commandLink action="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{node.id}"/> <c:choose> @@ -38,6 +47,8 @@ <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> </c:choose> </h:commandLink> + </c:otherwise> + </c:choose> <h:outputText value="&#160;#{portalObjectScreen}" rendered="#{portalObjectScreen != null and node.id == portalobjectmgr.selectedObject.id}"/> </li>