commit 22ffd1d74e10ac23308821b666f6057249700d19
author Michael Osipov <michaelo@apache.org> Wed Feb 10 19:34:25 2016 +0000
committer Michael Osipov <michaelo@apache.org> Wed Feb 10 19:34:25 2016 +0000
tree 4b5f64a4cfa7fe2beecce8ca634a55a060371e9b
parent d17e4a9903e531716c45130092e8a4de45e668c0

[MSKINS-123] Remove decoration model default value duplication in macro #publishDate

git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1729699 13f79535-47bb-0310-9956-ffa450edef68

doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
index e73b8aa..f3459bb 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
@@ -307,38 +307,16 @@
 #end
 ##
 #macro ( publishDate $position $decorationPublishDate $version )
-  #if ( $decorationPublishDate && $decorationPublishDate.format )
-    #set ( $format = $decorationPublishDate.format )
-  #else
-    #set ( $format = "yyyy-MM-dd" )
-  #end
-##
-  $dateFormat.applyPattern( $format )
-##
   #if ( $publishDate )
     #set ( $dateValue = $dateFormat.format( $publishDate ) )
   #elseif ( $decoration.custom.getChild( 'publishDate' ) )
     #set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() )
-  #else  
+  #else
     #set ( $dateValue = $dateFormat.format( $currentDate ) )
   #end
 ##
-  #if ( $decorationPublishDate && $decorationPublishDate.position )
-    #set ( $datePosition = $decorationPublishDate.position )
-  #else
-    #set ( $datePosition = "left" )
-  #end
-##
-  #if ( $version )
-    #if ( $version.position )
-      #set ( $versionPosition = $version.position )
-    #else
-      #set ( $versionPosition = "left" )
-    #end
-  #else
-    #set ( $version = "" )
-    #set ( $versionPosition = "left" )
-  #end
+  #set ( $datePosition = $decorationPublishDate.position )
+  #set ( $versionPosition = $version.position )
 ##
   #set ( $breadcrumbs = $decoration.body.breadcrumbs )
   #set ( $links = $decoration.body.links )
@@ -473,7 +451,7 @@
   #if( $accountId && $accountId != "" )
     <!-- Google Analytics -->
     <script type="text/javascript">
-    
+
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', '$accountId']);
       _gaq.push(['_trackPageview']);