#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 = $banner.alt ) - #else - #set ( $alt = $banner.name ) - #end - $alt

+ #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 = ' 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 + #if( $banner.title ) + #set ( $bannerTitle=' title="' + $banner.title + '"' ) + #else + #set ( $bannerTitle="" ) + #end +

#else $banner.name #end Binary files /tmp/tmp9PTCAL/oHD4PyjkjU/doxia-sitetools-1.7.4/doxia-site-renderer/src/site/apt/doxia-site-renderer.odg and /tmp/tmp9PTCAL/acMsy1uM2M/doxia-sitetools-1.7.5/doxia-site-renderer/src/site/apt/doxia-site-renderer.odg differ diff -Nru doxia-sitetools-1.7.4/doxia-site-renderer/src/site/apt/index.apt.vm doxia-sitetools-1.7.5/doxia-site-renderer/src/site/apt/index.apt.vm --- doxia-sitetools-1.7.4/doxia-site-renderer/src/site/apt/index.apt.vm 2016-10-15 12:58:28.000000000 +0000 +++ doxia-sitetools-1.7.5/doxia-site-renderer/src/site/apt/index.apt.vm 2017-02-26 16:14:33.000000000 +0000 @@ -29,20 +29,20 @@ Doxia Sitetools - Site Renderer - The Site Renderer handles the rendering of sites, assembling a common site decoration (also called ) + The Site Renderer handles the rendering of sites, assembling a common site decoration template (also called ) with a collection of documents. Documents can be dynamically generated with {{{/doxia/doxia/doxia-sink-api/}Doxia Sink API}}, like Maven reports, or simply read from static files written in {{{/doxia/references/index.html}markup supported by Doxia Parsers}}, - eventually processed by {{{http://velocity.apache.org/engine/releases/velocity-1.5/}Velocity}} + eventually processed by {{{http://velocity.apache.org/engine/1.7/}Velocity}} if their file names end in <<<.vm>>>. [doxia-site-renderer.png] * Doxia Site Skins - A default site decoration is included (see <<>>), but other decorations can be used at will, either - as a standalone template or packaged in a {{{../doxia-skin-descriptor}<> artifact}}. + A default site decoration template is included (see <<>>), but other decoration templates can be used at will, + either as a standalone template or packaged in a {{{../doxia-skin-descriptor}<> artifact}}. Maven team provides {{{/skins/}a collection of skins}} for projects use. @@ -59,7 +59,7 @@ *---------------------------------+----------------------+-------------------------------+ | <<>> | <<>> | The file name of the (HTML) document being rendered, relative to the document being rendered. | *---------------------------------+----------------------+-------------------------------+ -| <<>> | {{{../doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html}<<>>}} | This is a model that represents the data in your <<>>. | +| <<>> | {{{../doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html}<<>>}} | This is a model that represents the data in your {{{../doxia-decoration-model/decoration.html}<<>>}}. | *---------------------------------+----------------------+-------------------------------+ | <<>> | <<>> | <>: use <<>> or <<>>. The date when the site is rendered. | *---------------------------------+----------------------+-------------------------------+ Binary files /tmp/tmp9PTCAL/oHD4PyjkjU/doxia-sitetools-1.7.4/doxia-site-renderer/src/site/resources/doxia-site-renderer.png and /tmp/tmp9PTCAL/acMsy1uM2M/doxia-sitetools-1.7.5/doxia-site-renderer/src/site/resources/doxia-site-renderer.png differ diff -Nru doxia-sitetools-1.7.4/doxia-skin-model/pom.xml doxia-sitetools-1.7.5/doxia-skin-model/pom.xml --- doxia-sitetools-1.7.4/doxia-skin-model/pom.xml 2016-11-08 20:11:45.000000000 +0000 +++ doxia-sitetools-1.7.5/doxia-skin-model/pom.xml 2017-09-26 18:25:32.000000000 +0000 @@ -25,13 +25,13 @@ org.apache.maven.doxia doxia-sitetools - 1.7.4 + 1.7.5 ../pom.xml doxia-skin-model - Doxia :: Skin Model + Doxia Sitetools :: Skin Model The Skin Model defines metadata for Doxia Sitetools skins. diff -Nru doxia-sitetools-1.7.4/pom.xml doxia-sitetools-1.7.5/pom.xml --- doxia-sitetools-1.7.4/pom.xml 2016-11-08 20:11:45.000000000 +0000 +++ doxia-sitetools-1.7.5/pom.xml 2017-09-26 18:25:32.000000000 +0000 @@ -31,10 +31,10 @@ org.apache.maven.doxia doxia-sitetools - 1.7.4 + 1.7.5 pom - Doxia :: Sitetools + Doxia Sitetools Doxia Sitetools generates sites, consisting of static and dynamic content that was generated by Doxia. https://maven.apache.org/doxia/doxia-sitetools/ 2005 @@ -48,9 +48,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.4 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.4 - http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.4 + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.5 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.5 + http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.7.5 jira @@ -224,6 +224,11 @@ + + org.codehaus.plexus + plexus-component-metadata + 1.7.1 + @@ -381,5 +386,14 @@ + + jigsaw + + [1.9,) + + + true + +