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:23:42 UTC
svn commit: r700124 - in
/myfaces/tobago/trunk/example/sandbox/src/main/webapp/facelets/wizard/navi:
fileIntoCondition.xml filter.xml finish.xml forwardCondition.xml
Author: lofwyr
Date: Mon Sep 29 06:23:41 2008
New Revision: 700124
URL: http://svn.apache.org/viewvc?rev=700124&view=rev
Log:
TOBAGO-518:
+ using extension tag to keep pages simple
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=700124&r1=700123&r2=700124&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:23:41 2008
@@ -25,55 +25,68 @@
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">
+ <tfs:wizardExtension wizard="#{controller.wizard}"
+ title="File Into Condition"
+ outcome="fileIntoCondition"
+ allowJumpForward="true"
+ labelPrevious="Zurück"
+ labelNext="Weiter"
+ labelOkay="Fertig"
+ labelCancel="Abbruch"
+ actionNext="finish"
+ actionCancel="index">
+
+ <!--
+ <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: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: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>
+ <tx:in label="Value" value="#{controller.filterValue}"/>
- <tx:in label="Value" value="#{controller.filterValue}"/>
+ <tx:in label="Folder"/>
- <tx:in label="Folder"/>
+ <tc:cell/>
- <tc:cell/>
-
- </tc:panel>
+ </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>
- <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>
- </tc:panel>
-
- </tfs:wizard>
+ </tfs:wizard>
+ -->
+ </tfs:wizardExtension>
</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=700124&r1=700123&r2=700124&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:23:41 2008
@@ -33,7 +33,8 @@
labelNext="Weiter"
labelOkay="Fertig"
labelCancel="Abbruch"
- actionNext="${controller.createFilter}">
+ actionNext="${controller.createFilter}"
+ actionCancel="index">
<tc:selectOneRadio value="#{controller.filterType}" required="true">
<tc:selectItem itemLabel="File Into" itemValue="fileInto"/>
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=700124&r1=700123&r2=700124&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:23:41 2008
@@ -25,43 +25,53 @@
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">
+ <tfs:wizardExtension wizard="#{controller.wizard}"
+ title="Finish"
+ outcome="finish"
+ allowJumpForward="true"
+ labelPrevious="Zurück"
+ labelNext="Weiter"
+ labelOkay="Fertig"
+ labelCancel="Abbruch"
+ actionOkay="index">
+ <!--
+ <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: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: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:out value="Finish"/>
+ <tc:cell/>
</tc:panel>
-
- </tfs:wizard>
-
+ <!--
+ <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>
+
+ </tfs:wizard>
+ -->
+ </tfs:wizardExtension>
</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=700124&r1=700123&r2=700124&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:23:41 2008
@@ -25,42 +25,53 @@
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">
+ <tfs:wizardExtension wizard="#{controller.wizard}"
+ title="Forward Condition"
+ outcome="forwardCondition"
+ allowJumpForward="true"
+ labelPrevious="Zurück"
+ labelNext="Weiter"
+ labelOkay="Fertig"
+ labelCancel="Abbruch"
+ actionNext="finish"
+ actionCancel="index">
+ <!--
+ <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: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: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:out value="${w.index}"/>
+ <tc:out value="Forward Condition"/>
</tc:panel>
-
- </tfs:wizard>
-
+ <!--
+ <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>
+
+ </tfs:wizard>
+ -->
+ </tfs:wizardExtension>
</ui:composition>