Author: chris.laprun(a)jboss.com
Date: 2007-08-31 17:24:29 -0400 (Fri, 31 Aug 2007)
New Revision: 8128
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
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/renameObject.xhtml
Log:
- Simplified navigation code.
- Added styling of object names outside of tables.
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -13,7 +13,7 @@
Manage  
<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  
<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:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -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:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -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:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -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:
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-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -29,33 +29,16 @@
<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:otherwise>#{node.name}
#{node.typeName}</c:otherwise>
- </c:choose>
- </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>
+ <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=" #{portalObjectScreen}"
rendered="#{portalObjectScreen != null}"/>
+ </li>
</c:forEach>
</ul>
</h:form>
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31
16:30:38 UTC (rev 8127)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31
21:24:29 UTC (rev 8128)
@@ -7,11 +7,12 @@
<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">
<h:message for="newName"/>
- <p>Rename the <h:outputText value="
#{portalobjectmgr.selectedObject.name} "/>
- <h:outputText
value="#{portalobjectmgr.selectedObjectType}"/> to:
+
+ <p>Rename the <span
class="objectName">#{portalobjectmgr.selectedObject.name}</span>
+ #{portalobjectmgr.selectedObjectType} to:
<h:inputText id="newName"
value="#{renameAction.newName}"/>
<h:commandButton value="Rename"
action="#{renameAction.execute}"
styleClass="portlet-form-button"/>
</p>
Show replies by date