Author: michaelo
Date: Wed Jul 24 20:23:28 2013
New Revision: 1506695
URL: http://svn.apache.org/r1506695
Log:
- Fixed/removed superfluous line in generation header comment
- Aligned copyright notice with Javadoc/JXR bottom
- Child divs of div.container-fluid must be .row-fluid and not simply .row
- Avoid duplication of copyright p element
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=1506695&r1=1506694&r2=1506695&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 Jul 24 20:23:28 2013
@@ -1,11 +1,10 @@
<!DOCTYPE html>
<!--
- #set ( $skipGenerationDate = 'false')
- #if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate')
- && $decoration.custom.getChild( 'fluidoSkin'
).getChild('skipGenerationDate').getValue()=='true')
- #set ( $skipGenerationDate = 'true')
- #end
-
+#**##set ( $skipGenerationDate = 'false')
+#**##if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate')
+ && $decoration.custom.getChild( 'fluidoSkin'
).getChild('skipGenerationDate').getValue()=='true')
+ #set ( $skipGenerationDate = 'true')
+#**##end
| Generated by Apache Maven Doxia#if( $doxiaVersion ) $doxiaVersion #end #if
($skipGenerationDate == 'false')at $dateFormat.format( $currentDate ) #end
| Rendered using Apache Maven Fluido Skin @project.version@
@@ -377,7 +376,7 @@
#set ( $currentYear = ${currentDate.year} + 1900 )
##
#if ( ${project.inceptionYear} && ( ${project.inceptionYear} !=
${currentYear.toString()} ) )
- ${project.inceptionYear}-${currentYear}${period}
+ ${project.inceptionYear}–${currentYear}${period}
#else
${currentYear}${period}
#end
@@ -1155,13 +1154,15 @@
#else
<div class="container">
#end
+ #if ( $sideBarEnabled )
+ <div class="row-fluid">
+ #else
<div class="row">
+ #end
#if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('footerStyle') )
- <p class="$decoration.custom.getChild( 'fluidoSkin'
).getChild('footerStyle').getValue()">Copyright ©#copyright()All Rights
Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
- #else
- <p class="span12">Copyright ©#copyright()All Rights
Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
+ #set ( $footerStyle = 'class="' + $decoration.custom.getChild(
'fluidoSkin' ).getChild('footerStyle').getValue() + '"' )
#end
-
+ <p $!footerStyle>Copyright ©#copyright()All rights
reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version
)</p>
</div>
#if ( $decoration.body.footer )
