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 2017/01/10 14:23:16 UTC
svn commit: r1778133 -
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
Author: michaelo
Date: Tue Jan 10 14:23:16 2017
New Revision: 1778133
URL: http://svn.apache.org/viewvc?rev=1778133&view=rev
Log:
[DOXIASITETOOLS-172] Width, height and border values not used for banner display
Submitted-by: Michael Benz <mi...@foconis.de>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.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-macros.vm?rev=1778133&r1=1778132&r2=1778133&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm Tue Jan 10 14:23:16 2017
@@ -91,18 +91,40 @@
<div id="$id">
#end
##
- #if( $banner.src )
- #set ( $src = $banner.src )
- #if ( !$decoration.isLink( $src ) )
- #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
- #set ( $src = $src.replaceAll( '\\', '/' ) )
- #end
- #if ( $banner.alt )
- #set ( $alt = $banner.alt )
- #else
- #set ( $alt = $banner.name )
- #end
- <img src="$src" alt="$alt"#if( $banner.title ) title="$banner.title"#end />
+ #if( $banner.src )
+ #set ( $src = $banner.src )
+ #if ( !$decoration.isLink( $src ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( '\\', '/' ) )
+ #end
+ #if ( $banner.alt )
+ #set ( $alt = ' alt="' + $banner.alt + '"' )
+ #elseif ( $banner.name )
+ #set ( $alt = ' alt="' + $banner.name + '"' )
+ #else
+ #set ( $alt = ' alt=""' )
+ #end
+ #if( $banner.border )
+ #set ( $imgBorder = ' border="' + $banner.border + '"' )
+ #else
+ #set ( $imgBorder = "" )
+ #end
+ #if( $banner.width )
+ #set ( $imgWidth = ' width="' + $banner.width + '"' )
+ #else
+ #set ( $imgWidth = "" )
+ #end
+ #if( $banner.height )
+ #set ( $imgHeight = ' height="' + $banner.height + '"' )
+ #else
+ #set ( $imgHeight = "" )
+ #end
+ #if( $banner.title )
+ #set ( $bannerTitle=' title="' + $banner.title + '"' )
+ #else
+ #set ( $bannerTitle="" )
+ #end
+ <img src="$src" $alt$bannerTitle$imgBorder$imgWidth$imgHeight/>
#else
$banner.name
#end