svn commit: r1086336 - in /maven/doxia/doxia-sitetools/trunk: doxia-decoration-model/src/main/mdo/decoration.mdo doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

[dennisl]

Author: dennisl
Date: Mon Mar 28 18:50:29 2011
New Revision: 1086336

URL: http://svn.apache.org/viewvc?rev=1086336&view=rev
Log:
[DOXIASITETOOLS-50] Add a footer element
[DOXIASITETOOLS-56] Make copyright notice configurable in default template
Submitted by: Antonio Petrelli
Reviewed by: Dennis Lundberg

o Patch applied with modifications

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
    
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-decoration-model/src/main/mdo/decoration.mdo
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=1086336&r1=1086335&r2=1086336&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 Mon Mar 28 18:50:29 2011
@@ -351,6 +351,13 @@ under the License.
           </association>
           <identifier>true</identifier>
         </field>
+        <field>
+          <name>footer</name>
+          <description>If present, the contained text will be used instead of 
the generated copyright text.</description>
+          <version>1.1.0+</version>
+          <type>DOM</type>
+          <identifier>true</identifier>
+        </field>
       </fields>
     </class>
     <class java.clone="deep">

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=1086336&r1=1086335&r2=1086336&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
 Mon Mar 28 18:50:29 2011
@@ -532,7 +532,13 @@
       <hr/>
     </div>
     <div id="footer">
-      <div class="xright">Copyright &#169;#copyright()All Rights 
Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version 
)</div>
+      <div class="xright">
+      #if($decoration.body.footer)
+        $decoration.body.footer
+      #else
+        Copyright &#169;#copyright()All Rights Reserved.#publishDate( "bottom" 
$decoration.publishDate $decoration.version )
+      #end
+      </div>
       <div class="clear">
         <hr/>
       </div>