Author: julien(a)jboss.com
Date: 2007-03-03 17:31:03 -0500 (Sat, 03 Mar 2007)
New Revision: 6513
Removed:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.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/jsf/editPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
remove portal/page/window pref page, rather put that in the main page of each object
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-03-03
22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -207,10 +207,6 @@
<to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editPortalPreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPortalPreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editPortalSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editPortalSecurity.xhtml</to-view-id>
</navigation-case>
@@ -223,10 +219,6 @@
<to-view-id>/WEB-INF/jsf/editPageLayout.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editPagePreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPagePreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editPageSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id>
</navigation-case>
@@ -235,10 +227,6 @@
<to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>editWindowPreferences</from-outcome>
- <to-view-id>/WEB-INF/jsf/editWindowPreferences.xhtml</to-view-id>
- </navigation-case>
- <navigation-case>
<from-outcome>editWindowSecurity</from-outcome>
<to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id>
</navigation-case>
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-03-03
22:22:56 UTC (rev 6512)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -1,5 +1,6 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
@@ -14,6 +15,17 @@
<h:message for="name"
errorClass="portlet-msg-error"/>
</h:form>
+ <!-- Default page -->
+ <h:form>
+ <h:outputLabel for="name">
+ <h:outputText styleClass="portlet-form-field-label"
value="Default Page:"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="name"
styleClass="portlet-form-field"
value="#{portalAction.defaultPageName}">
+ <f:selectItems value="#{portalobjectmgr.portalPageItems}"
/>
+ </h:selectOneMenu>
+ <h:commandButton styleClass="portlet-form-button"
value="Update" action="objects"/>
+ </h:form>
+
</ui:define>
</ui:composition>
Deleted:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml 2007-03-03
22:22:56 UTC (rev 6512)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPagePreferences.xhtml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -1,25 +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">
-
- <h3>You are editing the page: <h:outputText
value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- <h:form>
- <h:inputText id="name" value="#{addPageAction.pageName}"
styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add
Portal sub-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/editPortalPreferences.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03
22:22:56 UTC (rev 6512)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalPreferences.xhtml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -1,31 +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"
-
xmlns:f="http://java.sun.com/jsf/core">
-
- <ui:composition
- template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the portal: <h:outputText
- value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- <h:form>
- <h:outputLabel for="name">
- <h:outputText styleClass="portlet-form-field-label" value="Default
Page:"/>
- </h:outputLabel>
- <h:selectOneMenu id="name" styleClass="portlet-form-field"
value="#{portalAction.defaultPageName}">
- <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
- </h:selectOneMenu>
- <h:commandButton styleClass="portlet-form-button"
value="Update" action="objects"/>
- </h:form>
-
-
- </ui:define>
-
- </ui:composition>
-</div>
-
-
-
Deleted:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml 2007-03-03
22:22:56 UTC (rev 6512)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowPreferences.xhtml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -1,20 +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">
-
- <h3>You are editing the window: <h:outputText
- value="#{portalobjectmgr.selectedObject.name}" /></h3>
-
- </ui:define>
-
-</ui:composition>
-
-</div>
-
-
-
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03
22:22:56 UTC (rev 6512)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-03-03
22:31:03 UTC (rev 6513)
@@ -27,10 +27,7 @@
</h:commandLink>
</td>
<td>
- <h:commandLink action="editPortalPreferences"
actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id"
value="#{object.id}"/>
- </h:commandLink> | <h:commandLink
action="editPortalSecurity"
actionListener="#{portalobjectmgr.selectObject}">
+ <h:commandLink action="editPortalSecurity"
actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Security"/>
<f:param name="id"
value="#{object.id}"/>
</h:commandLink> | <h:commandLink
action="editPortalTheme"
actionListener="#{portalobjectmgr.selectObject}">
@@ -99,10 +96,7 @@
</h:commandLink>
</td>
<td>
- <h:commandLink action="editWindowPreferences"
actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="Edit"/>
- <f:param name="id"
value="#{object.id}"/>
- </h:commandLink> | <h:commandLink
action="editWindowTheme"
actionListener="#{portalobjectmgr.selectObject}">
+ <h:commandLink action="editWindowTheme"
actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id"
value="#{object.id}"/>
</h:commandLink> | <h:commandLink
action="portals"
actionListener="#{portalobjectmgr.destroyObject}">