Revert revision 384074: display page titles as 'pom.name - docTitle'.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@395951 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-04-21 17:20:42 +00:00
parent 503076b0db
commit f678cb7024
2 changed files with 9 additions and 9 deletions

View File

@ -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"/>

View File

@ -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>