Author: andyhot
Date: Sun Nov 19 09:29:38 2006
New Revision: 476851
URL: http://svn.apache.org/viewvc?view=rev&rev=476851
Log:
more html-previewable example templates in the docs
Modified:
tapestry/tapestry4/trunk/src/site/xdoc/components/form/datepicker.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/form/fieldlabel.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/form/propertyselection.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/form/radiogroup.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/form/select.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/form/upload.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/link/directlink.xml
tapestry/tapestry4/trunk/src/site/xdoc/components/link/pagelink.xml
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/datepicker.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/datepicker.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/datepicker.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/datepicker.xml Sun
Nov 19 09:29:38 2006
@@ -184,31 +184,31 @@
an end date.
</p>
<p>HTML template</p>
- <source xml:space="preserve">
-<form jwcid="Form" listener="listener:formSubmit">
-<table valign="middle">
- <tr>
- <td>Start Date:</td> <td><span jwcid="@DatePicker"
value="ognl:startDate"/></td>
- </tr>
- <tr>
- <td>End Date:</td> <td><span jwcid="@DatePicker"
value="ognl:endDate"/></td>
- </tr>
- <tr>
- <td colspan="2">&nbsp;</td>
- </tr>
- <tr>
- <td colspan="2" align="right"><input type="submit"
value="Submit"/></td>
- </tr>
-</table>
-</form>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<form jwcid="Form" listener="listener:formSubmit">
+<table valign="middle">
+ <tr>
+ <td>Start Date:</td> <td><input jwcid="@DatePicker"
value="ognl:startDate"/></td>
+ </tr>
+ <tr>
+ <td>End Date:</td> <td><input jwcid="@DatePicker" value="ognl:endDate"/></td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="right"><input type="submit" value="Submit"/></td>
+ </tr>
+</table>
+</form>
+]]></source>
<p>Page specification</p>
- <source xml:space="preserve">
+ <source xml:space="preserve"><![CDATA[
...
-<property name="startDate" type="java.util.Date"/>
-<property name="endDate" type="java.util.Date"/>
+<property name="startDate" type="java.util.Date"/>
+<property name="endDate" type="java.util.Date"/>
...
-</source>
+]]></source>
<p>Java source</p>
<source xml:space="preserve">
public abstract class Dates extends BasePage {
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/fieldlabel.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/fieldlabel.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/fieldlabel.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/fieldlabel.xml Sun
Nov 19 09:29:38 2006
@@ -152,24 +152,24 @@
being labeled (and the displayName being provided as a
FieldLabel parameter).
</p>
- <source xml:space="preserve">
-<tr>
- <th>
- <span jwcid="@FieldLabel" field="component:textField"
displayName="message:textfield-label">Text Field</span>:
- </th>
- <td>
- <input jwcid="[EMAIL PROTECTED]" . . . />
- </td>
-</tr>
-<tr>
- <th>
- <span jwcid="@FieldLabel" field="component:validField">Valid
Field</span>:
- </th>
- <td>
- <input jwcid="[EMAIL PROTECTED]" displayName="message:validfield-label"
. . . />
- </td>
-</tr>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<tr>
+ <th>
+ <label jwcid="@FieldLabel" field="component:textField"
displayName="message:textfield-label">Text Field</label>:
+ </th>
+ <td>
+ <input jwcid="[EMAIL PROTECTED]" . . . />
+ </td>
+</tr>
+<tr>
+ <th>
+ <label jwcid="@FieldLabel" field="component:validField">Valid
Field</label>:
+ </th>
+ <td>
+ <input jwcid="[EMAIL PROTECTED]" displayName="message:validfield-label" .
. . />
+ </td>
+</tr>
+]]></source>
</section>
Modified:
tapestry/tapestry4/trunk/src/site/xdoc/components/form/propertyselection.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/propertyselection.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
---
tapestry/tapestry4/trunk/src/site/xdoc/components/form/propertyselection.xml
(original)
+++
tapestry/tapestry4/trunk/src/site/xdoc/components/form/propertyselection.xml
Sun Nov 19 09:29:38 2006
@@ -236,12 +236,12 @@
</a>
</p>
- <source xml:space="preserve">
-<form jwcid="@Form" listener="listener:formSubmit">
- Gender: <span jwcid="@PropertySelection" model="ognl:@[EMAIL PROTECTED]"
value="ognl:gender"/>
- <input type="submit"/>
-</form>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<form jwcid="@Form" listener="listener:formSubmit">
+ Gender: <select jwcid="@PropertySelection" model="ognl:@[EMAIL PROTECTED]"
value="ognl:gender"></select>
+ <input type="submit"/>
+</form>
+]]></source>
<source xml:space="preserve">
public abstract class DetailsPage extends BasePage {
@@ -271,24 +271,24 @@
<p>PurchasePage.html</p>
- <source xml:space="preserve">
-<body jwcid="@Body">
-<form jwcid="@Form" listener="listener:formSubmit">
- <span jwcid="@FieldLabel"
field="component:itemSelection">Selection</span>
- <span jwcid="[EMAIL PROTECTED]"
+ <source xml:space="preserve"><![CDATA[
+<body jwcid="@Body">
+<form jwcid="@Form" listener="listener:formSubmit">
+ <label jwcid="@FieldLabel" field="component:itemSelection">Selection</label>
+ <select jwcid="[EMAIL PROTECTED]"
model="ognl:itemSelectionModel"
value="ognl:clothingItem"
onchange="javascript:this.form.events.refresh();"
- displayName="Choose an item"/>
- <input type="submit" value="Show me this item"/>
- <span jwcid="@Conditional" condition="ognl:clothingItem!=null">
- <p>Description: <span jwcid="@Insert"
value="ognl:clothingItem.description"/></p>
- <p>Label: <span jwcid="@Insert"
value="ognl:clothingItem.label"/></p>
- <p>Price: $<span jwcid="@Insert"
value="ognl:clothingItem.price"/></p>
- </span>
-</form>
-</body>
-</source>
+ displayName="Choose an item"></select>
+ <input type="submit" value="Show me this item"/>
+ <span jwcid="@Conditional" condition="ognl:clothingItem!=null">
+ <p>Description: <span jwcid="@Insert"
value="ognl:clothingItem.description"/></p>
+ <p>Label: <span jwcid="@Insert" value="ognl:clothingItem.label"/></p>
+ <p>Price: $<span jwcid="@Insert" value="ognl:clothingItem.price"/></p>
+ </span>
+</form>
+</body>
+]]></source>
<p>PurchasePage.java</p>
<source xml:space="preserve">
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/radiogroup.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/radiogroup.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/radiogroup.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/radiogroup.xml Sun
Nov 19 09:29:38 2006
@@ -160,17 +160,17 @@
order size.
</p>
- <source xml:space="preserve">
-<form jwcid="@Form" success="listener:doSubmit">
- <span jwcid="@FieldLabel" field="component:size">Radio</span>
- <span jwcid="[EMAIL PROTECTED]" selected="ognl:orderSize"
displayName="Size" validators="validators:required">
- <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/>
Small
- <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/>
Medium
- <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/>
Large
- <input type="submit" value="Order"/>
- </span>
-</form>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<form jwcid="@Form" success="listener:doSubmit">
+ <label jwcid="@FieldLabel" field="component:size">Radio</label>
+ <span jwcid="[EMAIL PROTECTED]" selected="ognl:orderSize" displayName="Size"
validators="validators:required">
+ <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/> Small
+ <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/> Medium
+ <input type="radio" jwcid="@Radio" value="ognl:@[EMAIL PROTECTED]"/> Large
+ <input type="submit" value="Order"/>
+ </span>
+</form>
+]]></source>
<source xml:space="preserve">
package com.myexample;
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/select.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/select.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/select.xml (original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/select.xml Sun Nov
19 09:29:38 2006
@@ -162,17 +162,17 @@
validator, he must select at least one).
</p>
- <source xml:space="preserve">
-<form jwcid="@Form" listener="listener:formSubmit">
- <span jwcid="@FieldLabel" field="component:colorChooser"
displayName="Choose a color">Color</span>
- <select jwcid="[EMAIL PROTECTED]" multiple="ognl:true"
validators="validators:required">
- <span jwcid="@Foreach" source="ognl:colors" value="ognl:currentColor"
index="ognl:currentColorIndex">
- <option jwcid="@Option" selected="ognl:selection[currentColorIndex]"
label="ognl:currentColor"/>
- </span>
- </select>
- <input type="submit"/>
-</form>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<form jwcid="@Form" listener="listener:formSubmit">
+ <label jwcid="@FieldLabel" field="component:colorChooser" displayName="Choose
a color">Color</label>
+ <select jwcid="[EMAIL PROTECTED]" multiple="ognl:true"
validators="validators:required">
+ <span jwcid="@Foreach" source="ognl:colors" value="ognl:currentColor"
index="ognl:currentColorIndex">
+ <option jwcid="@Option" selected="ognl:selection[currentColorIndex]"
label="ognl:currentColor"/>
+ </span>
+ </select>
+ <input type="submit"/>
+</form>
+]]></source>
<source xml:space="preserve">
public abstract class ColorChooser extends BasePage implements
PageBeginRenderListener{
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/form/upload.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/form/upload.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/form/upload.xml (original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/form/upload.xml Sun Nov
19 09:29:38 2006
@@ -157,21 +157,21 @@
<section name="Examples">
<p>UploadPage.html</p>
- <source xml:space="preserve">
-<form jwcid="@Form" listener="listener:formSubmit">
-<span jwcid="@FieldLabel" field="component:upload"/>
-<input jwcid="[EMAIL PROTECTED]" file="ognl:uploadFile" type="file"
displayName="File" validators="validators:required"/>
-<input type= "submit" value="Upload"/>
-<span jwcid="@If" condition="ognl: uploadFile && serverFile">
-<ul>
- <li>Filename: <span jwcid="@Insert"
value="ognl:uploadFile.fileName"/></li>
- <li>Client path: <span jwcid="@Insert"
value="ognl:uploadFile.filePath"/></li>
- <li>Server Path: <span jwcid="@Insert"
value="ognl:serverFile.absolutePath"/></li>
- <li>File Size: <span jwcid="@Insert"
value="ognl:serverFile.length()" format="ognl:numberFormat"/>
bytes</li>
-</ul>
-</span>
-</form>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<form jwcid="@Form" listener="listener:formSubmit">
+<label jwcid="@FieldLabel" field="component:upload">File</label>
+<input jwcid="[EMAIL PROTECTED]" file="ognl:uploadFile" type="file"
displayName="File" validators="validators:required"/>
+<input type="submit" value="Upload"/>
+<span jwcid="@If" condition="ognl: uploadFile && serverFile">
+<ul>
+ <li>Filename: <span jwcid="@Insert" value="ognl:uploadFile.fileName"/></li>
+ <li>Client path: <span jwcid="@Insert"
value="ognl:uploadFile.filePath"/></li>
+ <li>Server Path: <span jwcid="@Insert"
value="ognl:serverFile.absolutePath"/></li>
+ <li>File Size: <span jwcid="@Insert" value="ognl:serverFile.length()"
format="ognl:numberFormat"/> bytes</li>
+</ul>
+</span>
+</form>
+]]></source>
<p>UploadPage.java</p>
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/link/directlink.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/link/directlink.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/link/directlink.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/link/directlink.xml Sun
Nov 19 09:29:38 2006
@@ -284,39 +284,39 @@
<p>HTML template</p>
- <source xml:space="preserve">
- <table cellspacing="6">
- <tr>
- <td>ID</td>
- <td>&nbsp;</td>
- <td>Name</td>
- <td>&nbsp;</td>
- <td>Level</td>
- <th>&nbsp;</th>
- </tr>
- <tr>
- <td colspan="6"><hr></td>
- </tr>
- <tr jwcid="@Foreach" source="ognl:customerList" value="ognl:customer"
element="tr">
- <td><span jwcid="@Insert" value="ognl:customer.id"/></td>
- <td>&nbsp;</td>
- <td><span jwcid="@DirectLink"
listener="listener:customerSelectAction" parameters="ognl:customer.id">
<span jwcid="@Insert" value="ognl:customer.fullName"/>
</span></td>
- <td>&nbsp;</td>
- <td><span jwcid="@Insert"
value="ognl:customer.memberLevel"/></td>
- <td>
- <a jwcid="@DirectLink" listener="listener.customerDeleteAction"
parameters="ognl:customer.id" onclick="return window.confirm('Are you sure you
want remove this customer?');">
- <img jwcid="@Image" image="ognl:assets.deleteImage" alt="Delete"/>
- </a>
- </td>
- </tr>
-</table>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<table cellspacing="6">
+ <tr>
+ <td>ID</td>
+ <td> </td>
+ <td>Name</td>
+ <td> </td>
+ <td>Level</td>
+ <th> </th>
+ </tr>
+ <tr>
+ <td colspan="6"><hr></td>
+ </tr>
+ <tr jwcid="@Foreach" source="ognl:customerList" value="ognl:customer"
element="tr">
+ <td><span jwcid="@Insert" value="ognl:customer.id"/></td>
+ <td> </td>
+ <td><a jwcid="@DirectLink" listener="listener:customerSelectAction"
parameters="ognl:customer.id"> <span jwcid="@Insert"
value="ognl:customer.fullName"/> </a></td>
+ <td> </td>
+ <td><span jwcid="@Insert" value="ognl:customer.memberLevel"/></td>
+ <td>
+ <a jwcid="@DirectLink" listener="listener.customerDeleteAction"
parameters="ognl:customer.id" onclick="return window.confirm('Are you sure you
want remove this customer?');">
+ <img jwcid="@Image" image="ognl:assets.deleteImage" alt="Delete"/>
+ </a>
+ </td>
+ </tr>
+</table>
+]]></source>
<p>Page specification</p>
- <source xml:space="preserve">
-<property name="customerList" type="java.util.List" persistent="yes"/>
-<property name="customer" type="Customer"/>
-</source>
+ <source xml:space="preserve"><![CDATA[
+<property name="customerList" type="java.util.List" persistent="yes"/>
+<property name="customer" type="Customer"/>
+]]></source>
<p>Java sources</p>
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/link/pagelink.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/link/pagelink.xml?view=diff&rev=476851&r1=476850&r2=476851
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/link/pagelink.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/link/pagelink.xml Sun Nov
19 09:29:38 2006
@@ -179,28 +179,28 @@
<p>There are two PageLink components in our Home page: Page1
and Page2.</p>
<p>The Home.html:</p>
- <source xml:space="preserve">
+ <source xml:space="preserve"><![CDATA[
...
-<a jwcid="@PageLink" page="Page1">go to Page1</a>
-<p> </p>
-<a jwcid="page2">go to Page2</a>
+<a jwcid="@PageLink" page="Page1">go to Page1</a>
+<p> </p>
+<a jwcid="page2">go to Page2</a>
...
-</source>
+]]></source>
<p>The Home.page:</p>
- <source xml:space="preserve">
+ <source xml:space="preserve"><![CDATA[
...
-<page-specification>
+<page-specification>
...
- <component id="page2" type="PageLink">
- <binding name="page" value="literal:Page2"/>
- </component>
+ <component id="page2" type="PageLink">
+ <binding name="page" value="literal:Page2"/>
+ </component>
...
-</page-specification>
+</page-specification>
-</source>
+]]></source>
<p>
Note: in the Home.page file, we use "literal" prefix when
binding value of the
@@ -209,7 +209,7 @@
</p>
- <p>Â </p>
+ <p/>
<p>
<strong>Another example:</strong>
</p>
@@ -226,36 +226,37 @@
</p>
<p>the html file:</p>
- <source xml:space="preserve">
-<!-- Navigation Bar -->
-<table bgcolor="navy" cellpadding="8" cellspacing="6" width="100%">
- <tr jwcid="@Foreach" source="ognl:[EMAIL PROTECTED]"
value="ognl:navigationPage" element="tr">
- <td><font color="white"><b><span jwcid="@PageLink"
page="ognl:navigationPage" disabled="ognl:!
visit.authenticated"/></b></font></td>
- </tr>
-</table>
+ <source xml:space="preserve"><![CDATA[
+<!-- Navigation Bar -->
+<table bgcolor="navy" cellpadding="8" cellspacing="6" width="100%">
+ <tr jwcid="@Foreach" source="ognl:[EMAIL PROTECTED]"
value="ognl:navigationPage" element="tr">
+ <td><font color="white"><b><a jwcid="@PageLink" page="ognl:navigationPage"
+ disabled="ognl:! visit.authenticated">Link</a></b></font></td>
+ </tr>
+</table>
-</source>
+]]></source>
<p>the application specification file:</p>
- <source xml:space="preserve">
+ <source xml:space="preserve"><![CDATA[
...
-<application name="PageLink Examples">
- <meta key="org.apache.tapestry.engine-class" value="MailEngine"/>
+<application name="PageLink Examples">
+ <meta key="org.apache.tapestry.engine-class" value="MailEngine"/>
...
-</application>
+</application>
-</source>
+]]></source>
<p>the page specification file:</p>
- <source xml:space="preserve">
+ <source xml:space="preserve"><![CDATA[
...
-<page-specification class="MailPage">
- <property name="navigationPage"/>
+<page-specification class="MailPage">
+ <property name="navigationPage"/>
...
-</page-specification>
+</page-specification>
-</source>
+]]></source>
<p>the java class files:</p>