Author: aheritier
Date: Tue Mar 7 15:24:08 2006
New Revision: 384052
URL: http://svn.apache.org/viewcvs?rev=384052&view=rev
Log:
In breadcrumbs, use for the project's name nav.title if defined, pom.name
otherwise.
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=384052&r1=384051&r2=384052&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
15:24:08 2006
@@ -287,7 +287,7 @@
</j:if>
<j:if test="${!empty( breadcrumbsUsed )}">
<jsl:applyTemplates select="$nav/body/breadcrumbs" />
- <a href="${home}">${pom.name}</a> <span
class="separator">></span> ${_docTitle}
+ <a href="${home}"><x:if
select="$nav/title">${_navTitle}</x:if><x:if
select="not($nav/title)">${pom.name}</x:if></a> <span
class="separator">></span> ${_docTitle}
</j:if>
</div>
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=384052&r1=384051&r2=384052&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue Mar 7 15:24:08 2006
@@ -27,8 +27,9 @@
</properties>
<body>
<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="add">Fix generated pages titles:
[nav.title | pom.name] - doc.title</action>
+ <action dev="aheritier" type="fix">Fix generated pages titles:
[nav.title | pom.name] - 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>
