This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
The following commit(s) were added to refs/heads/master by this push: new c3485f1 [DOXIASITETOOLS-189] improved html generated for menus c3485f1 is described below commit c3485f12c234e7bd92af45b9da4d4a3ddf8da81f Author: Hervé Boutemy <hbout...@apache.org> AuthorDate: Sun Mar 11 20:02:10 2018 +0100 [DOXIASITETOOLS-189] improved html generated for menus --- .../doxia/siterenderer/resources/default-site-macros.vm | 17 +++++++++-------- doxia-site-renderer/src/test/resources/site/site.xml | 7 +++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm index 655c0fa..1b6d449 100644 --- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm +++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm @@ -183,7 +183,7 @@ #**##end #end ## -#macro ( menuItem $item ) +#macro ( menuItem $item $indent ) #**##set ( $collapse = "none" ) #**##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) #**##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) @@ -203,7 +203,7 @@ #* *##set ( $collapse = "expanded" ) #* *##end #**##end - <li class="$collapse">## +$indent <li class="$collapse">## #**##if ( $item.img ) #* *##if ( $item.position == "left" ) #* *##if ( $alignedFileName == $currentItemHref ) @@ -220,21 +220,22 @@ #* *##end #**##else #* *##if ( $alignedFileName == $currentItemHref ) -#* *#<strong>$item.name</strong> +#* *#<strong>$item.name</strong>## #* *##else #* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title ) #* *##end #**##end #**##if ( $item && $item.items && $item.items.size() > 0 ) #* *##if ( $collapse == "expanded" ) - <ul> + +$indent <ul> #* *##foreach( $subitem in $item.items ) -#* *##menuItem( $subitem ) +#* *##menuItem( $subitem "$indent " ) #* *##end - </ul> +$indent </ul>## #* *##end #**##end - </li> +#**#</li> #end ## #macro ( mainMenu $menus ) @@ -297,7 +298,7 @@ #* *##if ( $menu.items && $menu.items.size() > 0 ) <ul> #* *##foreach( $item in $menu.items ) -#* *##menuItem( $item ) +#* *##menuItem( $item '' ) #* *##end </ul> #* *##end diff --git a/doxia-site-renderer/src/test/resources/site/site.xml b/doxia-site-renderer/src/test/resources/site/site.xml index 50b24f0..d18c154 100644 --- a/doxia-site-renderer/src/test/resources/site/site.xml +++ b/doxia-site-renderer/src/test/resources/site/site.xml @@ -45,6 +45,13 @@ under the License. <item name="nestedItems" href="/nestedItems.html"/> <item name="entities, cdata, comment" href="/entityTest.html"/> <item name="javascript alert" href="/javascript.html"/> + <item name="sub-menu" href="/confluence/link.html" collapse="true"> + <item name="nested-list" href="/confluence/nested-list.html"/> + <item name="sub-sub-menu" href="/confluence/section.html" collapse="true"> + <item name="table" href="/confluence/table.html"/> + <item name="test" href="/confluence/test.html"/> + </item> + </item> </menu> </body> </project> -- To stop receiving notification emails like this one, please contact hbout...@apache.org.