You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by he...@apache.org on 2005/09/09 17:51:29 UTC

svn commit: r279803 - in /cocoon/blocks/forms/trunk/samples: ./ aggregate/ captcha/ dreamteam/content/ dreamteam/resources/styles/ flow/ forms/ forms/binding/ messages/ sqldatabase/

Author: hepabolu
Date: Fri Sep  9 08:50:52 2005
New Revision: 279803

URL: http://svn.apache.org/viewcvs?rev=279803&view=rev
Log:
fixes re issue #34077, not tested yet due to runtime failure of Cocoon servlet

Added:
    cocoon/blocks/forms/trunk/samples/forms/binding/01value-template.xml
    cocoon/blocks/forms/trunk/samples/forms/binding/02lenient-template.xml
    cocoon/blocks/forms/trunk/samples/forms/binding/05custom-template.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml
Modified:
    cocoon/blocks/forms/trunk/samples/aggregate/template-combine.xml
    cocoon/blocks/forms/trunk/samples/aggregate/template-split.xml
    cocoon/blocks/forms/trunk/samples/captcha/success.xml
    cocoon/blocks/forms/trunk/samples/dreamteam/content/main.jx
    cocoon/blocks/forms/trunk/samples/dreamteam/content/showTeam.jx
    cocoon/blocks/forms/trunk/samples/dreamteam/content/teamTemplate.jx
    cocoon/blocks/forms/trunk/samples/dreamteam/resources/styles/dreamteam.css
    cocoon/blocks/forms/trunk/samples/flow/form_model_gui.js
    cocoon/blocks/forms/trunk/samples/flow/forms_flow_example.js
    cocoon/blocks/forms/trunk/samples/forms/binding/03aggregate-template.xml
    cocoon/blocks/forms/trunk/samples/forms/binding/04heavy-template.xml
    cocoon/blocks/forms/trunk/samples/forms/binding/done.jx
    cocoon/blocks/forms/trunk/samples/forms/carselector_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/carselector_template.xml
    cocoon/blocks/forms/trunk/samples/forms/countryselector_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/countryselector_template.xml
    cocoon/blocks/forms/trunk/samples/forms/datasource_chooser.xml
    cocoon/blocks/forms/trunk/samples/forms/datasource_chooser_template.xml
    cocoon/blocks/forms/trunk/samples/forms/dynamicrepeater_template.xml
    cocoon/blocks/forms/trunk/samples/forms/form1_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/form1_template.xml
    cocoon/blocks/forms/trunk/samples/forms/form1_template_action.xml
    cocoon/blocks/forms/trunk/samples/forms/form2_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/form2_template.xml
    cocoon/blocks/forms/trunk/samples/forms/form2simpleXML_result.xml
    cocoon/blocks/forms/trunk/samples/forms/form_model_gui_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/form_model_gui_template.xml
    cocoon/blocks/forms/trunk/samples/forms/htmlarea_success.jx
    cocoon/blocks/forms/trunk/samples/forms/htmlarea_template.xml
    cocoon/blocks/forms/trunk/samples/forms/imagemap_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/imagemap_template.xml
    cocoon/blocks/forms/trunk/samples/forms/multipage_template.xml
    cocoon/blocks/forms/trunk/samples/forms/registration_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/registration_template.xml
    cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml
    cocoon/blocks/forms/trunk/samples/forms/upload_success_jx.xml
    cocoon/blocks/forms/trunk/samples/forms/upload_template.xml
    cocoon/blocks/forms/trunk/samples/forms/xmlresult_template.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml
    cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml
    cocoon/blocks/forms/trunk/samples/sitemap.xmap
    cocoon/blocks/forms/trunk/samples/sqldatabase/employeexml2html.xslt
    cocoon/blocks/forms/trunk/samples/sqldatabase/form-template.xml
    cocoon/blocks/forms/trunk/samples/welcome.xml

Modified: cocoon/blocks/forms/trunk/samples/aggregate/template-combine.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/aggregate/template-combine.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/aggregate/template-combine.xml (original)
+++ cocoon/blocks/forms/trunk/samples/aggregate/template-combine.xml Fri Sep  9 08:50:52 2005
@@ -25,6 +25,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Aggregate widget</h4>
   <title>Aggregate Field: Combine</title>
   <content>
     <p>
@@ -92,7 +93,7 @@
       </table>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="../">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/aggregate/template-split.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/aggregate/template-split.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/aggregate/template-split.xml (original)
+++ cocoon/blocks/forms/trunk/samples/aggregate/template-split.xml Fri Sep  9 08:50:52 2005
@@ -25,6 +25,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Aggregate widget</h4>
   <title>Aggregate Field: Split</title>
   <content>
     <p>
@@ -88,7 +89,7 @@
       </table>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="../">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/captcha/success.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/captcha/success.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/captcha/success.xml (original)
+++ cocoon/blocks/forms/trunk/samples/captcha/success.xml Fri Sep  9 08:50:52 2005
@@ -17,8 +17,12 @@
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
 
+  <h4 class="samplesGroup">CAPTCHA widget</h4>
   <title>CAPTCHA validation succeeded</title>
   <content>
     <p>You guessed ${value}. Correct!</p>
+    <p>
+      <a href="../">Back to Forms samples</a>
+    </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/dreamteam/content/main.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/dreamteam/content/main.jx?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/dreamteam/content/main.jx (original)
+++ cocoon/blocks/forms/trunk/samples/dreamteam/content/main.jx Fri Sep  9 08:50:52 2005
@@ -78,6 +78,9 @@
             your business layer, we used a function <i>loadDocument</i> to read in the XML file and pass
             it on to the Manager class.
         </p>
+	    <p>
+	        <a href="../">Back to Forms samples</a>
+	    </p>            
 	</body>
 </html>
 </jx:template>

Modified: cocoon/blocks/forms/trunk/samples/dreamteam/content/showTeam.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/dreamteam/content/showTeam.jx?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/dreamteam/content/showTeam.jx (original)
+++ cocoon/blocks/forms/trunk/samples/dreamteam/content/showTeam.jx Fri Sep  9 08:50:52 2005
@@ -116,6 +116,9 @@
       <p class="developer-note"> This page also uses some i18n tags to show words rather than codes (for positions and
         countries). </p>
       <h2>Do study the code</h2>
+      <p>
+        <a href="../">Back to Forms samples</a>
+      </p>            
     </body>
   </html>
 </jx:template>

Modified: cocoon/blocks/forms/trunk/samples/dreamteam/content/teamTemplate.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/dreamteam/content/teamTemplate.jx?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/dreamteam/content/teamTemplate.jx (original)
+++ cocoon/blocks/forms/trunk/samples/dreamteam/content/teamTemplate.jx Fri Sep  9 08:50:52 2005
@@ -242,7 +242,7 @@
         function takes over and hands the selected team to the Manager class for further processing. Finally the
         function passes flow onto the <i>showteam</i> pipeline. </p>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="../">Back to Forms samples</a>
     </p>            
     </body>
   </html>

Modified: cocoon/blocks/forms/trunk/samples/dreamteam/resources/styles/dreamteam.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/dreamteam/resources/styles/dreamteam.css?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/dreamteam/resources/styles/dreamteam.css (original)
+++ cocoon/blocks/forms/trunk/samples/dreamteam/resources/styles/dreamteam.css Fri Sep  9 08:50:52 2005
@@ -1,3 +1,19 @@
+/*
+* Copyright 2005 The Apache Software Foundation or its licensors,
+* as applicable.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 /** CSS stylesheet for the dreamteam sample, adjusted to match the supersonic tour example app */
 
 body { 	

Modified: cocoon/blocks/forms/trunk/samples/flow/form_model_gui.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/flow/form_model_gui.js?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/flow/form_model_gui.js (original)
+++ cocoon/blocks/forms/trunk/samples/flow/form_model_gui.js Fri Sep  9 08:50:52 2005
@@ -22,7 +22,7 @@
 
 function form_model_gui(form) {
 
-    var locale = determineLocale();
+    var locale = _determineLocale();
     var model = form.getModel();
     form.locale = locale;
 
@@ -58,7 +58,8 @@
     cocoon.sendPage("form_model_gui-success-pipeline.xsp");
 }
 
-function determineLocale() {
+function _determineLocale() {
+/* Renamed to avoid conflicts with the same function in forms_flow_example.js */
     var localeParam = cocoon.request.get("locale");
     if (localeParam != null && localeParam.length > 0) {
         return Packages.org.apache.cocoon.i18n.I18nUtils.parseLocale(localeParam);

Modified: cocoon/blocks/forms/trunk/samples/flow/forms_flow_example.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/flow/forms_flow_example.js?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/flow/forms_flow_example.js (original)
+++ cocoon/blocks/forms/trunk/samples/flow/forms_flow_example.js Fri Sep  9 08:50:52 2005
@@ -80,7 +80,7 @@
 
 function determineLocale() {
     var localeParam = cocoon.request.get("locale");
-    if (localeParam != null && localeParam.length > 0) {
+    if (localeParam != null && localeParam.length() > 0) {
         return Packages.org.apache.cocoon.i18n.I18nUtils.parseLocale(localeParam);
     }
     return null;

Added: cocoon/blocks/forms/trunk/samples/forms/binding/01value-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/01value-template.xml?rev=279803&view=auto
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/binding/01value-template.xml (added)
+++ cocoon/blocks/forms/trunk/samples/forms/binding/01value-template.xml Fri Sep  9 08:50:52 2005
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
+      xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
+      xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Binding directions</h4>
+  <title>Value</title>
+  <content>
+    <ft:form-template>
+        <fi:group>
+          <fi:styling layout="columns" />
+          <fi:items>
+            <ft:widget id="simple"/>
+            <ft:widget id="readonly" />
+            <ft:widget id="writeonly"/>
+            <ft:widget id="diff" />
+            <ft:widget id="onupdate" />
+            <ft:widget id="bool" />
+            <ft:widget id="date"/>
+          </fi:items>
+        </fi:group>
+
+      <p>
+        <input type="submit" value="Submit"/>
+      </p>
+    </ft:form-template>
+  </content>
+  <p>
+    <a href="./">Back to Forms Samples</a>
+  </p>
+</page>

Added: cocoon/blocks/forms/trunk/samples/forms/binding/02lenient-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/02lenient-template.xml?rev=279803&view=auto
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/binding/02lenient-template.xml (added)
+++ cocoon/blocks/forms/trunk/samples/forms/binding/02lenient-template.xml Fri Sep  9 08:50:52 2005
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
+      xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
+      xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Binding with lenient attribute</h4>
+  <title>Lenient</title>
+  <content>
+    <p>To see the runtime effect of non-lenient binding
+    comment out one of the 'breakingField' nodes in the 02lenient-def.xml file
+    in the forms/samples/forms/binding directory.
+    </p>
+    <ft:form-template>
+      <ft:widget id="anyfield"/>
+
+      <p>
+        <input type="submit" value="Submit"/>
+      </p>
+    </ft:form-template>
+  </content>
+  <p>
+    <a href="./">Back to Forms Samples</a>
+  </p>
+</page>

Modified: cocoon/blocks/forms/trunk/samples/forms/binding/03aggregate-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/03aggregate-template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/binding/03aggregate-template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/binding/03aggregate-template.xml Fri Sep  9 08:50:52 2005
@@ -24,6 +24,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Binding an aggregate field</h4>
   <title>Aggregate Field Binding</title>
   <content>
     <p>
@@ -48,7 +49,7 @@
       
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/binding/04heavy-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/04heavy-template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/binding/04heavy-template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/binding/04heavy-template.xml Fri Sep  9 08:50:52 2005
@@ -18,6 +18,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Binding a repeater widget</h4>
   <title>Heavy Form</title>
   <content>
     <h3>Lots of select boxes</h3>
@@ -37,9 +38,12 @@
         </ft:repeater-widget>
       </div>
 
-      <p style="float: left; clear: both;">
+      <p>
         <input type="submit" value="Submit"/>
       </p>
     </ft:form-template>
+    <p>
+      <a href="./">Back to Forms Samples</a>
+    </p>
   </content>
 </page>

Added: cocoon/blocks/forms/trunk/samples/forms/binding/05custom-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/05custom-template.xml?rev=279803&view=auto
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/binding/05custom-template.xml (added)
+++ cocoon/blocks/forms/trunk/samples/forms/binding/05custom-template.xml Fri Sep  9 08:50:52 2005
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
+      xmlns:fi="http://apache.org/cocoon/forms/1.0#instance" 
+      xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <h4 class="samplesGroup">Binding with a custom binding</h4>
+  <title>Custom</title>
+  <content>
+    <ft:form-template>
+      <fi:group>
+        <fi:styling layout="columns" />
+        <fi:items>
+          <ft:widget id="jswrap"/>
+          <ft:widget id="custom" />
+          <ft:widget id="config"/>
+          <ft:widget id="test" />
+        </fi:items>
+      </fi:group>
+      
+      <p>
+        <input type="submit" value="Submit"/>
+      </p>
+    </ft:form-template>
+    <p>
+      <a href="./">Back to Forms Samples</a>
+    </p>
+  </content>
+</page>

Modified: cocoon/blocks/forms/trunk/samples/forms/binding/done.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/binding/done.jx?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/blocks/forms/trunk/samples/forms/carselector_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/carselector_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/carselector_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/carselector_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -20,13 +20,14 @@
 -->
 
 <page>
+  <h4 class="samplesGroup">AJAX sample</h4>
   <title>Car selector result</title>
   <content>
     You selected: maker ${request.getAttribute("carselectorform").lookupWidget("make").getValue()},
     type ${request.getAttribute("carselectorform").lookupWidget("type").getValue()},
     model ${request.getAttribute("carselectorform").lookupWidget("model").getValue()}
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/carselector_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/carselector_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/carselector_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/carselector_template.xml Fri Sep  9 08:50:52 2005
@@ -17,6 +17,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
    <!-- Import the macros that define CForms template elements -->
    <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+  <h4 class="samplesGroup">AJAX sample</h4>
   <title>Car selector</title>
   <para>This example illustrates:
      <ul>
@@ -78,7 +79,7 @@
       </fi:group>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/countryselector_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/countryselector_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/countryselector_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/countryselector_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -20,12 +20,13 @@
 -->
 
 <page>
+  <h4 class="samplesGroup">Dynamic selection list update</h4>
   <title>Country selector result</title>
   <content>
     You selected: ${request.getAttribute("countryselectorform").lookupWidget("us-nonus").getValue()}
     country/state ${request.getAttribute("countryselectorform").lookupWidget("country").getValue()}
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/countryselector_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/countryselector_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/countryselector_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/countryselector_template.xml Fri Sep  9 08:50:52 2005
@@ -15,6 +15,7 @@
   limitations under the License.
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+  <h4 class="samplesGroup">Dynamic selection list update</h4>
   <title>Country selector</title>
   <para>This example illustrates how you can programmatically update the
     content of a selection list using a collection built in the flow.</para>
@@ -50,6 +51,6 @@
     </ft:form-template>
   </content>
   <para>
-    <a href="../">Back to samples</a>
+    <a href="./">Back to Forms samples</a>
   </para>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/datasource_chooser.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/datasource_chooser.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/datasource_chooser.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/datasource_chooser.xml Fri Sep  9 08:50:52 2005
@@ -30,8 +30,8 @@
     <!-- The datasource type. This is the union's "case" widget -->
     <fd:field id="sourcetype">
       <fd:datatype base="string"/>
-      <!-- The union will initially be showing the "SQL" choice -->
-      <fd:initial-value>SQL</fd:initial-value>
+      <!-- If you uncomment the line below the union will initially be showing the "SQL" choice -->
+      <!-- <fd:initial-value>SQL</fd:initial-value> -->
       <fd:selection-list>
         <fd:item value=""/>
         <fd:item value="SQL"/>

Modified: cocoon/blocks/forms/trunk/samples/forms/datasource_chooser_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/datasource_chooser_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/datasource_chooser_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/datasource_chooser_template.xml Fri Sep  9 08:50:52 2005
@@ -20,7 +20,7 @@
       
   <!-- Import the macros that define CForms template elements -->
   <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
-  
+  <h4 class="samplesGroup">Union widget sample (with AJAX)</h4>
   <title>Datasource chooser</title>
   <content>
     <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
@@ -58,7 +58,7 @@
       
       <ft:widget id="ok"/>
       <br/>
-      <a href="./do-datasourceChooser.flow">Restart this sample</a> -  <a href="./">Back to samples</a>
+      <a href="./do-datasourceChooser.flow">Restart this sample</a> -  <a href="./">Back to Forms samples</a>
 
     </ft:form-template>
   </content>

Modified: cocoon/blocks/forms/trunk/samples/forms/dynamicrepeater_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/dynamicrepeater_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/dynamicrepeater_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/dynamicrepeater_template.xml Fri Sep  9 08:50:52 2005
@@ -24,6 +24,7 @@
   <!-- Import the macros that define CForms template elements -->
   <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
   
+  <h4 class="samplesGroup">Repeater widget</h4>
   <title>Dynamic template</title>
   <style type="text/css">
     /* Additional styles for alternating row colors */

Modified: cocoon/blocks/forms/trunk/samples/forms/form1_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form1_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form1_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form1_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -20,6 +20,7 @@
 -->
 
 <page>
+  <h4 class="samplesGroup">Widget sampler</h4>
   <title>Sample form result</title>
   <content>
   <!--
@@ -40,7 +41,7 @@
     The value of the checkbox is:
     ${request.getAttribute("form1").lookupWidget("somebool").getValue()}
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/form1_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form1_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form1_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form1_template.xml Fri Sep  9 08:50:52 2005
@@ -23,7 +23,7 @@
       
   <!-- Import the macros that define CForms template elements -->
   <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
-  
+  <h4 class="samplesGroup">Widget sampler (Flowscript)</h4>
   <title>Sample form</title>
   <content>
     <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST">
@@ -139,7 +139,7 @@
       </div>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/form1_template_action.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form1_template_action.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form1_template_action.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form1_template_action.xml Fri Sep  9 08:50:52 2005
@@ -19,7 +19,7 @@
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" 
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
       xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-      
+  <h4 class="samplesGroup">Widget sampler (Actions)</h4>
   <title>Sample form</title>
   <content>
     <ft:form-template action="form1" method="POST">
@@ -131,7 +131,7 @@
       </div>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/form2_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form2_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form2_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form2_jx.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <html xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <body>
+    <h4 class="samplesGroup">JXPath binding result: java beans</h4>
     Email: ${form2bean.email}
     <br/>
     Phone: +${form2bean.phoneCountry}-${form2bean.phoneZone}-${form2bean.phoneNumber}
@@ -63,6 +64,6 @@
     </table>
 
     <br/>
-    <a href="form2bean.flow">Do it again</a> - <a href="../">Back to samples</a>
+    <a href="form2bean.flow">Do it again</a> - <a href="./">Back to Forms samples</a>
   </body>
 </html>

Modified: cocoon/blocks/forms/trunk/samples/forms/form2_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form2_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form2_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form2_template.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+  <h4 class="samplesGroup">JXPath binding with Flowscript</h4>
   <title>Sample form</title>
   <content>
     <p>This form is used to illustrate the CForms binding framework. The binding
@@ -113,7 +114,7 @@
       <input type="submit"/>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/form2simpleXML_result.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form2simpleXML_result.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form2simpleXML_result.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form2simpleXML_result.xml Fri Sep  9 08:50:52 2005
@@ -16,7 +16,4 @@
 -->
 <jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <jx:out value="#{.}"/>
-  <p>
-    <a href="../">Back to samples</a>
-  </p>
 </jx:template>

Modified: cocoon/blocks/forms/trunk/samples/forms/form_model_gui_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form_model_gui_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form_model_gui_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form_model_gui_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -20,11 +20,12 @@
 -->
 
 <page>
+  <h4 class="samplesGroup">Class, New, Struct and Union widgets</h4>
   <title>Sample form result</title>
   <content>
     Repeater has ${request.getAttribute("form_model_gui").lookupWidget("widgets").getSize()} row(s).
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/form_model_gui_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/form_model_gui_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/form_model_gui_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/form_model_gui_template.xml Fri Sep  9 08:50:52 2005
@@ -27,6 +27,7 @@
     TODO: Add features to "widgets-class" (e.g. move-up, move-down, add-before, add-after).
     -->
 
+  <h4 class="samplesGroup">Class, New, Struct and Union widgets</h4>
   <title>Form GUI</title>
 
   <content>
@@ -168,7 +169,7 @@
 
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 

Modified: cocoon/blocks/forms/trunk/samples/forms/htmlarea_success.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/htmlarea_success.jx?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/htmlarea_success.jx (original)
+++ cocoon/blocks/forms/trunk/samples/forms/htmlarea_success.jx Fri Sep  9 08:50:52 2005
@@ -17,7 +17,4 @@
 <result>
   <data1>#{data1}</data1>
   <data2>#{data2}</data2>
-  <p>
-    <a href="../">Back to samples</a>
-  </p>
 </result>

Modified: cocoon/blocks/forms/trunk/samples/forms/htmlarea_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/htmlarea_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/htmlarea_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/htmlarea_template.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+  <h4 class="samplesGroup">HTMLArea widget</h4>
   <title>HTMLArea</title>
   <content>
     <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST">
@@ -63,7 +64,7 @@
       <input type="submit"/>      
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/imagemap_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/imagemap_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/imagemap_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/imagemap_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -15,6 +15,7 @@
   limitations under the License.
 -->
 <page>
+  <h4 class="samplesGroup">Imagemap widget</h4>
     <title>Imagemap result</title>
     <content>
     x:  ${x}

Modified: cocoon/blocks/forms/trunk/samples/forms/imagemap_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/imagemap_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/imagemap_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/imagemap_template.xml Fri Sep  9 08:50:52 2005
@@ -15,6 +15,7 @@
   limitations under the License.
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+    <h4 class="samplesGroup">Imagemap widget</h4>
     <title>Image map</title>
     <content>
         <p>Click on Cocoon logo.</p>

Modified: cocoon/blocks/forms/trunk/samples/forms/multipage_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/multipage_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/multipage_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/multipage_template.xml Fri Sep  9 08:50:52 2005
@@ -23,7 +23,7 @@
       
   <!-- Import the macros that define CForms template elements -->
   <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
-  
+  <h4 class="samplesGroup">Widget sampler: one form divided in multiple pages</h4>
   <title>Sample multipage form</title>
   <content>
     <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST">
@@ -90,6 +90,6 @@
       </div>
     </ft:form-template>
   	
-  	<a href="do-multipage.flow">Restart this sample</a> - <a href="./">Back to form samples</a>
+  	<a href="do-multipage.flow">Restart this sample</a> - <a href="./">Back to Forms samples</a>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/registration_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/registration_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/registration_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/registration_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -15,8 +15,12 @@
   limitations under the License.
 -->
 <page>
+  <h4 class="samplesGroup">Password styling and validation</h4>
   <title>Registration successful</title>
   <content>
     Registration was successful for ${username}!
   </content>
+  <p>
+    <a href="./">Back to Forms samples</a>
+  </p>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/registration_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/registration_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/registration_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/registration_template.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
   xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+  <h4 class="samplesGroup">Password styling and validation</h4>
   <title>Registration</title>
   <content>
     <ft:form-template action="continue" method="POST">
@@ -38,7 +39,7 @@
       </fi:group>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/tasktree_template.xml Fri Sep  9 08:50:52 2005
@@ -47,7 +47,7 @@
       padding-bottom: 0.4em;
       padding-left: 0.4em;
       border: 1px dotted black;
-      mmargin-top: 0.4em;
+      margin-top: 0.4em;
       margin-bottom: -1px;
     }
     

Modified: cocoon/blocks/forms/trunk/samples/forms/upload_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/upload_success_jx.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/upload_success_jx.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/upload_success_jx.xml Fri Sep  9 08:50:52 2005
@@ -15,6 +15,7 @@
   limitations under the License.
 -->
 <page>
+  <h4 class="samplesGroup">Upload widget</h4>
   <title>Sample form result</title>
   <content>
     User '${username}' uploaded file '${filename}' whose content is :
@@ -23,7 +24,7 @@
 ${uploadContent}
     </pre>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/upload_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/upload_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/upload_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/upload_template.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
       xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
+  <h4 class="samplesGroup">Upload widget</h4>
   <title>Upload Sample</title>
   <content>
     <para>
@@ -32,7 +33,7 @@
       </fi:group>
     </ft:form-template>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/forms/xmlresult_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/forms/xmlresult_template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/forms/xmlresult_template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/forms/xmlresult_template.xml Fri Sep  9 08:50:52 2005
@@ -32,7 +32,7 @@
       <input type="submit" value="Back to samples page"/>
     </form>
     <p>
-      <a href="../">Back to samples</a>
+      <a href="./">Back to Forms samples</a>
     </p>
   </content>
 </page>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages.xml Fri Sep  9 08:50:52 2005
@@ -16,40 +16,42 @@
 -->
 <!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue>
-  <message key="general.field-required">This field is required.</message>
-
-  <message key="datatype.conversion-failed">Not a valid {0}.</message>
-  <message key="datatype.decimal">decimal number</message>
-  <message key="datatype.integer">integer number</message>
-  <message key="datatype.long">integer number</message>
-  <message key="datatype.float">decimal number</message>
-  <message key="datatype.double">decimal number</message>
-  <message key="datatype.date.date">date</message>
-  <message key="datatype.date.time">time</message>
-  <message key="datatype.date.datetime">date-time</message>
-
-  <message key="validation.string.exact-length">Should be exactly {0} characters.</message>
-  <message key="validation.string.range-length">Should contain from {0} to {1} characters.</message>
-  <message key="validation.string.min-length">Should be at least {0} characters.</message>
-  <message key="validation.string.max-length">Should be at most {0} characters.</message>
-  <message key="validation.string.regexp">Does not match the following regular expression: {0}</message>
-  <message key="validation.string.invalidemail">This field does not contain a valid email address</message>
-
-  <message key="validation.array.exact-valuecount">Exactly {0} item(s) should be selected.</message>
-  <message key="validation.array.range-valuecount">At least {0} item(s) and at most {1} items should be selected.</message>
-  <message key="validation.array.min-valuecount">At least {0} item(s) should be selected.</message>
-  <message key="validation.array.max-valuecount">At most {0} items should be selected.</message>
-
-  <message key="multivaluefield.conversionfailed">One of the selected values is of an incorrect type.</message>
-
-  <message key="validation.numeric.range">Number should be in the range from {0} to {1}.</message>
-  <message key="validation.numeric.min">Number should be greater than or equal to {0}.</message>
-  <message key="validation.numeric.max">Number should be less than or equal to {0}.</message>
-
-  <message key="validation.mod10">Mod 10 check failed.</message>
-
   <message key="validation.captcha.mismatch">CAPTCHA check failed.</message>
 
-  <message key="aggregatedfield.split-failed">Content of this field does not match the following regular expression: {0}</message>
-  <message key="upload.invalid-type">Invalid content type.</message>
+   <message key="general.field-required">This field is required.</message>
+   <message key="datatype.conversion-failed">Not a valid {0}.</message>
+   <message key="datatype.decimal">decimal number</message>
+   <message key="datatype.integer">integer number</message>
+   <message key="datatype.long">integer number</message>
+   <message key="datatype.float">decimal number</message>
+   <message key="datatype.double">decimal number</message>
+   <message key="datatype.date.date">date</message>
+   <message key="datatype.date.time">time</message>
+   <message key="datatype.date.datetime">date-time</message>
+   <message key="validation.string.exact-length">Should be exactly {0} characters.</message>
+   <message key="validation.string.range-length">Should contain from {0} to {1} characters.</message>
+   <message key="validation.string.min-length">Should be at least {0} characters.</message>
+   <message key="validation.string.max-length">Should be at most {0} characters.</message>
+   <message key="validation.string.regexp">Does not match the following regular
+      expression: {0}</message>
+   <message key="validation.string.invalidemail">This field does not contain a
+      valid email address</message>
+   <message key="validation.array.exact-valuecount">Exactly {0} item(s) should
+      be selected.</message>
+   <message key="validation.array.range-valuecount">At least {0} item(s) and at
+      most {1} items should be selected.</message>
+   <message key="validation.array.min-valuecount">At least {0} item(s) should be selected.</message>
+   <message key="validation.array.max-valuecount">At most {0} items should be selected.</message>
+   <message key="multivaluefield.conversionfailed">One of the selected values is
+      of an incorrect type.</message>
+   <message key="validation.numeric.range">Number should be in the range from
+      {0} to {1}.</message>
+   <message key="validation.numeric.min">Number should be greater than or equal
+      to {0}.</message>
+   <message key="validation.numeric.max">Number should be less than or equal to {0}.</message>
+   <message key="validation.mod10">Mod 10 check failed.</message>
+   <message key="aggregatedfield.split-failed">Content of this field does not
+      match the following regular expression: {0}</message>
+   <message key="upload.invalid-type">Invalid content type.</message>
+   <message key="calendar.alt">Calendar</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_de.xml Fri Sep  9 08:50:52 2005
@@ -14,8 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- This catalogue file contains translations for built-in Woody messages. -->
+<!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue xml:lang="de">
+  <message key="validation.captcha.mismatch">Ungültige CAPTCHA check.</message>
+
   <message key="general.field-required">Dieses Feld muss aufgefüllt werden.</message>
 
   <message key="datatype.conversion-failed">Ungültige {0}.</message>
@@ -52,4 +54,5 @@
 
   <message key="aggregatedfield.split-failed">Der Inhalt des Feldes entspricht nicht dem regul. Ausdruck: {0}</message>
   <message key="upload.invalid-type">Falscher Inhaltstyp.</message>
+  <message key="calendar.alt">Kalender</message>
 </catalogue>

Added: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml?rev=279803&view=auto
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml (added)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_el.xml Fri Sep  9 08:50:52 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- This catalogue file contains translations for built-in CForms messages. -->
+<catalogue xml:lang="el">
+	<message key="validation.captcha.mismatch">#CAPTCHA check failed.#</message>
+	
+	<message key="general.field-required">Το πεδίο είναι υποχρεωτικό</message>
+	<message key="datatype.conversion-failed">Σφάλμα μετατροπής {0}.</message>
+	<message key="datatype.decimal">δεκαδικός αριθμός</message>
+	<message key="datatype.integer">ακέραιος αριθμός</message>
+	<message key="datatype.long">ακέραιος αριθμός</message>
+	<message key="datatype.float">πραγματικός αριθμός</message>
+	<message key="datatype.double">πραγματικός αριθμός</message>
+	<message key="datatype.date.date">ημερομηνία</message>
+	<message key="datatype.date.time">ώρα</message>
+	<message key="datatype.date.datetime">ημερομηνία-ωρα</message>
+	<message key="validation.string.exact-length">Οι χαρακτήρες πρέπει να είναι ακριβώς {0}</message>
+	<message key="validation.string.range-length">Το πεδίο πρέπει να έχει από {0} εώς  {1} χαρακτήρες.</message>
+	<message key="validation.string.min-length">Οι χαρακτήρες πρέπει να είναι τουλάχιστον {0}</message>
+	<message key="validation.string.max-length">Οι χαρακτήρες ΔΕΝ πρέπει να είναι περισσότεροι από  {0}</message>
+	<message key="validation.string.regexp">Δεν ικανοποιείται το regular expression: {0}</message>
+	<message key="validation.string.invalidemail">Το πεδίο ΔΕΝ περιέχει μια έγκυρη email διεύθυνση</message>
+	<message key="validation.array.exact-valuecount">Πρέπει να επιλεγούν ακριβώς {0} στοιχείο/α.</message>
+	<message key="validation.array.range-valuecount">Τουλάχιστον {0} έως το πολύ  {1} στοιχείο/α πρέπει να επιλεγούν.</message>
+	<message key="validation.array.min-valuecount">Τουλάχιστον {0} στοιχείο/α πρέπει να επιλεγούν.</message>
+	<message key="validation.array.max-valuecount">Μέχρι {0} στοιχείο/α επιτρέπεται να επιλεγούν.</message>
+	<message key="multivaluefield.conversionfailed">Μία από τις επιλεγμένες τιμές είναι λάθος τύπου δεδομένων.</message>
+	<message key="validation.numeric.range">Ο αριθμός πρέπει να είναι από {0} εώς {1}.</message>
+	<message key="validation.numeric.min">Ο αριθμός πρέπει να είναι μεγαλύτερος ή ίσος του {0}.</message>
+	<message key="validation.numeric.max">Ο αριθμός πρέπει να είναι μικρότερος ή ίσος του {0}.</message>
+	<message key="validation.mod10">Ο έλεγχος "Mod 10" απέτυχε.</message>
+	<message key="aggregatedfield.split-failed">Το περιεχόμενο του πεδίου δεν ικανοποιεί το regular expression: {0}</message>
+	<message key="upload.invalid-type">Μή έγκυρος τύπος δεδομένων.</message>
+	<message key="calendar.alt">ημερολόγιο</message>
+</catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_fr.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,8 @@
 -->
 <!-- This catalogue file contains translations for built-in Cocoon Forms messages. -->
 <catalogue>
+  <message key="validation.captcha.mismatch">#CAPTCHA check failed.#</message>
+  
   <message key="general.field-required">Cette donnée est obligatoire.</message>
 
   <message key="datatype.conversion-failed">N'est pas un(e) {0}.</message>
@@ -52,4 +54,5 @@
 
   <message key="aggregatedfield.split-failed">Ne correspond pas à l'expression régulière: {0}</message>
   <message key="upload.invalid-type">Type de fichier incorrect.</message>
+  <message key="calendar.alt">Calendrier</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_it_IT.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,8 @@
 -->
 <!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue xml:lang="it_IT">
+  <message key="validation.captcha.mismatch">#CAPTCHA check failed.#</message>
+  
   <message key="general.field-required">Questo campo è obbligatorio.</message>
 
   <message key="datatype.conversion-failed">Formato {0} non valido.</message>
@@ -53,4 +55,5 @@
 
   <message key="aggregatedfield.split-failed">Il valore non corrisponde alla seguente espressione regolare: {0}</message>
   <message key="upload.invalid-type">Tipo del contenuto non valido.</message>
+  <message key="calendar.alt">Calendario</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_nl.xml Fri Sep  9 08:50:52 2005
@@ -14,38 +14,41 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- This catalogue file contains translations for built-in Woody messages. -->
+<!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue xml:lang="nl">
-  <message key="general.field-required">Dit veld moet ingevuld zijn.</message>
-  <message key="datatype.conversion-failed">Ongeldig {0}.</message>
-  <message key="datatype.decimal">#decimal number#</message>
-  <message key="datatype.integer">integer getal</message>
-  <message key="datatype.long">integer getal</message>
-  <message key="datatype.float">#decimal number#</message>
-  <message key="datatype.double">#decimal number#</message>
-  <message key="datatype.date.date">datum</message>
-  <message key="datatype.date.time">#time#</message>
-  <message key="datatype.date.datetime">#date-time#</message>
-
-  <message key="validation.string.exact-length">Dit veld moet precies {0} tekens lang zijn.</message>
-  <message key="validation.string.range-length">Het aantal tekens moet tussen de {0} en {1} liggen.</message>
-  <message key="validation.string.min-length">Dit veld moet minimaal {0} tekens lang zijn.</message>
-  <message key="validation.string.max-length">Dit veld mag maximaal {0} tekens lang zijn.</message>
-  <message key="validation.string.regexp">De waarde komt niet overeen met deze reg. exp.: {0}</message>
-  <message key="validation.string.invalidemail">Dit is geen geldig email adres</message>
-
-  <message key="validation.array.exact-valuecount">Kies precies {0} elementen.</message>
-  <message key="validation.array.range-valuecount">Kies tussen de {0} en {1} elementen.</message>
-  <message key="validation.array.min-valuecount">Kies minimaal {0} elementen.</message>
-  <message key="validation.array.max-valuecount">Kies maximaal {0} elementen.</message>
-
-  <message key="multivaluefield.conversionfailed">Een van de gekozen waarden is ongeldig.</message>
-
-  <message key="validation.numeric.range">De waarde moet liggen tussen {0} en {1}.</message>
-  <message key="validation.numeric.min">De waarde is minimaal {0}.</message>
-  <message key="validation.numeric.max">De waarde is maximaal {0}.</message>
-
-  <message key="validation.mod10">De Mod 10 verificatie is mislukt.</message>
-
-  <message key="aggregatedfield.split-failed">De waarde komt niet overeen met deze reg. exp.: {0}</message>
+   <message key="validation.captcha.mismatch">CAPTCHA controle is ongeldig.</message>
+   
+   <message key="general.field-required">Dit veld moet ingevuld zijn.</message>
+   <message key="datatype.conversion-failed">Ongeldig {0}.</message>
+   <message key="datatype.decimal">gebroken getal</message>
+   <message key="datatype.integer">integer getal</message>
+   <message key="datatype.long">integer getal</message>
+   <message key="datatype.float">gebroken getal</message>
+   <message key="datatype.double">gebroken getal</message>
+   <message key="datatype.date.date">datum</message>
+   <message key="datatype.date.time">tijdstip</message>
+   <message key="datatype.date.datetime">datum en tijdstip</message>
+   <message key="validation.string.exact-length">Dit veld moet precies {0}
+      tekens lang zijn.</message>
+   <message key="validation.string.range-length">Het aantal tekens moet tussen
+      de {0} en {1} liggen.</message>
+   <message key="validation.string.min-length">Dit veld moet minimaal {0} tekens
+      lang zijn.</message>
+   <message key="validation.string.max-length">Dit veld mag maximaal {0} tekens
+      lang zijn.</message>
+   <message key="validation.string.regexp">De waarde komt niet overeen met deze
+      reg. exp.: {0}</message>
+   <message key="validation.string.invalidemail">Dit is geen geldig email adres</message>
+   <message key="validation.array.exact-valuecount">Kies precies {0} elementen.</message>
+   <message key="validation.array.range-valuecount">Kies tussen de {0} en {1} elementen.</message>
+   <message key="validation.array.min-valuecount">Kies minimaal {0} elementen.</message>
+   <message key="validation.array.max-valuecount">Kies maximaal {0} elementen.</message>
+   <message key="multivaluefield.conversionfailed">Een van de gekozen waarden is ongeldig.</message>
+   <message key="validation.numeric.range">De waarde moet liggen tussen {0} en {1}.</message>
+   <message key="validation.numeric.min">De waarde is minimaal {0}.</message>
+   <message key="validation.numeric.max">De waarde is maximaal {0}.</message>
+   <message key="validation.mod10">De Mod 10 verificatie is mislukt.</message>
+   <message key="aggregatedfield.split-failed">De waarde komt niet overeen met
+      deze reg. exp.: {0}</message>
+   <message key="calendar.alt">Kalender</message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_pl.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue>
+  <message key="validation.captcha.mismatch">#CAPTCHA check failed.#</message>
   <message key="general.field-required">To pole jest wymagane.</message>
 
   <message key="datatype.conversion-failed">Niepoprawna wartość typu: {0}.</message>
@@ -50,4 +51,5 @@
 
   <message key="aggregatedfield.split-failed">Zawartość tego pola nie odpowiada wyrażeniu regularnemu: {0}.</message>
   <message key="upload.invalid-type">Niepoprawny typ.</message>
+  <message key="calendar.alt"></message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml (original)
+++ cocoon/blocks/forms/trunk/samples/messages/FormsMessages_zh_CN.xml Fri Sep  9 08:50:52 2005
@@ -16,6 +16,7 @@
 -->
 <!-- This catalogue file contains translations for built-in CForms messages. -->
 <catalogue>
+  <message key="validation.captcha.mismatch">#CAPTCHA check failed.#</message>
   <message key="general.field-required">此域是必须的</message>
 
   <message key="datatype.conversion-failed">不是一个有效的{0}类型.</message>
@@ -52,4 +53,5 @@
 
   <message key="aggregatedfield.split-failed">域的内容不能满足如下表达式: {0}</message>
   <message key="upload.invalid-type">内容类型不正确.</message>
+  <message key="calendar.alt"></message>
 </catalogue>

Modified: cocoon/blocks/forms/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/sitemap.xmap?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/forms/trunk/samples/sitemap.xmap Fri Sep  9 08:50:52 2005
@@ -145,7 +145,8 @@
        <map:transform type="i18n">
        </map:transform>
        <map:transform src="resources/forms-samples-styling.xsl"/>
-
+       <map:transform type="i18n">
+       </map:transform>
        <map:serialize/>
      </map:match>
         
@@ -188,6 +189,8 @@
          <map:parameter name="file" value="forms/{1}_template.xml"/>
        </map:call>
        <map:transform src="resources/forms-samples-styling.xsl"/>
+       <map:transform type="i18n">
+       </map:transform>
        <map:serialize/>
      </map:match>
 
@@ -198,12 +201,15 @@
        <map:generate type="jx" src="forms/{1}_template.xml" label="content1"/>
        <map:transform type="browser-update"/>
        <map:transform type="i18n">
-         <!--map:parameter name="locale" value="en-US"/-->
+         <map:parameter name="locale" value="{flow-attribute:locale}"/>
        </map:transform>
        <map:call resource="simple-page2html">
          <map:parameter name="file" value="forms/{1}_template.xml"/>
        </map:call>
        <map:transform src="resources/forms-samples-styling.xsl"/>
+       <map:transform type="i18n">
+         <map:parameter name="locale" value="{flow-attribute:locale}"/>
+       </map:transform>
        <map:select type="request-parameter">
          <map:parameter name="parameter-name" value="cocoon-ajax"/>
          <map:when test="true">
@@ -488,6 +494,14 @@
              <map:parameter name="form-method" value="POST" />
            </map:transform>
          </map:when>
+         <!-- 
+            | If the template file does not exist, the code below generates the
+            | form, but results in a document fragment rather than a correct HTML
+            | tagged page (i.e. it lacks the HTML, HEAD and BODY tags).
+            |
+            | To simplify the samples, all template files exist and the code
+            | below is not executed.
+            -->
          <map:otherwise>       
            <map:generate type="forms">
              <map:parameter name="form-action" value="{flow-continuation:id}.continue" />
@@ -495,7 +509,9 @@
            </map:generate>
          </map:otherwise>
        </map:select>
-
+       <map:call resource="simple-page2html">
+         <map:parameter name="file" value="forms/{1}_template.xml"/>
+       </map:call>
        <map:transform src="resources/forms-samples-styling.xsl" />
        <map:serialize type="html" />
      </map:match>

Modified: cocoon/blocks/forms/trunk/samples/sqldatabase/employeexml2html.xslt
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/sqldatabase/employeexml2html.xslt?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/sqldatabase/employeexml2html.xslt (original)
+++ cocoon/blocks/forms/trunk/samples/sqldatabase/employeexml2html.xslt Fri Sep  9 08:50:52 2005
@@ -51,6 +51,9 @@
           Click one to edit, or use the XML links to view raw data:
         </p>
         <xsl:apply-templates/>
+        <p>
+          <a href="../">Back to Forms samples</a>
+        </p>
       </body>
     </html>
   </xsl:template>

Modified: cocoon/blocks/forms/trunk/samples/sqldatabase/form-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/sqldatabase/form-template.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/sqldatabase/form-template.xml (original)
+++ cocoon/blocks/forms/trunk/samples/sqldatabase/form-template.xml Fri Sep  9 08:50:52 2005
@@ -31,5 +31,8 @@
 			<input type="submit"/>
 		</ft:form-template>
     <p>(Yes, there's not much to edit- what do you expect from a sample?)</p>
+    <p>
+        <a href="../">Back to Forms samples</a>
+    </p>
 	</body>
 </html>

Modified: cocoon/blocks/forms/trunk/samples/welcome.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/welcome.xml?rev=279803&r1=279802&r2=279803&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/samples/welcome.xml (original)
+++ cocoon/blocks/forms/trunk/samples/welcome.xml Fri Sep  9 08:50:52 2005
@@ -41,7 +41,10 @@
   <sample name="Various (Flowscript)" href="form1.flow">The same sample as above using Flowscript.</sample>
   <sample name="Registration" href="registration">A simple registration form.</sample>
   <sample name="Car selector" href="carselector">(Ajax) Illustrates programmatically changing selectionlists.</sample>
+  <!-- XHR Car selector removed: broken and superceded by Ajax version -->
+<!--
   <sample name="XHR Car selector" href="xhr_carselector">Same sample, with the historical first use of XmlHttpRequest to reduce client/server roundtrips.</sample>
+-->
   <sample name="Country selector" href="countryselector">Illustrates programmatically changing flow-jxpath selectionlists.</sample>
   <sample name="Upload" href="upload">Shows an upload widget used with Flowscript</sample>
   <sample name="Form Model GUI" href="form_model_gui.flow">Illustrates the use of Class, New, Struct, and Union.</sample>
@@ -91,6 +94,8 @@
   <sample name="Flowscript" href="form1.flow?locale=it-IT">Italy</sample>
   <sample name="Flowscript" href="form1.flow?locale=de-DE">Germany</sample>
   <sample name="Flowscript" href="form1.flow?locale=nl-BE">Belgium (dutch)</sample>
+  <sample name="Flowscript" href="form1.flow?locale=el">Greek</sample>
+  <sample name="Flowscript" href="form1.flow?locale=zh_CN">Chinese</sample>
  </group>
  
  <group name="Dynamic templates and recursive forms">