From 6e83944830e22ee46ba4849a7e7b0692aa4088dc Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Tue, 31 May 2005 00:39:51 +0000
Subject: [PATCH] o tidy up the site template o set the classloader used where
 the template will be found

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179176 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/maven/doxia/DoxiaMojo.java  |  2 ++
 .../resources/org/apache/maven/doxia/maven-site.vm   | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
index 80fb0603e7..4378589ebb 100644
--- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
+++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
@@ -136,6 +136,8 @@ public class DoxiaMojo
     public void execute()
         throws MojoExecutionException
     {
+        siteRenderer.setTemplateClassLoader( DoxiaMojo.class.getClassLoader() );        
+        
         try
         {
             categorizeReports();
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
index c98a190fa5..10cef109d2 100644
--- a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
+++ b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
@@ -28,10 +28,14 @@
         <hr/>
       </div>
     </div>
-    <div id="leftColumn"><div id="navcolumn">$mainMenu<a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
-              <img alt="Built by Maven" src="$relativePath/images/logos/maven-feather.png"></img>
-            </a>
-    </div></div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+        $mainMenu
+        <a href="http://maven.apache.org/" title="Built by Maven" id="poweredBy">
+          <img alt="Built by Maven" src="$relativePath/images/logos/maven-feather.png"></img>
+        </a>
+      </div>
+    </div>
     <div id="bodyColumn">
       <div id="contentBox">
         $bodyContent