This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch banner-fixes
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit d21cf9356f4ccb0f20b994b30b2207ddc0160204
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Aug 31 12:21:41 2024 +0200
[MSKINS-250] bannerLeft/Right have external link decoration when consisting
only out of image
This closes #63
---
src/main/resources/META-INF/maven/site-macros.vm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm
b/src/main/resources/META-INF/maven/site-macros.vm
index 9a40d0f..e6b853e 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -48,7 +48,7 @@
#**##end
#end
##
-#macro( link $link $icon = false $omitImage = false $elemOnEmptyHref = "a"
$dotSlashOnEmptyHref = false $imageClass = "imageLink" $elemClass = false )
+#macro( link $link $icon = false $omitImage = false $elemOnEmptyHref = "a"
$dotSlashOnEmptyHref = false $imageClass = "imageLink" $overrideElemClass =
false )
#**##if( $link.name )
#* *##set( $name = $esc.xml( $link.name ) )
#**##else
@@ -89,8 +89,10 @@
#**##if( !$href && $elemOnEmptyHref )
#* *##set( $wrapElem = $elemOnEmptyHref )
#**##end
-#**##if( $elemClass )
-#* *##set( $class = ' class="' + $elemClass + '"' )
+#**##if( $overrideElemClass && $overrideElemClass != "" )
+#* *##set( $class = ' class="' + $overrideElemClass + '"' )
+#**##elseif( $overrideElemClass == "" )
+#* *##set( $class = "" )
#**##end
#**##if( $wrap )<$wrapElem#end$href$target$class#if( $wrap )>#end##
#**##if( $link.image && !$omitImage )
@@ -148,7 +150,7 @@
##
#macro( banner $banner $id )
#**##if( $banner )
-#* *#<div id="$id"><h1>#link( $banner false false false "set" false
)</h1></div>##
+#* *#<div id="$id"><h1>#link( $banner false false false "set" false ""
)</h1></div>##
#**##end
#end
##
