Author: vsiveton
Date: Tue Dec 8 12:21:17 2009
New Revision: 888366
URL: http://svn.apache.org/viewvc?rev=888366&view=rev
Log:
MSKINS-8: Merge Doxia 1.1.2 changes
o applied changes
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm?rev=888366&r1=888365&r2=888366&view=diff
==============================================================================
---
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Tue Dec 8 12:21:17 2009
@@ -1,5 +1,5 @@
<!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 ) -->
#macro ( link $href $name )
#if ( ( $href.toLowerCase().startsWith("http") ||
$href.toLowerCase().startsWith("https") ) )
<a href="$href" class="externalLink">$name</a>
@@ -7,15 +7,31 @@
<a href="$href">$name</a>
#end
#end
-
+##
+#macro ( linkWithImage $href $name $img $align )
+ #if ( ( $href.toLowerCase().startsWith("http") ||
$href.toLowerCase().startsWith("https") ) )
+ #if ( $align == "left" )
+ <a href="$href" class="externalLink">$img $name</a>
+ #else
+ <a href="$href" class="externalLink">$name $img</a>
+ #end
+ #else
+ #if ( $align == "left" )
+ <a href="$href">$img $name</a>
+ #else
+ <a href="$href">$name $img</a>
+ #end
+ #end
+#end
+##
#macro ( banner $banner $id )
#if ( $banner )
#if( $banner.href )
<a href="$banner.href" id="$id">
#else
- <span id="$id">
+ <span id="$id">
#end
-
+##
#if( $banner.src )
#set ( $src = $banner.src )
#if ( ! ( $src.toLowerCase().startsWith("http") ||
$src.toLowerCase().startsWith("https") ) )
@@ -31,7 +47,7 @@
#else
$banner.name
#end
-
+##
#if( $banner.href )
</a>
#else
@@ -39,7 +55,7 @@
#end
#end
#end
-
+##
#macro ( links $links )
#set ( $counter = 0 )
#foreach( $item in $links )
@@ -52,14 +68,14 @@
#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
@@ -70,27 +86,27 @@
#end
#end
#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( "\\", "/" ) )
-
+##
#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( "\\", "/" ) )
-
+##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
#set ( $collapse = "expanded" )
@@ -98,29 +114,75 @@
## 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.align )
+ #set ( $align = $item.align )
+ #else
+ #set ( $align = "left" )
+ #end
+##
+ #if ( ! ( $item.img.toLowerCase().startsWith("http") ||
$item.img.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #set ( $src = ' src="' + $src + '"' )
+ #else
+ #set ( $src = ' src="' + $item.img + '"' )
+ #end
+##
+ #if( $item.alt )
+ #set ( $alt = ' alt="' + $item.alt + '"' )
+ #else
+ #set ( $alt = ' alt="' + $item.name + '"' )
+ #end
+##
+ #if( $item.border )
+ #set ( $border = ' border="' + $item.border + '"' )
+ #else
+ #set ( $border = ' border="0"' )
+ #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
+##
+ #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width +
$height + "/>" )
+##
+ #if ( $align == "left" )
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$img $item.name</strong>
#else
- <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #linkWithImage( $currentItemHref $item.name $img $align )
+ #end
+ #else
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name $img</strong>
+ #else
+ #linkWithImage( $currentItemHref $item.name $img $align )
#end
#end
+ #else
#if ( $alignedFileName == $currentItemHref )
<strong>$item.name</strong>
#else
#link( $currentItemHref $item.name )
#end
+ #end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
<ul>
@@ -132,11 +194,58 @@
#end
</li>
#end
-
+##
#macro ( mainMenu $menus )
#foreach( $menu in $menus )
#if ( $menu.name )
- <h5>$menu.name</h5>
+ #if ( $menu.img )
+ #if( $menu.align )
+ #set ( $align = $menu.align )
+ #else
+ #set ( $align = "left" )
+ #end
+##
+ #if ( ! ( $menu.img.toLowerCase().startsWith("http") ||
$menu.img.toLowerCase().startsWith("https") ) )
+ #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 ( $align == "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>
@@ -147,40 +256,40 @@
#end
#end
#end
-
+##
#macro ( copyright )
#if ( $project )
#set ( $currentYear = ${currentDate.year} + 1900 )
-
+##
#if ( ${project.inceptionYear} && ( ${project.inceptionYear} !=
${currentYear.toString()} ) )
${project.inceptionYear}-${currentYear}
#else
${currentYear}
#end
-
+##
#if ( ${project.organization} && ${project.organization.name} )
${project.organization.name}
#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 )
@@ -188,16 +297,16 @@
#set ( $versionPosition = "left" )
#end
#end
-
+##
#set ( $breadcrumbs = $decoration.body.breadcrumbs )
#set ( $links = $decoration.body.links )
-
+##
#if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() >
0 )
#set ( $prefix = " |" )
#else
#set ( $prefix = "" )
#end
-
+##
#if ( $datePosition.equalsIgnoreCase( $position ) )
#if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || (
$datePosition.equalsIgnoreCase( "bottom" ) ) )
$prefix $i18n.getString( "site-renderer", $locale,
"template.lastpublished" ): $dateToday
@@ -245,48 +354,74 @@
#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 alt="$name" src="$img" />
- </a>
- #end
- #if( $poweredBy.isEmpty() )
- <a href="http://maven.apache.org/"; title="$i18n.getString(
"site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img alt="$i18n.getString( "site-renderer", $locale,
"template.builtby" ) Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
- </a>
- #end
- #else
+ #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") ) )
+ #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 alt="$i18n.getString( "site-renderer", $locale,
"template.builtby" ) Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
+ <img 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 alt="$i18n.getString( "site-renderer", $locale,
"template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png"/>
+ </a>
#end
#end
-
+##
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<title>$title</title>
@@ -297,8 +432,14 @@
</style>
<link rel="stylesheet" href="$relativePath/css/print.css" type="text/css"
media="print" />
#foreach( $author in $authors )
- <meta name="author" content="$author" />
+ <meta name="author" content="$author" />
#end
+#if ( $dateCreation )
+ <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
+#end
+#if ( $dateRevision )
+ <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
+#end
<meta http-equiv="Content-Type" content="text/html;
charset=${outputEncoding}" />
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
Modified:
maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css?rev=888366&r1=888365&r2=888366&view=diff
==============================================================================
--- maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
(original)
+++ maven/skins/trunk/maven-stylus-skin/src/main/resources/css/maven-base.css
Tue Dec 8 12:21:17 2009
@@ -10,6 +10,7 @@
width: 100%;
margin-left: -2px;
margin-right: -2px;
+ table-layout: fixed;
}
acronym {
cursor: help;
@@ -141,3 +142,11 @@
margin: 0px;
padding: 0px;
}
+#navcolumn img.imageLink, .imageLink{
+ padding-left: 0px;
+ padding-bottom: 0px;
+ padding-top: 0px;
+ padding-right: 2px;
+ border: 0px;
+ margin: 0px;
+}
