You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/12/30 01:02:11 UTC
svn commit: r359932 - in
/maven/plugins/trunk/maven-site-plugin/src/main/resources:
org/apache/maven/plugins/site/default-site.vm site-plugin.properties
Author: brett
Date: Thu Dec 29 16:02:06 2005
New Revision: 359932
URL: http://svn.apache.org/viewcvs?rev=359932&view=rev
Log:
add version element to decoration model for controlling position
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/default-site.vm
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties
Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/default-site.vm
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/default-site.vm?rev=359932&r1=359931&r2=359932&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/default-site.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/default-site.vm Thu Dec 29 16:02:06 2005
@@ -124,7 +124,7 @@
#end
#end
-#macro ( publishDate $position $publishDate )
+#macro ( publishDate $position $publishDate $version )
#if ( $publishDate && $publishDate.format )
#set ( $format = $publishDate.format )
#else
@@ -141,15 +141,45 @@
#set ( $datePosition = "left" )
#end
+ #if ( $version )
+ #if ( $version.position )
+ #set ( $versionPosition = $version.position )
+ #else
+ #set ( $versionPosition = "left" )
+ #end
+ #end
+
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
| $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
+ #end
#elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">$i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday</div>
+ <div id="lastPublished">
+ $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
+ #end
+ </div>
#elseif ( $datePosition.equalsIgnoreCase("left") )
<div class="xleft">
- $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday | Doc for
- ${project.version}
+ $i18n.getString( "site-plugin", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
+ #end
+ </div>
+ #end
+ #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+ #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
+ | $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
+ #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
+ </div>
+ #elseif ( $versionPosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-plugin", $locale, "template.version" ): ${project.version}
</div>
#end
#end
@@ -227,18 +257,18 @@
</div>
</div>
<div id="breadcrumbs">
- #publishDate( "left" $decoration.publishDate )
- <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate )</div>
+ #publishDate( "left" $decoration.publishDate $decoration.version )
+ <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
<div class="clear">
<hr/>
</div>
</div>
<div id="leftColumn">
<div id="navcolumn">
- #publishDate( "navigation-top" $decoration.publishDate )
+ #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
#mainMenu( $decoration.body.menus )
#poweredByLogo( $decoration.poweredBy )
- #publishDate( "navigation-bottom" $decoration.publishDate )
+ #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
</div>
</div>
<div id="bodyColumn">
@@ -250,7 +280,7 @@
<hr/>
</div>
<div id="footer">
- <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate )</div>
+ <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
<div class="clear">
<hr/>
</div>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties?rev=359932&r1=359931&r2=359932&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties Thu Dec 29 16:02:06 2005
@@ -15,6 +15,7 @@
# -------------------------------------------------------------------
template.lastpublished=Last Published
+template.version=Version
template.builtby=Built by
report.project.title=Maven Generated Reports
report.project.description1=This document provides an overview of the various reports that are automatically generated by