[DOXIASITETOOLS-212] Align common Velocity structures with Fluido Skin
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 911047f..3f55b30 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
@@ -89,7 +89,7 @@
#* *##end
#* *#<a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>##
#* *##else
-#* *#<div id="$id">
+#* *#<div id="$id">##
#* *##end
##
#* *##if( $banner.src )
@@ -131,7 +131,7 @@
#* *##end
##
#* *##if( $banner.href )
-#* *#</a>
+#* *#</a>##
#* *##else
#* *#</div>
#* *##end
@@ -184,26 +184,26 @@
#end
##
#macro ( menuItem $item $indent )
-#**##set ( $collapse = "none" )
+#**##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 ( $collapse = "expanded" )
+#* *##set ( $collapseClass = "expanded" )
#* *##else
#* *### By default collapsed
-#* *##set ( $collapse = "collapsed" )
+#* *##set ( $collapseClass = "collapsed" )
#* *##end
##
#* *##set ( $display = false )
#* *##displayTree( $display $item )
##
#* *##if ( $alignedFileName == $currentItemHref || $display )
-#* *##set ( $collapse = "expanded" )
+#* *##set ( $collapseClass = "expanded" )
#* *##end
#**##end
-$indent <li class="$collapse">##
+$indent <li class="$collapseClass">##
#**##if ( $item.img )
#* *##if ( $item.position == "left" )
#* *##if ( $alignedFileName == $currentItemHref )
@@ -226,7 +226,7 @@
#* *##end
#**##end
#**##if ( $item && $item.items && $item.items.size() > 0 )
-#* *##if ( $collapse == "expanded" )
+#* *##if ( $collapseClass == "expanded" )
$indent <ul>
#* *##foreach( $subitem in $item.items )
@@ -323,7 +323,7 @@
##
#* *##if ( ${project.organization} )
#* *##if ( ${project.organization.name} && ${project.organization.url} )
-#* *# <a href="$project.organization.url">${project.organization.name}</a>.
+#* *#<a href="$project.organization.url">${project.organization.name}</a>.
#* *##elseif ( ${project.organization.name} )
#* *#${project.organization.name}.
#* *##end
@@ -407,7 +407,7 @@
#* *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
#* *##set ( $href = $href.replaceAll( '\\', '/' ) )
#* *##else
-#* *##set ( $href="http://maven.apache.org/" )
+#* *##set ( $href="https://maven.apache.org/" )
#* *##end
##
#* *##if( $item.name )
@@ -489,6 +489,6 @@
#end
##
#macro( generatedBy )
-Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end
+Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end##
#end
##
\ No newline at end of file
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
index 4b74796..6f5e76d 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
@@ -17,33 +17,38 @@
## under the License.
##
#parse( "default-site-macros.vm" )
-<!-- Generated by #generatedBy()
-#if( $docRenderingContext.generator || $docRenderingContext.doxiaSource ) from##
-#if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
-#if( $docRenderingContext.doxiaSource ) $docRenderingContext.doxiaSourcePath#end##
+<!--
+ | Generated by #generatedBy()
+#if( $docRenderingContext && ( $docRenderingContext.generator || $docRenderingContext.doxiaSource ) ) from##
+#**##if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
+#**##if( $docRenderingContext.doxiaSource ) $docRenderingContext.doxiaSourcePath#end##
#end
- at $dateFormat.format( $currentDate ) -->
+ at $dateFormat.format( $currentDate )
+
+ | Rendered using Apache Maven Default Skin
+-->
+##
<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
- <title>$title</title>
- <style type="text/css" media="all">
- @import url("$relativePath/css/maven-base.css");
- @import url("$relativePath/css/maven-theme.css");
- @import url("$relativePath/css/site.css");
- </style>
- <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+ <meta charset="${outputEncoding}" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+## put meta together
<meta name="generator" content="#generatedBy()" />
#foreach( $author in $authors )
- <meta name="author" content="$author" />
+ <meta name="author" content="$author" />
#end
#if ( $documentDate )
<meta name="date" content="$documentDate" />
#end
-#if( $decoration.body.head )
-#**#$render.eval( $decoration.body.head )
-#end
- $headContent
+ <title>$title</title>
+ <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
+ <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
+ <link rel="stylesheet" href="$relativePath/css/site.css" />
+ <link rel="stylesheet" href="$relativePath/css/print.css" media="print" />
+#**##if( $decoration.body.head )
+#* *#$render.eval( $decoration.body.head )
+#**##end
+#**##if( $headContent )$headContent#end
#**##googleAnalytics( $decoration.googleAnalyticsAccountId )
</head>
<body class="composite">
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
index 687a910..7240814 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
@@ -63,17 +63,10 @@
// ----------------------------------------------------------------------
HtmlMeta meta = (HtmlMeta) elementIterator.next();
- assertEquals( "Content-Type", meta.getAttribute( "http-equiv" ) );
- assertEquals( "text/html; charset=UTF-8", meta.getAttribute( "content" ) );
+ assertEquals( "UTF-8", meta.getAttribute( "charset" ) );
- HtmlTitle title = (HtmlTitle) elementIterator.next();
- assertNotNull( title );
-
- HtmlStyle style = (HtmlStyle) elementIterator.next();
- assertNotNull( style );
-
- HtmlLink link = (HtmlLink) elementIterator.next();
- assertNotNull( link );
+ // Skip viewport
+ elementIterator.next();
meta = (HtmlMeta) elementIterator.next();
assertEquals( "Unexpected meta entry found generated resource " + file, "generator", meta.getAttribute( "name" ) );
@@ -84,6 +77,18 @@
assertEquals( "author", meta.getAttribute( "name" ) );
assertEquals( "John Doe", meta.getAttribute( "content" ).trim() );
+ HtmlTitle title = (HtmlTitle) elementIterator.next();
+ assertNotNull( title );
+
+ HtmlLink link = (HtmlLink) elementIterator.next();
+ assertNotNull( link );
+ link = (HtmlLink) elementIterator.next();
+ assertNotNull( link );
+ link = (HtmlLink) elementIterator.next();
+ assertNotNull( link );
+ link = (HtmlLink) elementIterator.next();
+ assertNotNull( link );
+
meta = (HtmlMeta) elementIterator.next();
assertEquals( "description", meta.getAttribute( "name" ) );
assertEquals( "Free Web tutorials", meta.getAttribute( "content" ) );
