improved generated html

git-svn-id: https://svn.apache.org/repos/asf/maven/skins/trunk@1745028 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm b/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
index 9a41ec4..8361ca7 100644
--- a/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
+++ b/maven-fluido-skin/src/main/resources/META-INF/maven/site-macros.vm
@@ -60,14 +60,16 @@
 #**#<a href="$href"$linkTarget title="$name">$name</a>##
 #end
 ##
+##
+##
 #macro ( topLinks $links )
-  #set ( $counter = 0 )
-  #foreach( $item in $links )
-    #set ( $counter = $counter + 1 )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#**##set ( $counter = 0 )
+#**##foreach( $item in $links )
+#*  *##set ( $counter = $counter + 1 )
+#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
     <li>#topLink( $currentItemHref $item.name $item.target )</li>
-  #end
+#**##end
 #end
 ##
 ##
@@ -137,82 +139,81 @@
 ##
 ##
 #macro ( banner $banner $id )
-  #if ( $banner )
-    #if( $banner.href )
-      #set ( $hrf = $banner.href )
-      #if ( !$decoration.isLink( $hrf ) )
-        #set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
-        #set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
-        #if ( ( $hrf == '' ) )
-          #set ( $hrf = './' )
-        #end
-      #end
-      <a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
-    #else
-        <div id="$id">
-    #end
+#**##if ( $banner )
+#*  *##if( $banner.href )
+#*    *##set ( $hrf = $banner.href )
+#*    *##if ( !$decoration.isLink( $hrf ) )
+#*      *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
+#*      *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
+#*      *##if ( ( $hrf == '' ) )
+#*        *##set ( $hrf = './' )
+#*      *##end
+#*    *##end
+#*    *#<a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>##
+#*  *##else
+#*    *#<div id="$id">##
+#*  *##end
 ##
-    #if( $banner.src )
-        #set ( $src = $banner.src )
-        #if ( !$decoration.isLink( $src ) )
-            #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
-            #set ( $src = $src.replaceAll( '\\', '/' ) )
-        #end
-        #if ( $banner.alt )
-            #set ( $alt = ' alt="' + $banner.alt + '"' )
-        #elseif ( $banner.name )
-            #set ( $alt = ' alt="' + $banner.name + '"' )
-        #else
-            #set ( $alt = "" )
-        #end
-        #if( $banner.border )
-          #set ( $imgBorder = ' border="' + $banner.border + '"' )
-        #else
-          #set ( $imgBorder = "" )
-        #end
-        #if( $banner.width )
-            #set ( $imgWidth = ' width="' + $banner.width + '"' )
-        #else
-            #set ( $imgWidth = "" )
-        #end
-        #if( $banner.height )
-           #set ( $imgHeight = ' height="' + $banner.height + '"' )
-        #else
-           #set ( $imgHeight = "" )
-        #end
-        <img src="$src" $alt$imgBorder$imgWidth$imgHeight/>
-    #else
-        <h2>$banner.name</h2>
-    #end
+#*  *##if( $banner.src )
+#*    *##set ( $src = $banner.src )
+#*    *##if ( !$decoration.isLink( $src ) )
+#*      *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+#*      *##set ( $src = $src.replaceAll( '\\', '/' ) )
+#*    *##end
+#*    *##if ( $banner.alt )
+#*      *##set ( $alt = ' alt="' + $banner.alt + '"' )
+#*    *##elseif ( $banner.name )
+#*      *##set ( $alt = ' alt="' + $banner.name + '"' )
+#*    *##else
+#*      *##set ( $alt = "" )
+#*    *##end
+#*    *##if( $banner.border )
+#*      *##set ( $imgBorder = ' border="' + $banner.border + '"' )
+#*    *##else
+#*      *##set ( $imgBorder = "" )
+#*    *##end
+#*    *##if( $banner.width )
+#*      *##set ( $imgWidth = ' width="' + $banner.width + '"' )
+#*    *##else
+#*      *##set ( $imgWidth = "" )
+#*    *##end
+#*    *##if( $banner.height )
+#*      *##set ( $imgHeight = ' height="' + $banner.height + '"' )
+#*    *##else
+#*      *##set ( $imgHeight = "" )
+#*    *##end
+#*    *#<img src="$src" $alt$imgBorder$imgWidth$imgHeight/>##
+#*  *##else
+#*    *#<h2>$banner.name</h2>
+#*  *##end
 ##
-    #if( $banner.href )
-        </a>
-    #else
-        </div>
-    #end
-  #end
+#*  *##if( $banner.href )
+#*    *#</a>##
+#*  *##else
+#*    *#</div>
+#*  *##end
+#**##end
 #end
 ##
 ##
 ##
 #macro ( links $links )
-  #set ( $counter = 0 )
-  ## MSKINS-41
-  #set ( $begin = $links.size() - 1 )
-  #foreach( $index in [$begin..0] )
-    #set ( $item = $links.get( $index ) )
-    #set ( $counter = $counter + 1 )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-
-    <li class="pull-right">
-    #if ( $counter > 0 && $counter < $links.size() )
-    <span class="divider">|</span>
-    #end
-    #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
-    </li>
-
-  #end
+#**##set ( $counter = 0 )
+#**### MSKINS-41
+#**##set ( $begin = $links.size() - 1 )
+#**##foreach( $index in [$begin..0] )
+#*  *##set ( $item = $links.get( $index ) )
+#*  *##set ( $counter = $counter + 1 )
+#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+##
+      <li class="pull-right">##
+#*  *##if ( $counter > 0 && $counter < $links.size() )
+#*  *#<span class="divider">|</span>
+#*  *##end
+#*  *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#*  *#</li>
+#**##end
 #end
 ##
 ##
@@ -234,7 +235,7 @@
 #*  *##end
 #*  *#<span class="divider">$breadcrumbDivider</span>##
 #*  *#</li>
-  #end
+#**##end
 #**##if ( $shortTitle )
     <li class="active $cssClass">$shortTitle</li>
 #**##else
@@ -245,79 +246,80 @@
 ##
 ##
 #macro ( displayTree $display $item )
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #foreach( $subitem in $item.items )
-      #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
-      #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##foreach( $subitem in $item.items )
+#*    *##set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+#*    *##set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
 ##
-      #if ( $alignedFileName == $subitemHref )
-        #set ( $display = true )
-      #end
+#*    *##if ( $alignedFileName == $subitemHref )
+#*      *##set ( $display = true )
+#*    *##end
 ##
-      #displayTree( $display $subitem )
-    #end
-  #end
+#*    *##displayTree( $display $subitem )
+#*  *##end
+#**##end
 #end
 ##
 ##
 ##
 #macro ( menuItem $item )
-  #set ( $collapseClass = "none" )
-  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-  #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#**##set ( $collapseClass = "none" )
+#**##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#**##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
 ##
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #if ( $item.collapse == false )
-      #set ( $collapseClass = "icon-chevron-down" )
-    #else
-      ## By default collapsed
-      #set ( $collapseClass = "icon-chevron-right" )
-    #end
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##if ( $item.collapse == false )
+#*    *##set ( $collapseClass = "icon-chevron-down" )
+#*  *##else
+#*    *### By default collapsed
+#*    *##set ( $collapseClass = "icon-chevron-right" )
+#*  *##end
 ##
-    #set ( $display = false )
-    #displayTree( $display $item )
+#*  *##set ( $display = false )
+#*  *##displayTree( $display $item )
 ##
-    #if ( $alignedFileName == $currentItemHref || $display )
-      #set ( $collapseClass = "icon-chevron-down" )
-    #end
-  #end
+#*  *##if ( $alignedFileName == $currentItemHref || $display )
+#*    *##set ( $collapseClass = "icon-chevron-down" )
+#*  *##end
+#**##end
 ##
-  #if ( $alignedFileName == $currentItemHref )
-    <li class="active">
-  #else
-    <li>
-  #end
+#**##if ( $alignedFileName == $currentItemHref )
+    <li class="active">##
+#**##else
+    <li>##
+#**##end
 ##
-  #if ( $item.img )
-    #if ( $item.position == "left" )
-      #if ( $alignedFileName == $currentItemHref )
-        <a href="#">#image($item.img $item.alt $item.border $item.width $item.height) $item.name</a>
-      #else
-        #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
-      #end
-    #else
-      #if ( $alignedFileName == $currentItemHref )
-        <a href="#">$item.name #image($item.img $item.alt $item.border $item.width $item.height)</a>
-      #else
-        #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
-      #end
-    #end
-  #else
-    #if ( $alignedFileName == $currentItemHref )
-      <a href="#"><span class="$collapseClass"></span>$item.name</a>
-    #else
-      #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $collapseClass)
-    #end
-  #end
-  #if ( $item && $item.items && $item.items.size() > 0 )
-    #if ( $collapseClass == "icon-chevron-down" )
+#**##if ( $item.img )
+#*  *##if ( $item.position == "left" )
+#*    *##if ( $alignedFileName == $currentItemHref )
+#*      *#<a href="#">#image($item.img $item.alt $item.border $item.width $item.height) $item.name</a>
+#*    *##else
+#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#*    *##end
+#*  *##else
+#*    *##if ( $alignedFileName == $currentItemHref )
+#*      *#<a href="#">$item.name #image($item.img $item.alt $item.border $item.width $item.height)</a>
+#*    *##else
+#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false)
+#*    *##end
+#*  *##end
+#**##else
+#*  *##if ( $alignedFileName == $currentItemHref )
+#*    *#<a href="#"><span class="$collapseClass"></span>$item.name</a>
+#*  *##else
+#*    *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $collapseClass)
+#*  *##end
+#**##end
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##if ( $collapseClass == "icon-chevron-down" )
+
       <ul class="nav nav-list">
-        #foreach( $subitem in $item.items )
-          #menuItem( $subitem )
-        #end
+#*    *##foreach( $subitem in $item.items )
+#*      *##menuItem( $subitem )
+#*    *##end
       </ul>
-    #end
-  #end
+#*  *##end
+#**##end
   </li>
 #end
 ##
@@ -326,61 +328,61 @@
 #macro ( mainMenu $menus )
 <ul class="nav nav-list">
   #foreach( $menu in $menus )
-    #if ( $menu.name )
-      #if ( $menu.img )
-        #if( $menu.position )
-          #set ( $position = $menu.position )
-        #else
-          #set ( $position = "left" )
-        #end
+#**##if ( $menu.name )
+#*  *##if ( $menu.img )
+#*    *##if( $menu.position )
+#*      *##set ( $position = $menu.position )
+#*    *##else
+#*      *##set ( $position = "left" )
+#*    *##end
 ##
-        #if ( !$decoration.isLink( $menu.img ) )
-          #set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
-          #set ( $src = $src.replaceAll( '\\', '/' ) )
-          #set ( $src = ' src="' + $src + '"' )
-        #else
-          #set ( $src = ' src="' + $menu.img + '"' )
-        #end
+#*    *##if ( !$decoration.isLink( $menu.img ) )
+#*      *##set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
+#*      *##set ( $src = $src.replaceAll( '\\', '/' ) )
+#*      *##set ( $src = ' src="' + $src + '"' )
+#*    *##else
+#*      *##set ( $src = ' src="' + $menu.img + '"' )
+#*    *##end
 ##
-        #if( $menu.alt )
-          #set ( $alt = ' alt="' + $menu.alt + '"' )
-        #else
-          #set ( $alt = ' alt="' + $menu.name + '"' )
-        #end
+#*    *##if( $menu.alt )
+#*      *##set ( $alt = ' alt="' + $menu.alt + '"' )
+#*    *##else
+#*      *##set ( $alt = ' alt="' + $menu.name + '"' )
+#*    *##end
 ##
-        #if( $menu.border )
-          #set ( $border = ' border="' + $menu.border + '"' )
-        #else
-          #set ( $border = ' border="0"' )
-        #end
+#*    *##if( $menu.border )
+#*      *##set ( $border = ' border="' + $menu.border + '"' )
+#*    *##else
+#*      *##set ( $border = ' border="0"' )
+#*    *##end
 ##
-        #if( $menu.width )
-          #set ( $width = ' width="' + $menu.width + '"' )
-        #else
-          #set ( $width = "" )
-        #end
-        #if( $menu.height )
-          #set ( $height = ' height="' + $menu.height + '"' )
-        #else
-          #set ( $height = "" )
-        #end
+#*    *##if( $menu.width )
+#*      *##set ( $width = ' width="' + $menu.width + '"' )
+#*    *##else
+#*      *##set ( $width = "" )
+#*    *##end
+#*    *##if( $menu.height )
+#*      *##set ( $height = ' height="' + $menu.height + '"' )
+#*    *##else
+#*      *##set ( $height = "" )
+#*    *##end
 ##
-        #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
+#*    *##set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
 ##
-        #if ( $position == "left" )
+#*    *##if ( $position == "left" )
         <li class="nav-header">$img $menu.name</li>
-        #else
+#*    *##else
         <li class="nav-header">$menu.name $img</li>
-        #end
-      #else
+#*    *##end
+#*  *##else
         <li class="nav-header">$menu.name</li>
-      #end
-    #end
-    #if ( $menu.items && $menu.items.size() > 0 )
-      #foreach( $item in $menu.items )
-        #menuItem( $item )
-      #end
-    #end
+#*  *##end
+#**##end
+#**##if ( $menu.items && $menu.items.size() > 0 )
+#*  *##foreach( $item in $menu.items )
+#*    *##menuItem( $item )
+#*  *##end
+#**##end
   #end
 </ul>
 #end
@@ -388,185 +390,185 @@
 ##
 ##
 #macro ( copyright )
-  #if ( $project )
-    #if ( ${project.organization} && ${project.organization.name} )
-      #set ( $period = "" )
-    #else
-      #set ( $period = "." )
-   #end
+#**##if ( $project )
+#*  *##if ( ${project.organization} && ${project.organization.name} )
+#*    *##set ( $period = "" )
+#*  *##else
+#*    *##set ( $period = "." )
+#*  *##end
 ##
-   #set ( $currentYear = ${currentDate.year} + 1900 )
+#*  *##set ( $currentYear = ${currentDate.year} + 1900 )
 ##
-    #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
-      ${project.inceptionYear}&#x2013;${currentYear}${period}
-    #else
-      ${currentYear}${period}
-    #end
+#*  *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+#*    *#${project.inceptionYear}&#x2013;${currentYear}${period}
+#*  *##else
+#*    *#${currentYear}${period}
+#*  *##end
 ##
-    #if ( ${project.organization} )
-      #if ( ${project.organization.name} && ${project.organization.url} )
-          <a href="$project.organization.url">${project.organization.name}</a>.
-      #elseif ( ${project.organization.name} )
-        ${project.organization.name}.
-      #end
-    #end
-  #end
+#*  *##if ( ${project.organization} )
+#*    *##if ( ${project.organization.name} && ${project.organization.url} )
+#*      *#<a href="$project.organization.url">${project.organization.name}</a>.
+#*    *##elseif ( ${project.organization.name} )
+#*      *#${project.organization.name}.
+#*    *##end
+#*  *##end
+#**##end
 #end
 ##
 ##
 ##
 #macro ( publishDate $position $decorationPublishDate $version )
-  #if ( $publishDate )
-    #set ( $dateValue = $dateFormat.format( $publishDate ) )
-  #elseif ( $decoration.custom.getChild( 'publishDate' ) )
-    #set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() )
-  #else
-    #set ( $dateValue = $dateFormat.format( $currentDate ) )
-  #end
+#**##if ( $publishDate )
+#*  *##set ( $dateValue = $dateFormat.format( $publishDate ) )
+#**##elseif ( $decoration.custom.getChild( 'publishDate' ) )
+#*  *##set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() )
+#**##else
+#*  *##set ( $dateValue = $dateFormat.format( $currentDate ) )
+#**##end
 ##
-  #set ( $datePosition = $decorationPublishDate.position )
-  #set ( $versionPosition = $version.position )
+#**##set ( $datePosition = $decorationPublishDate.position )
+#**##set ( $versionPosition = $version.position )
 ##
-  #set ( $breadcrumbs = $decoration.body.breadcrumbs )
-  #set ( $links = $decoration.body.links )
-
-  #if ( $datePosition.equalsIgnoreCase( "right" ) && ( $versionPosition.equalsIgnoreCase( "right" ) || !$topBarEnabled
+#**##set ( $breadcrumbs = $decoration.body.breadcrumbs )
+#**##set ( $links = $decoration.body.links )
+##
+#**##if ( $datePosition.equalsIgnoreCase( "right" ) && ( $versionPosition.equalsIgnoreCase( "right" ) || !$topBarEnabled
                                                                                                          && $decoration.body.links
                                                                                                          && $decoration.body.links.size() > 0) )
-    #set ( $prefix = '<span class="divider">|</span> ' )
-  #else
-    #set ( $prefix = "" )
-  #end
+#*  *##set ( $prefix = '<span class="divider">|</span> ' )
+#**##else
+#*  *##set ( $prefix = "" )
+#**##end
 ##
-  #if ( $datePosition.equalsIgnoreCase( $position ) )
-    #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+#**##if ( $datePosition.equalsIgnoreCase( $position ) )
+#*  *##if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
         <li id="publishDate" class="pull-right">$prefix$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</li>
-      #if ( $versionPosition.equalsIgnoreCase( $position ) )
-        <li id="projectVersion" class="pull-right">
-          #if ( !$topBarEnabled
+#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+          <li id="projectVersion" class="pull-right">##
+#*      *##if ( !$topBarEnabled
               && $decoration.body.links
               && $decoration.body.links.size() > 0 )
-            <span class="divider">|</span>
-          #end
-          $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-        </li>
-      #end
-    #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+#*        *#<span class="divider">|</span>##
+#*      *##end
+#*      *#$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}##
+#*      *#</li>
+#*    *##end
+#*  *##elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
       <div id="lastPublished">
         <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</span>
-        #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          <span class="divider">|</span> <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
-        #end
+#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+        <span class="divider">|</span> <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*    *##end
       </div>
-    #elseif ( $datePosition.equalsIgnoreCase("left") )
-        <li id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue
-          #if ( $versionPosition.equalsIgnoreCase( $position ) || $breadcrumbs && $breadcrumbs.size() > 0)
-            <span class="divider">|</span>
-          #end
-         </li>
-        #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-            #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-              <span class="divider">|</span>
-            #end
-          </li>
-        #end
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          #breadcrumbs( $breadcrumbs "" )
-        #end
-    #end
-  #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
-    #if ( $versionPosition.equalsIgnoreCase( "right" ) )
+#*  *##elseif ( $datePosition.equalsIgnoreCase("left") )
+        <li id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue##
+#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) || $breadcrumbs && $breadcrumbs.size() > 0)
+#*      *#<span class="divider">|</span>
+#*    *##end
+#*    *#</li>
+#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+          <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}##
+#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+#*        *#<span class="divider">|</span>##
+#*      *##end
+#*    *#</li>
+#*    *##end
+#*    *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+#*      *##breadcrumbs( $breadcrumbs "" )
+#*    *##end
+#*  *##end
+#**##elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+#*  *##if ( $versionPosition.equalsIgnoreCase( "right" ) )
       <li id="projectVersion" class="pull-right">$prefix$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</li>
-    #elseif ( $versionPosition.equalsIgnoreCase( "bottom" ) )
+#*  *##elseif ( $versionPosition.equalsIgnoreCase( "bottom" ) )
       <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
-    #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+#*  *##elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
       <div id="lastPublished">
         <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
       </div>
-    #elseif ( $versionPosition.equalsIgnoreCase("left") )
-        <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
-            #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-              <span class="divider">|</span>
-            #end
-        </li>
-        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-          #breadcrumbs( $breadcrumbs "")
-        #end
-    #end
-  #elseif ( $position.equalsIgnoreCase( "left" ) )
-    #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
-        #breadcrumbs( $breadcrumbs "" )
-    #end
-  #end
+#*  *##elseif ( $versionPosition.equalsIgnoreCase("left") )
+        <li id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}##
+#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+#*        *#<span class="divider">|</span>##
+#*      *##end
+#*    *#</li>
+#*    *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+#*      *##breadcrumbs( $breadcrumbs "")
+#*    *##end
+#*  *##end
+#**##elseif ( $position.equalsIgnoreCase( "left" ) )
+#*  *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+#*    *##breadcrumbs( $breadcrumbs "" )
+#*  *##end
+#**##end
 #end
 ##
 ##
 ##
 #macro ( builtByLogo $poweredBy )
   #if( $poweredBy )
-    #foreach ($item in $poweredBy)
-      #if( $item.href )
-        #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
-        #set ( $href = $href.replaceAll( '\\', '/' ) )
-      #else
-        #set ( $href="http://maven.apache.org/" )
-      #end
+#**##foreach ($item in $poweredBy)
+#*  *##if( $item.href )
+#*    *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*    *##set ( $href = $href.replaceAll( '\\', '/' ) )
+#*  *##else
+#*    *##set ( $href="https://maven.apache.org/" )
+#*  *##end
 ##
-      #if( $item.name )
-        #set ( $name = $item.name )
-      #else
-        #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
-        #set ( $name = "${name} Maven"  )
-      #end
+#*  *##if( $item.name )
+#*    *##set ( $name = $item.name )
+#*  *##else
+#*    *##set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
+#*    *##set ( $name = "${name} Maven"  )
+#*  *##end
 ##
-      #if( $item.img )
-        #set ( $img = $item.img )
-      #else
-        #set ( $img = "images/logos/maven-feather.png" )
-      #end
+#*  *##if( $item.img )
+#*    *##set ( $img = $item.img )
+#*  *##else
+#*    *##set ( $img = "images/logos/maven-feather.png" )
+#*  *##end
 ##
-      #if ( !$decoration.isLink( $img ) )
-        #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
-        #set ( $img = $img.replaceAll( '\\', '/' ) )
-      #end
+#*  *##if ( !$decoration.isLink( $img ) )
+#*    *##set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+#*    *##set ( $img = $img.replaceAll( '\\', '/' ) )
+#*  *##end
 ##
-      #if( $item.alt )
-        #set ( $alt = ' alt="' + $item.alt + '"' )
-      #else
-        #set ( $alt = ' alt="' + $name + '"' )
-      #end
+#*  *##if( $item.alt )
+#*    *##set ( $alt = ' alt="' + $item.alt + '"' )
+#*  *##else
+#*    *##set ( $alt = ' alt="' + $name + '"' )
+#*  *##end
 ##
-      #if( $item.border )
-        #set ( $border = ' border="' + $item.border + '"' )
-      #else
-        #set ( $border = "" )
-      #end
+#*  *##if( $item.border )
+#*    *##set ( $border = ' border="' + $item.border + '"' )
+#*  *##else
+#*    *##set ( $border = "" )
+#*  *##end
 ##
-      #if( $item.width )
-        #set ( $width = ' width="' + $item.width + '"' )
-      #else
-        #set ( $width = "" )
-      #end
-      #if( $item.height )
-        #set ( $height = ' height="' + $item.height + '"' )
-      #else
-        #set ( $height = "" )
-      #end
+#*  *##if( $item.width )
+#*    *##set ( $width = ' width="' + $item.width + '"' )
+#*  *##else
+#*    *##set ( $width = "" )
+#*  *##end
+#*  *##if( $item.height )
+#*    *##set ( $height = ' height="' + $item.height + '"' )
+#*  *##else
+#*    *##set ( $height = "" )
+#*  *##end
 ##
-      <a href="$href" title="$name" class="builtBy">
-        <img class="builtBy" $alt src="$img" $border $width $height />
-      </a>
-    #end
-    #if( $poweredBy.isEmpty() )
-      <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-        <img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-      </a>
-    #end
+#*  *#<a href="$href" title="$name" class="builtBy">##
+#*    *#<img class="builtBy" $alt src="$img" $border $width $height />##
+#*  *#</a>
+#**##end
+#**##if( $poweredBy.isEmpty() )
+#*  *#<a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">##
+#*    *#<img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />##
+#*  *#</a>
+#**##end
   #else
-    <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
-      <img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
-    </a>
+#**#<a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">##
+#*  *#<img class="builtBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />##
+#**#</a>
   #end
 #end
 ##
diff --git a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
index 1497f88..60df12f 100644
--- a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
+++ b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
@@ -48,272 +48,272 @@
     <link rel="stylesheet" href="$relativePath/css/apache-maven-fluido-@project.version@.min.css" />
     <link rel="stylesheet" href="$relativePath/css/site.css" />
     <link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
-    #prjProfile()
+#**##prjProfile()
     <script type="text/javascript" src="$relativePath/js/apache-maven-fluido-@project.version@.min.js"></script>
-    #if( $decoration.body.head )
-      $render.eval( $decoration.body.head )
-    #end
-    #if( $headContent )$headContent#end
-    #googleAnalytics( $decoration.googleAnalyticsAccountId )
-    #flattrHead()
+#**##if( $decoration.body.head )
+#*  *#$render.eval( $decoration.body.head )
+#**##end
+#**##if( $headContent )$headContent#end
+#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
+#**##flattrHead()
   </head>
-    #if ( $decoration.custom.getChild( 'fluidoSkin' )
+#**##if ( $decoration.custom.getChild( 'fluidoSkin' )
               && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarEnabled' )
               && 'true' == $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarEnabled' ).getValue() )
 #**##set( $topBarEnabled = true )
     <body class="topBarEnabled">
-    #else
+#**##else
     <body class="topBarDisabled">
-    #end
-    #forkMeOnGitHub()
+#**##end
+#**##forkMeOnGitHub()
 ##
-    #set ( $sideBarEnabled = true )
-    #if ( $decoration.custom.getChild('fluidoSkin') )
-        #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sideBarEnabled' )
-              && 'false' == $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sideBarEnabled' ).getValue() )
-            #set ( $sideBarEnabled = false )
-        #end
+#**##set ( $sideBarEnabled = true )
+#**##if ( $decoration.custom.getChild('fluidoSkin') )
+#*  *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sideBarEnabled' )
+            && 'false' == $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sideBarEnabled' ).getValue() )
+#*    *##set ( $sideBarEnabled = false )
+#*  *##end
 ##
-        #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch' )
-              && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch' ).getChild( 'sitesearch' )
+#*  *##if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch' )
+            && ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'googleSearch' ).getChild( 'sitesearch' )
                     || $project.url ) )
-          #set ( $searchEnabled = true )
-        #else
-          #set ( $searchEnabled = false )
-        #end
-    #end
+#*    *##set ( $searchEnabled = true )
+#*  *##else
+#*    *##set ( $searchEnabled = false )
+#*  *##end
+#**##end
 ##
-    #if ( $topBarEnabled )
-      #if ( $decoration.custom.getChild('fluidoSkin')
+#**##if ( $topBarEnabled )
+#*  *##if ( $decoration.custom.getChild('fluidoSkin')
            && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'navBarStyle' ) )
-        #set ( $navBarStyle = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'navBarStyle' ).getValue())
-      #else
-        #set ( $navBarStyle = '')
-      #end
+#*    *##set ( $navBarStyle = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'navBarStyle' ).getValue())
+#*  *##else
+#*    *##set ( $navBarStyle = '')
+#*  *##end
     <div id="topbar" class="navbar navbar-fixed-top $navBarStyle">
       <div class="navbar-inner">
-        #if ( $sideBarEnabled )
+#*    *##if ( $sideBarEnabled )
         <div class="container-fluid">
         <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        #else
-            #if ( $decoration.custom.getChild('fluidoSkin')
-                  && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ) )
-              <div class="container" style="$decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ).getValue()"><div class="nav-collapse">
-            #else
-              <div class="container"><div class="nav-collapse">
-            #end
-        #end
-        #if ( $decoration.custom.getChild('fluidoSkin')
+#*    *##else
+#*      *##if ( $decoration.custom.getChild('fluidoSkin')
+                && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ) )
+            <div class="container" style="$decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ).getValue()"><div class="nav-collapse">
+#*      *##else
+            <div class="container"><div class="nav-collapse">
+#*      *##end
+#*    *##end
+#*    *##if ( $decoration.custom.getChild('fluidoSkin')
               && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarIcon' ) )
-            #set ( $topBarIcon = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarIcon' ) )
+#*      *##set ( $topBarIcon = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarIcon' ) )
 ##
-            #if ( $topBarIcon.getChild( 'href' ) )
-                #set ( $hrf = $topBarIcon.getChild( 'href' ).getValue() )
-                #if ( !$decoration.isLink( $hrf ) )
-                    #set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
-                    #set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
-                    #if ( ( $hrf == '' ) )
-                        #set ( $hrf = './' )
-                    #end
-                #end
-                <a class="brand" href="$hrf" #if( $topBarIcon.getChild( 'alt' ) ) title="$topBarIcon.getChild( 'alt' ).getValue()"#end>
+#*      *##if ( $topBarIcon.getChild( 'href' ) )
+#*        *##set ( $hrf = $topBarIcon.getChild( 'href' ).getValue() )
+#*        *##if ( !$decoration.isLink( $hrf ) )
+#*          *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
+#*          *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
+#*          *##if ( ( $hrf == '' ) )
+#*            *##set ( $hrf = './' )
+#*          *##end
+#*        *##end
+#*        *#<a class="brand" href="$hrf" #if( $topBarIcon.getChild( 'alt' ) ) title="$topBarIcon.getChild( 'alt' ).getValue()"#end>##
 ##
-                #if( $topBarIcon.getChild( 'name' ) )
-                    #set ( $topBarIconName = $topBarIcon.getChild( 'name' ).getValue() )
-                #else
-                    #set ( $topBarIconName = $project.name )
-                #end
+#*        *##if( $topBarIcon.getChild( 'name' ) )
+#*          *##set ( $topBarIconName = $topBarIcon.getChild( 'name' ).getValue() )
+#*        *##else
+#*          *##set ( $topBarIconName = $project.name )
+#*        *##end
 ##
-                #if( $topBarIcon.getChild( 'src' ) )
-                    #set ( $src = $topBarIcon.getChild( 'src' ).getValue() )
-                    #if ( !$decoration.isLink( $src ) )
-                        #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
-                        #set ( $src = $src.replaceAll( '\\', '/' ) )
-                    #end
-                    #if ( $topBarIcon.getChild( 'alt' ) )
-                          #set ( $alt = $topBarIcon.getChild( 'alt' ).getValue() )
-                    #else
-                          #set ( $alt = $topBarIconName )
-                    #end
-                    <img src="$src" alt="$alt" />
-                #else
-                    $topBarIconName
-                #end
+#*        *##if( $topBarIcon.getChild( 'src' ) )
+#*          *##set ( $src = $topBarIcon.getChild( 'src' ).getValue() )
+#*          *##if ( !$decoration.isLink( $src ) )
+#*            *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+#*            *##set ( $src = $src.replaceAll( '\\', '/' ) )
+#*          *##end
+#*          *##if ( $topBarIcon.getChild( 'alt' ) )
+#*            *##set ( $alt = $topBarIcon.getChild( 'alt' ).getValue() )
+#*          *##else
+#*            *##set ( $alt = $topBarIconName )
+#*          *##end
+#*          *#<img src="$src" alt="$alt" />
+#*        *##else
+#*          *#$topBarIconName
+#*        *##end
 ##
-                </a>
-            #end
-        #end
+#*        *#</a>
+#*      *##end
+#*    *##end
 ##
-##        ## MSKINS-31
-          #if( $decoration.body && $decoration.body.menus )
+##      ## MSKINS-31
+#*      *##if( $decoration.body && $decoration.body.menus )
             <ul class="nav">
-              #topMenu( $decoration.body.menus )
+#*          *##topMenu( $decoration.body.menus )
             </ul>
-          #end
+#*      *##end
 ##
-          #if ( $searchEnabled && !$sideBarEnabled )
-            #googleSearch(true)
-          #end
+#*      *##if ( $searchEnabled && !$sideBarEnabled )
+#*        *##googleSearch(true)
+#*      *##end
 ##
-          #if ( !$sideBarEnabled )
-            #facebookLike( $sideBarEnabled )
-            #googlePlusOne( $sideBarEnabled )
-            #followTwitter( $sideBarEnabled )
-            #flattrBody( $sideBarEnabled )
-          #end
+#*      *##if ( !$sideBarEnabled )
+#*        *##facebookLike( $sideBarEnabled )
+#*        *##googlePlusOne( $sideBarEnabled )
+#*        *##followTwitter( $sideBarEnabled )
+#*        *##flattrBody( $sideBarEnabled )
+#*      *##end
 ##
 ##        ## MSKINS-31
-          #if( $decoration.body
+#*      *##if( $decoration.body
               && $decoration.body.links
               && $decoration.body.links.size() > 0 )
             <ul class="nav pull-right">
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">External Links <b class="caret"></b></a>
                 <ul class="dropdown-menu">
-                #topLinks( $decoration.body.links )
+#*            *##topLinks( $decoration.body.links )
                 </ul>
               </li>
             </ul>
-          #end
+#*      *##end
 ##
-          #if ($topBarEnabled)
+#*      *##if ($topBarEnabled)
             </div>
-          #end
+#*      *##end
 ##
         </div>
       </div>
     </div>
-    #end
+#**##end
 ##
-    #if ( $sideBarEnabled )
+#**##if ( $sideBarEnabled )
     <div class="container-fluid">
-    #else
+#**##else
     <div class="container">
-    #end
+#**##end
       <div id="banner">
-        <div class="pull-left">
-        #if( $decoration.bannerLeft )
-          #banner( $decoration.bannerLeft "bannerLeft" )
-        #else
-          ## MSKINS-32
-          <h1>
-            #if( $project.name && $project.name != '' )
-              $project.name
-            #else
-              $project.artifactId
-            #end
-          </h1>
-        #end
-        </div>
+        <div class="pull-left">##
+#*      *##if( $decoration.bannerLeft )
+#*        *##banner( $decoration.bannerLeft "bannerLeft" )
+#*      *##else
+#*      *### MSKINS-32
+          <h1>##
+#*        *##if( $project.name && $project.name != '' )
+#*          *#$project.name
+#*        *##else
+#*          *#$project.artifactId
+#*        *##end
+#*      *#</h1>##
+#*      *##end
+#*    *#</div>
         <div class="pull-right">#banner( $decoration.bannerRight "bannerRight" )</div>
         <div class="clear"><hr/></div>
       </div>
 
       <div id="breadcrumbs">
         <ul class="breadcrumb">
-          #publishDate( "left" $decoration.publishDate $decoration.version )
-          #publishDate( "right" $decoration.publishDate $decoration.version )
-          ## MSITE-44
-          #if ( !$topBarEnabled
+#*      *##publishDate( "left" $decoration.publishDate $decoration.version )
+#*      *##publishDate( "right" $decoration.publishDate $decoration.version )
+#*      *### MSITE-44
+#*      *##if ( !$topBarEnabled
               && $decoration.body.links
               && $decoration.body.links.size() > 0 )
-            #links( $decoration.body.links )
-          #end
+#*        *##links( $decoration.body.links )
+#*      *##end
         </ul>
       </div>
 ##
-      #if ( $sideBarEnabled )
-      #set ($leftColumnClass="span2")
-      #if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
+#*  *##if ( $sideBarEnabled )
+#*  *##set ($leftColumnClass="span2")
+#*  *##if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
         && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'leftColumnClass' ) )
-        #set ( $leftColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'leftColumnClass' ).getValue() )
-      #end
+#*    *##set ( $leftColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'leftColumnClass' ).getValue() )
+#*  *##end
 ##
       <div class="row-fluid">
         <div id="leftColumn" class="$leftColumnClass">
           <div class="well sidebar-nav">
-          #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
-          #mainMenu( $decoration.body.menus )
-          #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
-          #if ( $searchEnabled )
-            #googleSearch( false )
-          #end
+#*      *##publishDate( "navigation-top" $decoration.publishDate $decoration.version )
+#*      *##mainMenu( $decoration.body.menus )
+#*      *##publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
+#*      *##if ( $searchEnabled )
+#*        *##googleSearch( false )
+#*      *##end
           <hr />
           <div id="poweredBy">
-            #googlePlusOne( $sideBarEnabled )
+#*        *##googlePlusOne( $sideBarEnabled )
             <div class="clear"></div>
-            #facebookLike( $sideBarEnabled )
+#*        *##facebookLike( $sideBarEnabled )
             <div class="clear"></div>
-            #followTwitter( $sideBarEnabled )
+#*        *##followTwitter( $sideBarEnabled )
             <div class="clear"></div>
-            #flattrBody( $sideBarEnabled )
+#*        *##flattrBody( $sideBarEnabled )
             <div class="clear"></div>
-            #builtByLogo( $decoration.poweredBy )
+#*        *##builtByLogo( $decoration.poweredBy )
             </div>
           </div>
         </div>
-        #end
+#*    *##end
 ##
-        #set ($bodyColumnClass="span10")
-        #if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
+#*    *##set ($bodyColumnClass="span10")
+#*    *##if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
           && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'bodyColumnClass' ) )
-          #set ( $bodyColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'bodyColumnClass' ).getValue() )
-        #end
+#*      *##set ( $bodyColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'bodyColumnClass' ).getValue() )
+#*    *##end
 ##
         <div id="bodyColumn" #if ( $sideBarEnabled ) class="$bodyColumnClass" #end>
-          #if ( $title && $title.endsWith( "Project License" ) )
-            $bodyContent
-          #else
-            #if ( $decoration.custom.getChild('fluidoSkin')
+#*      *##if ( $title && $title.endsWith( "Project License" ) )
+#*        *#$bodyContent
+#*      *##else
+#*        *##if ( $decoration.custom.getChild('fluidoSkin')
               && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sourceLineNumbersEnabled' )
               && 'true' == $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'sourceLineNumbersEnabled' ).getValue() )
-              #set ( $sourceStyle = "prettyprint linenums" )
-            #else
-              #set ( $sourceStyle = "prettyprint" )
-            #end
+#*          *##set ( $sourceStyle = "prettyprint linenums" )
+#*        *##else
+#*          *##set ( $sourceStyle = "prettyprint" )
+#*        *##end
 ##
-            $bodyContent.replaceAll( "<div class=${esc.q}source${esc.q}>(\r?\n)?<pre>", "<div class=${esc.q}source${esc.q}><pre class=${esc.q}$sourceStyle${esc.q}>" ).replaceAll( "class=${esc.q}bodyTable${esc.q}", "class=${esc.q}table table-striped${esc.q}" )
-          #end
+#*        *#$bodyContent.replaceAll( "<div class=${esc.q}source${esc.q}>(\r?\n)?<pre>", "<div class=${esc.q}source${esc.q}><pre class=${esc.q}$sourceStyle${esc.q}>" ).replaceAll( "class=${esc.q}bodyTable${esc.q}", "class=${esc.q}table table-striped${esc.q}" )
+#*      *##end
         </div>
-      #if ( $sideBarEnabled )
+#*    *##if ( $sideBarEnabled )
       </div>
-      #end
+#*    *##end
     </div>
     <hr/>
     <footer>
-      #if ( $sideBarEnabled )
+#*  *##if ( $sideBarEnabled )
       <div class="container-fluid">
-      #else
+#*  *##else
       <div class="container">
-      #end
-        #if ( $sideBarEnabled )
+#*  *##end
+#*    *##if ( $sideBarEnabled )
         <div class="row-fluid">
-        #else
+#*    *##else
         <div class="row">
-        #end
-        #if ( $decoration.body.footer )
-          $render.eval( $decoration.body.footer )
-        #else
-          #if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
-            #set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
-          #end
-            <p $!copyrightClass>Copyright &copy;#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
-        #end
+#*    *##end
+#*    *##if ( $decoration.body.footer )
+#*      *#$render.eval( $decoration.body.footer )
+#*    *##else
+#*      *##if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
+#*        *##set ( $copyrightClass = ' class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
+#*      *##end
+            <p$!copyrightClass>Copyright &copy;#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</p>
+#*    *##end
         </div>
 ##
-        #if ( !$sideBarEnabled )
-        <p id="poweredBy" class="pull-right">
-          #builtByLogo( $decoration.poweredBy )
-        </p>
-        #end
+#*    *##if ( !$sideBarEnabled )
+        <p id="poweredBy" class="pull-right">##
+#*      *##builtByLogo( $decoration.poweredBy )
+#*    *#</p>
+#*    *##end
 ##
-        #ohloh()
+#*    *##ohloh()
       </div>
     </footer>
-    #piwik()
+#**##piwik()
   </body>
 </html>