Author: chris.laprun(a)jboss.com
Date: 2007-08-30 18:30:20 -0400 (Thu, 30 Aug 2007)
New Revision: 8117
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
Log:
- JBPORTAL-1654: Added separators.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-30
22:17:59 UTC (rev 8116)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-30
22:30:20 UTC (rev 8117)
@@ -2,12 +2,20 @@
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">
<ui:define name="content">
+ <h3 class="sectionTitle">
+ Manage  
+ <c:choose>
+ <c:when test="#{portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_CONTEXT}">portals</c:when>
+ <c:otherwise>#{portalobjectmgr.selectedObject.name}
portal</c:otherwise>
+ </c:choose>
+ </h3>
<h:form>
<h:commandLink action="editProperties"
actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Properties"/>
@@ -15,6 +23,13 @@
</h:commandLink>
</h:form>
+ <h3 class="sectionTitle">
+ Manage  
+ <c:choose>
+ <c:when test="#{portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_CONTEXT}">sub-portals</c:when>
+ <c:otherwise>pages within #{portalobjectmgr.selectedObject.name}
portal</c:otherwise>
+ </c:choose>
+ </h3>
<!-- Portal addition -->
<h:form styleClass="createObjectForm">
<span class="portlet-font">Create a portal named:
</span>
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-08-30
22:17:59 UTC (rev 8116)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-30
22:30:20 UTC (rev 8117)
@@ -8,6 +8,9 @@
<ui:define name="content">
+ <h3 class="sectionTitle">Manage
#{portalobjectmgr.selectedObject.name}
+ #{portalobjectmgr.selectedObject.typeName}</h3>
+
<h:form>
<h:panelGroup rendered="#{portalobjectmgr.selectedObject.type ==
PortalObject.TYPE_PAGE}"><h:commandLink
action="editPageLayout"
actionListener="#{portalobjectmgr.selectObject}">
@@ -35,6 +38,8 @@
</h:commandLink>
</h:form>
+ <h3 class="sectionTitle">Manage sub-pages within
#{portalobjectmgr.selectedObject.name}
+ #{portalobjectmgr.selectedObject.typeName}</h3>
<!-- Sub page addition -->
<h:form styleClass="createObjectForm">
<span class="portlet-font">Create a page named:
</span>
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-08-30
22:17:59 UTC (rev 8116)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-30
22:30:20 UTC (rev 8117)
@@ -25,57 +25,44 @@
<!-- Path nav -->
<h:form>
<ul class="objectpath">
- <c:forEach items="#{portalobjectmgr.selectedObjectPath}"
var="node">
- <li>
- >
- </li>
- <c:choose>
- <c:when test="#{node.id ==
portalobjectmgr.selectedObject.id}">
- <li class="selected">
- <c:choose>
- <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:forEach items="#{portalobjectmgr.selectedObjectPath}"
var="node">
+ <li>
+ >
+ </li>
+
+ <c:choose>
+ <c:when test="#{node.id ==
portalobjectmgr.selectedObject.id}">
+ <li class="selected">
+ <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:otherwise>#{node.name}
#{node.typeName}</c:otherwise>
</c:choose>
- </c:otherwise>
- </c:choose>
- </li>
- </c:when>
- <c:otherwise>
- <li>
- <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>
- </li>
- </c:otherwise>
- </c:choose>
- </c:forEach>
+ </h:commandLink>
+ <h:outputText value=" #{portalObjectScreen}"
rendered="#{portalObjectScreen != null}"/>
+
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <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:otherwise>#{node.name}
#{node.typeName}</c:otherwise>
+ </c:choose>
+ </h:commandLink>
+ </li>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
</ul>
</h:form>
<!-- Status message -->
- <h:message id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+ <h:message id="status" for="status"
infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>