You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2004/08/14 19:36:26 UTC
svn commit: rev 36397 - in forrest/trunk/src/core/context: . skins/common/xslt/html skins/crust/xslt/html skins/pelt-dev/xslt/html skins/tigris/xslt/html
Author: crossley
Date: Sat Aug 14 10:36:26 2004
New Revision: 36397
Modified:
forrest/trunk/src/core/context/sitemap.xmap
forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
forrest/trunk/src/core/context/skins/crust/xslt/html/site2xhtml.xsl
forrest/trunk/src/core/context/skins/pelt-dev/xslt/html/site2xhtml.xsl
forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl
Log:
Add meta information to head for generator, skin name, generation date.
Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap (original)
+++ forrest/trunk/src/core/context/sitemap.xmap Sat Aug 14 10:36:26 2004
@@ -251,6 +251,12 @@
<map:transform type="skinconf"/>
<map:serialize type="xml" />
</map:match>
+
+ <!-- Add some project info -->
+ <map:match pattern="info">
+ <map:generate src="{forrest:context}/WEB-INF/info.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
</map:pipeline>
<map:pipeline internal-only="false">
@@ -444,6 +450,7 @@
<map:match pattern="*.html">
<map:aggregate element="site">
<map:part src="cocoon:/skinconf.xml"/>
+ <map:part src="cocoon:/info"/>
<map:part src="cocoon:/tab-{0}"/>
<map:part src="cocoon:/menu-{0}"/>
<map:part src="cocoon:/body-{0}"/>
@@ -457,6 +464,7 @@
<map:match pattern="**/*.html">
<map:aggregate element="site">
<map:part src="cocoon:/skinconf.xml"/>
+ <map:part src="cocoon:/info"/>
<map:part src="cocoon:/{1}/tab-{2}.html"/>
<map:part src="cocoon:/{1}/menu-{2}.html"/>
<map:part src="cocoon:/{1}/body-{2}.html"/>
Modified: forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl Sat Aug 14 10:36:26 2004
@@ -278,8 +278,6 @@
<xsl:template name="minitoc">
<xsl:param name="tocroot"/>
-
-
<xsl:if test="count($tocroot/tocitem) >= $config/toc/@min-sections">
<xsl:if test="contains($config/toc/@location,'page')">
<ul class="minitoc">
@@ -298,6 +296,28 @@
</ul>
</xsl:if>
</xsl:if>
+ </xsl:template>
+
+ <xsl:template name="html-meta">
+ <meta name="Generator" content="Apache Forrest"/>
+ <meta>
+ <xsl:attribute name="name">Forrest-version</xsl:attribute>
+ <xsl:attribute name="content">
+ <xsl:value-of select="//info/forrest-version"/>
+ </xsl:attribute>
+ </meta>
+ <meta>
+ <xsl:attribute name="name">Forrest-skin-name</xsl:attribute>
+ <xsl:attribute name="content">
+ <xsl:value-of select="//info/project-skin"/>
+ </xsl:attribute>
+ </meta>
+ <meta>
+ <xsl:attribute name="name">DC.date</xsl:attribute>
+ <xsl:attribute name="content">
+ <xsl:value-of select="//info/generate-timestamp"/>
+ </xsl:attribute>
+ </meta>
</xsl:template>
<xsl:template match="node()|@*" priority="-1">
Modified: forrest/trunk/src/core/context/skins/crust/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/crust/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/crust/xslt/html/site2xhtml.xsl Sat Aug 14 10:36:26 2004
@@ -36,10 +36,11 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:import href="../../../common/xslt/html/site2xhtml.xsl"/>
-
+
<xsl:template match="site">
<html>
<head>
+ <xsl:call-template name="html-meta"/>
<title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
<link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
<link rel="stylesheet" href="{$root}skin/forrest.css" type="text/css"/>
@@ -69,7 +70,7 @@
+=========================+
-->
- <xsl:call-template name = "topstrip" />
+ <xsl:call-template name="topstrip" />
<xsl:call-template name="centerstrip"/>
Modified: forrest/trunk/src/core/context/skins/pelt-dev/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/pelt-dev/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/pelt-dev/xslt/html/site2xhtml.xsl Sat Aug 14 10:36:26 2004
@@ -498,19 +498,4 @@
</xsl:if>
</xsl:if>
</xsl:template>
-
-<xsl:template name="html-meta">
-<!--+
- |generator meta
- +-->
-<xsl:comment>+
- |start generator meta
- +</xsl:comment>
- <meta name="Generator" content="Apache Forrest"/>
- <meta name="Forrest-version" content="SVN-Head (0.6-dev)"/>
- <meta name="Forrest-skin-name" content="pelt"/>
-<xsl:comment>+
- |end generator meta
- +</xsl:comment>
-</xsl:template>
</xsl:stylesheet>
Modified: forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl Sat Aug 14 10:36:26 2004
@@ -40,7 +40,7 @@
<xsl:template match="site">
<html>
<head>
- <xsl:comment>*** This file is generated using Apache Forrest. Do not edit. ***</xsl:comment>
+ <xsl:call-template name="html-meta"/>
<style type="text/css">
/* <![CDATA[ */
@import "]]><xsl:value-of select="$root"/><![CDATA[skin/tigris.css";