crossley 2004/04/02 19:12:43
Modified: src/blocks/petstore/samples/flow petstore.js
src/blocks/petstore/samples/stylesheets site2html.xsl
src/blocks/petstore/samples/view/forms editAccountForm_t.xml
newAccountForm_t.xml newShippingForm_t.xml
Added: src/blocks/petstore/samples/stylesheets
ps-cforms-default.xsl
Removed: src/blocks/petstore/samples/stylesheets ps-woody-default.xsl
Log:
more changes woody => cforms
Revision Changes Path
1.10 +1 -1 cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js
Index: petstore.js
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- petstore.js 23 Mar 2004 16:36:04 -0000 1.9
+++ petstore.js 3 Apr 2004 03:12:43 -0000 1.10
@@ -16,7 +16,7 @@
// Page Flow for PetStore Application
-// load WOODY support
+// load CForms support
cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
var MAX_RESULTS = 5;
1.5 +3 -3
cocoon-2.1/src/blocks/petstore/samples/stylesheets/site2html.xsl
Index: site2html.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/stylesheets/site2html.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site2html.xsl 6 Mar 2004 02:26:17 -0000 1.4
+++ site2html.xsl 3 Apr 2004 03:12:43 -0000 1.5
@@ -17,7 +17,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <xsl:include href="ps-woody-default.xsl"/>
+ <xsl:include href="ps-cforms-default.xsl"/>
<xsl:template match="site">
<html>
@@ -38,9 +38,9 @@
<form method="post" action="index.do">
<input type="image" border="0"
src="images/logo-topbar.gif" />
<select name="view" width="14" align="left"
onchange="document.forms[0].submit()">
- <xsl:if test="@view='woody'">
+ <xsl:if test="@view='cforms'">
<xsl:attribute name="disabled">disabled</xsl:attribute>
- <option value="woody"
selected="selected">woody</option>
+ <option value="cforms"
selected="selected">cforms</option>
</xsl:if>
<option value="jexl"><xsl:if
test="@view='jexl'"><xsl:attribute
name="selected">selected</xsl:attribute></xsl:if>Jexl</option>
<option value="jxpath"><xsl:if
test="@view='jxpath'"><xsl:attribute
name="selected">selected</xsl:attribute></xsl:if>JXPath</option>
1.1
cocoon-2.1/src/blocks/petstore/samples/stylesheets/ps-cforms-default.xsl
Index: ps-cforms-default.xsl
===================================================================
<?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.
-->
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
<xsl:template match="fi:field">
<xsl:choose>
<xsl:when test="fi:selection-list">
<xsl:call-template name="field-with-selection-list">
<xsl:with-param name="fieldelement" select="."/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="field">
<xsl:with-param name="fieldelement" select="."/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="fi:validation-message">
<xsl:call-template name="validation-message">
<xsl:with-param name="message"
select="fi:validation-message"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="@required='true'">
 <b>*</b>
</xsl:if>
</xsl:template>
<xsl:template name="field">
<xsl:param name="fieldelement"/>
<input name="{$fieldelement/@id}" value="{$fieldelement/fi:value}">
<xsl:if test="fi:styling">
<xsl:copy-of select="fi:styling/@*"/>
</xsl:if>
</input>
</xsl:template>
<xsl:template name="field-with-selection-list">
<xsl:param name="fieldelement"/>
<xsl:variable name="value" select="$fieldelement/fi:value"/>
<xsl:variable name="liststyle"
select="$fieldelement/fi:styling/list-style/text()"/>
<xsl:choose>
<xsl:when test="$liststyle='radio'">
<xsl:for-each
select="$fieldelement/fi:selection-list/fi:item">
<input type="radio" name="{$fieldelement/@id}"
value="[EMAIL PROTECTED]">
<xsl:if test="@value = $value">
<xsl:attribute name="checked">true</xsl:attribute>
</xsl:if>
</input>
<xsl:copy-of select="fi:label/node()"/><br/>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<!-- default: dropdown box -->
<select name="{$fieldelement/@id}">
<xsl:if test="$liststyle='listbox'">
<xsl:attribute name="size">
<xsl:choose>
<xsl:when
test="$fieldelement/fi:styling/listbox-size">
<xsl:value-of
select="$fieldelement/fi:styling/listbox-size"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>5</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:if>
<xsl:for-each
select="$fieldelement/fi:selection-list/fi:item">
<option value="[EMAIL PROTECTED]">
<xsl:if test="@value = $value">
<xsl:attribute
name="selected">selected</xsl:attribute>
</xsl:if>
<xsl:copy-of select="fi:label/node()"/>
</option>
</xsl:for-each>
</select>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="validation-message">
<xsl:param name="message"/>
 <a href="#" style="color:RED; font-weight: bold; font-size:
24px;" onclick="alert('{normalize-space($message)}')">!</a>
</xsl:template>
<xsl:template match="fi:output">
<xsl:copy-of select="fi:value/node()"/>
</xsl:template>
<xsl:template match="fi:booleanfield">
<input type="checkbox" value="true" name="[EMAIL PROTECTED]">
<xsl:if test="fi:value/text() = 'true'">
<xsl:attribute name="checked">true</xsl:attribute>
</xsl:if>
</input>
</xsl:template>
<xsl:template match="fi:action">
<input type="submit" name="[EMAIL PROTECTED]">
<xsl:attribute name="value"><xsl:value-of
select="fi:label/node()"/></xsl:attribute>
</input>
</xsl:template>
<xsl:template match="fi:continuation-id">
<xsl:choose>
<xsl:when test="@name">
<input name="[EMAIL PROTECTED]" type="hidden" value="{.}"/>
</xsl:when>
<xsl:otherwise>
<input name="continuation-id" type="hidden" value="{.}"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="fi:multivaluefield">
<xsl:if test="fi:validation-message">
<xsl:call-template name="validation-message">
<xsl:with-param name="message"
select="fi:validation-message"/>
</xsl:call-template>
</xsl:if>
<xsl:variable name="id" select="@id"/>
<xsl:variable name="values" select="fi:values/fi:value/text()"/>
<xsl:for-each select="fi:selection-list/fi:item">
<xsl:variable name="value" select="@value"/>
<input type="checkbox" value="[EMAIL PROTECTED]" name="{$id}">
<xsl:if test="$values[.=$value]">
<xsl:attribute name="checked">true</xsl:attribute>
</xsl:if>
</input>
<xsl:copy-of select="fi:label/node()"/>
<br/>
</xsl:for-each>
</xsl:template>
<xsl:template match="fi:repeater">
<input type="hidden" name="[EMAIL PROTECTED]" value="[EMAIL
PROTECTED]"/>
<table border="1">
<tr>
<xsl:for-each select="fi:headings/fi:heading">
<th><xsl:value-of select="."/></th>
</xsl:for-each>
</tr>
<xsl:apply-templates select="fi:repeater-row"/>
</table>
</xsl:template>
<xsl:template match="fi:repeater-row">
<tr>
<xsl:for-each select="*">
<td>
<xsl:apply-templates select="."/>
</td>
</xsl:for-each>
</tr>
</xsl:template>
<xsl:template match="fi:repeater-size">
<input type="hidden" name="[EMAIL PROTECTED]" value="[EMAIL
PROTECTED]"/>
</xsl:template>
<xsl:template match="fi:form-template">
<form>
<xsl:apply-templates select="@*|node()"/>
</form>
</xsl:template>
<xsl:template match="fi:[EMAIL PROTECTED]'grey']">
<table cellpadding="10" cellspacing="0" align="center" border="1"
bgcolor="#dddddd">
<tr>
<td>
<xsl:for-each select="fi:group">
<font color="darkgreen"><h3><xsl:value-of
select="fi:label"/></h3></font>
<table bgcolor="#008800" border="0" cellpadding="3"
cellspacing="1">
<xsl:call-template name="processWidgets" />
</table>
</xsl:for-each>
</td>
</tr>
</table>
</xsl:template>
<xsl:template match="fi:[EMAIL PROTECTED]'yellow']">
<table bgcolor="#008800" border="0" cellpadding="3" cellspacing="1">
<xsl:for-each select="fi:group">
<tr bgcolor="#FFFF88">
<td colspan="2"><font color="GREEN"
size="4"><b><xsl:value-of select="fi:label"/></b></font></td>
</tr>
<xsl:call-template name="processWidgets" />
</xsl:for-each>
</table>
</xsl:template>
<xsl:template name="processWidgets">
<xsl:for-each select="fi:widgets/*">
<xsl:choose>
<xsl:when test="local-name(.) = 'repeater'">
<tr bgcolor="#FFFF88">
<td colspan="2"><xsl:apply-templates
select="."/></td>
</tr>
</xsl:when>
<xsl:when test="local-name(.) = 'booleanfield'">
<tr bgcolor="#FFFF88">
<td colspan="2">
<xsl:apply-templates select="."/>
<xsl:text> </xsl:text>
<xsl:copy-of select="fi:label"/>
</td>
</tr>
</xsl:when>
<xsl:when test="fi:styling/@class = 'output'">
<tr bgcolor="#FFFF88">
<td>
<xsl:value-of select="fi:label"/>
</td>
<td>
<xsl:value-of select="fi:value"/><input
type="hidden" name="[EMAIL PROTECTED]" value="{fi:value}" />
</td>
</tr>
</xsl:when>
<xsl:when test="fi:styling/@class = 'warnoutput'">
<xsl:variable name="tmp">
<xsl:value-of select="fi:value"/>
</xsl:variable>
<xsl:if test="boolean(normalize-space($tmp))">
<tr bgcolor="#FFFF88">
<td>
<xsl:value-of select="fi:label"/>
</td>
<td>
<b><font color="RED"><xsl:value-of
select="fi:value"/></font></b>
</td>
</tr>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<tr bgcolor="#FFFF88">
<td>
<xsl:value-of select="fi:label"/>
</td>
<td>
<xsl:apply-templates select="."/>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:template>
<xsl:template match="fi:aggregatefield">
<input name="[EMAIL PROTECTED]" value="{fi:value}"/>
<xsl:if test="fi:validation-message">
<xsl:call-template name="validation-message">
<xsl:with-param name="message"
select="fi:validation-message"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="@required='true'">
<b>*</b>
</xsl:if>
</xsl:template>
<xsl:template match="@*|node()" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.4 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_t.xml
Index: editAccountForm_t.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_t.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- editAccountForm_t.xml 9 Mar 2004 10:23:08 -0000 1.3
+++ editAccountForm_t.xml 3 Apr 2004 03:12:43 -0000 1.4
@@ -16,7 +16,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template";
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
- <site signOn="false" view="woody">
+ <site signOn="false" view="cforms">
<ft:form-template action="#{$continuation/id}.kont"
method="POST">
<fi:form layout="grey">
<fi:group>
1.4 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_t.xml
Index: newAccountForm_t.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_t.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newAccountForm_t.xml 9 Mar 2004 10:23:08 -0000 1.3
+++ newAccountForm_t.xml 3 Apr 2004 03:12:43 -0000 1.4
@@ -16,7 +16,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template";
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
- <site signOn="true" view="woody">
+ <site signOn="true" view="cforms">
<ft:form-template action="#{$continuation/id}.kont"
method="POST">
<fi:form layout="grey">
<fi:group>
1.4 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_t.xml
Index: newShippingForm_t.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_t.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- newShippingForm_t.xml 9 Mar 2004 10:23:08 -0000 1.3
+++ newShippingForm_t.xml 3 Apr 2004 03:12:43 -0000 1.4
@@ -16,7 +16,7 @@
-->
<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template";
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
- <site signOn="false" view="woody">
+ <site signOn="false" view="cforms">
<ft:form-template action="#{$continuation/id}.kont"
method="POST">
<fi:form layout="yellow">
<fi:group>
