forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r429087 - in /forrest/trunk: main/ whiteboard/plugins/org.apache.forrest.themes.core/themes/ whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/
Date Sun, 06 Aug 2006 01:34:17 GMT
Author: thorsten
Date: Sat Aug  5 18:34:16 2006
New Revision: 429087

URL: http://svn.apache.org/viewvc?rev=429087&view=rev
Log:
The dispatcher should not contain links or logic in the core

Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=429087&r1=429086&r2=429087&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Sat Aug  5 18:34:16 2006
@@ -249,7 +249,6 @@
       to be used later by Cocoon. -->
     <echo file="${project.temp-dir}/build-info.xml">&lt;info>
   &lt;project-skin>${project.skin}&lt;/project-skin>
-  &lt;project-theme>${project.theme}&lt;/project-theme>
   &lt;forrest-version>${forrest.version}&lt;/forrest-version>
 &lt;/info>
     </echo>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv?rev=429087&r1=429086&r2=429087&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv Sat Aug
 5 18:34:16 2006
@@ -40,6 +40,7 @@
       <forrest:property name="custom">
          <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
       </forrest:property>
+      <forrest:property name="theme" value="common"/>
     </forrest:contract>
     <!--
         nuggets (extra data requested by the contract) are now defined in the contract element.


Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft?rev=429087&r1=429086&r2=429087&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
Sat Aug  5 18:34:16 2006
@@ -24,19 +24,21 @@
       <note>Standard output:
         <source><![CDATA[<meta content="Apache Forrest" name="Generator" />
 <meta content="${forrest.version}" name="Forrest-version" />
-<meta content="${project.theme}" name="Forrest-theme-name" />]]></source>
+<meta content="${theme}" name="Forrest-theme-name" />]]></source>
       </note>
   </description>
   <usage><![CDATA[<forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
   [<forrest:property name="custom">
     <meta name="Description" content="This page was created to help myself, may it help
you now!"/>
-  </forrest:property>]
+  </forrest:property>
+  <forrest:property name="theme" value="common"/>]
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-meta" inputFormat="xsl">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="custom" />
+      <xsl:param name="theme" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
@@ -54,11 +56,13 @@
 		        <xsl:value-of select="forrest-version"/>
 		      </xsl:attribute>
 		    </meta>
-		    <meta name="Forrest-theme-name">
-		      <xsl:attribute name="content">
-		        <xsl:value-of select="project-theme"/>
-		      </xsl:attribute>
-		    </meta>
+        <xsl:if test="$theme">
+          <meta name="Forrest-theme-name">
+            <xsl:attribute name="content">
+              <xsl:value-of select="$theme/@value"/>
+            </xsl:attribute>
+          </meta>
+        </xsl:if>
 		  </xsl:template>
 		</xsl:stylesheet>
 	</forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv?rev=429087&r1=429086&r2=429087&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv Sat Aug
 5 18:34:16 2006
@@ -209,6 +209,7 @@
       <forrest:property name="custom">
          <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
       </forrest:property>
+      <forrest:property name="theme" value="pelt"/>
     </forrest:contract>
     <forrest:contract name="siteinfo-meta-navigation" 
       dataURI="cocoon://#{$getRequest}.navigation.xml"/>



Mime
View raw message