Author: crossley
Date: Thu Oct 31 13:40:23 2013
New Revision: 1537485
URL: http://svn.apache.org/r1537485
Log:
Utilise the source document/header/script if available.
Modified:
forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl?rev=1537485&r1=1537484&r2=1537485&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
(original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl Thu Oct
31 13:40:23 2013
@@ -25,6 +25,7 @@ imported document-to-html.xsl for detail
<meta-data>
<xsl:apply-templates select="header/meta"/>
<xsl:apply-templates select="header/link"/>
+ <xsl:apply-templates select="header/script"/>
</meta-data>
<div id="content">
<div id="skinconf-printlink"/>
Modified: forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl?rev=1537485&r1=1537484&r2=1537485&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
(original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl Thu Oct
31 13:40:23 2013
@@ -341,6 +341,11 @@ along with all other "link" elements. --
<xsl:apply-templates select="@*"/>
</xsl:element>
</xsl:for-each>
+ <xsl:for-each select="//meta-data/script">
+ <xsl:element name="script">
+ <xsl:apply-templates select="@*"/>
+ </xsl:element>
+ </xsl:for-each>
</xsl:template>
<xsl:template name="feedback">
<div id="feedback">
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl?rev=1537485&r1=1537484&r2=1537485&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
(original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl Thu Oct
31 13:40:23 2013
@@ -25,6 +25,7 @@ imported document-to-html.xsl for detail
<meta-data>
<xsl:apply-templates select="header/meta"/>
<xsl:apply-templates select="header/link"/>
+ <xsl:apply-templates select="header/script"/>
</meta-data>
<div id="content">
<xsl:apply-templates select="body" mode="carry-body-attribs"/>
Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl?rev=1537485&r1=1537484&r2=1537485&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
(original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl Thu
Oct 31 13:40:23 2013
@@ -25,6 +25,7 @@ imported document-to-html.xsl for detail
<meta-data>
<xsl:apply-templates select="header/meta"/>
<xsl:apply-templates select="header/link"/>
+ <xsl:apply-templates select="header/script"/>
</meta-data>
<div id="content">
<div id="skinconf-printlink"/>
Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl?rev=1537485&r1=1537484&r2=1537485&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
(original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl Thu
Oct 31 13:40:23 2013
@@ -33,6 +33,7 @@ and tabs (tab-to-menu.xsl) to generate t
<meta-data>
<xsl:apply-templates select="header/meta"/>
<xsl:apply-templates select="header/link"/>
+ <xsl:apply-templates select="header/script"/>
</meta-data>
<div class="content">
<div id="topmodule" align="right">
