Author: vsiveton
Date: Sat Aug 29 12:56:23 2009
New Revision: 809126
URL: http://svn.apache.org/viewvc?rev=809126&view=rev
Log:
DOXIASITETOOLS-7: site.xml <item target=> attribute no more working
o added new target field in link item
o used this field in the velocity template
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=809126&r1=809125&r2=809126&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Sat Aug 29 12:56:23 2009
@@ -380,7 +380,6 @@
<version>1.0.1+</version>
<type>String</type>
<identifier>true</identifier>
- <defaultValue>0</defaultValue>
</field>
<field xml.attribute="true">
<name>border</name>
@@ -403,6 +402,13 @@
<type>String</type>
<identifier>true</identifier>
</field>
+ <field xml.attribute="true">
+ <name>target</name>
+ <description>Where the new document will be displayed when the user
follows a link, i.e. _blank opens the new document in a new
window.</description>
+ <version>1.0.1+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
</fields>
</class>
<class xsd.compositor="sequence">
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=809126&r1=809125&r2=809126&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Sat Aug 29 12:56:23 2009
@@ -1,33 +1,64 @@
<!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>
+#macro ( link $href $name $target $img $position $alt $border $width $height )
+ #set ( $linkTitle = ' title="' + $name + '"' )
+ #if( $target )
+ #set ( $linkTarget = ' target="' + $target + '"' )
#else
- <a href="$href">$name</a>
+ #set ( $linkTarget = "" )
#end
-#end
-##
-#macro ( linkWithImage $href $name $img $position )
#if ( ( $href.toLowerCase().startsWith("http") ||
$href.toLowerCase().startsWith("https") ) )
+ #set ( $linkClass = ' class="externalLink"' )
+ #else
+ #set ( $linkClass = "" )
+ #end
+ #if ( $img )
#if ( $position == "left" )
- <a href="$href" class="externalLink">$img $name</a>
+ <a href="$href"$linkClass$linkTarget>#image($img $alt $border $width
$height)$name</a>
#else
- <a href="$href" class="externalLink">$name $img</a>
+ <a href="$href"$linkClass$linkTarget>$name #image($img $alt $border
$width $height)</a>
#end
#else
- #if ( $position == "left" )
- <a href="$href">$img $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") ) )
+ #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $imgSrc = $imgSrc.replaceAll( "\\", "/" ) )
+ #set ( $imgSrc = ' src="' + $imgSrc + '"' )
#else
- <a href="$href">$name $img</a>
+ #set ( $imgSrc = ' src="' + $img + '"' )
#end
+ #if( $alt )
+ #set ( $imgAlt = ' alt="' + $alt + '"' )
+ #else
+ #set ( $imgAlt = "" )
+ #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 >
+ <a href="$banner.href" id="$id"#if( $banner.alt )
title="$banner.alt"#end>
#else
<div id="$id">
#end
@@ -62,7 +93,7 @@
#set ( $counter = $counter + 1 )
#set ( $currentItemHref = $PathTool.calculateLink( $item.href,
$relativePath ) )
#set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position
$item.alt $item.border $item.width $item.height )
#if ( $links.size() > $counter )
|
#end
@@ -79,7 +110,7 @@
#if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
$item.name
#else
- #link( $currentItemHref $item.name )
+ #link( $currentItemHref $item.name $item.target $item.img $item.position
$item.alt $item.border $item.width $item.height )
#end
#if ( $breadcrumbs.size() > $counter )
>
@@ -123,63 +154,24 @@
#end
<li class="$collapse">
#if ( $item.img )
- #if( $item.position )
- #set ( $position = $item.position )
- #else
- #set ( $position = "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 ( $position == "left" )
+ #if ( $item.position == "left" )
#if ( $alignedFileName == $currentItemHref )
- <strong>$img $item.name</strong>
+ <strong>#image($item.img $item.alt $item.border $item.width
$item.height) $item.name</strong>
#else
- #linkWithImage( $currentItemHref $item.name $img $position )
+ #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 $img</strong>
+ <strong>$item.name #image($item.img $item.alt $item.border $item.width
$item.height)</strong>
#else
- #linkWithImage( $currentItemHref $item.name $img $position )
+ #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 )
