You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/07/10 14:42:56 UTC
svn commit: r210003 - in /forrest/trunk/whiteboard/plugins:
org.apache.forrest.plugin.internal.view/resources/stylesheets/
org.apache.forrest.plugin.internal.view/resources/views/
org.apache.forrest.plugin.output.viewHelper.xhtml/ org.apache.forrest.pl...
Author: thorsten
Date: Sun Jul 10 05:42:55 2005
New Revision: 210003
URL: http://svn.apache.org/viewcvs?rev=210003&view=rev
Log:
Activated nested forrest:call-template calls from within view:templates.
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl (with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl (with props)
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl?rev=210003&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl Sun Jul 10 05:42:55 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ 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:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+ <!---->
+ <xsl:template match="forrest:call-template">
+ <xi:include
+ href="cocoon://prepare.view-templates.{@name}#xpointer(/*/*)"/>
+ </xsl:template>
+
+ <xsl:template match="@*|*|text()|processing-instruction()|comment()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.templates.xsl
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=210003&r1=210002&r2=210003&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv Sun Jul 10 05:42:55 2005
@@ -39,14 +39,14 @@
<forrest:contract name="search-input"/>
</forrest:hook>
<!-- You can group elements to a template and call it from any view.
- e.g.
- <forrest:hook name="export-link">
- <forrest:contract name="content-txt-link"/>
- <forrest:contract name="content-pdf-link"/>
- </forrest:hook>
- can be called as <forrest:call-template name="export-link"/>
- when saved as {project:resources}/templates/export-link.vt.xml
- -->
+ e.g.
+ <forrest:hook name="export-link">
+ <forrest:contract name="content-txt-link"/>
+ <forrest:contract name="content-pdf-link"/>
+ </forrest:hook>
+ can be called as <forrest:call-template name="export-link"/>
+ when saved as {project:resources}/templates/export-link.vt.xml
+ -->
<forrest:call-template name="export-link"/>
<forrest:hook name="content">
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=210003&r1=210002&r2=210003&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap Sun Jul 10 05:42:55 2005
@@ -125,6 +125,10 @@
<map:generate src="resources/templates/{1}.vt.xml"/>
</map:when>
</map:select>
+ <!--FIXME: this has to come from the core
+ Duplicate stylesheet!!!-->
+ <map:transform src="resources/stylesheets/prepare.include.templates.xsl"/>
+ <map:transform type="xinclude"/>
<map:serialize type="xml"/>
</map:match>
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl?rev=210003&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl Sun Jul 10 05:42:55 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ 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:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+ <!---->
+ <xsl:template match="forrest:call-template">
+ <xi:include
+ href="cocoon://prepare.view-templates.{@name}#xpointer(/*/*)"/>
+ </xsl:template>
+
+ <xsl:template match="@*|*|text()|processing-instruction()|comment()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/stylesheets/prepare.include.templates.xsl
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native