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 2008/10/14 11:28:28 UTC
svn commit: r704410 - in
/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes:
common/fo/ common/html/ maven/html/ pelt/html/
Author: thorsten
Date: Tue Oct 14 02:28:23 2008
New Revision: 704410
URL: http://svn.apache.org/viewvc?rev=704410&view=rev
Log:
FOR-1118
The path of the defaultVariables has changed a bit. Removing one level
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/branding-logo.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/search-input.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/siteinfo-credits.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.contract.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.contract.xml
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.contract.xml Tue Oct 14 02:28:23 2008
@@ -35,11 +35,11 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.serif']/@value" />
+ <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
<xsl:param name="abstractFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.abstractFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.abstractFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.abstractFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.abstractFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.contract.xml Tue Oct 14 02:28:23 2008
@@ -36,11 +36,11 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
<xsl:param name="authorsFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.authorsFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.authorsFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.authorsFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.authorsFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.contract.xml Tue Oct 14 02:28:23 2008
@@ -82,63 +82,63 @@
<!-- Section depth at which we stop numbering and just indent -->
<xsl:param name="numbering-max-depth" select="'3'"/>
<!-- Font-family parameters defined here: -->
- <xsl:param name="serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.serif']/@value" />
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
- <xsl:param name="monospace" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.monospace']/@value" />
- <xsl:param name="imagesdir" select="$defaultVariables/*/*[@name='resources.images']/@value"/>
- <xsl:param name="xmlbasedir" select="$defaultVariables/*/*[@name='content.xdocs']/@value"/>
+ <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="monospace" select="$defaultVariables/*[@name='output.pdf.fontFamily.monospace']/@value" />
+ <xsl:param name="imagesdir" select="$defaultVariables/*[@name='resources.images']/@value"/>
+ <xsl:param name="xmlbasedir" select="$defaultVariables/*[@name='content.xdocs']/@value"/>
<xsl:param name="sectionTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="sourceFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.sourceFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sourceFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.sourceFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sourceFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="codeFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.codeFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.codeFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.codeFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.codeFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="warningTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.warningTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.warningTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.warningTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.warningTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="noteTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.noteTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.noteTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.noteTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noteTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="fixmeTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="rootFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.rootFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.rootFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.rootFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.rootFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.contract.xml Tue Oct 14 02:28:23 2008
@@ -35,11 +35,11 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.serif']/@value" />
+ <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
<xsl:param name="noticeFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.noticeFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.noticeFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.noticeFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noticeFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.contract.xml Tue Oct 14 02:28:23 2008
@@ -36,11 +36,11 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
<xsl:param name="documentTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.documentTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.documentTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.documentTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.documentTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.contract.xml Tue Oct 14 02:28:23 2008
@@ -43,20 +43,20 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
- <xsl:param name="serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.serif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
<xsl:param name="TOCTitleFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="TOCFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.TOCFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.TOCFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.TOCFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.contract.xml Tue Oct 14 02:28:23 2008
@@ -51,35 +51,35 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
<xsl:param name="headerFooterFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.headerFooterFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.headerFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="firstFooterFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.firstFooterFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.firstFooterFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.firstFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.firstFooterFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="evenFooterFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.evenFooterFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.evenFooterFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.evenFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.evenFooterFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="oddFooterFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.oddFooterFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.oddFooterFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.oddFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.oddFooterFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.contract.xml Tue Oct 14 02:28:23 2008
@@ -36,27 +36,27 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:param name="sans-serif" select="$defaultVariables/*/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+ <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
<xsl:param name="headerFooterFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.headerFooterFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.headerFooterFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="evenHeaderFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="oddHeaderFontFamily">
<xsl:choose>
- <xsl:when test="$defaultVariables/*/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']">
- <xsl:value-of select="$defaultVariables/*/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']/@value"/>
+ <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']">
+ <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']/@value"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
</xsl:choose>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.contract.xml Tue Oct 14 02:28:23 2008
@@ -38,7 +38,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="branding-breadcrumbs"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.contract.xml Tue Oct 14 02:28:23 2008
@@ -84,8 +84,8 @@
xmlns:forrest="http://apache.org/forrest/templates/1.0">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="branding-css-links-input"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
- <xsl:variable name="theme" select="$defaultVariables/*/*[@name='theme']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+ <xsl:variable name="theme" select="$defaultVariables/*[@name='theme']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.contract.xml Tue Oct 14 02:28:23 2008
@@ -27,7 +27,7 @@
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" name="branding-fontsize" inputFormat="xsl">
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.contract.xml Tue Oct 14 02:28:23 2008
@@ -57,7 +57,7 @@
<xsl:param name="branding-logo-over"/>
<xsl:param name="branding-logo-width"/>
<xsl:param name="branding-logo-height"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.contract.xml Tue Oct 14 02:28:23 2008
@@ -80,7 +80,7 @@
<xsl:variable name="captionSelect" select="$branding-theme-switcher-select/@caption"/>
<xsl:variable name="defaultTheme" select="$branding-theme-switcher-defaultTheme/@defaultTheme"/>
<xsl:variable name="profilerActivated" select="$branding-theme-switcher-profiler/@activated"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.contract.xml Tue Oct 14 02:28:23 2008
@@ -86,7 +86,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="content-motd-page"/>
- <xsl:variable name="path" select="$defaultVariables/*/*[@name='path']/@value"/>
+ <xsl:variable name="path" select="$defaultVariables/*[@name='path']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-odt-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -29,7 +29,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
- <xsl:variable name="filename-noext" select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part><a href="{$filename-noext}.odt" class="format">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -29,7 +29,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
- <xsl:variable name="filename-noext" select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part><a href="{$filename-noext}.pdf" class="format">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -29,7 +29,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
- <xsl:variable name="filename-noext" select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -35,7 +35,7 @@
<xsl:variable name="skin-img-dir"
select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
<xsl:variable name="filename-noext"
- select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/body">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -29,7 +29,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
- <xsl:variable name="filename-noext" select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ <xsl:variable name="filename-noext" select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/body">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.contract.xml Tue Oct 14 02:28:23 2008
@@ -34,7 +34,7 @@
<xsl:variable name="skin-img-dir"
select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
<xsl:variable name="filename-noext"
- select="$defaultVariables/*/*[@name='filename-noext']/@value"/>
+ select="$defaultVariables/*[@name='filename-noext']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part><a href="{$filename-noext}.xml" class="format">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.contract.xml Tue Oct 14 02:28:23 2008
@@ -36,7 +36,7 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.contract.xml Tue Oct 14 02:28:23 2008
@@ -38,7 +38,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="root"
- select="$defaultVariables/*/*[@name='root']/@value"/>
+ select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.contract.xml Tue Oct 14 02:28:23 2008
@@ -29,13 +29,13 @@
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="path" select="$defaultVariables/*/*[@name='path']/@value"/>
+ <xsl:variable name="path" select="$defaultVariables/*[@name='path']/@value"/>
<xsl:template match="/" >
<forrest:content>
<forrest:part> nav-main-testing-foo testing - no @xpath<br/>
Path: <xsl:value-of select="$path"/>
<br/>
- skin-img-dir: <xsl:copy-of select="$defaultVariables/*/*"/> value:
+ skin-img-dir: <xsl:copy-of select="$defaultVariables/*"/> value:
<xsl:value-of select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
<!--copy-of -->
</forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.contract.xml Tue Oct 14 02:28:23 2008
@@ -52,7 +52,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="root"
- select="$defaultVariables/*/*[@name='root']/@value"/>
+ select="$defaultVariables/*[@name='root']/@value"/>
<xsl:param name="expanding" select="'true'"/>
<xsl:param name="nav-section" select="/"/>
<xsl:param name="nav-section-toc" select="'test'"/>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.contract.xml Tue Oct 14 02:28:23 2008
@@ -47,7 +47,7 @@
<xsl:param name="search-lucene" select="'lucene-search.html'"/>
<xsl:param name="search-input"/>
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.contract.xml Tue Oct 14 02:28:23 2008
@@ -50,7 +50,7 @@
<xsl:include href="cocoon://prepare.contract.html.branding-logo"/>
<xsl:param name="siteinfo-credits"/>
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.contract.xml Tue Oct 14 02:28:23 2008
@@ -61,7 +61,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="siteinfo-feedback"/>
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="path" select="$defaultVariables/*/*[@name='path']/@value"/>
+ <xsl:variable name="path" select="$defaultVariables/*[@name='path']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.contract.xml Tue Oct 14 02:28:23 2008
@@ -42,7 +42,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="siteinfo-meta-icon"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part xpath="/html/head">
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.contract.xml Tue Oct 14 02:28:23 2008
@@ -45,7 +45,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:param name="nav-main" select="/"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<!-- ********************************** -->
<!-- Creates navigation links in header -->
<!-- ********************************** -->
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/branding-logo.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/branding-logo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/branding-logo.contract.xml Tue Oct 14 02:28:23 2008
@@ -57,7 +57,7 @@
<xsl:param name="branding-logo-over"/>
<xsl:param name="branding-logo-width"/>
<xsl:param name="branding-logo-height"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/search-input.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/search-input.contract.xml Tue Oct 14 02:28:23 2008
@@ -53,7 +53,7 @@
<xsl:param name="input-size"/>
<xsl:param name="search-input"/>
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/siteinfo-credits.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/html/siteinfo-credits.contract.xml Tue Oct 14 02:28:23 2008
@@ -49,8 +49,8 @@
<xsl:param name="top-separator">false</xsl:param>
<xsl:param name="use-role-as-prefix">false</xsl:param>
<xsl:param name="use-br">false</xsl:param>
- <xsl:variable name="filename" select="$defaultVariables/*/*[@name='filename']/@value"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="filename" select="$defaultVariables/*[@name='filename']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.contract.xml Tue Oct 14 02:28:23 2008
@@ -53,7 +53,7 @@
<xsl:param name="input-size"/>
<xsl:param name="search-input"/>
<xsl:param name="defaultVariables" select="'test.html'"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.contract.xml?rev=704410&r1=704409&r2=704410&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.contract.xml Tue Oct 14 02:28:23 2008
@@ -49,8 +49,8 @@
<xsl:param name="top-separator">false</xsl:param>
<xsl:param name="use-role-as-prefix">false</xsl:param>
<xsl:param name="use-br">false</xsl:param>
- <xsl:variable name="filename" select="$defaultVariables/*/*[@name='filename']/@value"/>
- <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:variable name="filename" select="$defaultVariables/*[@name='filename']/@value"/>
+ <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
<xsl:template match="/">
<forrest:content>
<forrest:part>