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/10/15 13:56:14 UTC
svn commit: r704870 - in
/myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp: ./ wizard/
wizard/navi/
Author: lofwyr
Date: Wed Oct 15 04:56:14 2008
New Revision: 704870
URL: http://svn.apache.org/viewvc?rev=704870&view=rev
Log:
TOBAGO-518: cleanup demo page structure
Added:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/
- copied from r704800, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/index.jsp
- copied, changed from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/index.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.xml
- copied unchanged from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/navi/fileIntoCondition.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.xml
- copied unchanged from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/navi/filter.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/finish.xml
- copied unchanged from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/navi/finish.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.xml
- copied unchanged from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/navi/forwardCondition.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/page.xml
- copied unchanged from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/navi/page.xml
Modified:
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.jsp
myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.jsp
Copied: myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/index.jsp (from r704843, myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/index.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/index.jsp?p2=myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/index.jsp&p1=myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/index.jsp&r1=704843&r2=704870&rev=704870&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/wizard/index.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/index.jsp Wed Oct 15 04:56:14 2008
@@ -28,11 +28,13 @@
<tc:gridLayout />
</f:facet>
- <tc:link action="filter" label="Mail Filter Example (separate pages with navigation rules)" />
+ <tc:link link="/jsp/wizard/navi/filter.jsp" label="Mail Filter Example (separate pages with navigation rules)" />
- <tc:link link="/wizard/bean/single.jsp" label="Wizard with navigation from model"/>
+ <tc:link link="/jsp/wizard/bean/single.jsp" label="Wizard with navigation from model"/>
- <tc:link link="/wizard/navi/filter.xml" label="Wizard with Facelets"/>
+ <tc:link link="/facelet/wizard/navi/filter.xml" label="Wizard with Facelets"/>
+
+ <tc:link action="#{controller.wizard.reset}" label="Reset Wizard State"/>
</tc:panel>
</jsp:body>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.jsp?rev=704870&r1=704800&r2=704870&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/fileIntoCondition.jsp Wed Oct 15 04:56:14 2008
@@ -60,7 +60,7 @@
<tcs:wizardPrevious wizard="w" label="Vorherige"/>
<tcs:wizardNext wizard="w" label="Nächste" action="finish"/>
<tcs:wizardFinish wizard="w" label="Fertig"/>
- <tcs:wizardCancel wizard="w" label="Cancel"/>
+ <tcs:wizardCancel wizard="w" action="index" label="Cancel"/>
</tc:panel>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.jsp?rev=704870&r1=704800&r2=704870&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/filter.jsp Wed Oct 15 04:56:14 2008
@@ -47,7 +47,7 @@
<tcs:wizardPrevious wizard="w" label="Vorherige"/>
<tcs:wizardNext wizard="w" label="Nächste" action="#{controller.createFilter}"/>
<tcs:wizardFinish wizard="w" label="Fertig"/>
- <tcs:wizardCancel wizard="w" label="Cancel"/>
+ <tcs:wizardCancel wizard="w" action="index" label="Cancel"/>
</tc:panel>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.jsp?rev=704870&r1=704800&r2=704870&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/jsp/wizard/navi/forwardCondition.jsp Wed Oct 15 04:56:14 2008
@@ -43,7 +43,7 @@
<tcs:wizardPrevious wizard="w" label="Vorherige"/>
<tcs:wizardNext wizard="w" label="Nächste" action="finish"/>
<tcs:wizardFinish wizard="w" label="Fertig"/>
- <tcs:wizardCancel wizard="w" label="Cancel"/>
+ <tcs:wizardCancel wizard="w" action="index" label="Cancel"/>
</tc:panel>