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/03/27 23:22:32 UTC
svn commit: r159194 - in
forrest/trunk/plugins/org.apache.forrest.plugin.views: output.xmap
resources/stylesheets/prepare.xhtml.xsl
Author: thorsten
Date: Sun Mar 27 13:22:31 2005
New Revision: 159194
URL: http://svn.apache.org/viewcvs?view=rev&rev=159194
Log:
fixed partly the path issue and cleaned up some code taht was not needed anymore.
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.views/output.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.views/resources/stylesheets/prepare.xhtml.xsl
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.views/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.views/output.xmap?view=diff&r1=159193&r2=159194
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.views/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.views/output.xmap Sun Mar 27 13:22:31 2005
@@ -304,12 +304,16 @@
-->
<map:match pattern="*.html">
<map:generate src="cocoon:/{1}.page"/>
- <map:transform src="cocoon:/prepare.xhtml.{1}"/>
+ <map:transform src="cocoon:/prepare.xhtml.{1}">
+ <map:parameter name="path" value="{0}"/>
+ </map:transform>
<map:serialize type="xhtml"/>
</map:match>
<map:match pattern="**/*.html">
<map:generate src="cocoon:/{1}/{2}.page"/>
- <map:transform src="cocoon:/prepare.xhtml.{1}"/>
+ <map:transform src="cocoon:/prepare.xhtml.{1}">
+ <map:parameter name="path" value="{0}"/>
+ </map:transform>
<map:serialize type="xhtml"/>
</map:match>
</map:pipeline>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.views/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.views/resources/stylesheets/prepare.xhtml.xsl?view=diff&r1=159193&r2=159194
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.views/resources/stylesheets/prepare.xhtml.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.views/resources/stylesheets/prepare.xhtml.xsl Sun Mar 27 13:22:31 2005
@@ -31,15 +31,7 @@
<alias:import href="cocoon:/pathutils"/>
<alias:import href="cocoon:/renderlogo"/>
<alias:include href="cocoon:/prepare.include.{$request}"/>
- <alias:param name="path"/>
- <alias:param name="request"/>
- <alias:variable name="config" select="//skinconfig"/>
- <alias:variable name="minitoc-location" select="$config/toc/@location"/>
- <!--FIXME: get all additional templates-->
-<!-- <xsl:comment>All xhtml additional templates requested by the forrest:template</xsl:comment>
- <xsl:for-each select="/*/forrest:properties/*[@additional='true']">
- <xsl:copy-of select=""/>
- </xsl:for-each>-->
+ <alias:param name="path"/>
<xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment>
<alias:template name="getHead">
<xsl:for-each select="/*/forrest:properties/*[@head='true']">