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/22 00:23:41 UTC
svn commit: r1375827 - in /maven/skins/trunk/maven-fluido-skin/src:
it/topbar/src/site/ it/topbar/src/site/apt/ main/resources/META-INF/maven/
Author: olamy
Date: Tue Aug 21 22:23:40 2012
New Revision: 1375827
URL: http://svn.apache.org/viewvc?rev=1375827&view=rev
Log:
[MSKINS-59] Submenu support on dropdowns.
Added:
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm (with props)
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm (with props)
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm (with props)
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm (with props)
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Added: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm?rev=1375827&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm Tue Aug 21 22:23:40 2012
@@ -0,0 +1,19 @@
+ ------
+ ${project.name}
+ ------
+ Hervé Boutemy
+ ------
+ 2011-10-15
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with topbar enabled, sidebar disabled and Google Search.
+
+ bar.html
+
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/bar.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm?rev=1375827&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm Tue Aug 21 22:23:40 2012
@@ -0,0 +1,19 @@
+ ------
+ ${project.name}
+ ------
+ Hervé Boutemy
+ ------
+ 2011-10-15
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with topbar enabled, sidebar disabled and Google Search.
+
+ beer.html
+
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/beer.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm?rev=1375827&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm Tue Aug 21 22:23:40 2012
@@ -0,0 +1,19 @@
+ ------
+ ${project.name}
+ ------
+ Hervé Boutemy
+ ------
+ 2011-10-15
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with topbar enabled, sidebar disabled and Google Search.
+
+ foo.html
+
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/foo.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm?rev=1375827&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm Tue Aug 21 22:23:40 2012
@@ -0,0 +1,19 @@
+ ------
+ ${project.name}
+ ------
+ Hervé Boutemy
+ ------
+ 2011-10-15
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with topbar enabled, sidebar disabled and Google Search.
+
+ wine.html
+
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/apt/wine.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml?rev=1375827&r1=1375826&r2=1375827&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/topbar/src/site/site.xml Tue Aug 21 22:23:40 2012
@@ -63,10 +63,13 @@
</breadcrumbs>
<menu name="Overview">
- <item name="Introduction" href="index.html"/>
+ <item name="Introduction" href="index.html">
+ <item name="Bar" href="bar.html"/>
+ </item>
<item name="Foo" href="foo.html">
<item name="Bar" href="bar.html"/>
<item name="Wine" href="wine.html"/>
+ <item name="Beer" href="beer.html"/>
</item>
</menu>
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=1375827&r1=1375826&r2=1375827&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 Tue Aug 21 22:23:40 2012
@@ -10,9 +10,25 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">$menu.name <b class="caret"></b></a>
<ul class="dropdown-menu">
#foreach( $item in $menu.items )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
- <li>#topLink( $currentItemHref $item.name $item.target )</li>
+
+ #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)
+ #set ( $currentItemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+ <li>#topLink( $currentItemHref $subitem.name $subitem.target )</li>
+ #end
+ </ul>
+ </li>
+ #else
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+ <li>#topLink( $currentItemHref $item.name $item.target )</li>
+ #end
#end
</ul>
</li>