diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl index 3adee366..965fc5dd 100644 --- a/xdoc/src/plugin-resources/site.jsl +++ b/xdoc/src/plugin-resources/site.jsl @@ -38,7 +38,10 @@ - + + + + @@ -113,19 +116,15 @@ - - - - - ${_navTitle}${titleSeparator}${_docTitle} - - - - - ${pom.name}${titleSeparator}${_docTitle} - - + + + <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} + + @@ -268,10 +267,6 @@ - - - -
@@ -288,7 +283,7 @@ ${_navTitle}${pom.name} > ${_docTitle} - +
@@ -699,7 +694,6 @@  >  - diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 3fd63512..a47e4c9a 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -29,7 +29,7 @@ In breadcrumbs, use for the project's name nav.title if defined, pom.name otherwise. Display the "external link" icon only if the link host is different from the project url (pom.url). - Fix generated pages titles: [nav.title | pom.name] - doc.title + Fix generated pages titles: [breadcrumbs]* > [nav.title | pom.name]+ > doc.title New attribute fileSuffix for the tag doc:registerReport allow to use another extension than '.html' for a report link. Include instructions for ClearCase, Starteam and Perforce access in the scm-usage page. Include dependencies' scope in dependencies page.