Author: crossley Date: Wed Dec 29 01:58:43 2010 New Revision: 1053505 URL: http://svn.apache.org/viewvc?rev=1053505&view=rev Log: Fix syntax errors for import of additional style sheets for "tigris" skin. Issue: FOR-1205 Contributed by: Simon Pepping
Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl forrest/trunk/site-author/status.xml Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl?rev=1053505&r1=1053504&r2=1053505&view=diff ============================================================================== --- forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl (original) +++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl Wed Dec 29 01:58:43 2010 @@ -41,18 +41,18 @@ footer, searchbar, css etc. As input, i <xsl:call-template name="html-meta"/> <xsl:call-template name="meta-data"/> <style type="text/css"> - /* <![CDATA[ */ - @import "]]> + <xsl:text>@import "</xsl:text> <xsl:value-of select="$root"/> -<![CDATA[skin/tigris.css"; - @import "]]> + <xsl:text>skin/tigris.css";</xsl:text> + <xsl:text>@import "</xsl:text> <xsl:value-of select="$root"/> -<![CDATA[skin/quirks.css"; - @import "]]> + <xsl:text>skin/quirks.css";</xsl:text> + <xsl:text>@import "</xsl:text> <xsl:value-of select="$root"/> -<![CDATA[skin/inst.css"; - /* ]]> */ - </style><link rel="stylesheet" type="text/css" href="{$root}skin/print.css" media="print" /><link rel="stylesheet" type="text/css" href="{$root}skin/forrest.css" /> + <xsl:text>skin/inst.css";</xsl:text> + </style> + <link rel="stylesheet" type="text/css" href="{$root}skin/print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="{$root}skin/forrest.css" /> <xsl:if test="$config/favicon-url"><link rel="shortcut icon"> <xsl:attribute name="href"> <xsl:value-of select="concat($root,$config/favicon-url)"/> Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1053505&r1=1053504&r2=1053505&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Dec 29 01:58:43 2010 @@ -153,6 +153,10 @@ Added document to facilitate <link href="site:upgrading_09">upgrading to v0.9</link> </action> +<!-- 2010-12 --> + <action context="code" type="update" dev="DC" due-to="Simon Pepping" fixes-bug="FOR-1205"> + Fix syntax errors for import of additional style sheets for "tigris" skin. + </action> <!-- 2010-10 --> <action dev="DC" type="add" context="code"> Add initial "Markdown" output plugin to Whiteboard.