aheritier 2004/08/22 07:24:26
Modified: xdoc/src/plugin-resources site.jsl
xdoc/xdocs changes.xml properties.xml
Log:
MPXDOC-117 : Show version if maven.xdoc.date=right and docs updates
Revision Changes Path
1.61 +19 -4 maven-plugins/xdoc/src/plugin-resources/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-resources/site.jsl,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- site.jsl 13 Jul 2004 12:18:59 -0000 1.60
+++ site.jsl 22 Aug 2004 14:24:26 -0000 1.61
@@ -129,17 +129,32 @@
</div>
<div id="breadcrumbs">
+ <maven:property var="version" name="maven.xdoc.version"
defaultValue="${pom.currentVersion}"/>
<j:if test="${date == 'left'}">
- <maven:property var="version" name="maven.xdoc.version"
defaultValue="${pom.currentVersion}"/>
<div class="xleft">
Last published: ${build.date}
- <j:if test="${!empty(version)}">| Doc for ${version}</j:if>
+ <j:if test="${!empty(version)}">
+ <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+ <span class="separator">${maven.xdoc.crumb.separator}</span>
+ </j:if>
+ Doc for ${version}
+ </j:if>
</div>
</j:if>
<div class="xright">
<j:if test="${date == 'right'}">
Last published: ${build.date}
- <x:if select="$nav/body/links">|</x:if>
+ <j:if test="${!empty(version)}">
+ <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+ <span class="separator">${maven.xdoc.crumb.separator}</span>
+ </j:if>
+ Doc for ${version}
+ </j:if>
+ <x:if select="$nav/body/links">
+ <j:if test="${!(maven.xdoc.crumb.separator == '')}">
+ <span class="separator">${maven.xdoc.crumb.separator}</span>
+ </j:if>
+ </x:if>
</j:if>
<!-- render links -->
<x:if select="$nav/body/links">
@@ -219,7 +234,7 @@
</j:if>
</j:if>
<j:if test="${date == 'bottom'}">
- - Last published: ${build.date}
+ © - Last published: ${build.date}
</j:if>
</div>
<div class="clear"><hr /></div>
1.63 +2 -0 maven-plugins/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/changes.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- changes.xml 16 Aug 2004 13:44:31 -0000 1.62
+++ changes.xml 22 Aug 2004 14:24:26 -0000 1.63
@@ -23,9 +23,11 @@
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
+ <author email="[EMAIL PROTECTED]">Arnaud HERITIER</author>
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in CVS">
+ <action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis
Lundberg">Show version if maven.xdoc.date=right</action>
<action dev="carlos" type="add" issue="MPFAQ-11">Added dt css style</action>
<action dev="brett" type="add">Add a legend for the symbols in the xdoc,
disabled by setting <code>maven.xdoc.legend=false</code></action>
</release>
1.15 +26 -1 maven-plugins/xdoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/properties.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- properties.xml 13 Jul 2004 12:18:59 -0000 1.14
+++ properties.xml 22 Aug 2004 14:24:26 -0000 1.15
@@ -29,6 +29,11 @@
<section name="Directory Layout Properties">
<table>
<tr>
+ <th>Property name</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
<td>maven.docs.dest</td>
<td>Yes</td>
<td>
@@ -61,6 +66,11 @@
<section name="Localization Properties">
<table>
<tr>
+ <th>Property name</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
<td>maven.docs.outputencoding</td>
<td>Yes</td>
<td>
@@ -76,6 +86,11 @@
<section name="Presentation Properties">
<table>
<tr>
+ <th>Property name</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
<td>maven.xdoc.theme</td>
<td>Yes</td>
<td>
@@ -111,7 +126,6 @@
<li>bottom : after the organization name, in the footer</li>
</ul>
If "maven.xdoc.date" is left empty, no date is shown on the site
(default).
- The default "maven.xdoc.date.locale" is "en" (ie: english).
</td>
</tr>
<tr>
@@ -129,6 +143,17 @@
<td>
Sets the locale used for the date.
Defaults to "en", ie english.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.xdoc.version</td>
+ <td>Yes</td>
+ <td>
+ The version number to show next to the date. This only works if you
also set
+ <code>maven.xdoc.date</code> to either <code>left</code> or
<code>right</code>.
+ A common way to use it is like this:
+ <code>maven.xdoc.version=${pom.currentVersion}</code>.
+ If <code>maven.xdoc.version</code> is left empty, no version is shown
on the site (default).
</td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
