Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPXDOC-185

Browse Source 
Fix broken maven.xdoc.date=navigation-top and navigation-bottom. Update docs.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@376091 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-02-08 21:55:43 +00:00
parent 861a524503
commit 9cd8af91d8
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xdoc/src/plugin-resources/site.jsl
View File

@ -287,8 +287,13 @@
</j:if> </j:if>
</div> </div>
<j:set var="linksUsed" value=""/>
<x:if select="$nav/body/links">
<j:set var="linksUsed" value="'true'"/>
</x:if>
<div class="xright"> <div class="xright">
<j:if test="${empty(breadcrumbsUsed)}"> <j:if test="${empty(linksUsed)}">
<j:if test="${date == 'right'}"> <j:if test="${date == 'right'}">
<fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date} <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
<j:if test="${!empty(version)}"> <j:if test="${!empty(version)}">
@ -300,9 +305,9 @@
</j:if> </j:if>
</j:if> </j:if>
<!-- render links --> <!-- render links -->
<x:if select="$nav/body/links"> <j:if test="${!empty(linksUsed)}">
<jsl:applyTemplates select="$nav/body/links"/> <jsl:applyTemplates select="$nav/body/links"/>
</x:if> </j:if>
</div> </div>
<div class="clear"><hr /></div> <div class="clear"><hr /></div>
</div> </div>
@ -310,6 +315,16 @@
<!-- left column start --> <!-- left column start -->
<div id="leftColumn"> <div id="leftColumn">
<div id="navcolumn"> <div id="navcolumn">
<j:if test="${date == 'navigation-top'}">
<div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
<j:if test="${!empty(version)}">
<j:if test="${!(maven.xdoc.crumb.separator == '')}">
<span class="separator">${maven.xdoc.crumb.separator}</span>
</j:if>
&#160;<fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
</j:if>
</div>
</j:if>
<x:if select="$nav"> <x:if select="$nav">
<jsl:applyTemplates <jsl:applyTemplates
select="$nav/body/menu[@type='header'] | select="$nav/body/menu[@type='header'] |
@ -420,10 +435,15 @@
<img alt="${maven.xdoc.poweredby.title}" src="${relativePathForLocale}images/logos/${poweredbyimage}" /> <img alt="${maven.xdoc.poweredby.title}" src="${relativePathForLocale}images/logos/${poweredbyimage}" />
</a> </a>
</j:if> </j:if>
<j:if test="${empty( breadcrumbsUsed )}">
<j:if test="${date == 'navigation-bottom'}"> <j:if test="${date == 'navigation-bottom'}">
<div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}</div> <div id="lastPublished"><fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
<j:if test="${!empty(version)}">
<j:if test="${!(maven.xdoc.crumb.separator == '')}">
<span class="separator">${maven.xdoc.crumb.separator}</span>
</j:if> </j:if>
&#160;<fmt:message key="site.doc_for" bundle="${msg}"/> ${version}
</j:if>
</div>
</j:if> </j:if>
</div> </div>
</div> </div>
@ -442,7 +462,7 @@
<div id="footer"> <div id="footer">
<jsl:applyTemplates select="$nav/body/footer"/> <jsl:applyTemplates select="$nav/body/footer"/>
<j:if test="${!empty(breadcrumbsUsed)}"> <j:if test="${date == 'bottom'}">
<div class="xleft"> <div class="xleft">
<fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date} <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
<j:if test="${!empty(version)}"> <j:if test="${!empty(version)}">
@ -466,11 +486,6 @@
<j:if test="${empty(pom.inceptionYear)}"> <j:if test="${empty(pom.inceptionYear)}">
&#169; ${mavenCurrentYear}, ${pom.organization.name} &#169; ${mavenCurrentYear}, ${pom.organization.name}
</j:if> </j:if>
<j:if test="${empty(breadcrumbsUsed)}">
<j:if test="${date == 'bottom'}">
&#169; - <fmt:message key="site.last_published" bundle="${msg}"/>: ${build.date}
</j:if>
</j:if>
</j:if> </j:if>
</div> </div>
<div class="clear"><hr /></div> <div class="clear"><hr /></div>

1
xdoc/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
</properties> </properties>
<body> <body>
<release version="1.10-SNAPSHOT" date="in SVN"> <release version="1.10-SNAPSHOT" date="in SVN">
<action dev="ltheussl" type="fix" issue="MPXDOC-185">Fix broken <code>maven.xdoc.date=navigation-top</code> and <code>navigation-bottom</code>.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-183" due-to="Niall Pemberton">Enable user-defined custom templates.</action> <action dev="ltheussl" type="add" issue="MPXDOC-183" due-to="Niall Pemberton">Enable user-defined custom templates.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-187">Correct cvs checkout instructions on cvs-usage page.</action> <action dev="ltheussl" type="fix" issue="MPXDOC-187">Correct cvs checkout instructions on cvs-usage page.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-125" due-to="Shinobu Kawai Yoshida">Url and timezone not used for contributor.</action> <action dev="ltheussl" type="fix" issue="MPXDOC-125" due-to="Shinobu Kawai Yoshida">Url and timezone not used for contributor.</action>

15
xdoc/xdocs/properties.xml
View File

@ -304,11 +304,11 @@
Allows the user to show the site generation date on the generated Allows the user to show the site generation date on the generated
website. One can place the date in 5 locations with "maven.xdoc.date": website. One can place the date in 5 locations with "maven.xdoc.date":
<ul> <ul>
<li>left : on the left side of the breadcrumbs</li> <li>left : at the place of the breadcrumbs (only if there are no breadcrumbs)</li>
<li>right : on the right side of the breadcrumbs, before the links</li> <li>right : at the place of the links (only if there are no links)</li>
<li>navigation-top : above the user links, in the navigation menu</li> <li>navigation-top : above the user links, in the navigation menu</li>
<li>navigation-bottom : under Maven's links, in the navigation menu</li> <li>navigation-bottom : below Maven's links, in the navigation menu</li>
<li>bottom : after the organization name, in the footer</li> <li>bottom : on the left side in the footer</li>
</ul> </ul>
If "maven.xdoc.date" is left empty, no date is shown on the site (default). If "maven.xdoc.date" is left empty, no date is shown on the site (default).
</td> </td>
@ -317,11 +317,10 @@
<td>maven.xdoc.version</td> <td>maven.xdoc.version</td>
<td>Yes</td> <td>Yes</td>
<td> <td>
The version number to show next to the date. <b>This only works if you also set The version number to show next to the date.
<code>maven.xdoc.date</code> to either <code>left</code> or <code>right</code>.</b> By default, <code>maven.xdoc.version</code> is not set and the value of
By default, <code>maven.xdoc.version</code> isn't setted and the value of
<code>pom.currentVersion</code> is displayed. <code>pom.currentVersion</code> is displayed.
If <code>maven.xdoc.version</code> is setted to empty, no version is shown on the site. If <code>maven.xdoc.version</code> is set to empty, no version is shown on the site.
</td> </td>
</tr> </tr>
<tr> <tr>