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

Author: chris.laprun(a)jboss.com Date: 2007-08-31 17:31:11 -0400 (Fri, 31 Aug 2007) New Revision: 8129 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/editWindowSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.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: - Simplified navigation code. - Added styling of object names outside of tables. 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-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -13,7 +13,7 @@ Manage &#160; <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise>#{portalobjectmgr.selectedObject.name} portal</c:otherwise> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> </c:choose> </h3> <h:form> @@ -27,7 +27,8 @@ Manage &#160; <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:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + portal</c:otherwise> </c:choose> </h3> <!-- Portal addition --> 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-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -8,7 +8,7 @@ <ui:define name="content"> - <h3 class="sectionTitle">Manage #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <h:form> @@ -38,7 +38,7 @@ </h:commandLink> </h:form> - <h3 class="sectionTitle">Manage sub-pages within #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <!-- Sub page addition --> <h:form styleClass="createObjectForm"> 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-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -5,8 +5,9 @@ <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"/> + <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + window</h3> + <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -15,8 +15,7 @@ <f:facet name="header"> <h:outputText value="Portal"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -61,8 +60,7 @@ <f:facet name="header"> <h:outputText value="Page"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -101,14 +99,15 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> 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-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -29,33 +29,16 @@ <li> &gt; </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:otherwise>#{node.name} #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - <h:outputText value="&#160;#{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> + <li class="#{node.id == portalobjectmgr.selectedObject.id ? '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:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + <h:outputText value="&#160;#{portalObjectScreen}" rendered="#{portalObjectScreen != null}"/> + </li> </c:forEach> </ul> </h:form> 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-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -7,12 +7,13 @@ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> - <p>Rename the <h:outputText value=" #{portalobjectmgr.selectedObject.name} "/> - <h:outputText value="#{portalobjectmgr.selectedObjectType}"/> to: + <h:message for="newName"/> + + <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} to: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:message for="newName"/> <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form>