From 7b7971e385932316fd92bc727d730cb183e67de1 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 22 Aug 2004 14:24:26 +0000
Subject: [PATCH] MPXDOC-117 : Show version if maven.xdoc.date=right and docs
 updates

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115992 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/src/plugin-resources/site.jsl | 23 +++++++++++++++++++----
 xdoc/xdocs/changes.xml             |  2 ++
 xdoc/xdocs/properties.xml          | 27 ++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index d983877e..b2139bd1 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -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}
+              &#169; - Last published: ${build.date}
             </j:if>
           </div>
           <div class="clear"><hr /></div>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 630a0694..f3f5bd4e 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -23,9 +23,11 @@
     <title>Changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
     <author email="vmassol@apache.org">Vincent Massol</author>
+    <author email="aheritier@apache.org">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>
diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml
index 2dcd3e63..64d72c41 100644
--- a/xdoc/xdocs/properties.xml
+++ b/xdoc/xdocs/properties.xml
@@ -28,6 +28,11 @@
   <body>
     <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>
@@ -60,6 +65,11 @@
     </section>
     <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>
@@ -75,6 +85,11 @@
     </section>
     <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>
@@ -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>
@@ -131,6 +145,17 @@
             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>
           <td>maven.xdoc.includeProjectDocumentation</td>
           <td>Yes</td>

Property name	Optional?	Description
maven.xdoc.theme	Yes
maven.xdoc.version	Yes	+ The version number to show next to the date. This only works if you also set + `maven.xdoc.date` to either `left` or `right`. + A common way to use it is like this: + `maven.xdoc.version=${pom.currentVersion}`. + If `maven.xdoc.version` is left empty, no version is shown on the site (default). +
maven.xdoc.includeProjectDocumentation	Yes