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 16:42:00 UTC
svn commit: r279786 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms:
datasource_chooser_template.xml dynamicrepeater.xml
dynamicrepeater_template.xml form1_template_action.xml
imagemap_success_jx.xml imagemap_template.xml
Author: hepabolu
Date: Fri Sep 9 07:41:51 2005
New Revision: 279786
URL: http://svn.apache.org/viewcvs?rev=279786&view=rev
Log:
synchronizing with TRUNK
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_success_jx.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_template.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/datasource_chooser_template.xml Fri Sep 9 07:41:51 2005
@@ -32,7 +32,7 @@
</legend>
<ft:union id="datasource">
<ft:case id="">
- Please choose a datasource type.
+ <span>Please choose a datasource type.</span>
</ft:case>
<ft:case id="SQL">
<ft:group id="SQL">
@@ -48,7 +48,7 @@
</ft:case>
<ft:case id="file">
<ft:group id="file">
- File name: <ft:widget id="filename"/>
+ <div>File name: <ft:widget id="filename"/></div>
</ft:group>
</ft:case>
</ft:union>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater.xml Fri Sep 9 07:41:51 2005
@@ -76,7 +76,7 @@
<fd:label>Remove selected contacts</fd:label>
</fd:repeater-action>
- <fd:submit id="submit">
+ <fd:submit id="ok">
<fd:label>Submit</fd:label>
</fd:submit>
</fd:widgets>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/dynamicrepeater_template.xml Fri Sep 9 07:41:51 2005
@@ -49,6 +49,7 @@
<li>when there are some contacts, the "move up" and "move down" buttons are not shown on the first and last lines, respectively.</li>
</ul>
<ft:repeater id="contacts">
+ <div id="contacts">
<jx:choose>
<jx:when test="${repeater.getSize() == 0}">
<p><strong><em>There are no contacts to display</em></strong></p>
@@ -100,13 +101,14 @@
</jx:otherwise>
</jx:choose>
<p>
- <ft:widget id="addcontact"/>
+ <ft:widget id="../addcontact"/>
<jx:if test="${widget.getChild('contacts').getSize() > 0}">
- <ft:widget id="removecontacts"/>
+ <ft:widget id="../removecontacts"/>
</jx:if>
</p>
+ </div>
</ft:repeater>
- <ft:widget id="submit"/><br/>
+ <ft:widget id="ok"/><br/>
<a href="./do-dynaRepeater.flow">Restart this sample</a> - <a href="./">Back to samples</a>
</ft:form-template>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/form1_template_action.xml Fri Sep 9 07:41:51 2005
@@ -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/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_success_jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_success_jx.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_success_jx.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_success_jx.xml Fri Sep 9 07:41:51 2005
@@ -15,7 +15,8 @@
limitations under the License.
-->
<page>
- <title>Imagemap result</title>
+ <h4 class="samplesGroup">Imagemap widget</h4>
+ <title>Imagemap result</title>
<content>
x: ${x}
<br/>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_template.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_template.xml?rev=279786&r1=279785&r2=279786&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_template.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/forms/imagemap_template.xml Fri Sep 9 07:41:51 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>