You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/12/25 21:14:46 UTC
svn commit: r1647917 -
/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: michaelo
Date: Thu Dec 25 20:14:46 2014
New Revision: 1647917
URL: http://svn.apache.org/r1647917
Log:
[MSKINS-81] Decoration model body/footer not correctly implemented by site.vm
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=1647917&r1=1647916&r2=1647917&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 Thu Dec 25 20:14:46 2014
@@ -233,9 +233,9 @@
<li class="$cssClass">
#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
#if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ) )
- #set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ).getValue() )
+ #set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ).getValue() )
#else
- #set ( $breadcrumbDivider = '/' )
+ #set ( $breadcrumbDivider = '/' )
#end
<span class="divider">$breadcrumbDivider</span>
</li>
@@ -1180,12 +1180,6 @@
#else
<div class="row">
#end
- #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
- #set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
- #end
- <p $!copyrightClass>Copyright ©#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
- </div>
-
#if ( $decoration.body.footer )
#foreach( $item in $decoration.body.footer.getChildren() )
#set ( $foot = $item.toString().trim() )
@@ -1196,7 +1190,13 @@
## #eval macro not supported yet, that is a silly turnaround to allow ASF projects adopt fluido
$StringUtils.replace( $foot, '@project.name@', ${project.name} )
#end
+ #else
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
+ #set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
+ #end
+ <p $!copyrightClass>Copyright ©#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
#end
+ </div>
#if ( !$sideBarEnabled )
<p id="poweredBy" class="pull-right">