Author: chris.laprun(a)jboss.com
Date: 2007-03-12 15:11:42 -0400 (Mon, 12 Mar 2007)
New Revision: 6644
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/wizard/newWindowTpl.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
Log:
Make JSF happy by embedding commandLinks in h:form elements.
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-12
16:48:34 UTC (rev 6643)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-12
19:11:42 UTC (rev 6644)
@@ -3,7 +3,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:c="http://java.sun.com/jstl/core">
-
+
<c:choose>
<c:when test="#{portalobjectmgr.selectedObject.type == 0}">
<ui:include src="editContext.xhtml"/>
@@ -19,7 +19,9 @@
</c:when>
<c:otherwise>FIXME</c:otherwise>
</c:choose>
-
- <p style="text-align: right"><h:commandLink
action="wizardMode">Go to wizard mode</h:commandLink></p>
+ <h:form>
+ <p style="text-align: right"><h:commandLink
action="wizardMode">Go to wizard mode</h:commandLink></p>
+ </h:form>
+
</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-03-12
16:48:34 UTC (rev 6643)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-03-12
19:11:42 UTC (rev 6644)
@@ -5,98 +5,112 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
- <div class="portlet-section-header">Adding a new Portlet</div>
+<div class="portlet-section-header">Adding a new Portlet</div>
+<h:form>
<p style="text-align: right;"><h:commandLink
action="advancedMode">Go to advanced mode</h:commandLink></p>
-
- <c:choose>
+</h:form>
+
+<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
- <div class="wizardStepBox" id="selected">
- <p class="stepNumber">Step 1</p>
- <p class="stepText">Select Portlet</p>
- </div>
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 1</p>
+
+ <p class="stepText">Select Portlet</p>
+ </div>
</c:when>
<c:otherwise>
- <div class="wizardStepBox">
- <p class="stepNumber">Step 1</p>
- <p class="stepText">Select Portlet</p>
- </div>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 1</p>
+
+ <p class="stepText">Select Portlet</p>
+ </div>
</c:otherwise>
- </c:choose>
-
- <c:choose>
+</c:choose>
+
+<c:choose>
<c:when test="#{newWindowWizard.currentStep == 1}">
- <div class="wizardStepBox" id="selected">
- <p class="stepNumber">Step 2</p>
- <p class="stepText">Select Portal</p>
- </div>
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 2</p>
+
+ <p class="stepText">Select Portal</p>
+ </div>
</c:when>
<c:otherwise>
- <div class="wizardStepBox">
- <p class="stepNumber">Step 2</p>
- <p class="stepText">Select Portal</p>
- </div>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 2</p>
+
+ <p class="stepText">Select Portal</p>
+ </div>
</c:otherwise>
- </c:choose>
+</c:choose>
- <c:choose>
+<c:choose>
<c:when test="#{newWindowWizard.currentStep == 2}">
- <div class="wizardStepBox" id="selected">
- <p class="stepNumber">Step 3</p>
- <p class="stepText">Select Page</p>
- </div>
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 3</p>
+
+ <p class="stepText">Select Page</p>
+ </div>
</c:when>
<c:otherwise>
- <div class="wizardStepBox">
- <p class="stepNumber">Step 3</p>
- <p class="stepText">Select Page</p>
- </div>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 3</p>
+
+ <p class="stepText">Select Page</p>
+ </div>
</c:otherwise>
- </c:choose>
+</c:choose>
- <c:choose>
+<c:choose>
<c:when test="#{newWindowWizard.currentStep == 3}">
- <div class="wizardStepBox" id="selected">
- <p class="stepNumber">Step 4</p>
- <p class="stepText">Select Region</p>
- </div>
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 4</p>
+
+ <p class="stepText">Select Region</p>
+ </div>
</c:when>
<c:otherwise>
- <div class="wizardStepBox">
- <p class="stepNumber">Step 4</p>
- <p class="stepText">Select Region</p>
- </div>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 4</p>
+
+ <p class="stepText">Select Region</p>
+ </div>
</c:otherwise>
- </c:choose>
+</c:choose>
- <c:choose>
+<c:choose>
<c:when test="#{newWindowWizard.currentStep == 4}">
- <div class="wizardStepBox" id="selected">
- <p class="stepNumber">Step 5</p>
- <p class="stepText">Confirm</p>
- </div>
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 5</p>
+
+ <p class="stepText">Confirm</p>
+ </div>
</c:when>
<c:otherwise>
- <div class="wizardStepBox">
- <p class="stepNumber">Step 5</p>
- <p class="stepText">Confirm</p>
- </div>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 5</p>
+
+ <p class="stepText">Confirm</p>
+ </div>
</c:otherwise>
- </c:choose>
+</c:choose>
- <!-- Status message -->
- <h:message id="status" for="status"/>
+<!-- Status message -->
+<h:message id="status" for="status"/>
- <!-- Content -->
- <div class="wizardContent">
+<!-- Content -->
+<div class="wizardContent">
<ui:insert name="content">Content</ui:insert>
- </div>
-
- <div class="wizardButtonBox">
+</div>
+
+<div class="wizardButtonBox">
<h:form>
- <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}"
value="Previous" action="#{newWindowWizard.previous}"
styleClass="portlet-form-button"/>
- <h:commandButton disabled="#{!newWindowWizard.nextEnabled}"
rendered="#{newWindowWizard.currentStep lt 4}" value="Next"
action="#{newWindowWizard.next}"
styleClass="portlet-form-button"/>
+ <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}"
value="Previous"
+ action="#{newWindowWizard.previous}"
styleClass="portlet-form-button"/>
+ <h:commandButton disabled="#{!newWindowWizard.nextEnabled}"
rendered="#{newWindowWizard.currentStep lt 4}"
+ value="Next" action="#{newWindowWizard.next}"
styleClass="portlet-form-button"/>
</h:form>
- </div>
-
</div>
+
+</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-03-12
16:48:34 UTC (rev 6643)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-03-12
19:11:42 UTC (rev 6644)
@@ -4,38 +4,41 @@
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="newWindowTpl.xhtml">
+
+ <ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
-<table>
- <tbody class="portlet-section-header">
- <tr>
- <th>Page</th>
- <th></th>
- </tr>
- </tbody>
- <tbody>
- <c:forEach items="#{newWindowWizard.pages}"
var="object" varStatus="status">
- <tr class="#{object.id == newWindowWizard.selectedPageId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:commandLink id="cl_#{status.index}"
action="#{newWindowWizard.selectPage}">
- <h:outputText id="ot_#{status.index}"
value="#{object.name}"/>
- <f:param id="f_#{status.index}" name="id"
value="#{object.id}"/>
- </h:commandLink>
- </td>
- <td>
- <c:if test="#{not empty object.pages}">
- <h:commandLink id="cl2_#{status.index}"
action="#{newWindowWizard.selectParentPage}">
- <h:outputText id="ot2_#{status.index}"
value="Sub-Pages"/>
- <f:param id="f2_#{status.index}" name="id"
value="#{object.id}"/>
- </h:commandLink>
- </c:if>
- </td>
+ <table>
+ <tbody class="portlet-section-header">
+ <tr>
+ <th>Page</th>
+ <th></th>
</tr>
- </c:forEach>
- </tbody>
-</table>
-</ui:define>
- </ui:composition>
+ </tbody>
+ <tbody>
+ <h:form>
+ <c:forEach items="#{newWindowWizard.pages}"
var="object" varStatus="status">
+ <tr
+ class="#{object.id == newWindowWizard.selectedPageId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink id="cl_#{status.index}"
action="#{newWindowWizard.selectPage}">
+ <h:outputText id="ot_#{status.index}"
value="#{object.name}"/>
+ <f:param id="f_#{status.index}"
name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <c:if test="#{not empty object.pages}">
+ <h:commandLink id="cl2_#{status.index}"
action="#{newWindowWizard.selectParentPage}">
+ <h:outputText id="ot2_#{status.index}"
value="Sub-Pages"/>
+ <f:param id="f2_#{status.index}"
name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </c:if>
+ </td>
+ </tr>
+ </c:forEach>
+ </h:form>
+ </tbody>
+ </table>
+ </ui:define>
+ </ui:composition>
</div>
\ No newline at end of file
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-03-12
16:48:34 UTC (rev 6643)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-03-12
19:11:42 UTC (rev 6644)
@@ -4,30 +4,33 @@
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="newWindowTpl.xhtml">
+
+ <ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <table width="100%">
+ <table width="100%">
- <tbody class="portlet-section-header">
- <tr>
- <th>Portal</th>
- </tr>
- </tbody>
- <tbody>
- <c:forEach items="#{portalobjectmgr.selectedObject.portals}"
var="object" varStatus="status">
- <tr class="#{object.id == newWindowWizard.selectedPortalId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:commandLink
action="#{newWindowWizard.selectPortal}">
- <h:outputText value="#{object.name}"/>
- <f:param name="id"
value="#{object.id}"/>
- </h:commandLink>
- </td>
+ <tbody class="portlet-section-header">
+ <tr>
+ <th>Portal</th>
</tr>
- </c:forEach>
- </tbody>
+ </tbody>
+ <tbody>
+ <h:form>
+ <c:forEach
items="#{portalobjectmgr.selectedObject.portals}" var="object"
varStatus="status">
+ <tr
+ class="#{object.id == newWindowWizard.selectedPortalId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink
action="#{newWindowWizard.selectPortal}">
+ <h:outputText value="#{object.name}"/>
+ <f:param name="id"
value="#{object.id}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </h:form>
+ </tbody>
-</table>
-</ui:define>
- </ui:composition>
+ </table>
+ </ui:define>
+ </ui:composition>
</div>
\ No newline at end of file
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-03-12
16:48:34 UTC (rev 6643)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-03-12
19:11:42 UTC (rev 6644)
@@ -4,32 +4,34 @@
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="newWindowTpl.xhtml">
+
+ <ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <table width="100%">
+ <table width="100%">
- <tbody class="portlet-section-header">
- <tr>
- <th>Portal</th>
- </tr>
- </tbody>
- <tbody>
- <c:forEach items="#{newWindowWizard.regions}"
var="object" varStatus="status">
- <tr class="#{object == newWindowWizard.selectedRegionId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:commandLink
action="#{newWindowWizard.selectRegion}">
- <h:outputText value="#{object}"/>
- <f:param name="name"
value="#{object}"/>
- </h:commandLink>
- </td>
+ <tbody class="portlet-section-header">
+ <tr>
+ <th>Portal</th>
</tr>
- </c:forEach>
- </tbody>
+ </tbody>
+ <tbody>
+ <h:form>
+ <c:forEach items="#{newWindowWizard.regions}"
var="object" varStatus="status">
+ <tr
+ class="#{object == newWindowWizard.selectedRegionId ?
'portlet-section-selected' : status.index % 2 == 0 ?
'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:commandLink
action="#{newWindowWizard.selectRegion}">
+ <h:outputText value="#{object}"/>
+ <f:param name="name"
value="#{object}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </h:form>
+ </tbody>
+ </table>
-</table>
-
-</ui:define>
- </ui:composition>
+ </ui:define>
+ </ui:composition>
</div>
\ No newline at end of file