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 2023/07/09 20:45:32 UTC
[maven-fluido-skin] branch site-model-rework updated (2ec3dfe -> 726a8af)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch site-model-rework
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
discard 2ec3dfe Rewrite poweredBy macro
discard 65cfef7 Rewrite banner macro
discard 58afc2b Drop title attribute
add e7e63b0 Use HTTPS
add ff9e481 [MSKINS-232] Upgrade to Doxia Sitetools 2.0.0-M11
add 35271a7 [MSKINS-231] site.vm contains untranslated "External Links" label
add 0fc266a [MSKINS-233] site-macros.vm contains untranslated "Edit" label
add ef19392 [maven-release-plugin] prepare release maven-fluido-skin-2.0.0-M7
add a60a4ef [maven-release-plugin] prepare for next development iteration
new fcf84cf Drop title attribute
new be74bf6 Rewrite banner macro
new 726a8af Rewrite poweredBy macro
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2ec3dfe)
\
N -- N -- N refs/heads/site-model-rework (726a8af)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 ++++----
src/it/mskins-107/verify.groovy | 2 +-
src/main/resources/META-INF/maven/site-macros.vm | 2 +-
src/main/resources/META-INF/maven/site.vm | 2 +-
src/main/resources/META-INF/maven/skin.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
[maven-fluido-skin] 01/03: Drop title attribute
Posted by 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 fcf84cfffc07e7b28057db812fb74459f9dc86d1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 29 16:24:58 2023 +0200
Drop title attribute
---
src/it/mskins-76/verify.groovy | 2 +-
src/it/mskins-76_topbar/verify.groovy | 2 +-
src/it/sidebar/verify.groovy | 6 ++---
src/it/topbar/verify.groovy | 8 +++---
src/main/resources/META-INF/maven/site-macros.vm | 31 +++++++++---------------
5 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/src/it/mskins-76/verify.groovy b/src/it/mskins-76/verify.groovy
index 7b6983e..7893786 100644
--- a/src/it/mskins-76/verify.groovy
+++ b/src/it/mskins-76/verify.groovy
@@ -34,4 +34,4 @@ assert text.contains( '''\
assert text.contains( '''\
<a class="FlattrButton" style="display:none;" href="http://opensource.org/"></a>
<noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
- <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
+ <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
diff --git a/src/it/mskins-76_topbar/verify.groovy b/src/it/mskins-76_topbar/verify.groovy
index 4ea467d..61cfcaf 100644
--- a/src/it/mskins-76_topbar/verify.groovy
+++ b/src/it/mskins-76_topbar/verify.groovy
@@ -34,4 +34,4 @@ assert text.contains( '''\
assert text.contains( '''\
<a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a>
<noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank">
- <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
+ <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" style="border: 0;" /></a></noscript>'''.normalize() )
diff --git a/src/it/sidebar/verify.groovy b/src/it/sidebar/verify.groovy
index 98b6cab..8a429c3 100644
--- a/src/it/sidebar/verify.groovy
+++ b/src/it/sidebar/verify.groovy
@@ -25,7 +25,7 @@ String html = index.text
// active menu
assert html.contains( '<li class="active"><a><span class="none"></span>About</a>' )
// inactive menu
-assert html.contains( '<li><a href="summary.html" title="Summary"><span class="none"></span>Summary</a>' )
-assert html.contains( '<li><a href="plugins.html" title="Plugins"><span class="none"></span>Plugins</a></li>' )
+assert html.contains( '<li><a href="summary.html"><span class="none"></span>Summary</a>' )
+assert html.contains( '<li><a href="plugins.html"><span class="none"></span>Plugins</a></li>' )
// breadcrumb
-assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )
+assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink">Apache</a><span class="divider">/</span></li>' )
diff --git a/src/it/topbar/verify.groovy b/src/it/topbar/verify.groovy
index 82704fd..2e3dd0b 100644
--- a/src/it/topbar/verify.groovy
+++ b/src/it/topbar/verify.groovy
@@ -23,9 +23,9 @@ assert index.exists()
// MSKINS-130 check that html structure is as clean as possible
String html = index.text
// active menu
-assert html.contains( '<li><a title="About">About</a></li>' )
+assert html.contains( '<li><a>About</a></li>' )
// inactive menu
-assert html.contains( '<li><a href="summary.html" title="Summary">Summary</a></li>' )
-assert html.contains( '<li><a href="plugins.html" title="Plugins">Plugins</a></li>' )
+assert html.contains( '<li><a href="summary.html">Summary</a></li>' )
+assert html.contains( '<li><a href="plugins.html">Plugins</a></li>' )
// breadcrumb
-assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' )
+assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink">Apache</a><span class="divider">/</span></li>' )
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 2f1a073..b1cff7a 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -49,16 +49,15 @@
#end
##
#macro ( topLink $href $name $target )
-#**##set ( $linkTitle = ' title="' + $esc.xml( $name ) + '"' )
#**##if( $target )
#* *##set ( $linkTarget = ' target="' + $target + '"' )
#**##else
#* *##set ( $linkTarget = "" )
#**##end
#**##if ( $alignedFileName == $href )
-#* *#<a$linkTitle>$esc.xml( $name )</a>##
+#* *#<a>$esc.xml( $name )</a>##
#**##else
-#* *#<a href="$href"$linkTarget$linkTitle>$esc.xml( $name )</a>##
+#* *#<a href="$href"$linkTarget>$esc.xml( $name )</a>##
#**##end
#end
##
@@ -71,7 +70,6 @@
#end
##
#macro ( link $href $name $target $img $position $alt $border $width $height $icon )
-#**##set ( $linkTitle = ' title="' + $esc.xml( $name ) + '"' )
#**##if( $target )
#* *##set ( $linkTarget = ' target="' + $target + '"' )
#**##else
@@ -89,12 +87,12 @@
#**##end
#**##if ( $img )
#* *##if ( $position == "left" )
-#* *#<a$href$linkClass$linkTarget$linkTitle>#image( $img $alt $border $width $height )$name</a>##
+#* *#<a$href$linkClass$linkTarget>#image( $img $alt $border $width $height )$name</a>##
#* *##else
-#* *#<a$href$linkClass$linkTarget$linkTitle>$esc.xml( $name ) #image( $img $alt $border $width $height )</a>##
+#* *#<a$href$linkClass$linkTarget>$esc.xml( $name ) #image( $img $alt $border $width $height )</a>##
#* *##end
#**##else
-#* *#<a$href$linkClass$linkTarget$linkTitle>##
+#* *#<a$href$linkClass$linkTarget>##
#* *##if( $icon )
#* *#<span class="$icon"></span>##
#* *##end
@@ -146,7 +144,7 @@
#* *##set ( $hrf = './' )
#* *##end
#* *##end
-#* *#<a href="$hrf" id="$id"#if( $banner.alt ) title="$esc.xml( $banner.alt )"#end>##
+#* *#<a href="$hrf" id="$id">##
#* *##else
#* *#<div id="$id">##
#* *##end
@@ -179,12 +177,7 @@
#* *##else
#* *##set ( $imgHeight = "" )
#* *##end
-#* *##if( $banner.title )
-#* *##set ( $bannerTitle=' title="' + $esc.xml( $banner.title ) + '"' )
-#* *##else
-#* *##set ( $bannerTitle="" )
-#* *##end
-#* *#<img src="$src" $alt$bannerTitle style="$imgBorder$imgWidth$imgHeight" />##
+#* *#<img src="$src"$alt style="$imgBorder$imgWidth$imgHeight" />##
#* *##else
#* *#<h1>$esc.xml( $banner.name )</h1>
#* *##end
@@ -541,17 +534,17 @@ $indent </ul>##
#* *##set ( $height = "" )
#* *##end
##
-#* *#<a href="$href" title="$esc.xml( $name )" class="builtBy">##
+#* *#<a href="$href" class="builtBy">##
#* *#<img class="builtBy" $alt src="$img" style="$border$width$height" />##
#* *#</a>
#**##end
#**##if( $poweredBy.isEmpty() )
-#* *#<a href="https://maven.apache.org/" title="$text.get( "template.builtby" ) Maven" class="poweredBy">##
+#* *#<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="https://maven.apache.org/" title="$text.get( "template.builtby" ) Maven" class="poweredBy">##
+#**#<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
@@ -653,7 +646,7 @@ $indent </ul>##
#* *##set ( $ribbonOrientation = "$decoration.getCustomValue( 'fluidoSkin.gitHub.ribbonOrientation' ) fixed" )
#* *##end
##
- <a class="github-fork-ribbon $ribbonOrientation" href="https://github.com/$gitHubProjectId" data-ribbon="Fork me on GitHub" title="Fork me on GitHub">Fork me on GitHub</a>
+ <a class="github-fork-ribbon $ribbonOrientation" href="https://github.com/$gitHubProjectId" data-ribbon="Fork me on GitHub">Fork me on GitHub</a>
#**##end
#end
##
@@ -756,7 +749,7 @@ $indent </ul>##
##
<a class="FlattrButton" style="display:none;" $styleModifier href="$flattrUrl"></a>
<noscript><a href="https://flattr.com/thing/$flattrThing" target="_blank">
- <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>
+ <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" style="border: 0;" /></a></noscript>
##
#* *##if ( $sideBarEnabled )
</div>
[maven-fluido-skin] 02/03: Rewrite banner macro
Posted by 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 be74bf6ed43d77066ab77655f467e686e2cd92f6
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jun 30 17:12:23 2023 +0200
Rewrite banner macro
---
src/main/resources/META-INF/maven/site-macros.vm | 95 ++++++++++++++----------
1 file changed, 56 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index b1cff7a..369cab3 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -100,6 +100,37 @@
#**##end
#end
##
+#macro ( image2 $image )
+#* *##if ( !$decoration.isLink( $image.src ) )
+#* *##set ( $src = $PathTool.calculateLink( $image.src, $relativePath ) )
+#* *##set ( $src = $src.replace( '\\', '/' ) )
+#* *##set ( $src = ' src="' + $src + '"' )
+#* *##else
+#* *##set ( $src = ' src="' + $image.src + '"' )
+#* *##end
+#* *##if( $image.alt )
+#* *##set ( $alt = ' alt="' + $esc.xml( $image.alt ) + '"' )
+#* *##else
+#* *##set ( $alt = "" )
+#* *##end
+#* *##if( $image.width )
+#* *##set ( $width = 'width: ' + $image.width + '; ' )
+#* *##else
+#* *##set ( $width = "" )
+#* *##end
+#* *##if( $image.height )
+#* *##set ( $height = 'height: ' + $image.height + ';' )
+#* *##else
+#* *##set ( $height = "" )
+#* *##end
+#* *##if( $image.style )
+#* *##set ( $style = $image.style )
+#* *##else
+#* *##set ( $style = "" )
+#* *##end
+<img class="imageLink"$src$alt style="$width$height$style" />##
+#end
+##
#macro ( image $img $alt $border $width $height )
#**##if( $img )
#* *##if ( !$decoration.isLink( $img ) )
@@ -135,58 +166,44 @@
##
#macro ( banner $banner $id )
#**##if ( $banner )
-#* *##if( $banner.href )
-#* *##set ( $hrf = $banner.href )
-#* *##if ( !$decoration.isLink( $hrf ) )
-#* *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
-#* *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
-#* *##if ( ( $hrf == '' ) )
-#* *##set ( $hrf = './' )
-#* *##end
-#* *##end
-#* *#<a href="$hrf" id="$id">##
+#* *#<div id="$id"><h1>##
+#* *##if( $banner.name )
+#* *##set ( $name = $esc.xml( $banner.name ) )
#* *##else
-#* *#<div id="$id">##
+#* *##set ( $name = "" )
#* *##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="' + $esc.xml( $banner.alt ) + '"' )
-#* *##elseif ( $banner.name )
-#* *##set ( $alt = ' alt="' + $esc.xml( $banner.name ) + '"' )
-#* *##else
-#* *##set ( $alt = "" )
-#* *##end
-#* *##if( $banner.border )
-#* *##set ( $imgBorder = 'border: ' + $banner.border + '; ' )
-#* *##else
-#* *##set ( $imgBorder = "" )
+#* *##if( $banner.href )
+#* *##set ( $href = $banner.href )
+#* *##if ( !$decoration.isLink( $href ) )
+#* *##set ( $href = $PathTool.calculateLink( $href, $relativePath ) )
+#* *##set ( $href = $href.replaceAll( '\\', '/' ) )
+#* *##if ( ( $href == '' ) )
+#* *##set ( $href = './' )
+#* *##end
#* *##end
-#* *##if( $banner.width )
-#* *##set ( $imgWidth = 'width: ' + $banner.width + '; ' )
+#* *##if( $banner.target )
+#* *##set ( $target = ' target="' + $banner.target + '"' )
#* *##else
-#* *##set ( $imgWidth = "" )
+#* *##set ( $target = "" )
#* *##end
-#* *##if( $banner.height )
-#* *##set ( $imgHeight = 'height: ' + $banner.height + ';' )
+#* *#<a href="$href"$target>##
+#* *##end
+##
+#* *##if( $banner.image )
+#* *##set ( $img = "#image2( $banner.image )" )
+#* *##if( $banner.image.position == "left" )
+#* *#$img#if ( $name ) $name#end##
#* *##else
-#* *##set ( $imgHeight = "" )
+#* *##if ( $name )$name #end$img##
#* *##end
-#* *#<img src="$src"$alt style="$imgBorder$imgWidth$imgHeight" />##
#* *##else
-#* *#<h1>$esc.xml( $banner.name )</h1>
+#* *#$name##
#* *##end
##
#* *##if( $banner.href )
#* *#</a>##
-#* *##else
-#* *#</div>
#* *##end
+#* *#</h1></div>
#**##end
#end
##
[maven-fluido-skin] 03/03: Rewrite poweredBy macro
Posted by 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 726a8af2507075f99070ffded536b2fd8cbd5033
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..bca8df1 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" )
+#* *##set ( $name = "" )
#* *##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( '\\', '/' ) )
-#* *##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( $item.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