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 <micha...@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>