Author: julien(a)jboss.com
Date: 2007-03-28 08:00:31 -0400 (Wed, 28 Mar 2007)
New Revision: 6859
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
Log:
- Go to wizard -> Switch to wizard
- put the link at the same place on the page (bottom right) in both modes
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-28
11:52:53 UTC (rev 6858)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-03-28
12:00:31 UTC (rev 6859)
@@ -21,7 +21,7 @@
</c:choose>
<h:form>
- <p style="text-align: right"><h:commandLink
action="wizardMode">Go to wizard mode</h:commandLink></p>
+ <p style="text-align: right"><h:commandLink
action="wizardMode">Switch 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-28
11:52:53 UTC (rev 6858)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-03-28
12:00:31 UTC (rev 6859)
@@ -5,112 +5,113 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
-<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>
-</h:form>
+ <div class="portlet-section-header">Adding a new Portlet</div>
+
+ <c:choose>
+ <c:when test="#{newWindowWizard.currentStep == 0}">
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 1</p>
-<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>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <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>
+ </c:otherwise>
+ </c:choose>
- <p class="stepText">Select Portlet</p>
- </div>
- </c:otherwise>
-</c:choose>
+ <c:choose>
+ <c:when test="#{newWindowWizard.currentStep == 1}">
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 2</p>
-<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>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <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>
+ </c:otherwise>
+ </c:choose>
- <p class="stepText">Select Portal</p>
- </div>
- </c:otherwise>
-</c:choose>
+ <c:choose>
+ <c:when test="#{newWindowWizard.currentStep == 2}">
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 3</p>
-<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>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <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>
+ </c:otherwise>
+ </c:choose>
- <p class="stepText">Select Page</p>
- </div>
- </c:otherwise>
-</c:choose>
+ <c:choose>
+ <c:when test="#{newWindowWizard.currentStep == 3}">
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 4</p>
-<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>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <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>
+ </c:otherwise>
+ </c:choose>
- <p class="stepText">Select Region</p>
- </div>
- </c:otherwise>
-</c:choose>
+ <c:choose>
+ <c:when test="#{newWindowWizard.currentStep == 4}">
+ <div class="wizardStepBox" id="selected">
+ <p class="stepNumber">Step 5</p>
-<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>
+ </c:when>
+ <c:otherwise>
+ <div class="wizardStepBox">
+ <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>
+ </c:otherwise>
+ </c:choose>
- <p class="stepText">Confirm</p>
- </div>
- </c:otherwise>
-</c:choose>
+ <!-- Status message -->
+ <h:message id="status" for="status"/>
-<!-- Status message -->
-<h:message id="status" for="status"/>
+ <!-- Content -->
+ <div class="wizardContent">
+ <ui:insert name="content">Content</ui:insert>
+ </div>
-<!-- Content -->
-<div class="wizardContent">
- <ui:insert name="content">Content</ui:insert>
-</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:form>
+ </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"/>
+ <p style="text-align: right;"><h:commandLink
action="advancedMode">Switch to advanced
mode</h:commandLink></p>
</h:form>
-</div>
</div>