Author: chris.laprun(a)jboss.com Date: 2007-09-12 17:34:19 -0400 (Wed, 12 Sep 2007) New Revision: 8253 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/objectNavigation.xhtml Log: - JBPORTAL-1690: added action* styles that were missed the first time around. 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-09-12 19:55:20 UTC (rev 8252) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-09-12 21:34:19 UTC (rev 8253) @@ -17,9 +17,10 @@ </c:choose> </h3> <h:form> - <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> + <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionProperties"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Properties </h:commandLink> </h:form> 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-09-12 19:55:20 UTC (rev 8252) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-09-12 21:34:19 UTC (rev 8253) @@ -16,25 +16,27 @@ action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Page layout"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" + </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> + Properties + </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Theme </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink - action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Rename"/> + action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" + Rename + </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Delete"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + Delete </h:commandLink> </h:form> 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-09-12 19:55:20 UTC (rev 8252) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-12 21:34:19 UTC (rev 8253) @@ -23,15 +23,18 @@ <f:facet name="header"> <h:outputText value="Actions"/> </f:facet> - <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> + <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionSecurity"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> + Properties + </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> + Theme </h:commandLink> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> @@ -39,16 +42,19 @@ <h:outputText value="Rename"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> - </h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Delete"/> + </h:panelGroup> | <h:commandLink action="confirm" styleClass="actionDelete" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> + Delete </h:commandLink> - <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}"> - <h:outputText value="Make Default"/> + <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" + action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> + Make Default </h:commandLink> </h:panelGroup> - <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup> + <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" + value="Default"/></h:panelGroup> </h:column> </h:dataTable> </c:if> @@ -68,32 +74,39 @@ <f:facet name="header"> <h:outputText value="Actions"/> </f:facet> - <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Page layout"/> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionLayout"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageSecurity" + Page layout + </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> + Security + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> + Properties + </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Rename"/> + Theme + </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Delete"/> + Rename + </h:commandLink> | <h:commandLink action="confirm" styleClass="actionDelete" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> + Delete </h:commandLink> - <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}"> - <h:outputText value="Make Default"/> + <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" + action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> + Make Default </h:commandLink> </h:panelGroup> - <h:panelGroup rendered="#{object.default}"> | <h:outputText value="Default"/></h:panelGroup> + <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" + value="Default"/></h:panelGroup> </h:column> </h:dataTable> </c:if> @@ -115,19 +128,22 @@ <f:facet name="header"> <h:outputText value="Actions"/> </f:facet> - <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> + <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionTheme"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" + Theme + </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Rename"/> + Properties + </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Delete"/> + Rename + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}" + styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> + Delete </h:commandLink> </h:column> </h:dataTable>