svn commit: r1309906 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main: java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

[de...@apache.org]

Author: dennisl
Date: Thu Apr  5 15:46:23 2012
New Revision: 1309906

URL: http://svn.apache.org/viewvc?rev=1309906&view=rev
Log:
[DOXIASITETOOLS-70] Html title of generated pages does not include project name

The problem was that the $title property was used for 2 different things in the velocity template: the title and the name of the last breadcrumb. They want different titles. The page title should include the project name, but the breadcrumb should not. I solved this by a adding a new property called $shortTitle that is now used by the breadcrumb generation.

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
    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-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1309906&r1=1309905&r2=1309906&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Thu Apr  5 15:46:23 2012
@@ -440,7 +440,27 @@ public class DefaultSiteRenderer
         // Add infos from document
         context.put( "authors", sink.getAuthors() );
 
-        context.put( "title", sink.getTitle() );
+        context.put( "shortTitle", sink.getTitle() );
+
+        // DOXIASITETOOLS-70: Prepend the project name to the title, if any
+        String title = "";
+        if ( siteRenderingContext.getDecoration() != null
+                && siteRenderingContext.getDecoration().getName() != null )
+        {
+            title = siteRenderingContext.getDecoration().getName();
+        }
+        else if ( siteRenderingContext.getDefaultWindowTitle() != null )
+        {
+            title = siteRenderingContext.getDefaultWindowTitle();
+        }
+
+        if ( title.length() > 0 )
+        {
+            title += " - ";
+        }
+        title += sink.getTitle();
+
+        context.put( "title", title );
 
         context.put( "headContent", sink.getHead() );
 

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=1309906&r1=1309905&r2=1309906&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 Thu Apr  5 15:46:23 2012
@@ -127,7 +127,7 @@
       #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
       >
   #end
-  $title
+  $shortTitle
 #end
 ##
 #macro ( displayTree $display $item )