Author: cdupoirieux
Date: Mon Oct 23 03:07:24 2006
New Revision: 466967
URL: http://svn.apache.org/viewvc?view=rev&rev=466967
Log:
content-main-conf parameter is "seen" at every level, no need to pass it as
param...
(cf. http://marc.theaimsgroup.com/?l=forrest-dev&m=116135583111365&w=2)
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft?view=diff&rev=466967&r1=466966&r2=466967
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
Mon Oct 23 03:07:24 2006
@@ -44,10 +44,7 @@
<forrest:part>
<xsl:comment>+ |start content-main +</xsl:comment>
<xsl:apply-templates
- select="//[EMAIL PROTECTED]'content']/[EMAIL
PROTECTED]'content-main']/*|//[EMAIL PROTECTED]'content']/[EMAIL
PROTECTED]'content-main']/processing-instruction()">
- <xsl:with-param name="content-main-conf"
- select="$content-main-conf"/>
- </xsl:apply-templates>
+ select="//[EMAIL PROTECTED]'content']/[EMAIL
PROTECTED]'content-main']/*|//[EMAIL PROTECTED]'content']/[EMAIL
PROTECTED]'content-main']/processing-instruction()"/>
<xsl:comment>+ |end content-main +</xsl:comment>
</forrest:part>
</forrest:content>
@@ -55,7 +52,6 @@
<!--headings-->
<xsl:template match="[EMAIL PROTECTED] = 'skinconf-heading-1']">
- <xsl:param name="content-main-conf"/>
<xsl:choose>
<xsl:when test="$content-main-conf/headings/@type='underlined'">
<h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
@@ -70,17 +66,12 @@
</xsl:template>
<xsl:template match="[EMAIL PROTECTED] = 'section']">
- <xsl:param name="content-main-conf"/>
<div class="section">
- <xsl:apply-templates select="*|processing-instruction()">
- <xsl:with-param name="content-main-conf"
- select="$content-main-conf"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="*|processing-instruction()"/>
</div>
</xsl:template>
<xsl:template match="[EMAIL PROTECTED] = 'skinconf-heading-2']">
- <xsl:param name="content-main-conf"/>
<xsl:choose>
<xsl:when test="$content-main-conf/headings/@type='underlined'">
<h3 class="underlined_5"><xsl:value-of select="h2"/></h3>
@@ -95,12 +86,8 @@
</xsl:template>
<xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
- <xsl:param name="content-main-conf"/>
<xsl:copy>
- <xsl:apply-templates select="@*|*|text()|processing-instruction()">
- <xsl:with-param name="content-main-conf"
- select="$content-main-conf"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
