[maven-fluido-skin] 03/03: Rewrite poweredBy macro

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch site-model-rework
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git

commit cc61a3e944c0e70453675662b08e63d4bdaf7c93
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jun 30 22:33:12 2023 +0200

    Rewrite poweredBy macro
---
 src/main/resources/META-INF/maven/site-macros.vm | 80 +++++++++---------------
 1 file changed, 31 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 369cab3..a210cbf 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -100,7 +100,7 @@
 #**##end
 #end
 ##
-#macro ( image2 $image )
+#macro ( image2 $image $class )
 #*  *##if ( !$decoration.isLink( $image.src ) )
 #*    *##set ( $src = $PathTool.calculateLink( $image.src, $relativePath ) )
 #*    *##set ( $src = $src.replace( '\\', '/' ) )
@@ -128,7 +128,8 @@
 #*  *##else
 #*    *##set ( $style = "" )
 #*  *##end
-<img class="imageLink"$src$alt style="$width$height$style" />##
+#*  *##set ( $style = "$width$height$style" )
+<img class="$class"$src$alt#if ( $style ) style="$style"#end />##
 #end
 ##
 #macro ( image $img $alt $border $width $height )
@@ -190,7 +191,7 @@
 #*  *##end
 ##
 #*  *##if( $banner.image )
-#*    *##set ( $img = "#image2( $banner.image )" )
+#*    *##set ( $img = "#image2( $banner.image 'imageLink' )" )
 #*    *##if( $banner.image.position == "left" )
 #*      *#$img#if ( $name ) $name#end##
 #*    *##else
@@ -503,65 +504,46 @@ $indent     </ul>##
 #macro ( builtByLogo $poweredBy )
 #**##if( $poweredBy )
 #**##foreach ( $item in $poweredBy )
-#*  *##if( $item.href )
-#*    *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
-#*    *##set ( $href = $href.replaceAll( '\\', '/' ) )
-#*  *##else
-#*    *##set ( $href="https://maven.apache.org/" )
-#*  *##end
-##
 #*  *##if( $item.name )
-#*    *##set ( $name = $item.name )
+#*    *##set ( $name = $esc.xml( $item.name ) )
 #*  *##else
-#*    *##set ( $name = $text.get( "template.builtby" )  )
-#*    *##set ( $name = "${name} Maven"  )
-#*  *##end
-##
-#*  *##if( $item.img )
-#*    *##set ( $img = $item.img )
-#*  *##else
-#*    *##set ( $img = "images/logos/maven-feather.png" )
-#*  *##end
-##
-#*  *##if ( !$decoration.isLink( $img ) )
-#*    *##set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-#*    *##set ( $img = $img.replaceAll( '\\', '/' ) )
+#*    *##set ( $name = ""  )
 #*  *##end
-##
-#*  *##if( $item.alt )
-#*    *##set ( $alt = ' alt="' + $esc.xml( $item.alt ) + '"' )
+#*  *##if( $item.href )
+#*    *##set ( $href = $item.href )
+#*    *##if ( !$decoration.isLink( $href ) )
+#*      *##set ( $href = $PathTool.calculateLink( $href, $relativePath ) )
+#*      *##set ( $href = $href.replaceAll( '\\', '/' ) )
+#*    *##end
+#*    *##if( $item.target )
+#*      *##set ( $target = ' target="' + $item.target + '"' )
+#*    *##else
+#*      *##set ( $target = "" )
+#*    *##end
+#*    *#<a href="$href"$target class="builtBy">##
 #*  *##else
-#*    *##set ( $alt = ' alt="' + $esc.xml( $name ) + '"' )
+#*    *#<span class="builtBy">##
 #*  *##end
 ##
-#*  *##if( $item.border )
-#*    *##set ( $border = 'border: ' + $item.border + '; ' )
+#*  *##if( $item.image )
+#*    *##set ( $img = "#image2( $item.image 'builtBy' )" )
+#*    *##if( $item.image.position == "left" )
+#*      *#$img#if ( $name ) $name#end##
+#*    *##else
+#*      *##if ( $name )$name #end$img##
+#*    *##end
 #*  *##else
-#*    *##set ( $border = "" )
+#*    *#$name##
 #*  *##end
 ##
-#*  *##if( $item.width )
-#*    *##set ( $width = 'width: ' + $item.width + '; ' )
+#*  *##if( $item.href )
+#*    *#</a>
 #*  *##else
-#*    *##set ( $width = "" )
+#*    *#</span>
 #*  *##end
-#*  *##if( $item.height )
-#*    *##set ( $height = 'height: ' + $item.height + ';' )
-#*  *##else
-#*    *##set ( $height = "" )
-#*  *##end
-##
-#*  *#<a href="$href" class="builtBy">##
-#*    *#<img class="builtBy" $alt src="$img" style="$border$width$height" />##
-#*  *#</a>
-#**##end
-#**##if( $poweredBy.isEmpty() )
-#*  *#<a href="http://maven.apache.org/" class="poweredBy">##
-#*    *#<img class="builtBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />##
-#*  *#</a>
 #**##end
 #**##else
-#**#<a href="http://maven.apache.org/" class="poweredBy">##
+#**#<a href="https://maven.apache.org/" class="poweredBy">##
 #*  *#<img class="builtBy" alt="$text.get( "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />##
 #**#</a>
 #**##end