You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/08/25 14:39:48 UTC
svn commit: r1377281 - in /maven/skins/trunk/maven-fluido-skin/src:
it/mskins-10/src/site/site.xml main/resources/META-INF/maven/site.vm
Author: olamy
Date: Sat Aug 25 12:39:47 2012
New Revision: 1377281
URL: http://svn.apache.org/viewvc?rev=1377281&view=rev
Log:
[MSKINS-63 use icon-chevron* for sidebar
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml?rev=1377281&r1=1377280&r2=1377281&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml Sat Aug 25 12:39:47 2012
@@ -34,6 +34,12 @@
<body>
<menu>
<item name="Suppress line wrapping in navigation caused by spaces or hyphens" href="./"/>
+ <item name="Beer" href="beer.html" collapse="true">
+ <item name="Wine" href="wine.html"/>
+ </item>
+ <item name="Beer1" href="beer1.html" collapse="true">
+ <item name="Wine1" href="wine1.html"/>
+ </item>
</menu>
<menu ref="reports"/>
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=1377281&r1=1377280&r2=1377281&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 Aug 25 12:39:47 2012
@@ -56,7 +56,7 @@
#end
#end
##
-#macro ( link $href $name $target $img $position $alt $border $width $height )
+#macro ( link $href $name $target $img $position $alt $border $width $height $icon)
#set ( $linkTitle = ' title="' + $name + '"' )
#if( $target )
#set ( $linkTarget = ' target="' + $target + '"' )
@@ -77,7 +77,11 @@
<a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
#end
#else
- <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
+ <a href="$href"$linkClass$linkTarget$linkTitle>
+ #if($icon)
+ <i class="$icon"></i>
+ #end
+ $name</a>
#end
#end
##
@@ -236,24 +240,24 @@
##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
- #set ( $collapse = "expanded" )
+ #set ( $collapse = "icon-chevron-down" )
#else
## By default collapsed
- #set ( $collapse = "collapsed" )
+ #set ( $collapse = "icon-chevron-right" )
#end
##
#set ( $display = false )
#displayTree( $display $item )
##
#if ( $alignedFileName == $currentItemHref || $display )
- #set ( $collapse = "expanded" )
+ #set ( $collapse = "icon-chevron-down" )
#end
#end
#if ( $alignedFileName == $currentItemHref )
- <li class="$collapse active">
+ <li class="active">
#else
- <li class="$collapse">
+ <li>
#end
#if ( $item.img )
@@ -272,13 +276,13 @@
#end
#else
#if ( $alignedFileName == $currentItemHref )
- <a href="#">$item.name</a>
+ <a href="#"><i class="$collapse"></i>$item.name</a>
#else
- #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $collapse)
#end
#end
#if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $collapse == "expanded" )
+ #if ( $collapse == "icon-chevron-down" )
<ul class="nav nav-list">
#foreach( $subitem in $item.items )
#menuItem( $subitem )