2:58 p.m.
Author: julien(a)jboss.com
Date: 2007-03-10 15:58:50 -0500 (Sat, 10 Mar 2007)
New Revision: 6625
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml
Log:
since we are not tied by the form for the portal layout submission, rearrange the widgets
so we have a better layout
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-10
20:33:28 UTC (rev 6624)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-10
20:58:50 UTC (rev 6625)
@@ -691,7 +691,7 @@
{
FacesContext faces = FacesContext.getCurrentInstance();
FacesMessage message = new
FacesMessage(FacesMessage.SEVERITY_ERROR, "No window name!", null);
- faces.addMessage("layoutForm:windowName", message);
+ faces.addMessage("windowName", message);
throw new AbortProcessingException();
}
@@ -701,7 +701,7 @@
{
FacesContext faces = FacesContext.getCurrentInstance();
FacesMessage message = new
FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this
page!", null);
- faces.addMessage("layoutForm:windowName", message);
+ faces.addMessage("windowName", message);
throw new AbortProcessingException();
}
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-10
20:33:28 UTC (rev 6624)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-10
20:58:50 UTC (rev 6625)
@@ -13,54 +13,72 @@
<h3>You are editing the page layout</h3>
- <h:form id="layoutForm">
<div style="float:left;padding:0 2em 0 2em">
- <table>
- <c:forEach items="#{portalobjectmgr.regionNames}"
var="regionName" varStatus="status">
- <tbody>
- <c:choose>
- <c:when test="#{status.index > 0}">
- <tr>
- <td colspan="3"
class="portlet-form-field-label" style="border-width:0px;border-top:1px
dashed #d5d5d5">#{regionName} Region</td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td colspan="3"
class="portlet-form-field-label">#{regionName} Region</td>
- </tr>
- </c:otherwise>
- </c:choose>
- <tr>
- <td>
- <div>
- <h:commandButton value="Up"
id="u_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- <div>
- <h:commandButton value="Down"
id="d_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- </td>
- <td>
- <h:selectManyListbox
-
value="#{assignWindowsAction.assignedWindows[regionName]}"
- size="7"
- styleClass="windowList portlet-form-field">
- <f:selectItems
value="#{portalobjectmgr.windowItemsMap[regionName]}"/>
- </h:selectManyListbox>
- </td>
- <td>
- <div>
- <h:commandButton value="->"
id="l_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
- </div>
- </td>
- </tr>
- </tbody>
- </c:forEach>
- </table>
+ <h:form id="layoutForm">
+ <table>
+ <c:forEach items="#{portalobjectmgr.regionNames}"
var="regionName" varStatus="status">
+ <tbody>
+ <c:choose>
+ <c:when test="#{status.index > 0}">
+ <tr>
+ <td colspan="3"
class="portlet-form-field-label" style="border-width:0px;border-top:1px
dashed #d5d5d5">#{regionName} Region</td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <tr>
+ <td colspan="3"
class="portlet-form-field-label">#{regionName} Region</td>
+ </tr>
+ </c:otherwise>
+ </c:choose>
+ <tr>
+ <td>
+ <div>
+ <h:commandButton value="Up"
id="u_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
+ </div>
+ <div>
+ <h:commandButton value="Down"
id="d_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
+ </div>
+ </td>
+ <td>
+ <h:selectManyListbox
+
value="#{assignWindowsAction.assignedWindows[regionName]}"
+ size="7"
+ styleClass="windowList portlet-form-field">
+ <f:selectItems
value="#{portalobjectmgr.windowItemsMap[regionName]}"/>
+ </h:selectManyListbox>
+ </td>
+ <td>
+ <div>
+ <h:commandButton value="->"
id="l_#{regionName}" actionListener="#{assignWindowsAction.execute}"
styleClass="portlet-form-button"/>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </c:forEach>
+ </table>
+ </h:form>
</div>
<div style="float:left">
<table class="form">
<tr>
<td class="label">
+ <span class="portlet-form-field-label">Content
type:</span>
+ </td>
+ <td class="widget">
+ <h:form id="abc">
+ <h:selectOneMenu
+ id="instanceId"
+ value="#{portalobjectmgr.selectedContentType}"
+ styleClass="portlet-form-field contentType">
+ <f:selectItems
value="#{portalobjectmgr.availableContentTypes}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="Change"
styleClass="portlet-form-button"/>
+ <h:message for="instanceId"
errorClass="portlet-msg-error"/>
+ </h:form>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
<span class="portlet-form-field-label">Window
Name:</span>
</td>
<td class="widget">
@@ -81,35 +99,24 @@
</tr>
<tr>
<td class="label">
- <span class="portlet-form-field-label">Content
type:</span>
+ <span class="portlet-form-field-label">Portlet
content:</span>
</td>
<td class="widget">
- <h:selectOneMenu
- id="instanceId"
- value="#{portalobjectmgr.selectedContentType}"
- styleClass="portlet-form-field contentType">
- <f:selectItems
value="#{portalobjectmgr.availableContentTypes}"/>
- </h:selectOneMenu>
- <h:commandButton value="Update"
styleClass="portlet-form-button"/>
- <h:message for="instanceId"
errorClass="portlet-msg-error"/>
+ <div align="left">
+ <jbp:portlet
+
instanceId="#{portalobjectmgr.selectedContentEditorInstance}"
+ actionListener="#{portalobjectmgr.processEvent}"
+ supportedModes="edit_content"
+ supportedWindowStates="normal"
+ initialMode="edit_content"
+ initialWindowState="normal"
+ onClick="url.setParameter('windowName',
document.getElementById('windowName').value).setParameter('targetRegion',
document.getElementById('targetRegion').value);"/>
+ </div>
</td>
</tr>
</table>
</div>
- </h:form>
<br />
- <span class="portlet-form-field-label">Portlet
content:</span>
- <br />
- <div align="left">
- <jbp:portlet
- instanceId="#{portalobjectmgr.selectedContentEditorInstance}"
- actionListener="#{portalobjectmgr.processEvent}"
- supportedModes="edit_content"
- supportedWindowStates="normal"
- initialMode="edit_content"
- initialWindowState="normal"
- onClick="url.setParameter('windowName',
document.getElementById('layoutForm:windowName').value).setParameter('targetRegion',
document.getElementById('layoutForm:targetRegion').value);"/>
- </div>
</ui:define>