From 4efd043d822c273e8b729026023b49944d3a0d4a Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
Date: Wed, 9 Nov 2005 12:42:16 +0000
Subject: [PATCH] PR: MNG-990 Submitted by Johnny R. Ruiz III Add basic
 positional configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332027 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugins/maven-site-plugin/pom.xml       |  8 +--
 .../maven/plugins/site/css/maven-base.css     |  4 +-
 .../apache/maven/plugins/site/maven-site.vm   | 59 ++++++++++++++++---
 3 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/maven-plugins/maven-site-plugin/pom.xml b/maven-plugins/maven-site-plugin/pom.xml
index b939dc7ec4..8a939f5125 100644
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@@ -43,9 +43,9 @@
       <artifactId>maven-project</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-site-renderer</artifactId>
-      <version>1.0-alpha-4-SNAPSHOT</version>
+      <groupId>org.codehaus.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>1.0-alpha-6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
@@ -57,4 +57,4 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
index 314da3a272..64081d0ad9 100644
--- a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
+++ b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
@@ -51,12 +51,12 @@ div.clear hr{
   padding: 3px 10px 3px 10px;
 }
 #leftColumn {
- width: 150px;
+ width: 170px;
  float:left;
 }
 #bodyColumn {
   margin-right: 1.5em;
-  margin-left: 177px;
+  margin-left: 197px;
 }
 #legend {
   padding: 8px 0 8px 0;
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
index 6bb91fa3a8..9060770942 100644
--- a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
+++ b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
@@ -127,6 +127,45 @@
   #end
 #end
 
+#macro ( publishDate $position)
+  #if ( $siteDescriptor.getChild( "publishDate" ) )
+      
+      #if ( $siteDescriptor.getChild( "publishDate" ).getAttribute( "format" ) ) 
+          #set ( $format = $siteDescriptor.getChild( "publishDate" ).getAttribute( "format" ) )
+      #end
+      
+      #if ( $format )
+          $dateFormat.applyPattern( $format )
+      #end
+          ##$dateFormat.applyPattern( "MM/dd/yyyy" )          
+      ##end    
+      
+      #set ( $dateToday = $dateFormat.format( $currentDate ) )
+      
+      #set ( $datePosition = $siteDescriptor.getChild( "publishDate" ).getAttribute( "position" ) ) 
+      #if ( $datePosition.equalsIgnoreCase( $position ) )
+        
+        #if ( $datePosition.equalsIgnoreCase( "right" ) || $datePosition.equalsIgnoreCase( "bottom" ) )
+          &nbsp;| $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday
+        
+        #elseif ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) || $datePosition.equalsIgnoreCase( "navigation-top" ) )
+           <div id="lastPublished">$i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday</div>
+        
+        #elseif ( $datePosition.equalsIgnoreCase("left") )
+            <div class="xleft">
+              $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday &nbsp; | &nbsp; Doc for 
+              #if ( $siteDescriptor.getChild( "version" ))
+                $siteDescriptor.getChild( "version" ).getValue()
+              #else
+                ${project.version}
+              #end
+            </div>
+        #end   
+      #end
+  #end                
+#end
+
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
   <head>
@@ -153,16 +192,22 @@
       </div>
     </div>
     <div id="breadcrumbs">
-      <div class="xleft">$i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $currentDate</div>
-      <div class="xright">#links()</div>
+      #publishDate( "left" )
+      <div class="xright">#links()#publishDate( "right" )</div>
       <div class="clear">
         <hr/>
       </div>
     </div>
-    <div id="leftColumn"><div id="navcolumn">#mainMenu()<a href="http://maven.apache.org/" title="$i18n.getString( "site-plugin", $locale, "template.builtby" ) Maven" id="poweredBy">
-              <img alt="$i18n.getString( "site-plugin", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
-            </a>
-    </div></div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       #publishDate( "navigation-top" )   
+       #mainMenu()
+        <a href="http://maven.apache.org/" title="$i18n.getString( "site-plugin", $locale, "template.builtby" ) Maven" id="poweredBy">
+          <img alt="$i18n.getString( "site-plugin", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"></img>
+        </a>
+        #publishDate( "navigation-bottom" )
+      </div>
+    </div>
     <div id="bodyColumn">
       <div id="contentBox">
         $bodyContent
@@ -172,7 +217,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">&#169;#copyright()</div>
+      <div class="xright">&#169;#copyright()#publishDate( "bottom" )</div>
       <div class="clear">
         <hr/>
       </div>