Author: michaelo
Date: Wed Feb 10 19:33:33 2016
New Revision: 1729698
URL: http://svn.apache.org/viewvc?rev=1729698&view=rev
Log:
[MSKINS-123] Remove decoration model default value duplication in macro
#publishDate
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1729698&r1=1729697&r2=1729698&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Wed Feb 10 19:33:33 2016
@@ -403,14 +403,6 @@
#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' ) )
@@ -419,22 +411,8 @@
#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 )
