maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1729699 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Date Wed, 10 Feb 2016 19:34:25 GMT
Author: michaelo
Date: Wed Feb 10 19:34:25 2016
New Revision: 1729699

URL: http://svn.apache.org/viewvc?rev=1729699&view=rev
Log:
[MSKINS-123] Remove decoration model default value duplication in macro #publishDate

Modified:
    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-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=1729699&r1=1729698&r2=1729699&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
Wed Feb 10 19:34:25 2016
@@ -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  
-    #set ( $dateValue = $dateFormat.format( $currentDate ) )
-  #end
-##
-  #if ( $decorationPublishDate && $decorationPublishDate.position )
-    #set ( $datePosition = $decorationPublishDate.position )
   #else
-    #set ( $datePosition = "left" )
+    #set ( $dateValue = $dateFormat.format( $currentDate ) )
   #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']);



Mime
View raw message