[portal-commits] JBoss Portal SVN: r6512 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF: jsf and 1 other directory.

Author: julien(a)jboss.com Date: 2007-03-03 17:22:56 -0500 (Sat, 03 Mar 2007) New Revision: 6512 Added: 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/editWindow.xhtml Removed: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 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/objects.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml Log: improve structure a bit Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml) =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -0,0 +1,21 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <!-- --> + <h:form id="portal_form"> + <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> + <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </h:form> + + </ui:define> + + </ui:composition> + +</div> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml) =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -0,0 +1,21 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <!-- Sub page addition --> + <h:form id="portal_form"> + <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> + <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </h:form> + + </ui:define> + + </ui:composition> + +</div> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml (from rev 6511, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml) =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -0,0 +1,24 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ct="http://www.julien.com" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="objectTemplate.xhtml"> + + <ui:define name="content"> + + <!-- --> + <h:form id="window_form"> + <ct:content + contentType="#{portalobjectmgr.selectedContentType}" + contentURI="#{portalobjectmgr.selectedContentURI}" + submitFunction="document.window_form.submit()"/> + <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/> + </h:form> + + </ui:define> + + </ui:composition> + +</div> 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-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -45,5 +45,11 @@ <!-- Content --> <ui:insert name="content">Content</ui:insert> - + + <!-- Separation --> + <hr/> + + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -6,17 +6,18 @@ <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == 0}"> - <ui:include src="portals.xhtml"/> + <ui:include src="editContext.xhtml"/> </c:when> <c:when test="#{portalobjectmgr.selectedObject.type == 1}"> - <ui:include src="pages.xhtml"/> + <ui:include src="editPage.xhtml"/> </c:when> <c:when test="#{portalobjectmgr.selectedObject.type == 2}"> - <ui:include src="pages.xhtml"/> + <ui:include src="editPage.xhtml"/> </c:when> <c:when test="#{portalobjectmgr.selectedObject.type == 3}"> - <ui:include src="windows.xhtml"/> + <ui:include src="editWindow.xhtml"/> </c:when> + <c:otherwise>FIXME</c:otherwise> </c:choose> </div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -1,23 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> - - <ui:composition template="objectTemplate.xhtml"> - - <ui:define name="content"> - <!-- Navigation --> - <ui:include src="objectNavigation.xhtml"/> - - <!-- Sub page addition --> - <hr/> - <h:form id="portal_form"> - <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> - <h:message for="name" errorClass="portlet-msg-error"/> - </h:form> - </ui:define> - - </ui:composition> - -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -1,27 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> - - <ui:composition template="objectTemplate.xhtml"> - - <ui:define name="content"> - - <!-- --> - <h:form id="portal_form"> - <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> - <h:message for="name" errorClass="portlet-msg-error"/> - </h:form> - - <!-- Separation --> - <hr/> - - <!-- Navigation --> - <ui:include src="objectNavigation.xhtml"/> - - </ui:define> - - </ui:composition> - -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-03 22:22:56 UTC (rev 6512) @@ -1,24 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:ct="http://www.julien.com" - xmlns:h="http://java.sun.com/jsf/html"> - - <ui:composition template="objectTemplate.xhtml"> - - <ui:define name="content"> - - <!-- --> - <h:form id="window_form"> - <ct:content - contentType="#{portalobjectmgr.selectedContentType}" - contentURI="#{portalobjectmgr.selectedContentURI}" - submitFunction="document.window_form.submit()"/> - <h:commandButton value="Update" action="#{assignContentToWindowAction.execute}" styleClass="portlet-form-button"/> - </h:form> - - </ui:define> - - </ui:composition> - -</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-03-03 22:14:42 UTC (rev 6511) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-03-03 22:22:56 UTC (rev 6512) @@ -34,7 +34,7 @@ <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> <init-param> <name>default-view</name> - <value>/WEB-INF/jsf/portals.xhtml</value> + <value>/WEB-INF/jsf/objects.xhtml</value> </init-param> <expiration-cache>-1</expiration-cache> <supports>