joerg 2004/06/30 11:51:48
Modified: src/blocks/forms/samples/forms registration_template.xml
htmlarea_template.xml countryselector_template.xml
form1_template.xml form1_template_action.xml
carselector_template.xml upload_template.xml
src/webapp/samples/common/style/xsl/html
simple-page2html.xsl
src/blocks/forms/samples/resources forms-field-styling.xsl
forms-advanced-field-styling.xsl
forms-calendar-styling.xsl
src/webapp/resources/styles main.css
Log:
made it validating against HTML 4.01 Strict (except for namespace declaration)
Revision Changes Path
1.2 +16 -24
cocoon-2.1/src/blocks/forms/samples/forms/registration_template.xml
Index: registration_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/registration_template.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- registration_template.xml 9 Mar 2004 10:33:48 -0000 1.1
+++ registration_template.xml 30 Jun 2004 18:51:48 -0000 1.2
@@ -19,30 +19,22 @@
<title>Registration</title>
<content>
<ft:form-template action="#{$continuation/id}.continue" method="POST">
- <ft:widget-label id="name"/>
- <ft:widget id="name"/>
- <br/>
- <ft:widget-label id="email"/>
- <ft:widget id="email"/>
- <br/>
- <ft:widget-label id="age"/>
- <ft:widget id="age"/>
- <br/>
- <ft:widget-label id="password"/>
- <ft:widget id="password">
- <fi:styling type="password"/>
- </ft:widget>
- <br/>
- <ft:widget-label id="confirmPassword"/>
- <ft:widget id="confirmPassword">
- <fi:styling type="password"/>
- </ft:widget>
- <br/>
- <ft:widget id="spam"/>
- <ft:widget-label id="spam"/>
- <br/>
-
- <input type="submit"/>
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:items>
+ <ft:widget id="name"/>
+ <ft:widget id="email"/>
+ <ft:widget id="age"/>
+ <ft:widget id="password">
+ <fi:styling type="password"/>
+ </ft:widget>
+ <ft:widget id="confirmPassword">
+ <fi:styling type="password"/>
+ </ft:widget>
+ <ft:widget id="spam"/>
+ <input type="submit"/>
+ </fi:items>
+ </fi:group>
</ft:form-template>
</content>
</page>
1.3 +9 -7
cocoon-2.1/src/blocks/forms/samples/forms/htmlarea_template.xml
Index: htmlarea_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/htmlarea_template.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htmlarea_template.xml 29 Jun 2004 19:53:45 -0000 1.2
+++ htmlarea_template.xml 30 Jun 2004 18:51:48 -0000 1.3
@@ -15,16 +15,18 @@
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:fi="http://apache.org/cocoon/forms/1.0#instance";>
<title>HTMLArea</title>
<content>
<ft:form-template action="#{$continuation/id}.continue" method="POST">
- <ft:widget-label id="data"/><br/>
- <ft:widget id="data">
- <fi:styling type="htmlarea" style="width: 100%;" rows="20"
cols="80"/>
- </ft:widget>
- <br/>
- <input type="submit"/>
+ <div>
+ <ft:widget-label id="data"/><br/>
+ <ft:widget id="data">
+ <fi:styling type="htmlarea" style="width: 100%;" rows="20"
cols="80"/>
+ </ft:widget>
+ <br/>
+ <input type="submit"/>
+ </div>
</ft:form-template>
</content>
</page>
1.3 +13 -25
cocoon-2.1/src/blocks/forms/samples/forms/countryselector_template.xml
Index: countryselector_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/countryselector_template.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- countryselector_template.xml 11 Mar 2004 02:56:32 -0000 1.2
+++ countryselector_template.xml 30 Jun 2004 18:51:48 -0000 1.3
@@ -34,31 +34,19 @@
<content>
<ft:form-template action="countryselector" method="POST">
<ft:continuation-id/>
- <table border="1">
- <tr>
- <td valign="top"><ft:widget-label id="us-nonus"/></td>
- <td valign="top">
- <ft:widget id="us-nonus">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- </td>
- </tr>
- <tr>
- <td valign="top"><ft:widget-label id="country"/></td>
- <td valign="top">
- <ft:widget id="country">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- </td>
- </tr>
- </table>
-
- <br/>
- <ft:widget id="message"/>
- <br/>
- <br/>
-
- <input type="submit"/>
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:items>
+ <ft:widget id="us-nonus">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="country">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="message"/>
+ <input type="submit"/>
+ </fi:items>
+ </fi:group>
</ft:form-template>
</content>
</page>
1.6 +87 -92
cocoon-2.1/src/blocks/forms/samples/forms/form1_template.xml
Index: form1_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/form1_template.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- form1_template.xml 10 May 2004 20:21:20 -0000 1.5
+++ form1_template.xml 30 Jun 2004 18:51:48 -0000 1.6
@@ -20,110 +20,105 @@
<title>Sample form</title>
<content>
<ft:form-template action="#{$continuation/id}.continue" method="POST">
- <table align="center">
- <tr>
- <td>
+ <div style="width: 90%; margin: 10px 50px 50px 50px;">
+ <!-- group with tabs. Each of the children of <items> will
constitute a tab -->
+ <fi:group>
+ <fi:styling type="choice"/>
+ <fi:label>Choose a panel: </fi:label>
+ <fi:state>
+ <ft:widget id="tab-state"/>
+ </fi:state>
- <!-- group with tabs. Each of the children of <items> will
constitute a tab -->
+ <fi:items>
+ <!-- group with automatic two-column layout -->
<fi:group>
- <fi:styling type="choice"/>
- <fi:label>Choose a panel: </fi:label>
- <fi:state>
- <ft:widget id="tab-state"/>
- </fi:state>
-
+ <fi:label>String fields</fi:label>
+ <fi:styling layout="columns"/>
<fi:items>
- <!-- group with automatic two-column layout -->
- <fi:group>
- <fi:label>String fields</fi:label>
- <fi:styling layout="columns"/>
- <fi:items>
- <ft:widget id="email"/>
- <ft:widget id="birthdate"/>
- <ft:widget id="fourchars">
- <!-- particular styling for the enumeration -->
- <fi:styling list-type="listbox" listbox-size="4"/>
- </ft:widget>
- </fi:items>
- </fi:group>
-
- <fi:group>
- <fi:label>Number fields</fi:label>
- <fi:styling layout="columns"/>
- <fi:items>
- <ft:widget id="number1">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- <ft:widget id="number2"/>
- <ft:widget id="account"/>
- <ft:widget id="cowheight">
- <fi:styling list-type="radio"/>
- </ft:widget>
- </fi:items>
- </fi:group>
-
- <fi:group>
- <fi:styling layout="columns"/>
- <fi:label>Boolean fields</fi:label>
- <fi:items>
- <ft:widget id="somebool"/>
- <ft:widget id="drinks">
- <fi:styling list-type="listbox" listbox-size="4"/>
- </ft:widget>
- </fi:items>
- </fi:group>
+ <ft:widget id="email"/>
+ <ft:widget id="birthdate"/>
+ <ft:widget id="fourchars">
+ <!-- particular styling for the enumeration -->
+ <fi:styling list-type="listbox" listbox-size="4"/>
+ </ft:widget>
</fi:items>
</fi:group>
-
- <p>Checkout the <a href="form1">form1 action page</a> for
another way of formatting panels</p>
<fi:group>
+ <fi:label>Number fields</fi:label>
<fi:styling layout="columns"/>
<fi:items>
- <ft:widget id="visa"/>
- <ft:widget id="ipaddress"/>
- <ft:widget id="altbirthdate"/>
- <ft:widget id="dieselprice"/>
+ <ft:widget id="number1">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="number2"/>
+ <ft:widget id="account"/>
+ <ft:widget id="cowheight">
+ <fi:styling list-type="radio"/>
+ </ft:widget>
</fi:items>
</fi:group>
- <!-- manual layout of fields, without use of a fi:group -->
- <ft:widget-label id="contacts"/><br/>
- <ft:repeater-size id="contacts"/>
- <table border="1">
- <tr>
- <th><ft:repeater-widget-label id="contacts"
widget-id="firstname"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="lastname"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="phone"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="email"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="birthdate"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="select"/></th>
- </tr>
- <!-- The contents of the repeater-widget element is a template
that will
- be applied to each row in the repeater. -->
- <ft:repeater-widget id="contacts">
- <tr>
- <td><ft:widget id="firstname"/></td>
- <td><ft:widget id="lastname"/></td>
- <td><ft:widget id="phone"/></td>
- <td><ft:widget id="email"/></td>
- <td>
- <ft:widget id="birthdate"/>
- </td>
- <td><ft:widget id="select"/></td>
- </tr>
- </ft:repeater-widget>
- <tr>
- <td colspan="4" align="right">
- <ft:widget id="addcontact"/>
- <ft:widget id="removecontacts"/>
- </td>
- </tr>
- </table>
- <input type="submit"/>
- </td>
- </tr>
- </table>
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:label>Boolean fields</fi:label>
+ <fi:items>
+ <ft:widget id="somebool"/>
+ <ft:widget id="drinks">
+ <fi:styling list-type="listbox" listbox-size="4"/>
+ </ft:widget>
+ </fi:items>
+ </fi:group>
+ </fi:items>
+ </fi:group>
+
+ <p>Checkout the <a href="form1">form1 action page</a> for another
way of formatting panels</p>
+
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:items>
+ <ft:widget id="visa"/>
+ <ft:widget id="ipaddress"/>
+ <ft:widget id="altbirthdate"/>
+ <ft:widget id="dieselprice"/>
+ </fi:items>
+ </fi:group>
+
+ <!-- manual layout of fields, without use of a fi:group -->
+ <ft:widget-label id="contacts"/><br/>
+ <ft:repeater-size id="contacts"/>
+ <table border="1">
+ <tr>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="firstname"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="lastname"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="phone"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="email"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="birthdate"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="select"/></th>
+ </tr>
+ <!-- The contents of the repeater-widget element is a template
that will
+ be applied to each row in the repeater. -->
+ <ft:repeater-widget id="contacts">
+ <tr>
+ <td><ft:widget id="firstname"/></td>
+ <td><ft:widget id="lastname"/></td>
+ <td><ft:widget id="phone"/></td>
+ <td><ft:widget id="email"/></td>
+ <td>
+ <ft:widget id="birthdate"/>
+ </td>
+ <td><ft:widget id="select"/></td>
+ </tr>
+ </ft:repeater-widget>
+ <tr>
+ <td colspan="4" align="right">
+ <ft:widget id="addcontact"/>
+ <ft:widget id="removecontacts"/>
+ </td>
+ </tr>
+ </table>
+ <input type="submit"/>
+ </div>
</ft:form-template>
</content>
</page>
1.5 +97 -101
cocoon-2.1/src/blocks/forms/samples/forms/form1_template_action.xml
Index: form1_template_action.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/form1_template_action.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- form1_template_action.xml 10 Apr 2004 13:43:18 -0000 1.4
+++ form1_template_action.xml 30 Jun 2004 18:51:48 -0000 1.5
@@ -20,115 +20,111 @@
<title>Sample form</title>
<content>
<ft:form-template action="form1" method="POST">
- <table align="center">
- <tr>
- <td>
-
- <!-- group with tabs. Each of the children of <items> will
constitute a tab -->
+ <div style="width: 90%; margin: 10px 50px 50px 50px;">
+
+ <!-- group with tabs. Each of the children of <items> will
constitute a tab -->
+ <fi:group>
+ <fi:styling type="tabs"/>
+ <fi:label>Choose a panel: </fi:label>
+ <fi:state>
+ <ft:widget id="tab-state"/>
+ </fi:state>
+
+ <fi:items>
+ <!-- group with automatic two-column layout -->
<fi:group>
- <fi:styling type="tabs"/>
- <fi:label>Choose a panel: </fi:label>
- <fi:state>
- <ft:widget id="tab-state"/>
- </fi:state>
-
+ <fi:label>String fields</fi:label>
+ <fi:styling layout="columns"/>
<fi:items>
- <!-- group with automatic two-column layout -->
- <fi:group>
- <fi:label>String fields</fi:label>
- <fi:styling layout="columns"/>
- <fi:items>
- <ft:widget id="email"/>
- <ft:widget id="fourchars">
- <!-- particular styling for the enumeration -->
- <fi:styling list-type="listbox" listbox-size="4"/>
- </ft:widget>
- </fi:items>
- </fi:group>
-
- <fi:group>
- <fi:label>Number fields</fi:label>
- <fi:styling layout="columns"/>
- <fi:items>
- <ft:widget id="number1">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- <ft:widget id="number2"/>
- <ft:widget id="account"/>
- <ft:widget id="cowheight">
- <fi:styling list-type="radio"/>
- </ft:widget>
- </fi:items>
- </fi:group>
-
- <fi:group>
- <fi:styling layout="columns"/>
- <fi:label>Boolean fields</fi:label>
- <fi:items>
- <ft:widget id="somebool"/>
- <ft:widget id="drinks">
- <fi:styling list-type="double-listbox">
- <fi:available-label>Available
drinks</fi:available-label>
- <fi:selected-label>Your selection</fi:selected-label>
- </fi:styling>
- </ft:widget>
- </fi:items>
- </fi:group>
+ <ft:widget id="email"/>
+ <ft:widget id="fourchars">
+ <!-- particular styling for the enumeration -->
+ <fi:styling list-type="listbox" listbox-size="4"/>
+ </ft:widget>
</fi:items>
</fi:group>
-
- <p>Checkout the <a href="form1.flow">form1 flow page</a> for
another way of formatting panels</p>
-
- <!-- Group of type 'fieldset' will have a surrounding frame -->
+
<fi:group>
- <fi:styling type="fieldset" layout="columns"/>
- <fi:label>Misc controls</fi:label>
+ <fi:label>Number fields</fi:label>
+ <fi:styling layout="columns"/>
<fi:items>
- <ft:widget id="visa"/>
- <ft:widget id="ipaddress"/>
- <ft:widget id="altbirthdate"/>
- <ft:widget id="birthdate"/>
- <ft:widget id="dieselprice"/>
+ <ft:widget id="number1">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="number2"/>
+ <ft:widget id="account"/>
+ <ft:widget id="cowheight">
+ <fi:styling list-type="radio"/>
+ </ft:widget>
+ </fi:items>
+ </fi:group>
+
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:label>Boolean fields</fi:label>
+ <fi:items>
+ <ft:widget id="somebool"/>
+ <ft:widget id="drinks">
+ <fi:styling list-type="double-listbox">
+ <fi:available-label>Available drinks</fi:available-label>
+ <fi:selected-label>Your selection</fi:selected-label>
+ </fi:styling>
+ </ft:widget>
</fi:items>
</fi:group>
-
- <!-- manual layout of fields, without use of a fi:group -->
- <ft:widget-label id="contacts"/><br/>
- <ft:repeater-size id="contacts"/>
- <table border="1">
- <tr>
- <th><ft:repeater-widget-label id="contacts"
widget-id="firstname"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="lastname"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="phone"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="email"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="birthdate"/></th>
- <th><ft:repeater-widget-label id="contacts"
widget-id="select"/></th>
- </tr>
- <!-- The contents of the repeater-widget element is a template
that will
- be applied to each row in the repeater. -->
- <ft:repeater-widget id="contacts">
- <tr>
- <td><ft:widget id="firstname"/></td>
- <td><ft:widget id="lastname"/></td>
- <td><ft:widget id="phone"/></td>
- <td><ft:widget id="email"/></td>
- <td>
- <ft:widget id="birthdate"/>
- </td>
- <td><ft:widget id="select"/></td>
- </tr>
- </ft:repeater-widget>
- <tr>
- <td colspan="4" align="right">
- <ft:widget id="addcontact"/>
- <ft:widget id="removecontacts"/>
- </td>
- </tr>
- </table>
- <input type="submit"/>
- </td>
- </tr>
- </table>
+ </fi:items>
+ </fi:group>
+
+ <p>Checkout the <a href="form1.flow">form1 flow page</a> for another
way of formatting panels</p>
+
+ <!-- Group of type 'fieldset' will have a surrounding frame -->
+ <fi:group>
+ <fi:styling type="fieldset" layout="columns"/>
+ <fi:label>Misc controls</fi:label>
+ <fi:items>
+ <ft:widget id="visa"/>
+ <ft:widget id="ipaddress"/>
+ <ft:widget id="altbirthdate"/>
+ <ft:widget id="birthdate"/>
+ <ft:widget id="dieselprice"/>
+ </fi:items>
+ </fi:group>
+
+ <!-- manual layout of fields, without use of a fi:group -->
+ <ft:widget-label id="contacts"/><br/>
+ <ft:repeater-size id="contacts"/>
+ <table border="1">
+ <tr>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="firstname"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="lastname"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="phone"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="email"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="birthdate"/></th>
+ <th><ft:repeater-widget-label id="contacts"
widget-id="select"/></th>
+ </tr>
+ <!-- The contents of the repeater-widget element is a template
that will
+ be applied to each row in the repeater. -->
+ <ft:repeater-widget id="contacts">
+ <tr>
+ <td><ft:widget id="firstname"/></td>
+ <td><ft:widget id="lastname"/></td>
+ <td><ft:widget id="phone"/></td>
+ <td><ft:widget id="email"/></td>
+ <td>
+ <ft:widget id="birthdate"/>
+ </td>
+ <td><ft:widget id="select"/></td>
+ </tr>
+ </ft:repeater-widget>
+ <tr>
+ <td colspan="4" align="right">
+ <ft:widget id="addcontact"/>
+ <ft:widget id="removecontacts"/>
+ </td>
+ </tr>
+ </table>
+ <input type="submit"/>
+ </div>
</ft:form-template>
</content>
</page>
1.3 +16 -33
cocoon-2.1/src/blocks/forms/samples/forms/carselector_template.xml
Index: carselector_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/carselector_template.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- carselector_template.xml 11 Mar 2004 02:56:32 -0000 1.2
+++ carselector_template.xml 30 Jun 2004 18:51:48 -0000 1.3
@@ -34,39 +34,22 @@
<content>
<ft:form-template action="carselector" method="POST">
<ft:continuation-id/>
- <table border="1">
- <tr>
- <td valign="top"><ft:widget-label id="make"/></td>
- <td valign="top">
- <ft:widget id="make">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- </td>
- </tr>
- <tr>
- <td valign="top"><ft:widget-label id="type"/></td>
- <td valign="top">
- <ft:widget id="type">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- </td>
- </tr>
- <tr>
- <td valign="top"><ft:widget-label id="model"/></td>
- <td valign="top">
- <ft:widget id="model">
- <fi:styling submit-on-change="true"/>
- </ft:widget>
- </td>
- </tr>
- </table>
-
- <br/>
- <ft:widget id="message"/>
- <br/>
- <br/>
-
- <input type="submit" value="Buy it!"/>
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:items>
+ <ft:widget id="make">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="type">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="model">
+ <fi:styling submit-on-change="true"/>
+ </ft:widget>
+ <ft:widget id="message"/>
+ <input type="submit" value="Buy it!"/>
+ </fi:items>
+ </fi:group>
</ft:form-template>
</content>
</page>
1.2 +10 -12
cocoon-2.1/src/blocks/forms/samples/forms/upload_template.xml
Index: upload_template.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/upload_template.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upload_template.xml 9 Mar 2004 10:33:48 -0000 1.1
+++ upload_template.xml 30 Jun 2004 18:51:48 -0000 1.2
@@ -14,24 +14,22 @@
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";>
+<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template";
+ xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
<title>Upload Sample</title>
<content>
<para>
For this example to work, you must enable uploads in your web.xml file.
</para>
<ft:form-template action="#{$continuation/id}.continue" method="POST"
enctype="multipart/form-data">
- <table>
- <tr>
- <td valign="top"><ft:widget-label id="user"/></td>
- <td valign="top"><ft:widget id="user"/></td>
- </tr>
- <tr>
- <td valign="top"><ft:widget-label id="upload"/></td>
- <td valign="top"><ft:widget id="upload"/></td>
- </tr>
- </table>
- <input type="submit"/>
+ <fi:group>
+ <fi:styling layout="columns"/>
+ <fi:items>
+ <ft:widget id="user"/>
+ <ft:widget id="upload"/>
+ <input type="submit"/>
+ </fi:items>
+ </fi:group>
</ft:form-template>
</content>
</page>
1.10 +23 -39
cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
Index: simple-page2html.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- simple-page2html.xsl 3 Apr 2004 02:04:17 -0000 1.9
+++ simple-page2html.xsl 30 Jun 2004 18:51:48 -0000 1.10
@@ -40,45 +40,29 @@
<xsl:template name="resources">
<div class="resources">
- <table width="100%" cellpadding="3">
- <tbody>
- <tr>
- <td width="90%"> </td>
- <td nowrap="nowrap">
- <a href="?cocoon-view=content">Content View</a>
- </td>
- <td nowrap="nowrap">
- <a href="?cocoon-view=pretty-content">Source</a>
- </td>
- <td nowrap="nowrap">
- <a href="{$sitemap}?cocoon-view=pretty-content">Sitemap</a>
- </td>
- <xsl:for-each select="resources/resource">
- <td class="[EMAIL PROTECTED]">
- <xsl:choose>
- <xsl:when test="@type='file'">
- <a href="[EMAIL PROTECTED]">
- <!-- we need an explicite match in the sitemap showing
- the source of these resources -->
- <xsl:apply-templates/>
- </a>
- </xsl:when>
- <xsl:when test="@type='doc'">
- <a href="{concat($contextPath,'/docs/',@href)}">
- <xsl:apply-templates/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <a href="{concat($contextPath,'/',@href)}">
- <xsl:apply-templates/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </xsl:for-each>
- </tr>
- </tbody>
- </table>
+ <a href="?cocoon-view=content">Content View</a>
+ <a href="?cocoon-view=pretty-content">Source</a>
+ <a href="{$sitemap}?cocoon-view=pretty-content">Sitemap</a>
+ <xsl:for-each select="resources/resource">
+ <xsl:variable name="href">
+ <xsl:choose>
+ <xsl:when test="@type='file'">
+ <!-- we need an explicite match in the sitemap showing
+ the source of these resources -->
+ <xsl:value-of select="@href"/>
+ </xsl:when>
+ <xsl:when test="@type='doc'">
+ <xsl:value-of select="concat($contextPath, '/docs/', @href)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($contextPath, '/', @href)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <a class="[EMAIL PROTECTED]" href="{$href}">
+ <xsl:apply-templates/>
+ </a>
+ </xsl:for-each>
</div>
</xsl:template>
1.13 +3 -1
cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl
Index: forms-field-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-field-styling.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- forms-field-styling.xsl 29 Jun 2004 19:44:25 -0000 1.12
+++ forms-field-styling.xsl 30 Jun 2004 18:51:48 -0000 1.13
@@ -307,7 +307,9 @@
<xsl:value-of select="@name"/>
<xsl:if test="not(@name)">continuation-id</xsl:if>
</xsl:variable>
- <input name="{$name}" type="hidden" value="{.}"/>
+ <div style="display: none;">
+ <input name="{$name}" type="hidden" value="{.}"/>
+ </div>
</xsl:template>
<!--+
1.8 +4 -1
cocoon-2.1/src/blocks/forms/samples/resources/forms-advanced-field-styling.xsl
Index: forms-advanced-field-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-advanced-field-styling.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- forms-advanced-field-styling.xsl 29 Jun 2004 19:44:25 -0000 1.7
+++ forms-advanced-field-styling.xsl 30 Jun 2004 18:51:48 -0000 1.8
@@ -76,7 +76,10 @@
<script type="text/javascript">
var helpWin<xsl:value-of select="$id"/> =
forms_createPopupWindow('help<xsl:value-of select="$id"/>');
</script>
- <a id="{$id}" name="{$id}" href="#"
onclick="helpWin{$id}.showPopup('{$id}');return false;"><img border="0"
src="{$resources-uri}/help.gif"/></a>
+ <a id="{$id}" name="{$id}" href="#"
onclick="helpWin{$id}.showPopup('{$id}');return false;">
+ <!-- TODO: i18n key for helppopup -->
+ <img src="{$resources-uri}/help.gif" alt="helppopup"/>
+ </a>
</xsl:template>
<!--+
1.8 +2 -1
cocoon-2.1/src/blocks/forms/samples/resources/forms-calendar-styling.xsl
Index: forms-calendar-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-calendar-styling.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- forms-calendar-styling.xsl 13 May 2004 17:55:22 -0000 1.7
+++ forms-calendar-styling.xsl 30 Jun 2004 18:51:48 -0000 1.8
@@ -70,7 +70,8 @@
<!-- calendar popup -->
<a href="#" name="{$id}" id="{$id}"
onClick="forms_calendar.select(forms_getForm(this)['[EMAIL
PROTECTED]'],'{$id}','{$format}'); return false;">
- <img src="{$resources-uri}/cal.gif" border="0" alt="Calendar"/>
+ <!-- TODO: i18n key for @alt -->
+ <img src="{$resources-uri}/cal.gif" alt="Calendar"/>
</a>
<!-- common stuff -->
1.11 +7 -0 cocoon-2.1/src/webapp/resources/styles/main.css
Index: main.css
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/resources/styles/main.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main.css 2 Jun 2004 20:24:49 -0000 1.10
+++ main.css 30 Jun 2004 18:51:48 -0000 1.11
@@ -72,3 +72,10 @@
margin-top: 0.2em;
}
+div.resources {
+ text-align: right;
+}
+
+div.resources a {
+ margin: 5px;
+}
