forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r312914 - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
Date Tue, 11 Oct 2005 16:45:02 GMT
Author: thorsten
Date: Tue Oct 11 09:44:51 2005
New Revision: 312914

URL: http://svn.apache.org/viewcvs?rev=312914&view=rev
Log:
Changed order of calling the head-contracts like suggested by kevin. This way first all css
get loaded and then all additional contract head information

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl?rev=312914&r1=312913&r2=312914&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
Tue Oct 11 09:44:51 2005
@@ -50,7 +50,6 @@
             <alias:template match="/">
                 <html>
                     <head>
-                        <alias:call-template name="getHead"/>
                     	<!--Test whether there is an own css implemention requested by the
view-->
                     	<!--*No* forrest:css found in the view-->
                         <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)">
@@ -62,6 +61,7 @@
                         <xsl:if test="/*/forrest:views/forrest:view/forrest:css">
                             <xsl:apply-templates select="/*/forrest:views/forrest:view/forrest:css"/>
                         </xsl:if>
+                        <alias:call-template name="getHead"/>
                         <title>
                             <alias:value-of select="div[@id='content']/h1"/>
                         </title>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl?rev=312914&r1=312913&r2=312914&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
Tue Oct 11 09:44:51 2005
@@ -50,7 +50,6 @@
             <alias:template match="site">
                 <html>
                     <head>
-                        <alias:call-template name="getHead"/>
                     	<!--Test whether there is an own css implemention requested by the
view-->
                     	<!--*No* forrest:css found in the view-->
                         <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)">
@@ -62,6 +61,7 @@
                         <xsl:if test="/*/forrest:views/forrest:view/forrest:css">
                             <xsl:apply-templates select="/*/forrest:views/forrest:view/forrest:css"/>
                         </xsl:if>
+                        <alias:call-template name="getHead"/>
                         <title>
                             <alias:value-of select="div[@id='content']/h1"/>
                         </title>



Mime
View raw message