You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2005/11/09 13:42:23 UTC
svn commit: r332027 - in
/maven/components/trunk/maven-plugins/maven-site-plugin: pom.xml
src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
src/main/resources/org/apache/maven/plugins/site/maven-site.vm
Author: evenisse
Date: Wed Nov 9 04:42:16 2005
New Revision: 332027
URL: http://svn.apache.org/viewcvs?rev=332027&view=rev
Log:
PR: MNG-990
Submitted by Johnny R. Ruiz III
Add basic positional configuration
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=332027&r1=332026&r2=332027&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Wed Nov 9 04:42:16 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css?rev=332027&r1=332026&r2=332027&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css Wed Nov 9 04:42:16 2005
@@ -51,12 +51,12 @@
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;
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm?rev=332027&r1=332026&r2=332027&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm Wed Nov 9 04:42:16 2005
@@ -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" ) )
+ | $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 | 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">©#copyright()</div>
+ <div class="xright">©#copyright()#publishDate( "bottom" )</div>
<div class="clear">
<hr/>
</div>