svn commit: r384074 - in /maven/maven-1/plugins/trunk/xdoc: src/plugin-resources/site.jsl xdocs/changes.xml

[ah...@apache.org]

Author: aheritier
Date: Tue Mar  7 17:01:04 2006
New Revision: 384074

URL: http://svn.apache.org/viewcvs?rev=384074&view=rev
Log:
Display the breadcrumbs hierarchy in the title of the page

Modified:
    maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
    maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=384074&r1=384073&r2=384074&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Tue Mar  7 17:01:04 2006
@@ -38,7 +38,10 @@
     <j:catch>
       <j:new var="siteHost" className="java.net.URL"><j:arg value="${pom.url}"/></j:new>
     </j:catch>
-    
+    <j:set var="breadcrumbsUsed" value=""/>
+    <x:if select="$nav/body/breadcrumbs">
+      <j:set var="breadcrumbsUsed" value="'true'"/>
+    </x:if>
     <j:useBean var="navbean" class="org.apache.maven.NavBean"/>
     <j:set var="location" value="${outFile.substring(destdir.length())}"/>
     <util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
@@ -113,19 +116,15 @@
           </j:if>
         </j:if>
 
-        <j:set var="titleSeparator" value=" - "/>
-        
-        <x:if select="$nav/title">
-          <title>
-            ${_navTitle}${titleSeparator}${_docTitle}
-          </title>
-        </x:if>
-        <x:if select="not($nav/title)">
-          <title>
-            ${pom.name}${titleSeparator}${_docTitle}
-          </title>
-        </x:if>
+        <j:set var="titleSeparator" value=" &gt; "/>
         
+        <title>
+          <j:if test="${!empty( breadcrumbsUsed )}">
+            <x:forEach var="item" select="$nav/body/breadcrumbs/item"><x:expr select="@name" />${titleSeparator}</x:forEach>
+          </j:if>
+          <x:if select="$nav/title">${_navTitle}</x:if><x:if select="not($nav/title)">${pom.name}</x:if>${titleSeparator}${_docTitle}
+        </title>
+
         <j:set var="themeUrl" value="${maven.xdoc.theme.url}"/>
         <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/>
 
@@ -268,10 +267,6 @@
               <j:set var="version" value=""/>
             </j:when>
           </j:choose>
-          <j:set var="breadcrumbsUsed" value=""/>  
-          <x:if select="$nav/body/breadcrumbs">
-            <j:set var="breadcrumbsUsed" value="'true'"/>  
-          </x:if>
                       
           <div class="xleft">
             <j:if test="${empty(breadcrumbsUsed)}">
@@ -288,7 +283,7 @@
             <j:if test="${!empty( breadcrumbsUsed )}">
               <jsl:applyTemplates select="$nav/body/breadcrumbs" />
               <a href="${home}"><x:if select="$nav/title">${_navTitle}</x:if><x:if select="not($nav/title)">${pom.name}</x:if></a>&#160;<span class="separator">&gt;</span>&#160;${_docTitle}
-            </j:if>             
+            </j:if>
           </div>
 
           <j:set var="linksUsed" value=""/>
@@ -699,7 +694,6 @@
       &#160;<span class="separator">&gt;</span>&#160;
     </x:forEach>
   </jsl:template>
-
   <!-- Process a menu for the navigation bar -->
   <jsl:template match="menu" trim="true">
     <x:set var="_menuName" select="string(@name)"/>

Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=384074&r1=384073&r2=384074&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue Mar  7 17:01:04 2006
@@ -29,7 +29,7 @@
     <release version="1.10-SNAPSHOT" date="in SVN">
       <action dev="aheritier" type="update">In breadcrumbs, use for the project's name nav.title if defined, pom.name otherwise.</action>
       <action dev="aheritier" type="fix">Display the "external link" icon only if the link host is different from the project url (pom.url).</action>
-      <action dev="aheritier" type="fix">Fix generated pages titles: [nav.title | pom.name] - doc.title</action>
+      <action dev="aheritier" type="fix">Fix generated pages titles: [breadcrumbs]* &gt; [nav.title | pom.name]+ &gt; doc.title</action>
       <action dev="aheritier" type="add">New attribute fileSuffix for the tag doc:registerReport allow to use another extension than '.html' for a report link.</action>
       <action dev="ltheussl" type="add">Include instructions for ClearCase, Starteam and Perforce access in the scm-usage page.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-191">Include dependencies' scope in dependencies page.</action>