You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/05/21 20:54:33 UTC
svn commit: r1744982 - in
/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven:
site-macros.vm site.vm
Author: hboutemy
Date: Sat May 21 20:54:32 2016
New Revision: 1744982
URL: http://svn.apache.org/viewvc?rev=1744982&view=rev
Log:
improved generated html for menu & breadcrumbs
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm?rev=1744982&r1=1744981&r2=1744982&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm Sat May 21 20:54:32 2016
@@ -17,46 +17,47 @@
##
#macro ( topMenu $menus )
#foreach( $menu in $menus )
- #if ( $menu.name )
+#**##if ( $menu.name )
<li class="dropdown">
<a href="#" 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)
+#* *##foreach( $item in $menu.items )
+#* *##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 )
+#* *##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)
- #set ( $currentItemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#* *##foreach($subitem in $item.items)
+#* *##set ( $currentItemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+#* *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
<li>#topLink( $currentItemHref $subitem.name $subitem.target )</li>
- #end
+#* *##end
</ul>
</li>
- #else
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#* *##else
+#* *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#* *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
<li>#topLink( $currentItemHref $item.name $item.target )</li>
- #end
- #end
+#* *##end
+#* *##end
</ul>
</li>
- #end
+#**##end
#end
#end
##
##
##
#macro ( topLink $href $name $target )
- #set ( $linkTitle = ' title="' + $name + '"' )
- #if( $target )
- #set ( $linkTarget = ' target="' + $target + '"' )
- #else
- #set ( $linkTarget = "" )
- #end
- <a href="$href" $linkTarget title="$name">$name</a>
+#**##set ( $linkTitle = ' title="' + $name + '"' )
+#**##if( $target )
+#* *##set ( $linkTarget = ' target="' + $target + '"' )
+#**##else
+#* *##set ( $linkTarget = "" )
+#**##end
+#**#<a href="$href"$linkTarget title="$name">$name</a>##
#end
##
#macro ( topLinks $links )
@@ -72,30 +73,30 @@
##
##
#macro ( link $href $name $target $img $position $alt $border $width $height $icon)
- #set ( $linkTitle = ' title="' + $name + '"' )
- #if( $target )
- #set ( $linkTarget = ' target="' + $target + '"' )
- #else
- #set ( $linkTarget = "" )
- #end
- #if ( $decoration.isLink( $href ) )
- #set ( $linkClass = ' class="externalLink"' )
- #else
- #set ( $linkClass = "" )
- #end
- #if ( $img )
- #if ( $position == "left" )
- <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>
- #end
- #else
- <a href="$href"$linkClass$linkTarget$linkTitle>
- #if($icon)
- <span class="$icon"></span>
- #end
- $name</a>
- #end
+#**##set ( $linkTitle = ' title="' + $name + '"' )
+#**##if( $target )
+#* *##set ( $linkTarget = ' target="' + $target + '"' )
+#**##else
+#* *##set ( $linkTarget = "" )
+#**##end
+#**##if ( $decoration.isLink( $href ) )
+#* *##set ( $linkClass = ' class="externalLink"' )
+#**##else
+#* *##set ( $linkClass = "" )
+#**##end
+#**##if ( $img )
+#* *##if ( $position == "left" )
+#* *#<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>
+#* *##end
+#**##else
+#* *#<a href="$href"$linkClass$linkTarget$linkTitle>##
+#* *##if($icon)
+#* *#<span class="$icon"></span>##
+#* *##end
+#* *#$name</a>##
+#**##end
#end
##
##
@@ -218,27 +219,27 @@
##
#macro ( breadcrumbs $breadcrumbs $cssClass )
#foreach( $item in $breadcrumbs )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
- #if ( ( $currentItemHref == '' ) )
- #set ( $currentItemHref = './' )
- #end
-##
- <li class="$cssClass">
- #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
- #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ) )
- #set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ).getValue() )
- #else
- #set ( $breadcrumbDivider = '/' )
- #end
- <span class="divider">$breadcrumbDivider</span>
- </li>
+#**##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#**##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#**##if ( ( $currentItemHref == '' ) )
+#* *##set ( $currentItemHref = './' )
+#**##end
+##
+ <li class="$cssClass">##
+#* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false )
+#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ) )
+#* *##set ( $breadcrumbDivider = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'breadcrumbDivider' ).getValue() )
+#* *##else
+#* *##set ( $breadcrumbDivider = '/' )
+#* *##end
+#* *#<span class="divider">$breadcrumbDivider</span>##
+#* *#</li>
#end
- #if ( $shortTitle )
+#**##if ( $shortTitle )
<li class="active $cssClass">$shortTitle</li>
- #else
+#**##else
<li class="active $cssClass">$title</li>
- #end
+#**##end
#end
##
##
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1744982&r1=1744981&r2=1744982&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Sat May 21 20:54:32 2016
@@ -17,11 +17,11 @@
## under the License.
#parse( "site-macros.vm" )
<!--
-#**##set ( $skipGenerationDate = 'false')
-#**##if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate')
- && $decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate').getValue()=='true')
- #set ( $skipGenerationDate = 'true')
-#**##end
+#* *##set ( $skipGenerationDate = 'false')
+#* *##if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate')
+ && $decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate').getValue()=='true')
+#* *##set ( $skipGenerationDate = 'true')
+#* *##end
| Generated by Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end #if ($skipGenerationDate == 'false')at $dateFormat.format( $currentDate ) #end
| Rendered using Apache Maven Fluido Skin @project.version@