Author: julien(a)jboss.com Date: 2007-06-24 19:37:16 -0400 (Sun, 24 Jun 2007) New Revision: 7525 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/wizard/selectPage.xhtml Log: replace literals by constants in facelets 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-06-24 23:35:04 UTC (rev 7524) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-06-24 23:37:16 UTC (rev 7525) @@ -9,7 +9,7 @@ <ui:define name="content"> <h:form> - <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == 2}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink 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" actionListener="#{portalobjectmgr.selectObject}"> @@ -21,7 +21,7 @@ </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Theme"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == 1) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + </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"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-06-24 23:35:04 UTC (rev 7524) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-06-24 23:37:16 UTC (rev 7525) @@ -17,7 +17,7 @@ </tbody> <tbody> <h:form> - <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != 1}"> + <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> <h:outputText value="Up"/> <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> </h:commandLink>