ivelin 2002/09/28 12:43:29
Modified: src/webapp/samples/xmlform/wizard confirm.xml deployment.xml
system.xml userIdentity.xml
Log:
added support for xforms HINT and HELP tags,
by Simon Price <[EMAIL PROTECTED]>
and Konstantin Piroumian <[EMAIL PROTECTED]>
Revision Changes Path
1.5 +5 -2 xml-cocoon2/src/webapp/samples/xmlform/wizard/confirm.xml
Index: confirm.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/confirm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- confirm.xml 28 Jul 2002 14:08:26 -0000 1.4
+++ confirm.xml 28 Sep 2002 19:43:29 -0000 1.5
@@ -3,8 +3,9 @@
XMLForm instance document for the Cocoon Feedback Wizard.
- Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002
- Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
@@ -76,9 +77,11 @@
<!-- submit -->
<xf:submit id="prev" class="button">
<xf:caption>Prev</xf:caption>
+ <xf:hint>Go to previous page</xf:hint>
</xf:submit>
<xf:submit id="next" class="button">
<xf:caption>Finish</xf:caption>
+ <xf:hint>Finish the wizard</xf:hint>
</xf:submit>
</xf:form>
<xf:output ref="count" id="show_count" form="form-feedback" class="info">
1.6 +6 -2 xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml
Index: deployment.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/deployment.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deployment.xml 23 Sep 2002 03:57:18 -0000 1.5
+++ deployment.xml 28 Sep 2002 19:43:29 -0000 1.6
@@ -3,8 +3,9 @@
XMLForm instance document for the Cocoon Feedback Wizard.
- Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002
- Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
@@ -19,6 +20,7 @@
</xf:textbox>
<xf:textbox ref="/liveUrl">
<xf:caption>Live URL</xf:caption>
+ <xf:help>You must enter a valid URL</xf:help>
<xf:violations class="error"/>
</xf:textbox>
<xf:selectBoolean ref="/publish">
@@ -43,9 +45,11 @@
</xf:group>
<xf:submit id="prev" class="button">
<xf:caption>Prev</xf:caption>
+ <xf:hint>Go to previous page</xf:hint>
</xf:submit>
<xf:submit id="next" class="button">
<xf:caption>Next</xf:caption>
+ <xf:hint>Go to next page</xf:hint>
</xf:submit>
</xf:form>
<xf:output ref="count" id="show_count" form="form-feedback" class="info">
1.7 +6 -3 xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml
Index: system.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/system.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system.xml 23 Sep 2002 03:57:18 -0000 1.6
+++ system.xml 28 Sep 2002 19:43:29 -0000 1.7
@@ -3,8 +3,9 @@
XMLForm instance document for the Cocoon Feedback Wizard.
- Original Author: Torsten Curdt, [EMAIL PROTECTED], March 2002
- Author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Ivelin Ivanov, [EMAIL PROTECTED], April 2002
+ author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
@@ -25,7 +26,7 @@
<xf:value>Mac OS/X</xf:value>
</xf:item>
<xf:item id="win">
- <xf:caption>Windows 95/98/NT/2000</xf:caption>
+ <xf:caption>Windows 95/98/NT/2000/XP</xf:caption>
<xf:value>Windows</xf:value>
</xf:item>
<xf:item id="other">
@@ -117,9 +118,11 @@
</xf:group>
<xf:submit id="prev" class="button">
<xf:caption>Prev</xf:caption>
+ <xf:hint>Go to previous page</xf:hint>
</xf:submit>
<xf:submit id="next" class="button">
<xf:caption>Next</xf:caption>
+ <xf:hint>Go to next page</xf:hint>
</xf:submit>
</xf:form>
<xf:output ref="count" id="show_count" form="form-feedback" class="info">
1.9 +7 -3 xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml
Index: userIdentity.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/wizard/userIdentity.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- userIdentity.xml 27 Sep 2002 02:52:23 -0000 1.8
+++ userIdentity.xml 28 Sep 2002 19:43:29 -0000 1.9
@@ -3,8 +3,9 @@
XMLForm instance document for the Cocoon Feedback Wizard.
- Author: Ivelin Ivanov, [EMAIL PROTECTED], July 2002
- Author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Ivelin Ivanov, [EMAIL PROTECTED], July 2002
+ author: Torsten Curdt, [EMAIL PROTECTED], March 2002
+ author: Simon Price <[EMAIL PROTECTED]>, September 2002
-->
<document xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002";>
@@ -23,6 +24,7 @@
</xf:textbox>
<xf:textbox ref="/email">
<xf:caption>Email</xf:caption>
+ <xf:help>Please check this carefully</xf:help>
<xf:violations class="error"/>
</xf:textbox>
<xf:textbox ref="/age">
@@ -31,6 +33,7 @@
</xf:textbox>
<xf:selectMany ref="/role" selectUIType="listbox">
<xf:caption>Professional roles</xf:caption>
+ <xf:help>Select one or more</xf:help>
<xf:item>
<xf:caption>Geek</xf:caption>
<xf:value>Geek</xf:value>
@@ -75,7 +78,7 @@
<xf:value ref="key"/>
</xf:itemset>
</xf:selectMany>
- <xf:textarea ref="notes" style="width:8cm; height:3cm">
+ <xf:textarea ref="notes" style="width:8cm; height:3cm">
<xf:caption>Additional Notes</xf:caption>
</xf:textarea>
<!-- hidden model attribute -->
@@ -84,6 +87,7 @@
</xf:hidden>
<xf:submit id="next" class="button">
<xf:caption>Next</xf:caption>
+ <xf:hint>Go to next page</xf:hint>
</xf:submit>
</xf:form>
<xf:output ref="count" id="show_count" form="form-feedback" class="info">
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
