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 2022/05/10 20:22:34 UTC
[maven-fluido-skin] branch master updated: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
The following commit(s) were added to refs/heads/master by this push:
new 3b163ec Fix formatting
3b163ec is described below
commit 3b163ecd353cb0fcdbeb52181c7bfa54afba5c78
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue May 10 19:22:59 2022 +0200
Fix formatting
---
src/main/resources/META-INF/maven/site-macros.vm | 30 ++++++++++++------------
src/main/resources/META-INF/maven/site.vm | 6 ++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index b4085b1..29acdab 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -22,14 +22,14 @@
<a class="dropdown-toggle" data-toggle="dropdown">$menu.name <b class="caret"></b></a>
<ul class="dropdown-menu">
#* *##foreach( $item in $menu.items )
-#* *##if ($item.items.size() > 0)
+#* *##if ( $item.items.size() > 0 )
<li class="dropdown-submenu">
#* *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
#* *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
#* *##topLink( $currentItemHref $item.name $item.target )
<ul class="dropdown-menu">
-#* *##foreach($subitem in $item.items)
+#* *##foreach( $subitem in $item.items )
#* *##set ( $currentItemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
#* *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
<li>#topLink( $currentItemHref $subitem.name $subitem.target )</li>
@@ -72,7 +72,7 @@
#**##end
#end
##
-#macro ( link $href $name $target $img $position $alt $border $width $height $icon)
+#macro ( link $href $name $target $img $position $alt $border $width $height $icon )
#**##set ( $linkTitle = ' title="' + $name + '"' )
#**##if( $target )
#* *##set ( $linkTarget = ' target="' + $target + '"' )
@@ -86,13 +86,13 @@
#**##end
#**##if ( $img )
#* *##if ( $position == "left" )
-#* *#<a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>##
+#* *#<a href="$href"$linkClass$linkTarget$linkTitle>#image( $img $alt $border $width $height )$name</a>##
#* *##else
-#* *#<a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>##
+#* *#<a href="$href"$linkClass$linkTarget$linkTitle>$name #image( $img $alt $border $width $height )</a>##
#* *##end
#**##else
#* *#<a href="$href"$linkClass$linkTarget$linkTitle>##
-#* *##if($icon)
+#* *##if( $icon )
#* *#<span class="$icon"></span>##
#* *##end
#* *#$name</a>##
@@ -209,7 +209,7 @@
#* *##if ( $counter > 0 && $counter < $links.size() )
#* *#<span class="divider">|</span>
#* *##end
-#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
#* *#</li>
#* *##end
#**##end
@@ -285,22 +285,22 @@ $indent <li>##
#**##if ( $item.img )
#* *##if ( $item.position == "left" )
#* *##if ( $alignedFileName == $currentItemHref )
-#* *#<a>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</a>##
+#* *#<a>#image( $item.img $item.alt $item.border $item.width $item.height ) $item.name</a>##
#* *##else
-#* *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
#* *##end
#* *##else
#* *##if ( $alignedFileName == $currentItemHref )
-#* *#<a>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</a>##
+#* *#<a>$item.name #image( $item.img $item.alt $item.border $item.width $item.height )</a>##
#* *##else
-#* *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
#* *##end
#* *##end
#**##else
#* *##if ( $alignedFileName == $currentItemHref )
#* *#<a><span class="$collapseClass"></span>$item.name</a>##
#* *##else
-#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $collapseClass)
+#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $collapseClass )
#* *##end
#**##end
#**##if ( $item && $item.items && $item.items.size() > 0 )
@@ -415,7 +415,7 @@ $indent </ul>##
##
#**##if ( $datePosition.equalsIgnoreCase( "right" ) && ( $versionPosition.equalsIgnoreCase( "right" ) || !$topBarEnabled
&& $decoration.body.links
- && $decoration.body.links.size() > 0) )
+ && $decoration.body.links.size() > 0 ) )
#* *##set ( $prefix = '<span class="divider">|</span> ' )
#**##else
#* *##set ( $prefix = "" )
@@ -443,7 +443,7 @@ $indent </ul>##
</div>
#* *##elseif ( $datePosition.equalsIgnoreCase("left") )
<li id="publishDate">$text.get( "template.lastpublished" ): $dateValue##
-#* *##if ( $versionPosition.equalsIgnoreCase( $position ) || $breadcrumbs && $breadcrumbs.size() > 0)
+#* *##if ( $versionPosition.equalsIgnoreCase( $position ) || $breadcrumbs && $breadcrumbs.size() > 0 )
#* *#<span class="divider">|</span>
#* *##end
#* *#</li>
@@ -486,7 +486,7 @@ $indent </ul>##
##
#macro ( builtByLogo $poweredBy )
#**##if( $poweredBy )
-#**##foreach ($item in $poweredBy)
+#**##foreach ( $item in $poweredBy )
#* *##if( $item.href )
#* *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
#* *##set ( $href = $href.replaceAll( '\\', '/' ) )
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 3c800b5..78dda53 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -139,13 +139,13 @@
</ul>
#* *##end
##
-#* *##if (!$sideBarEnabled)
+#* *##if ( !$sideBarEnabled )
</nav>
<div class="nav-collapse">
#* *##end
##
#* *##if ( $searchEnabled && !$sideBarEnabled )
-#* *##googleSearch(true)
+#* *##googleSearch( true )
#* *##end
##
#* *##if ( !$sideBarEnabled )
@@ -168,7 +168,7 @@
</ul>
#* *##end
##
-#* *##if (!$sideBarEnabled)
+#* *##if ( !$sideBarEnabled )
</div>
#* *##end
##