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/08 19:48:23 UTC
svn commit: r279593 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples: ./ captcha/ flow/
forms/ forms/binding/ sqldatabase/ xsl/
Author: hepabolu
Date: Thu Sep 8 10:48:04 2005
New Revision: 279593
URL: http://svn.apache.org/viewcvs?rev=279593&view=rev
Log:
"back to samples" link fixed, xhr_carselector references removed, cosmetic changes and partial fix of localization problem
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/01value-template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/02lenient-template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/05custom-template.xml
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/xsl/xhr_carfilter.xsl
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/captcha/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/forms_flow_example.js
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/03aggregate-template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/04heavy-template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/done.jx
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_jx.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2simpleXML_result.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/xmlresult_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/employeexml2html.xslt
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/captcha/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/captcha/sitemap.xmap?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/captcha/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/captcha/sitemap.xmap Thu Sep 8 10:48:04 2005
@@ -88,6 +88,8 @@
<map:transform src="../resources/forms-samples-styling.xsl">
<map:parameter name="resources-uri" value="../resources"/>
</map:transform>
+ <map:transform type="i18n">
+ </map:transform>
<map:serialize/>
</map:match>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/form_model_gui.js Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/forms_flow_example.js
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/forms_flow_example.js?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/forms_flow_example.js (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/flow/forms_flow_example.js Thu Sep 8 10:48:04 2005
@@ -52,14 +52,6 @@
cocoon.sendPage("carselector-success-pipeline.xsp");
}
-function xhrSelectCar() {
- var form = new Form("forms/xhr_carselector_form.xml");
- // form.lookupWidget("make").setValue(cocoon.parameters.defaultMake);
- form.showForm("xhr_carselector-display-pipeline");
- cocoon.request.setAttribute("carselectorform", form.getWidget());
- cocoon.sendPage("carselector-success-pipeline.xsp");
-}
-
var states = [
{ key: "AL", value: "Alabama" },
{ key: "AK", value: "Alaska" },
@@ -80,7 +72,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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/01value-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/01value-template.xml?rev=279593&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/01value-template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/01value-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/02lenient-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/02lenient-template.xml?rev=279593&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/02lenient-template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/02lenient-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/03aggregate-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/03aggregate-template.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/03aggregate-template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/03aggregate-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/04heavy-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/04heavy-template.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/04heavy-template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/04heavy-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/05custom-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/05custom-template.xml?rev=279593&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/05custom-template.xml (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/05custom-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/done.jx
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/done.jx?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/done.jx (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/binding/done.jx Thu Sep 8 10:48:04 2005
@@ -16,7 +16,6 @@
-->
<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-
<jx:macro name="dumpBean">
<jx:parameter name="bean"/>
<table cellspacing="2" cellpadding="1" bgcolor="#222222">
@@ -38,7 +37,7 @@
</table>
</jx:macro>
-
+ <h4 class="samplesGroup">Binding tutorial</h4>
<title>BindingSample :: Result</title>
<content>
<i>Contents of the #{./backendType} BEAN after using the binding for save():</i>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_jx.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_jx.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_jx.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2_template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2simpleXML_result.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2simpleXML_result.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2simpleXML_result.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form2simpleXML_result.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/xmlresult_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/xmlresult_template.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/xmlresult_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/xmlresult_template.xml Thu Sep 8 10:48:04 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 samples</a>
</p>
</content>
</page>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/employeexml2html.xslt
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/employeexml2html.xslt?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/employeexml2html.xslt (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/employeexml2html.xslt Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-template.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/sqldatabase/form-template.xml Thu Sep 8 10:48:04 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/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml?rev=279593&r1=279592&r2=279593&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/welcome.xml Thu Sep 8 10:48:04 2005
@@ -93,6 +93,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">