joerg 2004/04/21 06:53:56
Modified: src/blocks/forms/samples/resources forms-page-styling.xsl
forms-field-styling.xsl
src/blocks/woody/samples/resources woody-page-styling.xsl
woody-field-styling.xsl
Log:
- field labels belong to field styling, not page styling
- labels for pure outputs must not contain <label/> as there is no form
element they can point to
Revision Changes Path
1.5 +0 -6
cocoon-2.1/src/blocks/forms/samples/resources/forms-page-styling.xsl
Index: forms-page-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/samples/resources/forms-page-styling.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- forms-page-styling.xsl 30 Mar 2004 12:18:48 -0000 1.4
+++ forms-page-styling.xsl 21 Apr 2004 13:53:56 -0000 1.5
@@ -322,12 +322,6 @@
</tr>
</xsl:template>
- <xsl:template match="fi:*" mode="label">
- <label for="[EMAIL PROTECTED]" title="{fi:hint}">
- <xsl:copy-of select="fi:label/node()"/>
- </label>
- </xsl:template>
-
<xsl:template match="@*|node()" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
1.6 +17 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- forms-field-styling.xsl 30 Mar 2004 12:19:44 -0000 1.5
+++ forms-field-styling.xsl 21 Apr 2004 13:53:56 -0000 1.6
@@ -242,6 +242,22 @@
</xsl:template>
<!--+
+ | Labels for form elements.
+ +-->
+ <xsl:template match="fi:*" mode="label">
+ <label for="[EMAIL PROTECTED]" title="{fi:hint}">
+ <xsl:copy-of select="fi:label/node()"/>
+ </label>
+ </xsl:template>
+
+ <!--+
+ | Labels for pure outputs must not contain <label/> as there is no
element to point to.
+ +-->
+ <xsl:template match="fi:output | fi:field[fi:styling/@type='output']"
mode="label">
+ <xsl:copy-of select="fi:label/node()"/>
+ </xsl:template>
+
+ <!--+
| fi:booleanfield : produce a checkbox
+-->
<xsl:template match="fi:booleanfield">
1.24 +0 -6
cocoon-2.1/src/blocks/woody/samples/resources/woody-page-styling.xsl
Index: woody-page-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/woody-page-styling.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- woody-page-styling.xsl 9 Mar 2004 13:54:02 -0000 1.23
+++ woody-page-styling.xsl 21 Apr 2004 13:53:56 -0000 1.24
@@ -322,12 +322,6 @@
</tr>
</xsl:template>
- <xsl:template match="wi:*" mode="label">
- <label for="[EMAIL PROTECTED]" title="{wi:hint}">
- <xsl:copy-of select="wi:label/node()"/>
- </label>
- </xsl:template>
-
<xsl:template match="@*|node()" priority="-1">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
1.47 +17 -1
cocoon-2.1/src/blocks/woody/samples/resources/woody-field-styling.xsl
Index: woody-field-styling.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/samples/resources/woody-field-styling.xsl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- woody-field-styling.xsl 9 Mar 2004 13:54:02 -0000 1.46
+++ woody-field-styling.xsl 21 Apr 2004 13:53:56 -0000 1.47
@@ -241,6 +241,22 @@
</xsl:template>
<!--+
+ | Labels for form elements.
+ +-->
+ <xsl:template match="wi:*" mode="label">
+ <label for="[EMAIL PROTECTED]" title="{wi:hint}">
+ <xsl:copy-of select="wi:label/node()"/>
+ </label>
+ </xsl:template>
+
+ <!--+
+ | Labels for pure outputs must not contain <label/> as there is no
element to point to.
+ +-->
+ <xsl:template match="wi:output | wi:field[wi:styling/@type='output']"
mode="label">
+ <xsl:copy-of select="wi:label/node()"/>
+ </xsl:template>
+
+ <!--+
| wi:booleanfield : produce a checkbox
+-->
<xsl:template match="wi:booleanfield">
