Author: julien(a)jboss.com
Date: 2007-03-03 21:04:37 -0500 (Sat, 03 Mar 2007)
New Revision: 6521
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
Log:
flow improvement, leverage more facelets
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04
02:04:37 UTC (rev 6521)
@@ -768,19 +768,7 @@
selectObject(po.getParent());
//
- if (po.getType() == PortalObject.TYPE_PORTAL)
- {
- return "portals";
- }
- else if (po.getType() == PortalObject.TYPE_PAGE)
- {
- return "pages";
- }
- else if (po.getType() == PortalObject.TYPE_WINDOW)
- {
- return "windows";
- }
- return null;
+ return "objects";
}
public RoleModule getRoleModule()
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-04
02:04:37 UTC (rev 6521)
@@ -214,8 +214,6 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "portals";
}
else if (po.getType() == PortalObject.TYPE_PAGE)
{
@@ -225,8 +223,6 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "pages";
}
else if (po.getType() == PortalObject.TYPE_WINDOW)
{
@@ -236,10 +232,8 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "windows";
}
- return "";
+ return "objects";
}
}
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -18,7 +18,7 @@
<td>
<h:selectManyCheckbox
id="cars_#{status.index}"
- style="portlet-form-field"
+ styleClass="portlet-form-field"
value="#{auth.forRole[role]}"
layout="lineDirection">
<f:selectItems
value="#{auth.availableActions}"/>
@@ -28,7 +28,7 @@
</c:forEach>
<tr>
<td colspan="2">
- <h:commandButton action="#{auth.execute}"
value="Update" styleClass="portlet-form-button"/>
+ <ui:insert name="form_submit"/>
</td>
</tr>
</tbody>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -4,10 +4,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <h:panelGroup styleClass="portlet-section-body"
- id="themepg">
- <h:form
- id="themeform">
+ <h:panelGroup styleClass="portlet-section-body"
id="themepg">
+ <h:form id="themeform">
<fieldset style="border: 1px solid;">
<legend>Theme properties</legend>
<table>
@@ -44,8 +42,7 @@
</tr>
<tr>
<td colspan="2">
- <h:commandButton styleClass="portlet-form-button"
id="the_command" value="Update"
- action="#{themePropertyAction.execute}"
/>
+ <ui:insert name="form_submit"/>
</td>
</tr>
</tbody>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -1,13 +1,22 @@
<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="http://www.w3.org/1999/xhtml"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
<h3>Please set the page permissions</h3>
- <ui:include src="common/editSecurity.xhtml">
+ <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth"
value="#{portalobjectmgr.auth}"/>
- </ui:include>
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update"
action="#{auth.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
</ui:define>
</ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -1,19 +1,24 @@
<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>Please set the display options for the page: <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <br/>
- <ui:include src="common/editTheme.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+
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>Please set the display options for the page:
+ <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/>
+ </h3>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update"
action="#{themePropertyAction.execute}"
styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -1,20 +1,23 @@
<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>Please set the portal permissions</h3>
-
- <ui:include src="common/editSecurity.xhtml">
- <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- </ui:include>
-
- </ui:define>
-
-</ui:composition>
-
+
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:c="http://java.sun.com/jstl/core">
+ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>Please set the portal permissions</h3>
+ <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+ <ui:param name="auth"
value="#{portalobjectmgr.auth}"/>
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update"
action="#{auth.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -1,7 +1,8 @@
<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="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">
@@ -10,7 +11,16 @@
<h3>Please set the display options for the portal: <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/></h3>
<p>The settings defined here will be applied to the whole portal including all
the pages and windows unless they have been assigned with different settings</p>
<br/>
- <ui:include src="common/editTheme.xhtml"/>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update"
action="#{themePropertyAction.execute}"
styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
</ui:define>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-03-04
01:36:28 UTC (rev 6520)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-03-04
02:04:37 UTC (rev 6521)
@@ -1,19 +1,24 @@
<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>Please set the display options for the window: <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <br/>
- <ui:include src="common/editTheme.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+
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>Please set the display options for the window:
+ <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/>
+ </h3>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update"
action="#{themePropertyAction.execute}"
styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel"
action="#{portalobjectmgr.selectObject}"
styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>