|
|
|
Choosing A Webhost: |
svn commit: r314943 - in /lenya/trunk/src/webapp: global-sitemap.xmap lenya: msg#00044cms.lenya.cvs
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>
|
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | svn commit: r314919 - /lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/SMTP.java, edith |
|---|---|
| Next by Date: | svn commit: r314996 - in /lenya/trunk/src: modules/xhtml/xslt/clean-xhtml.xsl webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap, chestnut |
| Previous by Thread: | svn commit: r314919 - /lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/net/SMTP.java, edith |
| Next by Thread: | svn commit: r314996 - in /lenya/trunk/src: modules/xhtml/xslt/clean-xhtml.xsl webapp/lenya/pubs/default/lenya/usecases/webdav/sitemap.xmap, chestnut |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
Free MagazinesCisco NewsReceive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business. subscribe Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field. subscribe The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business. subscribe Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company. subscribe Total Telecom Total Telecom is "The Economist of the communications industry". subscribe |
