cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r448826 - /cocoon/trunk/site/cocoon-maven-site-skin/src/main/resources/META-INF/maven/site.vm
Date Fri, 22 Sep 2006 06:20:56 GMT
Author: reinhard
Date: Thu Sep 21 23:20:55 2006
New Revision: 448826

URL: http://svn.apache.org/viewvc?view=rev&rev=448826
Log:
rework setting of docs name; use "docs" prefix for all used properties

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=448826&r1=448825&r2=448826
==============================================================================
--- 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 23:20:55 2006
@@ -170,6 +170,23 @@
     #end
 #end
 
+#macro ( nameAndVersion ) 
+  #if ( $decoration.name ) 
+    $decoration.name
+  #else
+    #if ( $project.getProperties().get("docs.name") ) 
+      $project.getProperties().get("docs.name")
+    #else 
+      #if ( $project.name )
+	      $project.name
+	  #end
+    #end
+  #end
+  #if ( $project.getProperties().get("docs.version") )
+  	$project.getProperties().get("docs.version")
+  #end
+#end
+
 <html>
   <head>
     <title>$title</title>
@@ -186,10 +203,10 @@
   </head>
   <body class="composite">
     <div id="banner">
-		<a href="$project.getProperties().get("externalUrl")" id="bannerLeft">
+		<a href="$project.getProperties().get("docs.externalUrl")" id="bannerLeft">
 			<img src="$PathTool.calculateLink( "images/cocoon-project-logo.png", $relativePath
)" alt="Cocoon Project Logo" />
 		</a>
-		<a href="$project.getProperties().get("externalUrl")" id="bannerRight">
+		<a href="$project.getProperties().get("docs.externalUrl")" id="bannerRight">
 			<img src="$PathTool.calculateLink( "images/cocoon-logo.gif", $relativePath )" alt="Cocoon
Logo" />
 		</a>
       <div class="clear">
@@ -197,16 +214,12 @@
       </div>
     </div>
     <div id="breadcrumbs">
-      <div id="projectName">$decoration.getName() 
-      #if ( $project.getProperties().get("moduleVersion") )
-      	$project.getProperties().get("moduleVersion")
-      #end
-      </div>
+      <div id="projectName">#nameAndVersion()</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>
| 
-		  <a href="$project.getProperties().get("externalUrl")/blocks/">Cocoon Blocks</a>
|   
-		  <a href="$project.getProperties().get("externalUrl")/maven-plugins/">Cocoon Maven
Plugins</a>    
+		  <a href="$project.getProperties().get("docs.externalUrl")/core-modules/">Cocoon
Core</a> | 
+		  <a href="$project.getProperties().get("docs.externalUrl")/blocks/">Cocoon Blocks</a>
|   
+		  <a href="$project.getProperties().get("docs.externalUrl")/maven-plugins/">Cocoon
Maven Plugins</a>    
       	  #links( $decoration.body.links )</div>
       <div class="clear">
         <hr/>



Mime
View raw message