You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/18 21:35:28 UTC
[maven-doxia-sitetools] branch DOXIASITETOOLS-212 created (now
ae7eb49)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIASITETOOLS-212
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
at ae7eb49 [DOXIASITETOOLS-212] Align common Velocity structures with Fluido Skin
This branch includes the following new commits:
new ae7eb49 [DOXIASITETOOLS-212] Align common Velocity structures with Fluido Skin
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-212] Align common
Velocity structures with Fluido Skin
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-212
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit ae7eb490ec57f3c0d55676b773c57053bb631b18
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jun 18 23:35:05 2019 +0200
[DOXIASITETOOLS-212] Align common Velocity structures with Fluido Skin
---
.../siterenderer/resources/default-site-macros.vm | 22 ++++++------
.../doxia/siterenderer/resources/default-site.vm | 41 ++++++++++++----------
2 files changed, 34 insertions(+), 29 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 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 @@ $indent <li class="$collapse">##
#* *##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 @@ $indent </ul>##
##
#* *##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 @@ $indent </ul>##
#* *##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 @@ $indent </ul>##
#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..09499c0 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,22 +17,22 @@
## 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" />
@@ -40,10 +40,15 @@
#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">
@@ -84,7 +89,7 @@
#* *##if( $decoration.body.footer )
$render.eval( $decoration.body.footer )
#* *##else
- Copyright ©#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )
+ Copyright ©#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )
#* *##end
</div>
<div class="clear">