You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/02/26 22:25:58 UTC
svn commit: r1074931 -
/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
Author: sebb
Date: Sat Feb 26 21:25:58 2011
New Revision: 1074931
URL: http://svn.apache.org/viewvc?rev=1074931&view=rev
Log:
Replace with copy from o.a.hc.maven-skin:1.1
Added:
commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
- copied, changed from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
Copied: commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm)
URL: http://svn.apache.org/viewvc/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm?p2=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&p1=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&r1=1074894&r2=1074931&rev=1074931&view=diff
==============================================================================
--- commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (original)
+++ commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm Sat Feb 26 21:25:58 2011
@@ -1,24 +1,90 @@
-#macro ( link $href $name )
- #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
- <a href="$href" class="externalLink">$name</a>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) ( $Revision$ ) -->
+<!-- $HeadURL$ -->
+#macro ( link $href $name $target $img $position $alt $border $width $height )
+ #set ( $linkTitle = ' title="' + $name + '"' )
+ #if( $target )
+ #set ( $linkTarget = ' target="' + $target + '"' )
+ #else
+ #set ( $linkTarget = "" )
+ #end
+ #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
+ $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
+ $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
+ #set ( $linkClass = ' class="externalLink"' )
+ #else
+ #set ( $linkClass = "" )
+ #end
+ #if ( $img )
+ #if ( $position == "left" )
+ <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
+ #else
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
+ #end
#else
- <a href="$href">$name</a>
+ <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
+ #end
+#end
+##
+#macro ( image $img $alt $border $width $height )
+ #if( $img )
+ #if ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
+ $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
+ $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
+ #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
+ #set ( $imgSrc = ' src="' + $imgSrc + '"' )
+ #else
+ #set ( $imgSrc = ' src="' + $img + '"' )
+ #end
+ #if( $alt )
+ #set ( $imgAlt = ' alt="' + $alt + '"' )
+ #else
+ #set ( $imgAlt = ' alt=""' )
+ #end
+ #if( $border )
+ #set ( $imgBorder = ' border="' + $border + '"' )
+ #else
+ #set ( $imgBorder = "" )
+ #end
+ #if( $width )
+ #set ( $imgWidth = ' width="' + $width + '"' )
+ #else
+ #set ( $imgWidth = "" )
+ #end
+ #if( $height )
+ #set ( $imgHeight = ' height="' + $height + '"' )
+ #else
+ #set ( $imgHeight = "" )
+ #end
+ <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
#end
#end
-
#macro ( banner $banner $id )
#if ( $banner )
#if( $banner.href )
- <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
+ #set ( $hrf = $banner.href )
+ #if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") ||
+ $hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:/") ||
+ $hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) )
+ #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 ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+ #if ( ! ( $src.toLowerCase().startsWith("http:/") || $src.toLowerCase().startsWith("https:/") ||
+ $src.toLowerCase().startsWith("ftp:/") || $src.toLowerCase().startsWith("mailto:/") ||
+ $src.toLowerCase().startsWith("file:/") || ($src.toLowerCase().indexOf("://") != -1) ) )
#set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #set ( $src = $src.replaceAll( '\\', '/' ) )
#end
#if ( $banner.alt )
#set ( $alt = $banner.alt )
@@ -29,7 +95,7 @@
#else
$banner.name
#end
-
+##
#if( $banner.href )
</a>
#else
@@ -37,57 +103,54 @@
#end
#end
#end
-
+##
#macro ( links $links )
#set ( $counter = 0 )
#foreach( $item in $links )
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #link( $currentItemHref $item.name )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#if ( $links.size() > $counter )
|
#end
#end
#end
-
+##
#macro ( breadcrumbs $breadcrumbs )
- #set ( $counter = 0 )
#foreach( $item in $breadcrumbs )
- #set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
- #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
- $item.name
- #else
- #link( $currentItemHref $item.name )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+ #if ( ( $currentItemHref == '' ) )
+ #set ( $currentItemHref = './' )
#end
- #if ( $breadcrumbs.size() > $counter )
+##
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
>
- #end
#end
+ $title
#end
-
+##
#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( "\\", "/" ) )
+ #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
+##
#if ( $alignedFileName == $subitemHref )
#set ( $display = true )
#end
-
+##
#displayTree( $display $subitem )
#end
#end
#end
-
+##
#macro ( menuItem $item )
#set ( $collapse = "none" )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-
+ #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
#set ( $collapse = "expanded" )
@@ -95,29 +158,36 @@
## By default collapsed
#set ( $collapse = "collapsed" )
#end
-
+##
#set ( $display = false )
#displayTree( $display $item )
-
+##
#if ( $alignedFileName == $currentItemHref || $display )
#set ( $collapse = "expanded" )
#end
#end
<li class="$collapse">
- #if ( $item.img )
- #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- <img src="$src"/>
+ #if ( $item.img )
+ #if ( $item.position == "left" )
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
#else
- <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
+ #end
+ #else
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
+ #else
+ #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
#end
#end
+ #else
#if ( $alignedFileName == $currentItemHref )
<strong>$item.name</strong>
#else
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
+ #end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
<ul>
@@ -129,11 +199,60 @@
#end
</li>
#end
-
+##
#macro ( mainMenu $menus )
#foreach( $menu in $menus )
#if ( $menu.name )
- <h5>$menu.name</h5>
+ #if ( $menu.img )
+ #if( $menu.position )
+ #set ( $position = $menu.position )
+ #else
+ #set ( $position = "left" )
+ #end
+##
+ #if ( ! ( $menu.img.toLowerCase().startsWith("http:/") || $menu.img.toLowerCase().startsWith("https:/") ||
+ $menu.img.toLowerCase().startsWith("ftp:/") || $menu.img.toLowerCase().startsWith("mailto:/") ||
+ $menu.img.toLowerCase().startsWith("file:/") || ($menu.img.toLowerCase().indexOf("://") != -1) ) )
+ #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.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
+##
+ #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
+##
+ #if ( $position == "left" )
+ <h5>$img $menu.name</h5>
+ #else
+ <h5>$menu.name $img</h5>
+ #end
+ #else
+ <h5>$menu.name</h5>
+ #end
#end
#if ( $menu.items && $menu.items.size() > 0 )
<ul>
@@ -144,7 +263,7 @@
#end
#end
#end
-
+##
#macro ( copyright )
#if ( $project )
#if ( ${project.organization} && ${project.organization.name} )
@@ -152,15 +271,15 @@
#else
#set ( $period = "." )
#end
-
+##
#set ( $currentYear = ${currentDate.year} + 1900 )
-
+##
#if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
${project.inceptionYear}-${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>.
@@ -170,24 +289,24 @@
#end
#end
#end
-
+##
#macro ( publishDate $position $publishDate $version )
#if ( $publishDate && $publishDate.format )
#set ( $format = $publishDate.format )
#else
#set ( $format = "yyyy-MM-dd" )
#end
-
+##
$dateFormat.applyPattern( $format )
-
+##
#set ( $dateToday = $dateFormat.format( $currentDate ) )
-
+##
#if ( $publishDate && $publishDate.position )
#set ( $datePosition = $publishDate.position )
#else
#set ( $datePosition = "left" )
#end
-
+##
#if ( $version )
#if ( $version.position )
#set ( $versionPosition = $version.position )
@@ -198,7 +317,7 @@
#set ( $version = "" )
#set ( $versionPosition = "left" )
#end
-
+##
#set ( $breadcrumbs = $decoration.body.breadcrumbs )
#set ( $links = $decoration.body.links )
@@ -207,7 +326,7 @@
#else
#set ( $prefix = "" )
#end
-
+##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
$prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
@@ -255,66 +374,96 @@
#end
#end
#end
-
+##
#macro ( poweredByLogo $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
-
- #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
-
- <a href="$href" title="$name" class="poweredBy">
- #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $img = $img.replaceAll( "\\", "/" ) )
- <img class="poweredBy"
- alt="$name"
- src="$img"
- width="90"
- height="30"
- />
- </a>
- #end
- #if( $poweredBy.isEmpty() )
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img class="poweredBy"
- alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
- src="$relativePath/images/logos/maven-feather.png"
- width="90"
- height="30"
- border="1" />
- </a>
- #end
- #else
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img class="poweredBy"
- alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
- src="$relativePath/images/logos/maven-feather.png"
- width="90"
- height="30"
- border="1"
- />
- </a>
+ #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
+##
+ #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 ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
+ $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
+ $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $img = $src.replaceAll( '\\', '/' ) )
+ #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.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="poweredBy">
+ <img class="poweredBy" $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="poweredBy" 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="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
+ </a>
+ #end
#end
+##
+#macro ( googleAnalytics $accountId )
+ #if( $accountId && $accountId != "" )
+ <!-- Google Analytics -->
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '$accountId']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+ </script>
+ #end
+#end
+##
+<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>
@@ -322,31 +471,26 @@
@import url("$relativePath/css/maven-base.css");
@import url("$relativePath/css/maven-theme.css");
@import url("$relativePath/css/site.css");
- @import url("$relativePath/css/prettify.css");
</style>
<link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
- <script type="text/javascript" src="$relativePath/js/prettify.js"></script>
- <script type="text/javascript">
- window.onload=function() {
- prettyPrint();
- }
- </script>
- #foreach( $author in $authors )
+#foreach( $author in $authors )
<meta name="author" content="$author" />
- #end
+#end
#if ( $dateCreation )
<meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
#end
#if ( $dateRevision )
<meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
#end
+#if ( $locale )
+ <meta http-equiv="Content-Language" content="$locale.language" />
+#end
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
- #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
- #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
+ #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
#if ( $item.name == "script" )
$StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
#else
@@ -354,45 +498,52 @@
#end
#end
#end
+ $headContent
+ #googleAnalytics( $decoration.googleAnalyticsAccountId )
</head>
- <body>
- <div id="wrapper">
- <div id="banner">
- #banner( $decoration.bannerLeft "bannerLeft" )
- #banner( $decoration.bannerRight "bannerRight" )
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="breadcrumbs">
- #publishDate( "left" $decoration.publishDate $decoration.version )
- <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="leftColumn">
- <div id="navcolumn">
- #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
- #mainMenu( $decoration.body.menus )
- #poweredByLogo( $decoration.poweredBy )
- #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
- </div>
- </div>
- <div id="bodyColumn">
- <div id="contentBox">
- $bodyContent
- </div>
- </div>
- <div class="clear">
- <hr/>
- </div>
- <div id="footer">
- <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
+ <body class="composite">
+ <div id="banner">
+ #banner( $decoration.bannerLeft "bannerLeft" )
+ #banner( $decoration.bannerRight "bannerRight" )
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="breadcrumbs">
+ #publishDate( "left" $decoration.publishDate $decoration.version )
+ <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="leftColumn">
+ <div id="navcolumn">
+ #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
+ #mainMenu( $decoration.body.menus )
+ #poweredByLogo( $decoration.poweredBy )
+ #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
+ </div>
+ </div>
+ <div id="bodyColumn">
+ <div id="contentBox">
+ $bodyContent
+ </div>
+ </div>
+ <div class="clear">
+ <hr/>
+ </div>
+ <div id="footer">
+ #if ( $decoration.custom.getChild("footer") )
+ ## See DOXIA-150
+ #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
+ #foreach( $item in $decoration.custom.getChild("footer").getChildren() )
+ $StringUtils.replace( $item.toString().trim(), $documentHeader, "" )
+ #end
+ #end
+ <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
</div>
</body>
</html>
Re: svn commit: r1074931 - /commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
Posted by sebb <se...@gmail.com>.
On 27 February 2011 10:26, Simone Tripodi <si...@apache.org> wrote:
> Hi Dennis,
> Sebastian copied it from o.a.hc.maven-skin:1.1 because of the brand
> requirements, since that work was already done there, it was easier
> then reimporting the base skin and modifying it again.
I have raised a JIRA against Doxia [1]
When this is fixed and released, we can consider dropping our private template.
[1] http://jira.codehaus.org/browse/MSITE-549
>
>
> On Sun, Feb 27, 2011 at 11:11 AM, Dennis Lundberg <de...@apache.org> wrote:
>> On 2011-02-26 22:25, sebb@apache.org wrote:
>>> Author: sebb
>>> Date: Sat Feb 26 21:25:58 2011
>>> New Revision: 1074931
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1074931&view=rev
>>> Log:
>>> Replace with copy from o.a.hc.maven-skin:1.1
>>
>> Why?
>> Is there something missing in the default-site.vm?
>> If so what? Perhaps it is something that should be added in Doxia instead.
>>
>>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1074931 - /commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
Posted by Simone Tripodi <si...@apache.org>.
Hi Dennis,
Sebastian copied it from o.a.hc.maven-skin:1.1 because of the brand
requirements, since that work was already done there, it was easier
then reimporting the base skin and modifying it again.
Have a nice weekend,
Simo
http://people.apache.org/~simonetripodi/
http://www.99soft.org/
On Sun, Feb 27, 2011 at 11:11 AM, Dennis Lundberg <de...@apache.org> wrote:
> On 2011-02-26 22:25, sebb@apache.org wrote:
>> Author: sebb
>> Date: Sat Feb 26 21:25:58 2011
>> New Revision: 1074931
>>
>> URL: http://svn.apache.org/viewvc?rev=1074931&view=rev
>> Log:
>> Replace with copy from o.a.hc.maven-skin:1.1
>
> Why?
> Is there something missing in the default-site.vm?
> If so what? Perhaps it is something that should be added in Doxia instead.
>
>>
>> Added:
>> commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
>> - copied, changed from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
>>
>> Copied: commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm)
>> URL: http://svn.apache.org/viewvc/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm?p2=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&p1=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&r1=1074894&r2=1074931&rev=1074931&view=diff
>> ==============================================================================
>> --- commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (original)
>> +++ commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm Sat Feb 26 21:25:58 2011
>> @@ -1,24 +1,90 @@
>> -#macro ( link $href $name )
>> - #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
>> - <a href="$href" class="externalLink">$name</a>
>> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>> +<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) ( $Revision$ ) -->
>> +<!-- $HeadURL$ -->
>> +#macro ( link $href $name $target $img $position $alt $border $width $height )
>> + #set ( $linkTitle = ' title="' + $name + '"' )
>> + #if( $target )
>> + #set ( $linkTarget = ' target="' + $target + '"' )
>> + #else
>> + #set ( $linkTarget = "" )
>> + #end
>> + #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
>> + $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
>> + $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
>> + #set ( $linkClass = ' class="externalLink"' )
>> + #else
>> + #set ( $linkClass = "" )
>> + #end
>> + #if ( $img )
>> + #if ( $position == "left" )
>> + <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
>> + #else
>> + <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
>> + #end
>> #else
>> - <a href="$href">$name</a>
>> + <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
>> + #end
>> +#end
>> +##
>> +#macro ( image $img $alt $border $width $height )
>> + #if( $img )
>> + #if ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
>> + $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
>> + $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
>> + #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
>> + #set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
>> + #set ( $imgSrc = ' src="' + $imgSrc + '"' )
>> + #else
>> + #set ( $imgSrc = ' src="' + $img + '"' )
>> + #end
>> + #if( $alt )
>> + #set ( $imgAlt = ' alt="' + $alt + '"' )
>> + #else
>> + #set ( $imgAlt = ' alt=""' )
>> + #end
>> + #if( $border )
>> + #set ( $imgBorder = ' border="' + $border + '"' )
>> + #else
>> + #set ( $imgBorder = "" )
>> + #end
>> + #if( $width )
>> + #set ( $imgWidth = ' width="' + $width + '"' )
>> + #else
>> + #set ( $imgWidth = "" )
>> + #end
>> + #if( $height )
>> + #set ( $imgHeight = ' height="' + $height + '"' )
>> + #else
>> + #set ( $imgHeight = "" )
>> + #end
>> + <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
>> #end
>> #end
>> -
>> #macro ( banner $banner $id )
>> #if ( $banner )
>> #if( $banner.href )
>> - <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
>> + #set ( $hrf = $banner.href )
>> + #if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") ||
>> + $hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:/") ||
>> + $hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) )
>> + #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 ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
>> + #if ( ! ( $src.toLowerCase().startsWith("http:/") || $src.toLowerCase().startsWith("https:/") ||
>> + $src.toLowerCase().startsWith("ftp:/") || $src.toLowerCase().startsWith("mailto:/") ||
>> + $src.toLowerCase().startsWith("file:/") || ($src.toLowerCase().indexOf("://") != -1) ) )
>> #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
>> - #set ( $src = $src.replaceAll( "\\", "/" ) )
>> + #set ( $src = $src.replaceAll( '\\', '/' ) )
>> #end
>> #if ( $banner.alt )
>> #set ( $alt = $banner.alt )
>> @@ -29,7 +95,7 @@
>> #else
>> $banner.name
>> #end
>> -
>> +##
>> #if( $banner.href )
>> </a>
>> #else
>> @@ -37,57 +103,54 @@
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( links $links )
>> #set ( $counter = 0 )
>> #foreach( $item in $links )
>> #set ( $counter = $counter + 1 )
>> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
>> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
>> - #link( $currentItemHref $item.name )
>> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
>> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
>> #if ( $links.size() > $counter )
>> |
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( breadcrumbs $breadcrumbs )
>> - #set ( $counter = 0 )
>> #foreach( $item in $breadcrumbs )
>> - #set ( $counter = $counter + 1 )
>> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
>> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
>> -
>> - #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
>> - $item.name
>> - #else
>> - #link( $currentItemHref $item.name )
>> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
>> + #if ( ( $currentItemHref == '' ) )
>> + #set ( $currentItemHref = './' )
>> #end
>> - #if ( $breadcrumbs.size() > $counter )
>> +##
>> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
>> >
>> - #end
>> #end
>> + $title
>> #end
>> -
>> +##
>> #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( "\\", "/" ) )
>> + #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
>> +##
>> #if ( $alignedFileName == $subitemHref )
>> #set ( $display = true )
>> #end
>> -
>> +##
>> #displayTree( $display $subitem )
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( menuItem $item )
>> #set ( $collapse = "none" )
>> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
>> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
>> -
>> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
>> +##
>> #if ( $item && $item.items && $item.items.size() > 0 )
>> #if ( $item.collapse == false )
>> #set ( $collapse = "expanded" )
>> @@ -95,29 +158,36 @@
>> ## By default collapsed
>> #set ( $collapse = "collapsed" )
>> #end
>> -
>> +##
>> #set ( $display = false )
>> #displayTree( $display $item )
>> -
>> +##
>> #if ( $alignedFileName == $currentItemHref || $display )
>> #set ( $collapse = "expanded" )
>> #end
>> #end
>> <li class="$collapse">
>> - #if ( $item.img )
>> - #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
>> - #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
>> - #set ( $src = $src.replaceAll( "\\", "/" ) )
>> - <img src="$src"/>
>> + #if ( $item.img )
>> + #if ( $item.position == "left" )
>> + #if ( $alignedFileName == $currentItemHref )
>> + <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
>> #else
>> - <img src="$item.img" align="absbottom" style="border-width: 0"/>
>> + #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
>> + #end
>> + #else
>> + #if ( $alignedFileName == $currentItemHref )
>> + <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
>> + #else
>> + #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
>> #end
>> #end
>> + #else
>> #if ( $alignedFileName == $currentItemHref )
>> <strong>$item.name</strong>
>> #else
>> - #link( $currentItemHref $item.name )
>> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
>> #end
>> + #end
>> #if ( $item && $item.items && $item.items.size() > 0 )
>> #if ( $collapse == "expanded" )
>> <ul>
>> @@ -129,11 +199,60 @@
>> #end
>> </li>
>> #end
>> -
>> +##
>> #macro ( mainMenu $menus )
>> #foreach( $menu in $menus )
>> #if ( $menu.name )
>> - <h5>$menu.name</h5>
>> + #if ( $menu.img )
>> + #if( $menu.position )
>> + #set ( $position = $menu.position )
>> + #else
>> + #set ( $position = "left" )
>> + #end
>> +##
>> + #if ( ! ( $menu.img.toLowerCase().startsWith("http:/") || $menu.img.toLowerCase().startsWith("https:/") ||
>> + $menu.img.toLowerCase().startsWith("ftp:/") || $menu.img.toLowerCase().startsWith("mailto:/") ||
>> + $menu.img.toLowerCase().startsWith("file:/") || ($menu.img.toLowerCase().indexOf("://") != -1) ) )
>> + #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.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
>> +##
>> + #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
>> +##
>> + #if ( $position == "left" )
>> + <h5>$img $menu.name</h5>
>> + #else
>> + <h5>$menu.name $img</h5>
>> + #end
>> + #else
>> + <h5>$menu.name</h5>
>> + #end
>> #end
>> #if ( $menu.items && $menu.items.size() > 0 )
>> <ul>
>> @@ -144,7 +263,7 @@
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( copyright )
>> #if ( $project )
>> #if ( ${project.organization} && ${project.organization.name} )
>> @@ -152,15 +271,15 @@
>> #else
>> #set ( $period = "." )
>> #end
>> -
>> +##
>> #set ( $currentYear = ${currentDate.year} + 1900 )
>> -
>> +##
>> #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
>> ${project.inceptionYear}-${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>.
>> @@ -170,24 +289,24 @@
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( publishDate $position $publishDate $version )
>> #if ( $publishDate && $publishDate.format )
>> #set ( $format = $publishDate.format )
>> #else
>> #set ( $format = "yyyy-MM-dd" )
>> #end
>> -
>> +##
>> $dateFormat.applyPattern( $format )
>> -
>> +##
>> #set ( $dateToday = $dateFormat.format( $currentDate ) )
>> -
>> +##
>> #if ( $publishDate && $publishDate.position )
>> #set ( $datePosition = $publishDate.position )
>> #else
>> #set ( $datePosition = "left" )
>> #end
>> -
>> +##
>> #if ( $version )
>> #if ( $version.position )
>> #set ( $versionPosition = $version.position )
>> @@ -198,7 +317,7 @@
>> #set ( $version = "" )
>> #set ( $versionPosition = "left" )
>> #end
>> -
>> +##
>> #set ( $breadcrumbs = $decoration.body.breadcrumbs )
>> #set ( $links = $decoration.body.links )
>>
>> @@ -207,7 +326,7 @@
>> #else
>> #set ( $prefix = "" )
>> #end
>> -
>> +##
>> #if ( $datePosition.equalsIgnoreCase( $position ) )
>> #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
>> $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
>> @@ -255,66 +374,96 @@
>> #end
>> #end
>> #end
>> -
>> +##
>> #macro ( poweredByLogo $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
>> -
>> - #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
>> -
>> - <a href="$href" title="$name" class="poweredBy">
>> - #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
>> - #set ( $img = $img.replaceAll( "\\", "/" ) )
>> - <img class="poweredBy"
>> - alt="$name"
>> - src="$img"
>> - width="90"
>> - height="30"
>> - />
>> - </a>
>> - #end
>> - #if( $poweredBy.isEmpty() )
>> - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
>> - <img class="poweredBy"
>> - alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
>> - src="$relativePath/images/logos/maven-feather.png"
>> - width="90"
>> - height="30"
>> - border="1" />
>> - </a>
>> - #end
>> - #else
>> - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
>> - <img class="poweredBy"
>> - alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
>> - src="$relativePath/images/logos/maven-feather.png"
>> - width="90"
>> - height="30"
>> - border="1"
>> - />
>> - </a>
>> + #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
>> +##
>> + #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 ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
>> + $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
>> + $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
>> + #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
>> + #set ( $img = $src.replaceAll( '\\', '/' ) )
>> + #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.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="poweredBy">
>> + <img class="poweredBy" $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="poweredBy" 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="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
>> + </a>
>> + #end
>> #end
>> +##
>> +#macro ( googleAnalytics $accountId )
>> + #if( $accountId && $accountId != "" )
>> + <!-- Google Analytics -->
>> + <script type="text/javascript">
>> +
>> + var _gaq = _gaq || [];
>> + _gaq.push(['_setAccount', '$accountId']);
>> + _gaq.push(['_trackPageview']);
>> +
>> + (function() {
>> + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
>> + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
>> + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
>> + })();
>>
>> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
>> -<html xmlns="http://www.w3.org/1999/xhtml">
>> + </script>
>> + #end
>> +#end
>> +##
>> +<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>
>> @@ -322,31 +471,26 @@
>> @import url("$relativePath/css/maven-base.css");
>> @import url("$relativePath/css/maven-theme.css");
>> @import url("$relativePath/css/site.css");
>> - @import url("$relativePath/css/prettify.css");
>> </style>
>> <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
>> - <script type="text/javascript" src="$relativePath/js/prettify.js"></script>
>> - <script type="text/javascript">
>> - window.onload=function() {
>> - prettyPrint();
>> - }
>> - </script>
>> - #foreach( $author in $authors )
>> +#foreach( $author in $authors )
>> <meta name="author" content="$author" />
>> - #end
>> +#end
>> #if ( $dateCreation )
>> <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
>> #end
>> #if ( $dateRevision )
>> <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
>> #end
>> +#if ( $locale )
>> + <meta http-equiv="Content-Language" content="$locale.language" />
>> +#end
>> #if ( $decoration.body.head )
>> #foreach( $item in $decoration.body.head.getChildren() )
>> ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
>> ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
>> ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
>> - #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
>> - #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
>> + #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
>> #if ( $item.name == "script" )
>> $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
>> #else
>> @@ -354,45 +498,52 @@
>> #end
>> #end
>> #end
>> + $headContent
>> + #googleAnalytics( $decoration.googleAnalyticsAccountId )
>> </head>
>> - <body>
>> - <div id="wrapper">
>> - <div id="banner">
>> - #banner( $decoration.bannerLeft "bannerLeft" )
>> - #banner( $decoration.bannerRight "bannerRight" )
>> - <div class="clear">
>> - <hr/>
>> - </div>
>> - </div>
>> - <div id="breadcrumbs">
>> - #publishDate( "left" $decoration.publishDate $decoration.version )
>> - <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
>> - <div class="clear">
>> - <hr/>
>> - </div>
>> - </div>
>> - <div id="leftColumn">
>> - <div id="navcolumn">
>> - #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
>> - #mainMenu( $decoration.body.menus )
>> - #poweredByLogo( $decoration.poweredBy )
>> - #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
>> - </div>
>> - </div>
>> - <div id="bodyColumn">
>> - <div id="contentBox">
>> - $bodyContent
>> - </div>
>> - </div>
>> - <div class="clear">
>> - <hr/>
>> - </div>
>> - <div id="footer">
>> - <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
>> - <div class="clear">
>> - <hr/>
>> - </div>
>> - </div>
>> + <body class="composite">
>> + <div id="banner">
>> + #banner( $decoration.bannerLeft "bannerLeft" )
>> + #banner( $decoration.bannerRight "bannerRight" )
>> + <div class="clear">
>> + <hr/>
>> + </div>
>> + </div>
>> + <div id="breadcrumbs">
>> + #publishDate( "left" $decoration.publishDate $decoration.version )
>> + <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
>> + <div class="clear">
>> + <hr/>
>> + </div>
>> + </div>
>> + <div id="leftColumn">
>> + <div id="navcolumn">
>> + #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
>> + #mainMenu( $decoration.body.menus )
>> + #poweredByLogo( $decoration.poweredBy )
>> + #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
>> + </div>
>> + </div>
>> + <div id="bodyColumn">
>> + <div id="contentBox">
>> + $bodyContent
>> + </div>
>> + </div>
>> + <div class="clear">
>> + <hr/>
>> + </div>
>> + <div id="footer">
>> + #if ( $decoration.custom.getChild("footer") )
>> + ## See DOXIA-150
>> + #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
>> + #foreach( $item in $decoration.custom.getChild("footer").getChildren() )
>> + $StringUtils.replace( $item.toString().trim(), $documentHeader, "" )
>> + #end
>> + #end
>> + <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
>> + <div class="clear">
>> + <hr/>
>> + </div>
>> </div>
>> </body>
>> </html>
>>
>>
>>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1074931 - /commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
Posted by Dennis Lundberg <de...@apache.org>.
On 2011-02-26 22:25, sebb@apache.org wrote:
> Author: sebb
> Date: Sat Feb 26 21:25:58 2011
> New Revision: 1074931
>
> URL: http://svn.apache.org/viewvc?rev=1074931&view=rev
> Log:
> Replace with copy from o.a.hc.maven-skin:1.1
Why?
Is there something missing in the default-site.vm?
If so what? Perhaps it is something that should be added in Doxia instead.
>
> Added:
> commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
> - copied, changed from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm
>
> Copied: commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (from r1074894, commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm)
> URL: http://svn.apache.org/viewvc/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm?p2=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&p1=commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm&r1=1074894&r2=1074931&rev=1074931&view=diff
> ==============================================================================
> --- commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm (original)
> +++ commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm Sat Feb 26 21:25:58 2011
> @@ -1,24 +1,90 @@
> -#macro ( link $href $name )
> - #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
> - <a href="$href" class="externalLink">$name</a>
> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
> +<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) ( $Revision$ ) -->
> +<!-- $HeadURL$ -->
> +#macro ( link $href $name $target $img $position $alt $border $width $height )
> + #set ( $linkTitle = ' title="' + $name + '"' )
> + #if( $target )
> + #set ( $linkTarget = ' target="' + $target + '"' )
> + #else
> + #set ( $linkTarget = "" )
> + #end
> + #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") ||
> + $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:/") ||
> + $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) )
> + #set ( $linkClass = ' class="externalLink"' )
> + #else
> + #set ( $linkClass = "" )
> + #end
> + #if ( $img )
> + #if ( $position == "left" )
> + <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
> + #else
> + <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
> + #end
> #else
> - <a href="$href">$name</a>
> + <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
> + #end
> +#end
> +##
> +#macro ( image $img $alt $border $width $height )
> + #if( $img )
> + #if ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
> + $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
> + $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
> + #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
> + #set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
> + #set ( $imgSrc = ' src="' + $imgSrc + '"' )
> + #else
> + #set ( $imgSrc = ' src="' + $img + '"' )
> + #end
> + #if( $alt )
> + #set ( $imgAlt = ' alt="' + $alt + '"' )
> + #else
> + #set ( $imgAlt = ' alt=""' )
> + #end
> + #if( $border )
> + #set ( $imgBorder = ' border="' + $border + '"' )
> + #else
> + #set ( $imgBorder = "" )
> + #end
> + #if( $width )
> + #set ( $imgWidth = ' width="' + $width + '"' )
> + #else
> + #set ( $imgWidth = "" )
> + #end
> + #if( $height )
> + #set ( $imgHeight = ' height="' + $height + '"' )
> + #else
> + #set ( $imgHeight = "" )
> + #end
> + <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
> #end
> #end
> -
> #macro ( banner $banner $id )
> #if ( $banner )
> #if( $banner.href )
> - <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
> + #set ( $hrf = $banner.href )
> + #if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") ||
> + $hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:/") ||
> + $hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) )
> + #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 ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
> + #if ( ! ( $src.toLowerCase().startsWith("http:/") || $src.toLowerCase().startsWith("https:/") ||
> + $src.toLowerCase().startsWith("ftp:/") || $src.toLowerCase().startsWith("mailto:/") ||
> + $src.toLowerCase().startsWith("file:/") || ($src.toLowerCase().indexOf("://") != -1) ) )
> #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
> - #set ( $src = $src.replaceAll( "\\", "/" ) )
> + #set ( $src = $src.replaceAll( '\\', '/' ) )
> #end
> #if ( $banner.alt )
> #set ( $alt = $banner.alt )
> @@ -29,7 +95,7 @@
> #else
> $banner.name
> #end
> -
> +##
> #if( $banner.href )
> </a>
> #else
> @@ -37,57 +103,54 @@
> #end
> #end
> #end
> -
> +##
> #macro ( links $links )
> #set ( $counter = 0 )
> #foreach( $item in $links )
> #set ( $counter = $counter + 1 )
> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
> - #link( $currentItemHref $item.name )
> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
> #if ( $links.size() > $counter )
> |
> #end
> #end
> #end
> -
> +##
> #macro ( breadcrumbs $breadcrumbs )
> - #set ( $counter = 0 )
> #foreach( $item in $breadcrumbs )
> - #set ( $counter = $counter + 1 )
> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
> -
> - #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
> - $item.name
> - #else
> - #link( $currentItemHref $item.name )
> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
> + #if ( ( $currentItemHref == '' ) )
> + #set ( $currentItemHref = './' )
> #end
> - #if ( $breadcrumbs.size() > $counter )
> +##
> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
> >
> - #end
> #end
> + $title
> #end
> -
> +##
> #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( "\\", "/" ) )
> + #set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
> +##
> #if ( $alignedFileName == $subitemHref )
> #set ( $display = true )
> #end
> -
> +##
> #displayTree( $display $subitem )
> #end
> #end
> #end
> -
> +##
> #macro ( menuItem $item )
> #set ( $collapse = "none" )
> #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
> - #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
> -
> + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
> +##
> #if ( $item && $item.items && $item.items.size() > 0 )
> #if ( $item.collapse == false )
> #set ( $collapse = "expanded" )
> @@ -95,29 +158,36 @@
> ## By default collapsed
> #set ( $collapse = "collapsed" )
> #end
> -
> +##
> #set ( $display = false )
> #displayTree( $display $item )
> -
> +##
> #if ( $alignedFileName == $currentItemHref || $display )
> #set ( $collapse = "expanded" )
> #end
> #end
> <li class="$collapse">
> - #if ( $item.img )
> - #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
> - #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
> - #set ( $src = $src.replaceAll( "\\", "/" ) )
> - <img src="$src"/>
> + #if ( $item.img )
> + #if ( $item.position == "left" )
> + #if ( $alignedFileName == $currentItemHref )
> + <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
> #else
> - <img src="$item.img" align="absbottom" style="border-width: 0"/>
> + #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
> + #end
> + #else
> + #if ( $alignedFileName == $currentItemHref )
> + <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
> + #else
> + #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
> #end
> #end
> + #else
> #if ( $alignedFileName == $currentItemHref )
> <strong>$item.name</strong>
> #else
> - #link( $currentItemHref $item.name )
> + #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
> #end
> + #end
> #if ( $item && $item.items && $item.items.size() > 0 )
> #if ( $collapse == "expanded" )
> <ul>
> @@ -129,11 +199,60 @@
> #end
> </li>
> #end
> -
> +##
> #macro ( mainMenu $menus )
> #foreach( $menu in $menus )
> #if ( $menu.name )
> - <h5>$menu.name</h5>
> + #if ( $menu.img )
> + #if( $menu.position )
> + #set ( $position = $menu.position )
> + #else
> + #set ( $position = "left" )
> + #end
> +##
> + #if ( ! ( $menu.img.toLowerCase().startsWith("http:/") || $menu.img.toLowerCase().startsWith("https:/") ||
> + $menu.img.toLowerCase().startsWith("ftp:/") || $menu.img.toLowerCase().startsWith("mailto:/") ||
> + $menu.img.toLowerCase().startsWith("file:/") || ($menu.img.toLowerCase().indexOf("://") != -1) ) )
> + #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.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
> +##
> + #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
> +##
> + #if ( $position == "left" )
> + <h5>$img $menu.name</h5>
> + #else
> + <h5>$menu.name $img</h5>
> + #end
> + #else
> + <h5>$menu.name</h5>
> + #end
> #end
> #if ( $menu.items && $menu.items.size() > 0 )
> <ul>
> @@ -144,7 +263,7 @@
> #end
> #end
> #end
> -
> +##
> #macro ( copyright )
> #if ( $project )
> #if ( ${project.organization} && ${project.organization.name} )
> @@ -152,15 +271,15 @@
> #else
> #set ( $period = "." )
> #end
> -
> +##
> #set ( $currentYear = ${currentDate.year} + 1900 )
> -
> +##
> #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
> ${project.inceptionYear}-${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>.
> @@ -170,24 +289,24 @@
> #end
> #end
> #end
> -
> +##
> #macro ( publishDate $position $publishDate $version )
> #if ( $publishDate && $publishDate.format )
> #set ( $format = $publishDate.format )
> #else
> #set ( $format = "yyyy-MM-dd" )
> #end
> -
> +##
> $dateFormat.applyPattern( $format )
> -
> +##
> #set ( $dateToday = $dateFormat.format( $currentDate ) )
> -
> +##
> #if ( $publishDate && $publishDate.position )
> #set ( $datePosition = $publishDate.position )
> #else
> #set ( $datePosition = "left" )
> #end
> -
> +##
> #if ( $version )
> #if ( $version.position )
> #set ( $versionPosition = $version.position )
> @@ -198,7 +317,7 @@
> #set ( $version = "" )
> #set ( $versionPosition = "left" )
> #end
> -
> +##
> #set ( $breadcrumbs = $decoration.body.breadcrumbs )
> #set ( $links = $decoration.body.links )
>
> @@ -207,7 +326,7 @@
> #else
> #set ( $prefix = "" )
> #end
> -
> +##
> #if ( $datePosition.equalsIgnoreCase( $position ) )
> #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
> $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
> @@ -255,66 +374,96 @@
> #end
> #end
> #end
> -
> +##
> #macro ( poweredByLogo $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
> -
> - #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
> -
> - <a href="$href" title="$name" class="poweredBy">
> - #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
> - #set ( $img = $img.replaceAll( "\\", "/" ) )
> - <img class="poweredBy"
> - alt="$name"
> - src="$img"
> - width="90"
> - height="30"
> - />
> - </a>
> - #end
> - #if( $poweredBy.isEmpty() )
> - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
> - <img class="poweredBy"
> - alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
> - src="$relativePath/images/logos/maven-feather.png"
> - width="90"
> - height="30"
> - border="1" />
> - </a>
> - #end
> - #else
> - <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
> - <img class="poweredBy"
> - alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
> - src="$relativePath/images/logos/maven-feather.png"
> - width="90"
> - height="30"
> - border="1"
> - />
> - </a>
> + #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
> +##
> + #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 ( ! ( $img.toLowerCase().startsWith("http:/") || $img.toLowerCase().startsWith("https:/") ||
> + $img.toLowerCase().startsWith("ftp:/") || $img.toLowerCase().startsWith("mailto:/") ||
> + $img.toLowerCase().startsWith("file:/") || ($img.toLowerCase().indexOf("://") != -1) ) )
> + #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
> + #set ( $img = $src.replaceAll( '\\', '/' ) )
> + #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.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="poweredBy">
> + <img class="poweredBy" $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="poweredBy" 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="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
> + </a>
> + #end
> #end
> +##
> +#macro ( googleAnalytics $accountId )
> + #if( $accountId && $accountId != "" )
> + <!-- Google Analytics -->
> + <script type="text/javascript">
> +
> + var _gaq = _gaq || [];
> + _gaq.push(['_setAccount', '$accountId']);
> + _gaq.push(['_trackPageview']);
> +
> + (function() {
> + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
> + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
> + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
> + })();
>
> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
> -<html xmlns="http://www.w3.org/1999/xhtml">
> + </script>
> + #end
> +#end
> +##
> +<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>
> @@ -322,31 +471,26 @@
> @import url("$relativePath/css/maven-base.css");
> @import url("$relativePath/css/maven-theme.css");
> @import url("$relativePath/css/site.css");
> - @import url("$relativePath/css/prettify.css");
> </style>
> <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
> - <script type="text/javascript" src="$relativePath/js/prettify.js"></script>
> - <script type="text/javascript">
> - window.onload=function() {
> - prettyPrint();
> - }
> - </script>
> - #foreach( $author in $authors )
> +#foreach( $author in $authors )
> <meta name="author" content="$author" />
> - #end
> +#end
> #if ( $dateCreation )
> <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
> #end
> #if ( $dateRevision )
> <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
> #end
> +#if ( $locale )
> + <meta http-equiv="Content-Language" content="$locale.language" />
> +#end
> #if ( $decoration.body.head )
> #foreach( $item in $decoration.body.head.getChildren() )
> ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
> ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
> ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
> - #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
> - #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
> + #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
> #if ( $item.name == "script" )
> $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
> #else
> @@ -354,45 +498,52 @@
> #end
> #end
> #end
> + $headContent
> + #googleAnalytics( $decoration.googleAnalyticsAccountId )
> </head>
> - <body>
> - <div id="wrapper">
> - <div id="banner">
> - #banner( $decoration.bannerLeft "bannerLeft" )
> - #banner( $decoration.bannerRight "bannerRight" )
> - <div class="clear">
> - <hr/>
> - </div>
> - </div>
> - <div id="breadcrumbs">
> - #publishDate( "left" $decoration.publishDate $decoration.version )
> - <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
> - <div class="clear">
> - <hr/>
> - </div>
> - </div>
> - <div id="leftColumn">
> - <div id="navcolumn">
> - #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
> - #mainMenu( $decoration.body.menus )
> - #poweredByLogo( $decoration.poweredBy )
> - #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
> - </div>
> - </div>
> - <div id="bodyColumn">
> - <div id="contentBox">
> - $bodyContent
> - </div>
> - </div>
> - <div class="clear">
> - <hr/>
> - </div>
> - <div id="footer">
> - <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
> - <div class="clear">
> - <hr/>
> - </div>
> - </div>
> + <body class="composite">
> + <div id="banner">
> + #banner( $decoration.bannerLeft "bannerLeft" )
> + #banner( $decoration.bannerRight "bannerRight" )
> + <div class="clear">
> + <hr/>
> + </div>
> + </div>
> + <div id="breadcrumbs">
> + #publishDate( "left" $decoration.publishDate $decoration.version )
> + <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
> + <div class="clear">
> + <hr/>
> + </div>
> + </div>
> + <div id="leftColumn">
> + <div id="navcolumn">
> + #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
> + #mainMenu( $decoration.body.menus )
> + #poweredByLogo( $decoration.poweredBy )
> + #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
> + </div>
> + </div>
> + <div id="bodyColumn">
> + <div id="contentBox">
> + $bodyContent
> + </div>
> + </div>
> + <div class="clear">
> + <hr/>
> + </div>
> + <div id="footer">
> + #if ( $decoration.custom.getChild("footer") )
> + ## See DOXIA-150
> + #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
> + #foreach( $item in $decoration.custom.getChild("footer").getChildren() )
> + $StringUtils.replace( $item.toString().trim(), $documentHeader, "" )
> + #end
> + #end
> + <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
> + <div class="clear">
> + <hr/>
> + </div>
> </div>
> </body>
> </html>
>
>
>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org