Author: julien(a)jboss.com Date: 2007-02-27 06:02:21 -0500 (Tue, 27 Feb 2007) New Revision: 6422 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: move back the window editing stuff of a page to a separate page called editPageLayout Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-02-27 11:02:21 UTC (rev 6422) @@ -222,6 +222,10 @@ <to-view-id>/WEB-INF/jsp/management/editPortalTheme.xhtml</to-view-id> </navigation-case> <navigation-case> + <from-outcome>editPageLayout</from-outcome> + <to-view-id>/WEB-INF/jsp/management/editPageLayout.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-outcome>editPagePreferences</from-outcome> <to-view-id>/WEB-INF/jsp/management/editPagePreferences.xhtml</to-view-id> </navigation-case> Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -0,0 +1,96 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:t="http://myfaces.apache.org/tomahawk" + xmlns:ct="http://www.julien.com"> + +<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + + <ui:define name="content"> + + <h3>You are editing the layout of the page #{portalobjectmgr.selectedObject.name}</h3> + + <!-- --> + + <hr /> + + <h:form id="page_form_2"> + <t:dataTable + id="data" + var="row" + value="#{portalobjectmgr.rows}" + border="1"> + <t:columns value="#{portalobjectmgr.cols}" var="col"> + <f:facet name="header"> + <h:outputText value="#{col}"/> + </f:facet> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> + <f:param name="id" value="#{row[col].id}"/> + <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> + </h:commandLink> + <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{row[col].id}"/> + <h:outputText value="#{row[col].name}"/> + </h:commandLink> + </t:columns> + </t:dataTable> + + </h:form> + + <!-- --> + + <hr /> + + <h:form id="page_form_3"> + <h:message for="windowName" style="color: red"/> + <br /> + <br /> + <h:selectOneMenu + value="#{portalobjectmgr.selectedContentType}"> + <f:selectItems value="#{registry.availableTypes}"/> + </h:selectOneMenu> + <h:commandButton + value="Change content type" styleClass="portlet-form-button"/> + <ct:content + contentType="#{portalobjectmgr.selectedContentType}" + contentURI="#{portalobjectmgr.selectedContentURI}"/> + + <br/> + + <h:panelGroup> + <h:outputLabel for="windowName"> + <h:outputText value="New Window Name: " style="font-weight:bold;"/> + </h:outputLabel> + <h:inputText id="windowName" value="#{addWindowAction.windowName}" + validator="#{addWindowAction.validateWindowName}" + required="true"/> + <h:selectOneMenu value="#{addWindowAction.regionName}"> + <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> + </h:selectOneMenu> + <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> + </h:panelGroup> + + </h:form> + + </ui:define> + +</ui:composition> + +</div> + + + Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -44,8 +44,8 @@ </h:column> <h:column> <f:facet name="header"><h:outputText value="Actions"/></f:facet> - <h:commandLink action="windows" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Layout"/> <f:param name="id" value="#{page.id}"/> </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:48:09 UTC (rev 6421) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 11:02:21 UTC (rev 6422) @@ -3,8 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:t="http://myfaces.apache.org/tomahawk" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ct="http://www.julien.com"> + xmlns:f="http://java.sun.com/jsf/core"> <ui:include src="nodeNavigation.xhtml"/> @@ -20,80 +19,6 @@ <h:message for="name" style="color: red"/> </h:form> - <!-- --> - - <hr /> - - <h:form id="page_form_2"> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}" - border="1"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="header"> - <h:outputText value="#{col}"/> - </f:facet> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveUp}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/up.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveDown}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/down.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveLeft}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/left.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.moveRight}"> - <f:param name="id" value="#{row[col].id}"/> - <h:graphicImage value="/images/management/right.png" style="vertical-align:middle;border-width:0"/> - </h:commandLink> - <h:commandLink rendered="#{row[col] != null}" action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{row[col].id}"/> - <h:outputText value="#{row[col].name}"/> - </h:commandLink> - </t:columns> - </t:dataTable> - - </h:form> - - <!-- --> - - <hr /> - - <h:form id="page_form_3"> - <h:message for="windowName" style="color: red"/> - <br /> - <br /> - <h:selectOneMenu - value="#{portalobjectmgr.selectedContentType}"> - <f:selectItems value="#{registry.availableTypes}"/> - </h:selectOneMenu> - <h:commandButton - value="Change content type" styleClass="portlet-form-button"/> - <ct:content - contentType="#{portalobjectmgr.selectedContentType}" - contentURI="#{portalobjectmgr.selectedContentURI}"/> - - <br/> - - <h:panelGroup> - <h:outputLabel for="windowName"> - <h:outputText value="New Window Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="windowName" value="#{addWindowAction.windowName}" - validator="#{addWindowAction.validateWindowName}" - required="true"/> - <h:selectOneMenu value="#{addWindowAction.regionName}"> - <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> - </h:selectOneMenu> - <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> - </h:panelGroup> - - </h:form> - <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink> </div>