maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r732681 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Date Thu, 08 Jan 2009 10:56:22 GMT
Author: ltheussl
Date: Thu Jan  8 02:56:22 2009
New Revision: 732681

URL: http://svn.apache.org/viewvc?rev=732681&view=rev
Log:
[DOXIASITETOOLS-11] Improve site footer
Submitted by: Michael Osipov

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=732681&r1=732680&r2=732681&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Thu Jan  8 02:56:22 2009
@@ -149,16 +149,26 @@
 
 #macro ( copyright )
   #if ( $project )
-    #set ( $currentYear = ${currentDate.year} + 1900 )
+    #if ( ${project.organization} && ${project.organization.name} ) 
+      #set ( $period = "" )
+    #else 
+      #set ( $period = "." )
+   #end
+
+   #set ( $currentYear = ${currentDate.year} + 1900 )
 
     #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()}
) )
-      ${project.inceptionYear}-${currentYear}
+      ${project.inceptionYear}-${currentYear}${period}
     #else
-      ${currentYear}
+      ${currentYear}${period}
     #end
 
-    #if ( ${project.organization} && ${project.organization.name} )
-      ${project.organization.name}
+    #if ( ${project.organization} )
+      #if ( ${project.organization.name} && ${project.organization.url} )
+          <a href="$project.organization.url">${project.organization.name}</a>.
+      #elseif ( ${project.organization.name} )
+        ${project.organization.name}.
+      #end
     #end
   #end
 #end
@@ -365,7 +375,7 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">&#169;#copyright()#publishDate( "bottom" $decoration.publishDate
$decoration.version )</div>
+      <div class="xright">Copyright &#169;#copyright()All Rights Reserved.#publishDate(
"bottom" $decoration.publishDate $decoration.version )</div>
       <div class="clear">
         <hr/>
       </div>



Mime
View raw message