You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/09/21 18:45:37 UTC
svn commit: r448603 -
/cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
Author: reinhard
Date: Thu Sep 21 09:45:36 2006
New Revision: 448603
URL: http://svn.apache.org/viewvc?view=rev&rev=448603
Log:
tidy up Velocity macros; add version number
Modified:
cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
Modified: cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm?view=diff&rev=448603&r1=448602&r2=448603
==============================================================================
--- cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm Thu Sep 21 09:45:36 2006
@@ -17,40 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-#macro ( banner $banner $id )
- #if ( $banner )
- #if( $banner.href )
- <a href="$banner.href" id="$id">
- #else
- <span id="$id">
- #end
- #if( $banner.src )
- #set ( $src = $banner.src )
- #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- #end
- #if ( $banner.alt )
- #set ( $alt = $banner.alt )
- #else
- #set ( $alt = "" )
- #end
- <img src="$src" alt="$alt" />
- #else
- $banner.name
- #end
-
- #if( $banner.href )
- </a>
- #else
- </span>
- #end
- #end
-#end
-
#macro ( links $links )
#set ( $counter = 0 )
-
#if ( $links.size() > 0 )
|
#end
@@ -65,24 +33,6 @@
#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
- <a href="$currentItemHref">$item.name</a>
- #end
- #if ( $breadcrumbs.size() > $counter )
- >
- #end
- #end
-#end
-
#macro ( displayTree $display $item )
#if ( $item && $item.items && $item.items.size() > 0 )
#foreach( $subitem in $item.items )
@@ -179,82 +129,6 @@
#end
#end
-#macro ( publishDate $position $publishDate $version )
-
- #if ( $publishDate && $publishDate.format )
- #set ( $format = $publishDate.format )
- #else
- #set ( $format = "dd/MM/yyyy" )
- #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 )
- #else
- #set ( $versionPosition = "left" )
- #end
- #end
-
- #set ( $breadcrumbs = $decoration.body.breadcrumbs )
-
- #if ( $datePosition.equalsIgnoreCase( $position ) )
- #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
- | $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- </div>
- #elseif ( $datePosition.equalsIgnoreCase("left") )
- <div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #end
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
- #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
- | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- </div>
- #elseif ( $versionPosition.equalsIgnoreCase("left") )
- <div class="xleft">
- $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $position.equalsIgnoreCase( "left" ) )
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- <div class="xleft">
- #breadcrumbs( $breadcrumbs )
- </div>
- #end
- #end
-#end
-
#macro ( poweredByLogo $poweredBy )
#if( $poweredBy )
#foreach ($item in $poweredBy)
@@ -309,15 +183,6 @@
<meta name="author" content="$author" />
#end
<meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
- #if ( $decoration.body.head )
- #foreach( $item in $decoration.body.head.getChildren() )
- #if ( $item.name == "script" )
- $item.toUnescapedString()
- #else
- $item.toString()
- #end
- #end
- #end
</head>
<body class="composite">
<div id="banner">
@@ -332,7 +197,11 @@
</div>
</div>
<div id="breadcrumbs">
- <div id="projectName">$decoration.getName()</div>
+ <div id="projectName">$decoration.getName()
+ #if ( $project.getProperties().get("moduleVersion") )
+ $project.getProperties().get("moduleVersion")
+ #end
+ </div>
<div class="xright">
<a href="http://www.apache.org/">The Apache Software Foundation</a> |
<a href="$project.getProperties().get("externalUrl")/core-modules/">Cocoon Core</a> |
@@ -345,10 +214,12 @@
</div>
<div id="leftColumn">
<div id="navcolumn">
- #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
#mainMenu( $decoration.body.menus )
#poweredByLogo( $decoration.poweredBy )
<div id="lastPublished">
+ #set ( $format = "dd/MM/yyyy" )
+ $dateFormat.applyPattern( $format )
+ #set ( $dateToday = $dateFormat.format( $currentDate ) )
$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
</div>
</div>