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

[lt...@apache.org]

Author: ltheussl
Date: Fri Apr 21 10:20:42 2006
New Revision: 395951

URL: http://svn.apache.org/viewcvs?rev=395951&view=rev
Log:
Revert revision 384074: display page titles as 'pom.name - docTitle'.

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=395951&r1=395950&r2=395951&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 Fri Apr 21 10:20:42 2006
@@ -116,14 +116,15 @@
           </j:if>
         </j: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="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="themeUrl" value="${maven.xdoc.theme.url}"/>
         <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/>

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=395951&r1=395950&r2=395951&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Fri Apr 21 10:20:42 2006
@@ -33,7 +33,6 @@
       <action dev="aheritier" type="add">Allow the use of items' attributes 'target' and 'img' for breadcrumbs entries in the navigation file.</action>
       <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: [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>