cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jer...@apache.org
Subject svn commit: r694391 [2/2] - /cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/
Date Thu, 11 Sep 2008 18:14:26 GMT
Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+
+<!--
+  @version $Id: form1.xml 497900 2007-01-19 18:39:48Z bruno $
+-->
+
+<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+         xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+
+
+  <fd:widgets>
+    <!-- group state holders -->
+    <fd:field id="tab-state">
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <!-- Selection Lists -->
+    <fd:field id="height">
+      <fd:label>Your Height</fd:label>
+      <fd:hint>Your height in potatoes</fd:hint>
+      <fd:help>Selection-list built into the Model, with an initial value set.</fd:help>
+      <fd:datatype base="long"/>
+      <fd:initial-value>4</fd:initial-value>
+      <fd:selection-list>
+        <fd:item value="1">
+          <fd:label>One Potato</fd:label>
+        </fd:item>
+        <fd:item value="2">
+          <fd:label>Two Potato</fd:label>
+        </fd:item>
+        <fd:item value="3">
+          <fd:label>Three Potato</fd:label>
+        </fd:item>
+        <fd:item value="4">
+          <fd:label>Four</fd:label>
+        </fd:item>
+        <fd:item value="5">
+          <fd:label>Five Potato</fd:label>
+        </fd:item>
+        <fd:item value="6">
+          <fd:label>Six Potato</fd:label>
+        </fd:item>
+        <fd:item value="7">
+          <fd:label>Seven Potato</fd:label>
+        </fd:item>
+        <fd:item value="8">
+          <fd:label>More</fd:label>
+        </fd:item>
+      </fd:selection-list>
+    </fd:field>
+
+    <fd:field id="fourchars" required="true">
+      <fd:label>Can you count?</fd:label>
+      <fd:help>Selection-list made from an external file, with validation on the response.</fd:help>
+      <fd:hint>Choose something with four characters</fd:hint>
+      <fd:help>Something Helpful</fd:help>
+      <fd:datatype base="string"/>
+      <fd:validation>
+        <fd:length exact="4"/>
+      </fd:validation>
+      <fd:selection-list src="forms/a-choices.xml"/>
+    </fd:field>
+
+    <fd:field id="altbirthdate" required="true">
+      <fd:label>Prefered Date of Birth</fd:label>
+      <fd:help>A static selection-list with a Date DataType and convertor.</fd:help>
+      <fd:hint>Select a date on which you'd rather had been born</fd:hint>
+      <fd:datatype base="date">
+        <fd:convertor variant="date" style="full"/>
+      </fd:datatype>
+      <fd:selection-list>
+        <!-- The convertor element here is used to specify how the values
+             in the value attributes of the fd:item elements should be
+             interpreted. -->
+        <fd:convertor type="formatting">
+          <fd:patterns>
+            <fd:pattern>yyyyMMdd</fd:pattern>
+          </fd:patterns>
+        </fd:convertor>
+        <fd:item value="13020711"/>
+        <fd:item value="19120623"/>
+        <fd:item value="19690721"/>
+        <fd:item value="19700506"/>
+        <fd:item value="19781014"/>
+        <fd:item value="20010911"/>
+        <fd:item value="20120729"/>
+      </fd:selection-list>
+    </fd:field>
+
+    <fd:field id="altbirthdate2" required="true">
+      <fd:label>Other date of birth</fd:label>
+      <fd:help>A selection-list made by a Java Class</fd:help>
+      <fd:hint>Select another date on which you'd rather had been born</fd:hint>
+      <fd:datatype base="date">
+        <fd:convertor variant="date" style="medium"/>
+      </fd:datatype>
+      <fd:selection-list type="java" class="org.apache.cocoon.forms.samples.DateTestJavaSelectionList" nullable="false"/>
+    </fd:field>
+
+    <fd:field id="petfish">
+      <fd:label>Fish</fd:label>
+      <fd:help>A selection-list made by the Flowscript</fd:help>
+      <fd:hint>Please choose the species of your pet fish</fd:hint>
+      <fd:datatype base="string"/>
+      <fd:selection-list  type="flow-jxpath" list-path="fish" value-path="value" label-path="label"/>
+    </fd:field>
+
+    <fd:field id="fishgender">
+      <fd:label>Gender</fd:label>
+      <fd:help>A selection-list made using an Enum</fd:help>
+      <fd:hint>The gender of your pet fish</fd:hint>
+      <fd:datatype base="enum">
+        <fd:convertor type="enum">
+          <fd:enum>org.apache.cocoon.forms.samples.Sex</fd:enum>
+        </fd:convertor>
+      </fd:datatype>
+      <fd:selection-list type="enum" class="org.apache.cocoon.forms.samples.Sex"/>
+    </fd:field>
+
+    <fd:field id="vegetables">
+      <fd:label>Eat your Vegetables</fd:label>
+      <fd:hint>Choose your least favourite vegetable</fd:hint>
+      <fd:help>A selection list with suggestions, based on what you type.<br/>In this case, there is a static selection-list which is also used for the suggestions, due to the type="suggest" styling.</fd:help>
+      <fd:datatype base="string"/>
+      <fd:selection-list>
+        <fd:item value="Artichokes"/>
+        <fd:item value="Asparagus"/>
+        <fd:item value="Aubergine"/>
+        <fd:item value="Beetroot"/>
+        <fd:item value="Broad Beans"/>
+        <fd:item value="Broccoli"/>
+        <fd:item value="Brussel Sprouts"/>
+        <fd:item value="Cabbage"/>
+        <fd:item value="Carrots"/>
+        <fd:item value="Cauliflower"/>
+        <fd:item value="Courgettes"/>
+        <fd:item value="Aubergine"><fd:label>Egg Plant</fd:label></fd:item>
+        <fd:item value="Fennel"/>
+        <fd:item value="French Beans"/>
+        <fd:item value="Garlic"/>
+        <fd:item value="Green Peppers"/>
+        <fd:item value="Jerusalem Artichokes"/>
+        <fd:item value="Leeks"/>
+        <fd:item value="Okra"/>
+        <fd:item value="Onions"/>
+        <fd:item value="Parsnips"/>
+        <fd:item value="Peas"/>
+        <fd:item value="Potatoes"/>
+        <fd:item value="Red Peppers"/>
+        <fd:item value="Spinach"/>
+        <fd:item value="Swedes"/>
+        <fd:item value="Turnips"/>
+        <fd:item value="Courgettes"><fd:label>Zucchini</fd:label></fd:item>
+      </fd:selection-list>
+    </fd:field>
+
+    <!-- TODO: this version of the FilteringSelect WIdget is not working properly yet. -->
+    <fd:field id="personId">
+      <fd:label>Person</fd:label>
+      <fd:help>A suggestion-list made using a Widget, by adding a fd:suggestion-list/@type="javascript" to the model.</fd:help>
+      <fd:hint>The person who'd make the best lunch from the other vegetables.</fd:hint>
+      <fd:datatype base="integer"/>
+      <fd:initial-value>9</fd:initial-value>
+      <fd:suggestion-list type="javascript">
+      <![CDATA[
+        function addSuggestion(bean) {
+            suggestions.push({value: bean.value, label: bean.label});
+        }
+
+        function personList() {
+          return [
+                  {value: 1, label: "Donald Ball"},
+                  {value: 2, label: "Sylvain Wallez"},
+                  {value: 3, label: "Carsten Ziegeler"},
+                  {value: 4, label: "Torsten Curdt"},
+                  {value: 5, label: "Marcus Crafter"},
+                  {value: 6, label: "Ovidiu Predescu"},
+                  {value: 7, label: "Christian Haul"},
+                  {value: 8, label: "Jeremy Quinn"},
+                  {value: 9, label: "Stefano Mazzocchi"},
+                  {value: 10, label: "Pierpaolo Fumagalli"},
+                  {value: 11, label: "Davanum Srinivas"},
+                  {value: 12, label: "Antonio Gallardo"},
+                  {value: 13, label: "Ugo Cei"},
+                  {value: 14, label: "David Crossley"},
+                  {value: 15, label: "Bertrand Delacrétaz"},
+                  {value: 16, label: "Bruno Dumon"},
+                  {value: 17, label: "Daniel Fagerstrom"},
+                  {value: 18, label: "Leszek Gawron"},
+                  {value: 19, label: "Ralph Goers"},
+                  {value: 20, label: "Vadim Gritsenko"},
+                  {value: 21, label: "Jorg Heymans"},
+                  {value: 22, label: "Joerg Heinicke"},
+                  {value: 23, label: "Jean-Baptiste Quenot"}
+                ];
+        }
+
+  var suggestable = System.Collections.getSuggestionList(
+    System.Collections.registerSuggestionList("people", personList(), "value", "label")
+  );
+	var suggestions = [];
+	var filter = cocoon.request.getParameter("filter");
+	var id = cocoon.request.getParameter("id");
+  var locale = Packages.org.apache.cocoon.i18n.I18nUtils.parseLocale(cocoon.request.get("locale"));
+	if (filter) {
+	  suggestions = suggestable.getSuggested(locale, filter, cocoon.request.getParameter("ignoreCase"), cocoon.request.getParameter("start"), cocoon.request.getParameter("count"));
+	} else if (id) {
+	  suggestions = suggestable.getById(locale, id);
+	} else {
+	  suggestions = suggestable.getAll(locale, cocoon.request.getParameter("start"), cocoon.request.getParameter("count"));
+	}
+
+
+        return suggestions;
+      ]]>
+      </fd:suggestion-list>
+    </fd:field>
+
+    <fd:field id="workplace">
+      <fd:label>Location</fd:label>
+      <fd:help>A suggestion-list made using a Flow Pipeline, by using the styling attributes: <br/><code>dataUrl="countries"<br/>pageSize="10"</code>.</fd:help>
+      <fd:hint>The country where you'd rather work.</fd:hint>
+      <fd:datatype base="string"/>
+      <fd:initial-value>NL</fd:initial-value>
+    </fd:field>
+
+    <fd:submit id="ok">
+      <fd:label>Submit</fd:label>
+    </fd:submit>
+
+  </fd:widgets>
+
+</fd:form>

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists_template.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists_template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists_template.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- The only difference between this file and the form1_template_flow.xml
+     is the value of the action attribute on the ft:form-template element -->
+<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"/>
+  <jx:import uri="resources/samples-jx-macros.xml"/><!-- common macros for samples -->
+
+  <h4 class="samplesGroup">List Samples</h4>
+  <title>List Samples (<jx:out value="${locale}"/>)</title>
+	<style type="text/css">
+
+		body {
+			margin:20px;
+		}
+
+		/* add padding to each contentpane inside the tab container, and scrollbar if necessary */
+		.dijitTabPane {
+			padding : 1em;
+		}
+		table.columns {
+		  width:100%;
+		}
+    table.columns > tbody > tr > td {
+      width:50%;
+    }
+	</style>
+
+  <content>
+
+    <ft:form-template class="fadeIn" action="continue" method="POST" ajax="true">
+      <ft:continuation-id/><!-- Widget-supplied SuggestionLists, require that the continuation-id be in a form field -->
+      <div style="width: 90%; margin: 10px 50px 50px 50px;">
+        <p>
+          <sample-locale-display/><!-- a macro from samples-jx-macros.xml -->
+        </p>
+        <!-- group with tabs. Each of the children of <items> will constitute a tab -->
+        <fi:group>
+          <fi:styling type="tabs" style="height:28em;width:100%;"/>
+          <fi:state>
+            <ft:widget id="tab-state"/>
+          </fi:state>
+          <fi:items>
+            <fi:group>
+              <fi:label>Single Choice</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="height"/>
+                <ft:widget id="fourchars"/>
+                <ft:widget id="altbirthdate"/>
+                <ft:widget id="altbirthdate2"/>
+                <ft:widget id="petfish">
+                  <fi:styling list-type="listbox" listbox-size="3"/>
+                </ft:widget>
+                <ft:widget id="fishgender"/>
+                <p>Single selection lists from different sources.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Multiple Choice</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <p><b>TODO: </b> These need to be implemented</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Suggestable</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="vegetables">
+                  <fi:styling type="suggest"/>
+                </ft:widget>
+                <!--<ft:widget id="personId"> TODO: currently broken, org.apache.cocoon.forms.generation.SuggestionListGenerator cannot find the continuation
+                  <fi:styling type="suggest"/>
+                </ft:widget>-->
+                <ft:widget id="workplace">
+                  <fi:styling type="suggest" dataUrl="countries" pageSize="10"/>
+                </ft:widget>
+                <p>Auto-suggest single selection lists, using different mechanisms.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Description</fi:label>
+              <fi:items>
+                <h2>Lists</h2>
+                <p>TODO: Describe them</p>
+              </fi:items>
+            </fi:group>
+          </fi:items>
+        </fi:group>
+        
+        <p><ft:widget id="ok"/></p>
+      </div>
+      <p>Supported Locales: 
+          <sample-locale-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+      <p>
+        <a href="./do-groupStyles.flow">Restart this sample</a> - <a href="./">Back to samples</a>
+      </p>
+      <p align="center">
+         <sample-theme-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+    </ft:form-template>
+  </content>
+</page>
+

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/lists_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/multipage_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/multipage_template.xml?rev=694391&r1=694390&r2=694391&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/multipage_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/multipage_template.xml Thu Sep 11 11:14:22 2008
@@ -34,7 +34,7 @@
       <div style="width: 70%; margin: 10px 50px 50px 50px;">
       	
         <ft:group id="page1">
-	       <div id="page1">
+	       <div>
             <!-- group with automatic two-column layout -->
             <fi:group>
               <fi:label>String fields</fi:label>
@@ -55,7 +55,7 @@
          </ft:group>
 
          <ft:group id="page2">
-	        <div id="page2">
+	        <div>
             <fi:group>
               <fi:label>Number fields</fi:label>
               <fi:styling type="fieldset" layout="columns"/>
@@ -76,7 +76,7 @@
          </ft:group>
          
          <ft:group id="page3">
-	        <div id="page3">
+	        <div>
             <fi:group>
               <fi:styling type="fieldset" layout="columns"/>
               <fi:label>Boolean fields</fi:label>

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+
+<!--
+  @version $Id: form1.xml 497900 2007-01-19 18:39:48Z bruno $
+-->
+
+<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+         xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+
+
+  <fd:widgets>
+    <!-- group state holders -->
+    <fd:field id="tab-state">
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <!-- Currencies based on BigDecimal -->
+    <fd:field id="EUR" required="true">
+      <fd:label>Euros</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="EUR"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="USD" required="true">
+      <fd:label>US Dollars</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="USD"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="CNY" required="false">
+      <fd:label>Chinese Yuan</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="CNY"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="JPY" required="true">
+      <fd:label>Japanese Yen</fd:label>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="JPY"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="GBP" required="true">
+      <fd:label>Pounds Sterling</fd:label>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="GBP"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="RUB" required="true">
+      <fd:label>Russian Roubles</fd:label>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency" currency="RUB"/>
+      </fd:datatype>
+    </fd:field>
+    <fd:field id="XXX" required="true">
+      <fd:label>Default Locale</fd:label>
+      <fd:datatype base="decimal">
+        <fd:convertor variant="currency"/>
+      </fd:datatype>
+    </fd:field>    
+  
+    <!-- Unformatted Numbers -->
+    <fd:field id="plainInteger" required="true">
+      <fd:label>Plain Integer</fd:label>
+      <fd:initial-value>123456</fd:initial-value>
+      <fd:datatype base="integer"><fd:convertor type="plain"/></fd:datatype>
+    </fd:field>
+    <fd:field id="plainLong" required="true">
+      <fd:label>Plain Long</fd:label>
+      <fd:initial-value>123456</fd:initial-value>
+      <fd:datatype base="long"><fd:convertor type="plain"/></fd:datatype>
+    </fd:field>
+    <fd:field id="plainDecimal" required="true">
+      <!-- NB. Initial value supplied from the FlowScript -->
+      <fd:label>Plain Decimal</fd:label>
+      <fd:datatype base="decimal"><fd:convertor type="plain"/></fd:datatype>
+    </fd:field>
+    <fd:field id="plainDouble" required="true">
+      <fd:label>Plain Double</fd:label>
+      <fd:initial-value>123456.678</fd:initial-value>
+      <fd:datatype base="double"><fd:convertor type="plain"/></fd:datatype>
+    </fd:field>
+    <fd:field id="plainFloat" required="true">
+      <fd:label>Plain Float</fd:label>
+      <fd:initial-value>123456.678</fd:initial-value>
+      <fd:datatype base="float"><fd:convertor type="plain"/></fd:datatype>
+    </fd:field>
+
+    <!-- Formatted Numbers -->
+    <fd:field id="formattedInteger" required="true">
+      <fd:label>Formatted Integer</fd:label>
+      <fd:initial-value>123456</fd:initial-value>
+      <fd:datatype base="integer"><fd:convertor variant="integer"/></fd:datatype>
+    </fd:field>
+    <fd:field id="formattedLong" required="true">
+      <fd:label>Formatted Long</fd:label>
+      <fd:initial-value>123456</fd:initial-value>
+      <fd:datatype base="long"><fd:convertor variant="integer"/></fd:datatype>
+    </fd:field>
+    <fd:field id="formattedDecimal" required="true">
+      <!-- NB. Initial value supplied from the FlowScript -->
+      <fd:label>Formatted Decimal</fd:label>
+      <fd:datatype base="decimal"><fd:convertor variant="number"/></fd:datatype>
+    </fd:field>
+    <fd:field id="formattedDouble" required="true">
+      <fd:label>Formatted Double</fd:label>
+      <fd:initial-value>123456.678</fd:initial-value>
+      <fd:datatype base="double"><fd:convertor variant="number"/></fd:datatype>
+    </fd:field>
+    <fd:field id="formattedFloat" required="true">
+      <fd:label>Formatted Float</fd:label>
+      <fd:initial-value>123456.678</fd:initial-value>
+      <fd:datatype base="float"><fd:convertor variant="number"/></fd:datatype>
+    </fd:field>
+    <fd:field id="formattedPercent" required="true">
+      <fd:label>Formatted Percent</fd:label>
+      <fd:datatype base="double"><fd:convertor variant="percent"/></fd:datatype>
+    </fd:field>
+
+    <fd:submit id="ok">
+      <fd:label>Submit</fd:label>
+    </fd:submit>
+
+  </fd:widgets>
+
+</fd:form>

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers_template.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers_template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers_template.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- The only difference between this file and the form1_template_flow.xml
+     is the value of the action attribute on the ft:form-template element -->
+<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"/>
+  <jx:import uri="resources/samples-jx-macros.xml"/><!-- common macros for samples -->
+
+  <h4 class="samplesGroup">Validating Number Samples</h4>
+  <title>Number Samples (<jx:out value="${locale}"/>)</title>
+<style type="text/css">
+
+  body {
+    margin:20px;
+  }
+
+  /* add padding to each contentpane inside the tab container, and scrollbar if necessary */
+  .dijitTabPane {
+    padding : 1em;
+  }
+  table.columns {
+    width:100%;
+  }
+  table.columns > tbody > tr > td {
+    width:50%;
+  }
+</style>
+
+  <content>
+
+    <ft:form-template class="fadeIn" action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
+      <div style="width: 90%; margin: 10px 50px 50px 50px;">
+        <p>
+          <sample-locale-display/><!-- a macro from samples-jx-macros.xml -->
+        </p>
+
+        <!-- group with tabs. Each of the children of <items> will constitute a tab -->
+        <fi:group>
+          <fi:styling type="tabs" style="height:28em;width:100%;"/>
+          <fi:state>
+            <ft:widget id="tab-state"/>
+          </fi:state>
+          <fi:items>
+            <fi:group>
+              <fi:label>Currency fields</fi:label>
+              <fi:items>
+                <table border="0" class="columns">
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('EUR')}"/></td>
+                    <td class="content"><ft:widget id="EUR"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('USD')}"/></td>
+                    <td class="content"><ft:widget id="USD"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('CNY')}"/></td>
+                    <td class="content"><ft:widget id="CNY"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('JPY')}"/></td>
+                    <td class="content"><ft:widget id="JPY"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('GBP')}"/></td>
+                    <td class="content"><ft:widget id="GBP"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><jx:out value="${currencies.get('RUB')}"/></td>
+                    <td class="content"><ft:widget id="RUB"/></td>
+                  </tr>
+                  <tr>
+                    <td class="label"><i><ft:widget-label id="XXX"/></i>- <jx:out value="${currencies.get('XXX')}"/></td>
+                    <td class="content"><ft:widget id="XXX"/></td>
+                  </tr>
+                  <tr><td colspan="2" class="content"><p>Different Currencies formatted by Locale.<br/>Try viewing this in different locales, using the menu below.</p></td></tr> 
+                </table>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Plain fields</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="plainInteger"/>
+                <ft:widget id="plainLong"/>
+                <ft:widget id="plainDecimal"/>
+                <ft:widget id="plainDouble"/>
+                <ft:widget id="plainFloat"/>
+                <p>Numbers that use a plain convertor are not formatted by locale.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Formatted fields</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="formattedInteger"/>
+                <ft:widget id="formattedLong"/>
+                <ft:widget id="formattedDecimal"/>
+                <ft:widget id="formattedDouble"/>
+                <ft:widget id="formattedFloat"/>
+                <ft:widget id="formattedPercent"/>
+                <p>Numbers that use a formatting convertor are formatted to suit the User's locale.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Description</fi:label>
+              <fi:items>
+                <h2>Validated Number Fields</h2>
+                <p>Samples of different kinds of numbers and their validation, available in many different locales.</p>
+                <p>There are currently a few combinations of number type and locale that do not work properly. Fields with broken validation, show an orange marker.</p>
+              </fi:items>
+            </fi:group>
+          </fi:items>
+        </fi:group>
+        <p><ft:widget id="ok"/></p>
+      </div>
+      <p>Supported Locales: 
+          <sample-locale-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+      <p>
+        <a href="./do-numbers.flow">Restart this sample</a> - <a href="./">Back to samples</a>
+      </p>
+      <p align="center">
+         <sample-theme-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+
+    </ft:form-template>
+
+  </content>
+</page>
+

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/numbers_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/tasktree.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/tasktree.xml?rev=694391&r1=694390&r2=694391&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/tasktree.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/tasktree.xml Thu Sep 11 11:14:22 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -61,16 +61,16 @@
             
             <!-- these actions will act on the "tasks" repeater in which this class is inlined -->
             <fd:row-action id="add" command="add-after">
-              <fd:label>+</fd:label>
+              <fd:label>&#9099;</fd:label>
             </fd:row-action>
             <fd:row-action id="up" command="move-up">
-              <fd:label>^</fd:label>
+              <fd:label>&#9650;</fd:label>
             </fd:row-action>
             <fd:row-action id="down" command="move-down">
-              <fd:label>v</fd:label>
+              <fd:label>&#9660;</fd:label>
             </fd:row-action>
             <fd:row-action id="delete" command="delete">
-              <fd:label>X</fd:label>
+              <fd:label>&#9021;</fd:label>
             </fd:row-action>
             
             <!-- the substasks -->

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+
+<!--
+  @version $Id: form1.xml 497900 2007-01-19 18:39:48Z bruno $
+-->
+
+<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+         xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+
+
+  <fd:widgets>
+    <!-- group state holders -->
+    <fd:field id="tab-state">
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <fd:field id="simple">
+      <fd:label>Simple TextArea</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="string"/>
+    </fd:field>
+    <fd:field id="validating" required="true">
+      <fd:label>Validating TextArea</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="string"/>
+    </fd:field>
+    <fd:field id="rich">
+      <fd:label>Rich Text</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="string"/>
+    </fd:field>
+    <fd:field id="inplacearea">
+      <fd:label>Inplace TextArea</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="string"/>
+    </fd:field>
+    <fd:field id="inplacerich">
+      <fd:label>Inplace Rich Text</fd:label>
+      <fd:hint>A helpful hint</fd:hint>
+      <fd:help>Some useful help</fd:help>
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <fd:submit id="ok">
+      <fd:label>Submit</fd:label>
+    </fd:submit>
+
+  </fd:widgets>
+
+</fd:form>

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas_template.xml?rev=694391&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas_template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas_template.xml Thu Sep 11 11:14:22 2008
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- The only difference between this file and the form1_template_flow.xml
+     is the value of the action attribute on the ft:form-template element -->
+<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"/>
+  <jx:import uri="resources/samples-jx-macros.xml"/><!-- common macros for samples -->
+  	
+  <h4 class="samplesGroup">TextArea Samples</h4>
+  <title>TextArea Samples</title>
+	<style type="text/css">
+
+		body {
+			margin:20px;
+		}
+
+		/* add padding to each contentpane inside the tab container, and scrollbar if necessary */
+		.dijitTabPane {
+			padding : 10px 10px 10px 10px;
+			margin:5px;
+			overflow: auto;
+		}
+
+	</style>
+  <content>
+    <ft:form-template class="fadeIn" action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
+      <div style="width: 90%; margin: 10px 50px 50px 50px;">
+        <p>
+          <sample-locale-display/><!-- a macro from samples-jx-macros.xml -->
+        </p>
+
+        <!-- group with tabs. Each of the children of <items> will constitute a tab -->
+        <fi:group>
+          <fi:styling type="tabs" style="height:30em;width:100%;"/>
+          <fi:state>
+            <ft:widget id="tab-state"/>
+          </fi:state>
+          <fi:items>
+            <fi:group>
+              <fi:label>Simple</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="simple">
+                  <fi:styling type="textarea" rows="8" cols="50"/>
+                </ft:widget>
+                <p>A simple textarea for editing text with line breaks</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Validating</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="validating">
+                  <fi:styling type="textarea" rows="8" cols="50"/>
+                </ft:widget>                
+                <p>A validating textarea for editing text with line breaks</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Inline Area</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="inplacearea">
+                  <fi:styling type="inplace-area" rows="8" cols="50"/>
+                </ft:widget>                
+                <p>A simple textarea embedded in an Inplace Editor</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>RichText</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="rich">
+                  <fi:styling type="htmlarea" height="10em"/>
+                </ft:widget>                
+                <p>A richtext textarea for editing HTML<br/>NB. Sometimes the text is too small to edit, in Safari.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Inline RichText</fi:label>
+              <fi:styling layout="columns"/>
+              <fi:items>
+                <ft:widget id="inplacerich">
+                  <fi:styling type="inplace-area" height="10em" editor="cocoon.forms.RichTextArea"/>
+                </ft:widget>                
+                <p>A richtext textarea embedded in an Inplace Editor<br/>NB. This is not currently working, a fix should come with Dojo 1.2.</p>
+              </fi:items>
+            </fi:group>
+            <fi:group>
+              <fi:label>Description</fi:label>
+              <fi:items>
+                <h2>Variously styled textareas</h2>
+                <p>Samples of different kinds of textarea, simple, validating and rich text.</p>
+                <p>Including samples of these editors in an Inplace Editor.</p>
+              </fi:items>
+            </fi:group>
+          </fi:items>
+        </fi:group>
+        
+        <p><ft:widget id="ok"/></p>
+      </div>
+      <p>Supported Locales: 
+          <sample-locale-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+      <p>
+        <a href="./do-groupStyles.flow">Restart this sample</a> - <a href="./">Back to samples</a>
+      </p>
+      <p align="center">
+         <sample-theme-chooser/><!-- a macro from samples-jx-macros.xml -->
+      </p>
+    </ft:form-template>
+  </content>
+</page>
+

Propchange: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/textareas_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_model.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_model.xml?rev=694391&r1=694390&r2=694391&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_model.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_model.xml Thu Sep 11 11:14:22 2008
@@ -41,6 +41,11 @@
     <fd:output id="message">
       <fd:datatype base="string"/>
     </fd:output>
+
+    <fd:submit id="done">
+      <fd:label>Submit</fd:label>
+      <fd:hint>Finish tagging the upload</fd:hint>
+    </fd:submit>
     
   </fd:widgets>
 </fd:form>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_template.xml?rev=694391&r1=694390&r2=694391&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/upload_template.xml Thu Sep 11 11:14:22 2008
@@ -38,7 +38,7 @@
           <ft:widget id="user"/>
           <ft:widget id="upload"/>
 	      <ft:widget id="message"/>
-          <input type="submit"/>
+          <ft:widget id="done"/>
         </fi:items>
       </fi:group>
     </ft:form-template>

Modified: cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/uploadprogress_template.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/uploadprogress_template.xml?rev=694391&r1=694390&r2=694391&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/uploadprogress_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X-dojo1_1/src/blocks/forms/samples/forms/uploadprogress_template.xml Thu Sep 11 11:14:22 2008
@@ -29,28 +29,12 @@
     
     Place the Widget inside the form which is doing the upload.
     eg. 
-        <div dojoType="ajax:FormUploadProgress">Upload Progress:</div>
- 
-    It should be possible to use this widget outside the context of a CForm.
- 
-    There are several parameters that may be optionally configured:
-    eg.
-        <div dojoType="ajax:FormUploadProgress"
-            background="#333"
-            color="#ccc"
-            ready="upload:progress.ready"
-            connecting="upload:progress.connecting" 
-            i18n:attr="ready connecting"
-        >
-            <i18n:text catalogue="upload">progress.title</i18n:text>
+        <script type="text/javascript">dojo.require("cocoon.ajax.FormUploadProgress");</script>
+        <div dojoType="cocoon.ajax.FormUploadProgress">
+            <div>Upload Progress</div>
         </div>
-    
-    @background : the CSS colour to use for the progress bar
-    @color      : the CSS colour to use for the status text and progress bar border
-    @ready      : the String to show on startup
-    @connecting : the String to show while connecting
-    
-    NB. This example assumes the use of an 'upload' catalogue configured in the I18nTransformer
+ 
+    NB. It is not possible to use this widget outside the context of a CForm.
 
     @version $Id$
     
@@ -69,7 +53,7 @@
     
         <para>
             For this example to work, you must enable uploads in your web.xml file.<br/>
-            It would also be a good idea to up the limit on file-size a bit, so you can upload larger files to see the effect ....
+            It would also be a good idea to raise the limit on file-size a lot, so you can upload larger files to see the effect ....
         </para>
         <para>
             This samples shows uploads in a repeater. Notice how your first click to add an upload row is submitted via XHR, while subsequent clicks are submitted via IframeIO (on supported browsers), as there are now file fields in the form.<br/>
@@ -83,7 +67,9 @@
                     <td valign="top"><ft:widget id="user"/></td>
                 </tr>
             </table>
-            
+            <p>
+                <ft:widget id="addupload"/>
+            </p>            
             <ft:repeater id="uploads">
                 <div>
                     <jx:choose>
@@ -94,7 +80,7 @@
                             <p>
                                 <b><ft:repeater-widget-label widget-id="upload"/></b>
                                 <ft:repeater-rows>
-                                    <p class="forms-row-${repeaterLoop.index % 2}"><ft:widget id="upload"/></p>
+                                    <p><ft:widget id="upload"/></p>
                                 </ft:repeater-rows>
                             </p>
                         </jx:otherwise>
@@ -102,11 +88,12 @@
                 </div>
             </ft:repeater>
             <p>
-                <ft:widget id="addupload"/> <ft:widget id="ok"/><br/>
+                <ft:widget id="ok"/>
             </p>
             <p>
-                <div dojoType="ajax:FormUploadProgress">
-                    <div>Upload Progress Sample</div>
+                <script type="text/javascript">dojo.require("cocoon.ajax.FormUploadProgress");</script>
+                <div dojoType="cocoon.ajax.FormUploadProgress">
+                    <div>Upload Progress</div>
                 </div>
             </p>
         </ft:form-template>



Mime
View raw message