You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2005/10/12 17:21:42 UTC
svn commit: r314943 - in /lenya/trunk/src/webapp: global-sitemap.xmap
lenya/xslt/cforms/forms-samples-styling.xsl
Author: chestnut
Date: Wed Oct 12 08:21:35 2005
New Revision: 314943
URL: http://svn.apache.org/viewcvs?rev=314943&view=rev
Log:
Checks if the xml contains cforms elements, and fixes inclusion of ajax libs
Thanks to a patch by Felix Röthenbacher, fixes Bug 37050
Modified:
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/global-sitemap.xmap?rev=314943&r1=314942&r2=314943&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Wed Oct 12 08:21:35 2005
@@ -126,6 +126,13 @@
</map:match>
</map:pipeline>
+ <!-- ajax -->
+ <map:pipeline>
+ <map:match pattern="cforms/ajax/**">
+ <map:read src="resource://org/apache/cocoon/ajax/resources/{1}"/>
+ </map:match>
+ </map:pipeline>
+
<!-- cforms -->
<map:pipeline>
<map:match pattern="cforms/**">
Modified: lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl?rev=314943&r1=314942&r2=314943&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl Wed Oct 12 08:21:35 2005
@@ -1,49 +1,50 @@
-<?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">
-
- <!--+ Include styling stylesheets, one for the widgets, the other one for the
- | page. As 'forms-advanced-field-styling.xsl' is a specialization of
- | 'forms-field-styling.xsl' the latter one is imported there. If you don't
- | want advanced styling of widgets, change it here!
- | See xsl:include as composition and xsl:import as extension/inheritance.
- +-->
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
-
- <!-- Location of the resources directory, where JS libs and icons are stored -->
- <xsl:param name="resources-uri"/>
-
- <xsl:template match="head">
- <head>
- <xsl:apply-templates/>
- <xsl:apply-templates select="." mode="forms-page"/>
- <xsl:apply-templates select="." mode="forms-field"/>
- </head>
- </xsl:template>
-
- <xsl:template match="body">
- <body>
- <!--+ !!! If template with mode 'forms-page' adds text or elements
- | template with mode 'forms-field' can no longer add attributes!!!
- +-->
- <xsl:apply-templates select="." mode="forms-page"/>
- <xsl:apply-templates select="." mode="forms-field"/>
- <xsl:apply-templates/>
- </body>
- </xsl:template>
-</xsl:stylesheet>
+<?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">
+
+ <!--+ Include styling stylesheets, one for the widgets, the other one for the
+ | page. As 'forms-advanced-field-styling.xsl' is a specialization of
+ | 'forms-field-styling.xsl' the latter one is imported there. If you don't
+ | want advanced styling of widgets, change it here!
+ | See xsl:include as composition and xsl:import as extension/inheritance.
+ +-->
+ <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-page-styling.xsl"/>
+ <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl"/>
+
+ <!-- Location of the resources directory, where JS libs and icons are stored -->
+ <xsl:param name="resources-uri"/>
+
+ <xsl:template match="head[//fi:*]">
+ <head>
+ <xsl:apply-templates/>
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ </head>
+ </xsl:template>
+
+ <xsl:template match="body[//fi:*]">
+ <body>
+ <!--+ !!! If template with mode 'forms-page' adds text or elements
+ | template with mode 'forms-field' can no longer add attributes!!!
+ +-->
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ <xsl:apply-templates/>
+ </body>
+ </xsl:template>
+</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r314943 - in /lenya/trunk/src/webapp: global-sitemap.xmap
lenya/xslt/cforms/forms-samples-styling.xsl
Posted by Doug Chestnut <dh...@virginia.edu>.
Thanks for catching this Felix, Thorsten,
Hmm, I am using the ready-made config file from the link below. I will
take a closer look at my conf ;).
--Doug
Thorsten Scherler wrote:
> El jue, 13-10-2005 a las 10:28 +0200, Felix Röthenbacher escribió:
>
>>Hi Doug
>>
>>it seems that it was forgotten to set the eol style properly of
>>
>>lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
>>
>>Would you mind to execute
>>
>>svn propset svn:eol-style native
>>src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl ?
>>
>>Thanks
>
>
> Please, see as well the ready-made config file linked at:
> http://www.apache.org/dev/version-control.html#https-svn
>
> salu2
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r314943 - in /lenya/trunk/src/webapp:
global-sitemap.xmap lenya/xslt/cforms/forms-samples-styling.xsl
Posted by Thorsten Scherler <th...@apache.org>.
El jue, 13-10-2005 a las 10:28 +0200, Felix Röthenbacher escribió:
> Hi Doug
>
> it seems that it was forgotten to set the eol style properly of
>
> lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
>
> Would you mind to execute
>
> svn propset svn:eol-style native
> src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl ?
>
> Thanks
Please, see as well the ready-made config file linked at:
http://www.apache.org/dev/version-control.html#https-svn
salu2
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r314943 - in /lenya/trunk/src/webapp: global-sitemap.xmap
lenya/xslt/cforms/forms-samples-styling.xsl
Posted by Felix Röthenbacher <fe...@wyona.com>.
Hi Doug
it seems that it was forgotten to set the eol style properly of
lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
Would you mind to execute
svn propset svn:eol-style native
src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl ?
Thanks
- Felix
chestnut@apache.org wrote:
> Author: chestnut
> Date: Wed Oct 12 08:21:35 2005
> New Revision: 314943
>
> URL: http://svn.apache.org/viewcvs?rev=314943&view=rev
> Log:
> Checks if the xml contains cforms elements, and fixes inclusion of ajax libs
> Thanks to a patch by Felix Röthenbacher, fixes Bug 37050
>
> Modified:
> lenya/trunk/src/webapp/global-sitemap.xmap
> lenya/trunk/src/webapp/lenya/xslt/cforms/forms-samples-styling.xsl
>
--
Felix Röthenbacher felix.roethenbacher@wyona.com
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org