Author: thomas.heute(a)jboss.com
Date: 2007-05-23 05:30:24 -0400 (Wed, 23 May 2007)
New Revision: 7307
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
JBPORTAL-1416: The "Step" panels at the top of each of the wizard pages should
be clickable
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-05-23
01:52:05 UTC (rev 7306)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-05-23
09:30:24 UTC (rev 7307)
@@ -90,7 +90,14 @@
currentStep++;
return (String)steps.get(currentStep);
}
-
+
+ public String goTo()
+ {
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ currentStep =
Integer.parseInt((String)ctx.getExternalContext().getRequestParameterMap().get("step"));
+ return (String)steps.get(currentStep);
+ }
+
public String previous()
{
currentStep--;
@@ -363,25 +370,27 @@
this.authorizationDomainRegistry = authorizationDomainRegistry;
}
- public boolean getNextEnabled()
+ public boolean[] getEnabled()
{
- if (currentStep == 0)
+ boolean[] result = new boolean[steps.size()];
+ result[0] = true;
+ if (selectedPortletId != null)
{
- return (selectedPortletId != null);
+ result[1] = true;
}
- if (currentStep == 1)
+ if (selectedPortalId != null)
{
- return (selectedPortalId != null);
+ result[2] = true;
}
- if (currentStep == 2)
+ if (selectedPageId != null)
{
- return (selectedPageId != null);
+ result[3] = true;
}
- if (currentStep == 3)
+ if (selectedRegionId != null)
{
- return (selectedRegionId != null);
+ result[4] = true;
}
- return true;
+ return result;
}
}
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-05-23
01:52:05 UTC (rev 7306)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-05-23
09:30:24 UTC (rev 7307)
@@ -2,6 +2,7 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
@@ -11,16 +12,27 @@
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
<p class="stepNumber">Step 1</p>
-
<p class="stepText">Select Portlet</p>
</div>
</c:when>
<c:otherwise>
+ <c:choose>
+ <c:when test="#{newWindowWizard.enabled[0]}">
+ <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <f:param name="step" value="0"/>
<div class="wizardStepBox">
<p class="stepNumber">Step 1</p>
-
<p class="stepText">Select Portlet</p>
</div>
+ </h:commandLink></h:form>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 1</p>
+ <p class="stepText">Select Portlet</p>
+ </div>
+ </c:otherwise>
+ </c:choose>
</c:otherwise>
</c:choose>
@@ -28,16 +40,27 @@
<c:when test="#{newWindowWizard.currentStep == 1}">
<div class="wizardStepBox" id="selected">
<p class="stepNumber">Step 2</p>
-
<p class="stepText">Select Portal</p>
</div>
</c:when>
<c:otherwise>
+ <c:choose>
+ <c:when test="#{newWindowWizard.enabled[1]}">
+ <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <f:param name="step" value="1"/>
<div class="wizardStepBox">
<p class="stepNumber">Step 2</p>
-
<p class="stepText">Select Portal</p>
</div>
+ </h:commandLink></h:form>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 2</p>
+ <p class="stepText">Select Portal</p>
+ </div>
+ </c:otherwise>
+ </c:choose>
</c:otherwise>
</c:choose>
@@ -45,16 +68,27 @@
<c:when test="#{newWindowWizard.currentStep == 2}">
<div class="wizardStepBox" id="selected">
<p class="stepNumber">Step 3</p>
-
<p class="stepText">Select Page</p>
</div>
</c:when>
<c:otherwise>
+ <c:choose>
+ <c:when test="#{newWindowWizard.enabled[2]}">
+ <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <f:param name="step" value="2"/>
<div class="wizardStepBox">
<p class="stepNumber">Step 3</p>
-
<p class="stepText">Select Page</p>
</div>
+ </h:commandLink></h:form>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 3</p>
+ <p class="stepText">Select Page</p>
+ </div>
+ </c:otherwise>
+ </c:choose>
</c:otherwise>
</c:choose>
@@ -62,16 +96,27 @@
<c:when test="#{newWindowWizard.currentStep == 3}">
<div class="wizardStepBox" id="selected">
<p class="stepNumber">Step 4</p>
-
<p class="stepText">Select Region</p>
</div>
</c:when>
<c:otherwise>
+ <c:choose>
+ <c:when test="#{newWindowWizard.enabled[3]}">
+ <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <f:param name="step" value="3"/>
<div class="wizardStepBox">
<p class="stepNumber">Step 4</p>
-
<p class="stepText">Select Region</p>
</div>
+ </h:commandLink></h:form>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 4</p>
+ <p class="stepText">Select Region</p>
+ </div>
+ </c:otherwise>
+ </c:choose>
</c:otherwise>
</c:choose>
@@ -79,16 +124,27 @@
<c:when test="#{newWindowWizard.currentStep == 4}">
<div class="wizardStepBox" id="selected">
<p class="stepNumber">Step 5</p>
-
<p class="stepText">Confirm</p>
</div>
</c:when>
<c:otherwise>
+ <c:choose>
+ <c:when test="#{newWindowWizard.enabled[4]}">
+ <h:form><h:commandLink action="#{newWindowWizard.goTo}">
+ <f:param name="step" value="4"/>
<div class="wizardStepBox">
<p class="stepNumber">Step 5</p>
-
<p class="stepText">Confirm</p>
</div>
+ </h:commandLink></h:form>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <p class="stepNumber">Step 5</p>
+ <p class="stepText">Confirm</p>
+ </div>
+ </c:otherwise>
+ </c:choose>
</c:otherwise>
</c:choose>
@@ -105,7 +161,7 @@
<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}"
+ <h:commandButton
disabled="#{!newWindowWizard.enabled[newWindowWizard.currentStep + 1]}"
rendered="#{newWindowWizard.currentStep lt 4}"
value="Next"
action="#{newWindowWizard.next}"
styleClass="portlet-form-button"/>
</h:form>
</div>