You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2005/10/11 16:23:51 UTC
svn commit: r312891 - in /lenya/trunk/src/webapp: global-sitemap.xmap
lenya/usecases/usecase.xmap lenya/xslt/cforms/add-xhtml-namespace.xsl
lenya/xslt/cforms/forms-samples-styling.xsl
lenya/xslt/cforms/strip-xhtml-namespace.xsl
Author: thorsten
Date: Tue Oct 11 07:23:43 2005
New Revision: 312891
URL: http://svn.apache.org/viewcvs?rev=312891&view=rev
Log:
Bugfix 37021. Fixed the inclusion of the cforms-libs. Patch submitted by Felix Röthenbacher. Thanks Felix
Added:
lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl (with props)
lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl (with props)
Modified:
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/usecases/usecase.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=312891&r1=312890&r2=312891&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Oct 11 07:23:43 2005
@@ -126,6 +126,13 @@
</map:match>
</map:pipeline>
+ <!-- cforms -->
+ <map:pipeline>
+ <map:match pattern="cforms/**">
+ <map:read src="resource://org/apache/cocoon/forms/resources/{1}"/>
+ </map:match>
+ </map:pipeline>
+
<map:pipeline>
<!-- Lenya GUI -->
<map:match pattern="lenya/**">
Modified: lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/usecase.xmap?rev=312891&r1=312890&r2=312891&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecase.xmap Tue Oct 11 07:23:43 2005
@@ -54,7 +54,12 @@
<map:parameter name="locale" value="{request:locale}"/>
</map:transform>
<map:transform src="cocoon://lenya-screen.xsl"/>
- <map:transform src="fallback://lenya/xslt/cforms/forms-samples-styling.xsl"/>
+ <!-- Strip xhtml namespace from <head> and <body> element -->
+ <map:transform src="fallback://lenya/xslt/cforms/strip-xhtml-namespace.xsl"/>
+ <map:transform src="fallback://lenya/xslt/cforms/forms-samples-styling.xsl">
+ <map:parameter name="resources-uri" value="/cforms"/>
+ </map:transform>
+ <map:transform src="fallback://lenya/xslt/cforms/add-xhtml-namespace.xsl"/>
<map:match pattern="view/menu/**">
<map:transform src="cocoon://lenya-page/{page-envelope:publication-id}/{page-envelope:area}/default.xml"/>
</map:match>
Added: lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl?rev=312891&view=auto
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl (added)
+++ lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl Tue Oct 11 07:23:43 2005
@@ -0,0 +1,38 @@
+<?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="http://www.w3.org/1999/xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+ <xsl:template match="head">
+ <head>
+ <xsl:apply-templates select="@*|node()"/>
+ </head>
+ </xsl:template>
+
+ <xsl:template match="body">
+ <body>
+ <xsl:apply-templates select="@*|node()"/>
+ </body>
+ </xsl:template>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: lenya/trunk/src/webapp/lenya/xslt/cforms/add-xhtml-namespace.xsl
------------------------------------------------------------------------------
svn:eol-style = native
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=312891&r1=312890&r2=312891&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 Tue Oct 11 07:23:43 2005
@@ -26,8 +26,8 @@
<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">resources</xsl:param>
-
+ <xsl:param name="resources-uri"/>
+
<xsl:template match="head">
<head>
<xsl:apply-templates/>
@@ -46,5 +46,4 @@
<xsl:apply-templates/>
</body>
</xsl:template>
-
</xsl:stylesheet>
Added: lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl?rev=312891&view=auto
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl (added)
+++ lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl Tue Oct 11 07:23:43 2005
@@ -0,0 +1,38 @@
+<?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:xhtml="http://www.w3.org/1999/xhtml">
+
+ <xsl:template match="xhtml:head">
+ <head>
+ <xsl:apply-templates select="@*|node()"/>
+ </head>
+ </xsl:template>
+
+ <xsl:template match="xhtml:body">
+ <body>
+ <xsl:apply-templates select="@*|node()"/>
+ </body>
+ </xsl:template>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: lenya/trunk/src/webapp/lenya/xslt/cforms/strip-xhtml-namespace.xsl
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org