You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/09/29 15:06:19 UTC
svn commit: r700120 - in
/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi:
fileIntoCondition.xml filter.xml finish.xml forwardCondition.xml page.xml
Author: lofwyr
Date: Mon Sep 29 06:06:18 2008
New Revision: 700120
URL: http://svn.apache.org/viewvc?rev=700120&view=rev
Log:
TOBAGO-518:
+ using page.xml tempate to stucture the 4 Steps
Added:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/page.xml
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/fileIntoCondition.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/filter.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/finish.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/forwardCondition.xml
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/fileIntoCondition.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/fileIntoCondition.xml?rev=700120&r1=700119&r2=700120&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/fileIntoCondition.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/fileIntoCondition.xml Mon Sep 29 06:06:18 2008
@@ -15,72 +15,65 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
- xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
- <tc:loadBundle basename="demo" var="bundle"/>
-
- <tc:page label="Sandbox - Wizard" id="page"
- width="700px" height="800px">
- <f:facet name="layout">
- <tc:gridLayout margin="10px"/>
- </f:facet>
+<ui:composition template="page.xml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+ <ui:param name="title" value="File Into Condition"/>
+
+ <tfs:wizard var="w" controller="#{controller.wizard}" title="File Into Condition" outcome="fileIntoCondition"
+ allowJumpForward="true">
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;*;fixed"/>
+ </f:facet>
- <tfs:wizard var="w" controller="#{controller.wizard}" title="File Into Condition" outcome="fileIntoCondition"
- allowJumpForward="true">
+ <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
+ <tfs:wizardTrain wizard="#{controller.wizard}"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;*;fixed"/>
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;*"/>
</f:facet>
- <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
- <tfs:wizardTrain wizard="#{controller.wizard}"/>
+ <tx:selectOneChoice label="Header Field">
+ <tc:selectItem itemLabel="To:" itemValue="to"/>
+ <tc:selectItem itemLabel="From:" itemValue="from"/>
+ <tc:selectItem itemLabel="Subject:" itemValue="subject"/>
+ </tx:selectOneChoice>
+
+ <tx:selectOneChoice label="Condition">
+ <tc:selectItem itemLabel="contains" itemValue="contains"/>
+ <tc:selectItem itemLabel="equals" itemValue="equals"/>
+ </tx:selectOneChoice>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;*"/>
- </f:facet>
+ <tx:in label="Value" value="#{controller.filterValue}"/>
- <tx:selectOneChoice label="Header Field">
- <tc:selectItem itemLabel="To:" itemValue="to"/>
- <tc:selectItem itemLabel="From:" itemValue="from"/>
- <tc:selectItem itemLabel="Subject:" itemValue="subject"/>
- </tx:selectOneChoice>
+ <tx:in label="Folder"/>
- <tx:selectOneChoice label="Condition">
- <tc:selectItem itemLabel="contains" itemValue="contains"/>
- <tc:selectItem itemLabel="equals" itemValue="equals"/>
- </tx:selectOneChoice>
+ <tc:cell/>
- <tx:in label="Value" value="#{controller.filterValue}"/>
-
- <tx:in label="Folder"/>
-
- <tc:cell/>
-
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
- </f:facet>
+ </tc:panel>
- <tc:cell/>
- <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
- <tfs:wizardNext wizard="${w}" label="Nächste" action="finish"/>
- <tfs:wizardLeave wizard="${w}" label="Fertig"/>
- <tfs:wizardLeave wizard="${w}" label="Cancel"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
+ </f:facet>
- </tc:panel>
+ <tc:cell/>
+ <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
+ <tfs:wizardNext wizard="${w}" label="Nächste" action="finish"/>
+ <tfs:wizardLeave wizard="${w}" label="Fertig"/>
+ <tfs:wizardLeave wizard="${w}" label="Cancel"/>
</tc:panel>
- </tfs:wizard>
-
+ </tc:panel>
- </tc:page>
-</f:view>
+ </tfs:wizard>
+</ui:composition>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/filter.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/filter.xml?rev=700120&r1=700119&r2=700120&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/filter.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/filter.xml Mon Sep 29 06:06:18 2008
@@ -15,77 +15,71 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
- xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
- <tc:loadBundle basename="demo" var="bundle"/>
-
- <tc:page label="Sandbox - Wizard" id="page"
- width="700px" height="800px">
- <f:facet name="layout">
- <tc:gridLayout margin="10px"/>
- </f:facet>
-
- <tfs:wizardExtension wizard="#{controller.wizard}"
- title="New Filter"
- outcome="filter"
- allowJumpForward="true"
- labelPrevious="Zurück"
- labelNext="Weiter"
- labelOkay="Fertig"
- labelCancel="Abbruch"
- actionNext="${controller.createFilter}">
-
- <tc:selectOneRadio value="#{controller.filterType}" required="true">
- <tc:selectItem itemLabel="File Into" itemValue="fileInto"/>
- <tc:selectItem itemLabel="Forward" itemValue="forward"/>
- </tc:selectOneRadio>
-
- </tfs:wizardExtension>
-<!--
- <tfs:wizard controller="#{controller.wizard}" title="New Filter" outcome="filter"
- allowJumpForward="true">
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;*;fixed"/>
- </f:facet>
-
- <tfs:wizardTrain wizard="#{controller.wizard}"/>
+<ui:composition template="page.xml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+ <ui:param name="title" value="New Filter"/>
+
+ <tfs:wizardExtension wizard="#{controller.wizard}"
+ title="New Filter"
+ outcome="filter"
+ allowJumpForward="true"
+ labelPrevious="Zurück"
+ labelNext="Weiter"
+ labelOkay="Fertig"
+ labelCancel="Abbruch"
+ actionNext="${controller.createFilter}">
+
+ <tc:selectOneRadio value="#{controller.filterType}" required="true">
+ <tc:selectItem itemLabel="File Into" itemValue="fileInto"/>
+ <tc:selectItem itemLabel="Forward" itemValue="forward"/>
+ </tc:selectOneRadio>
+
+ </tfs:wizardExtension>
+ <!--
+ <tfs:wizard controller="#{controller.wizard}" title="New Filter" outcome="filter"
+ allowJumpForward="true">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout/>
+ <tc:gridLayout rows="fixed;*;fixed"/>
</f:facet>
- <tc:selectOneRadio value="#{controller.filterType}" required="true">
- <tc:selectItem itemLabel="File Into" itemValue="fileInto"/>
- <tc:selectItem itemLabel="Forward" itemValue="forward"/>
- </tc:selectOneRadio>
-
- </tc:panel>
+ <tfs:wizardTrain wizard="#{controller.wizard}"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
- </f:facet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout/>
+ </f:facet>
+
+ <tc:selectOneRadio value="#{controller.filterType}" required="true">
+ <tc:selectItem itemLabel="File Into" itemValue="fileInto"/>
+ <tc:selectItem itemLabel="Forward" itemValue="forward"/>
+ </tc:selectOneRadio>
+
+ </tc:panel>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
+ </f:facet>
+
+ <tc:cell/>
+ <tfs:wizardPrevious wizard="#{controller.wizard}" label="Vorherige"/>
+ <tfs:wizardNext wizard="#{controller.wizard}" label="Nächste" action="${controller.createFilter}"/>
+ <tfs:wizardLeave wizard="#{controller.wizard}" label="Fertig"/>
+ <tfs:wizardLeave wizard="#{controller.wizard}" label="Cancel"/>
- <tc:cell/>
- <tfs:wizardPrevious wizard="#{controller.wizard}" label="Vorherige"/>
- <tfs:wizardNext wizard="#{controller.wizard}" label="Nächste" action="${controller.createFilter}"/>
- <tfs:wizardLeave wizard="#{controller.wizard}" label="Fertig"/>
- <tfs:wizardLeave wizard="#{controller.wizard}" label="Cancel"/>
+ </tc:panel>
</tc:panel>
- </tc:panel>
-
- </tfs:wizard>
--->
+ </tfs:wizard>
+ -->
- </tc:page>
-</f:view>
+</ui:composition>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/finish.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/finish.xml?rev=700120&r1=700119&r2=700120&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/finish.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/finish.xml Mon Sep 29 06:06:18 2008
@@ -15,58 +15,53 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
- xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
- <tc:loadBundle basename="demo" var="bundle"/>
-
- <tc:page label="Sandbox - Wizard" id="page"
- width="700px" height="800px">
- <f:facet name="layout">
- <tc:gridLayout margin="10px"/>
- </f:facet>
+<ui:composition template="page.xml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+ <ui:param name="title" value="Finish"/>
+
+ <tfs:wizard var="w" controller="#{controller.wizard}" title="Finish" outcome="finish"
+ allowJumpForward="true">
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;*;fixed"/>
+ </f:facet>
- <tfs:wizard var="w" controller="#{controller.wizard}" title="Finish" outcome="finish"
- allowJumpForward="true">
+ <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
+ <tfs:wizardTrain wizard="#{controller.wizard}"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;*;fixed"/>
+ <tc:gridLayout rows="fixed;*"/>
</f:facet>
- <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
- <tfs:wizardTrain wizard="#{controller.wizard}"/>
+ <tc:out value="Finish"/>
+ <tc:cell/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;*"/>
- </f:facet>
-
- <tc:out value="Finish" />
- <tc:cell/>
-
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
- </f:facet>
-
- <tc:cell/>
- <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
- <tfs:wizardNext wizard="${w}" label="Nächste"/>
- <tfs:wizardLeave wizard="${w}" label="Fertig"/>
- <tfs:wizardLeave wizard="${w}" label="Cancel"/>
+ </tc:panel>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
+ </f:facet>
- </tc:panel>
+ <tc:cell/>
+ <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
+ <tfs:wizardNext wizard="${w}" label="Nächste"/>
+ <tfs:wizardLeave wizard="${w}" label="Fertig"/>
+ <tfs:wizardLeave wizard="${w}" label="Cancel"/>
</tc:panel>
- </tfs:wizard>
+ </tc:panel>
+
+ </tfs:wizard>
- </tc:page>
-</f:view>
+</ui:composition>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/forwardCondition.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/forwardCondition.xml?rev=700120&r1=700119&r2=700120&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/forwardCondition.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/forwardCondition.xml Mon Sep 29 06:06:18 2008
@@ -15,58 +15,52 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
- xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
- <tc:loadBundle basename="demo" var="bundle"/>
-
- <tc:page label="Sandbox - Wizard" id="page"
- width="700px" height="800px">
- <f:facet name="layout">
- <tc:gridLayout margin="10px"/>
- </f:facet>
+<ui:composition template="page.xml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:tcs="http://myfaces.apache.org/tobago/sandbox"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+ <ui:param name="title" value="Forward Condition"/>
+
+ <tfs:wizard var="w" controller="#{controller.wizard}" title="Forward Condition" outcome="forwardCondition"
+ allowJumpForward="true">
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;*;fixed"/>
+ </f:facet>
- <tfs:wizard var="w" controller="#{controller.wizard}" title="ForwardCondition" outcome="forwardCondition"
- allowJumpForward="true">
+ <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
+ <tfs:wizardTrain wizard="#{controller.wizard}"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;*;fixed"/>
+ <tc:gridLayout rows="fixed;*"/>
</f:facet>
- <!--<tfs:wizardTrain wizard="w" controller="#{controller.wizard}"/>-->
- <tfs:wizardTrain wizard="#{controller.wizard}"/>
+ <tc:out value="${w.index}"/>
+ <tc:out value="Forward Condition"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;*"/>
- </f:facet>
-
- <tc:out value="${w.index}" />
- <tc:out value="Forward Condition"/>
-
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
- </f:facet>
-
- <tc:cell/>
- <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
- <tfs:wizardNext wizard="${w}" label="Nächste" action="finish"/>
- <tfs:wizardLeave wizard="${w}" label="Fertig"/>
- <tfs:wizardLeave wizard="${w}" label="Cancel"/>
+ </tc:panel>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed;fixed;fixed;fixed"/>
+ </f:facet>
- </tc:panel>
+ <tc:cell/>
+ <tfs:wizardPrevious wizard="${w}" label="Vorherige"/>
+ <tfs:wizardNext wizard="${w}" label="Nächste" action="finish"/>
+ <tfs:wizardLeave wizard="${w}" label="Fertig"/>
+ <tfs:wizardLeave wizard="${w}" label="Cancel"/>
</tc:panel>
- </tfs:wizard>
+ </tc:panel>
+ </tfs:wizard>
- </tc:page>
-</f:view>
+</ui:composition>
Added: myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/page.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/page.xml?rev=700120&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/page.xml (added)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi/page.xml Mon Sep 29 06:06:18 2008
@@ -0,0 +1,24 @@
+<tobago xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <ui:composition>
+
+ <f:view>
+
+ <tc:page label="Tobago Sandbox - Wizard - ${title}" width="700" height="500">
+
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px"/>
+ </f:facet>
+
+ <ui:insert />
+
+ </tc:page>
+
+ </f:view>
+
+ </ui:composition>
+
+</tobago>
\ No newline at end of file