cmlenz 2003/01/03 08:45:20
Modified: documentation/docs/xdocs book.xml
documentation/docs/skins/jakarta.apache.org/stylesheets
document2html.xsl
documentation build.xml
Log:
- Move the "last updated", "currentversion" and "otherversion"
properties from book.xml to build.xml, and pass them to the stylesheet
as parameters. Motivation: keep as close to the "standard" (hehe) DTD
as possible
- Remove some tabs etc
Revision Changes Path
1.23 +1 -4 jakarta-cactus/documentation/docs/xdocs/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/book.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- book.xml 3 Jan 2003 13:41:01 -0000 1.22
+++ book.xml 3 Jan 2003 16:45:20 -0000 1.23
@@ -2,10 +2,7 @@
<book software="Cactus"
title="Cactus Documentation"
- copyright="@year@ The Apache Software Foundation"
- updated="@today@"
- currentversion="@version@"
- otherversion="@otherversion@">
+ copyright="@year@ The Apache Software Foundation">
<menu label="About">
<menu-item label="What is Cactus ?" source="index.xml"/>
1.9 +28 -13
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- document2html.xsl 3 Jan 2003 16:12:29 -0000 1.8
+++ document2html.xsl 3 Jan 2003 16:45:20 -0000 1.9
@@ -23,6 +23,19 @@
items for the last 15 days web site changes -->
<xsl:param name="cvslogfile" select="''"/>
+ <!-- Date of the last update, to be passed in from the build -->
+ <xsl:param name="last.updated.date"/>
+
+ <!-- Version of the current documentation (for switching between the
+ documentation for the current development version and the latest stable
+ release), to be passed in from the build -->
+ <xsl:param name="project.version"/>
+
+ <!-- Version of the "other" documentation (for switching between the
+ documentation for the current development version and the latest stable
+ release), to be passed in from the build -->
+ <xsl:param name="project.other.version"/>
+
<!-- Output method -->
<xsl:output method="html" indent="no"/>
@@ -75,7 +88,7 @@
<!-- Display left logo (the Jakarta logo) -->
<td valign="top" align="left">
- <a href="http://jakarta.apache.org/index.html";>
+ <a href="http://jakarta.apache.org/";>
<img hspace="0" vspace="0" border="0">
<xsl:attribute name="src">images/jakarta-logo.gif</xsl:attribute>
</img>
@@ -83,12 +96,14 @@
</td>
<td width="100%" valign="middle" align="left" bgcolor="#ffffff">
- <img hspace="0" vspace="0" border="0" align="right">
- <xsl:attribute name="alt">
- <xsl:call-template name="get-title"/>
- </xsl:attribute>
- <xsl:attribute name="src">images/logocactus.gif</xsl:attribute>
- </img>
+ <a href="http://jakarta.apache.org/cactus/";>
+ <img hspace="0" vspace="0" border="0" align="right">
+ <xsl:attribute name="alt">
+ <xsl:call-template name="get-title"/>
+ </xsl:attribute>
+ <xsl:attribute name="src">images/logocactus.gif</xsl:attribute>
+ </img>
+ </a>
</td>
</tr>
@@ -112,25 +127,25 @@
</td>
<td width="14%" valign="top" nowrap="1">
<font size="-2">
- Last update: <xsl:value-of select="$book/@updated"/>
+ Last update: <xsl:value-of select="$last.updated.date"/>
</font>
<br/>
<font size="-2">
- Doc for: <b>v<xsl:value-of select="$book/@currentversion"/></b>
+ Docs for: <b>v<xsl:value-of select="$project.version"/></b>
<xsl:text> | </xsl:text>
<a>
<xsl:attribute name="href">
<xsl:choose>
- <xsl:when test="contains($book/@currentversion,'dev')">
+ <xsl:when test="contains($project.version,'dev')">
<xsl:text>..</xsl:text>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$book/@otherversion"/>
+ <xsl:value-of select="$project.other.version"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:text>v</xsl:text>
- <xsl:value-of select="$book/@otherversion"/>
+ <xsl:value-of select="$project.other.version"/>
</a>
</font>
1.20 +20 -11 jakarta-cactus/documentation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 3 Jan 2003 15:51:07 -0000 1.19
+++ build.xml 3 Jan 2003 16:45:20 -0000 1.20
@@ -200,26 +200,35 @@
filtering="on"/>
<!-- Generate the docs -->
- <style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
+ <style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
style="${doc.skin.dir}/jakarta.apache.org/stylesheets/document2html.xsl">
- <include name="*.xml"/>
- <exclude name="book.xml"/>
+ <include name="*.xml"/>
+ <exclude name="book.xml"/>
<!--Location of the book.xml file relative to where the stylesheet
is located. Note: this path MUST be relative as it is used as a
realtive URI from within the stylesheet -->
- <param name="bookfile"
expression="../../../../../${target.xdoc.dir}/book.xml"/>
+ <param name="bookfile"
+ expression="../../../../../${target.xdoc.dir}/book.xml"/>
+
+ <!-- Location of the cvslog.xml file relative to where the
+ stylesheet is located. Note: this path MUST be relative as it
+ is used as a realtive URI from within the stylesheet -->
+ <param name="cvslogfile"
+ expression="../../../../../${target.xdoc.dir}/cvslog/cvslog.xml"/>
+
+ <param name="project.version"
+ expression="${project.version}"/>
+ <param name="project.other.version"
+ expression="${project.other.version}"/>
+ <param name="last.updated.date"
+ expression="${TODAY}"/>
- <!-- Location of the cvslog.xml file relative to where the
- stylesheet is located. Note: this path MUST be relative
as it
- is used as a realtive URI from within the stylesheet -->
- <param name="cvslogfile"
expression="../../../../../${target.xdoc.dir}/cvslog/cvslog.xml"/>
-
</style>
- </target>
-
+ </target>
+
<!--
========================================================================
Generate the documentation (without the generated clover reports that
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
