You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ah...@apache.org on 2005/06/28 08:03:46 UTC
svn commit: r202135 - in /maven/maven-1/plugins/trunk/xdoc:
src/plugin-resources/site.jsl xdocs/changes.xml
Author: aheritier
Date: Mon Jun 27 23:03:45 2005
New Revision: 202135
URL: http://svn.apache.org/viewcvs?rev=202135&view=rev
Log:
fix MPXDOC-147 and MPXDOC-151
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=202135&r1=202134&r2=202135&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 Mon Jun 27 23:03:45 2005
@@ -586,9 +586,8 @@
<!-- Process a menu for the navigation bar -->
<jsl:template match="menu" trim="true">
- <j:set var="_menuName"><x:expr select="@name"/></j:set>
- <j:set var="_menuName"><doc:escapeNameToken value="${_menuName}"/></j:set>
-
+ <j:set var="_menuName"><x:expr select="string(@name)"/></j:set>
+ <j:set var="_menuNameEscaped"><doc:escapeNameToken value="${_menuName}"/></j:set>
<!-- Key is more important than message... -->
<j:set var="_key">
<x:expr select="@key" />
@@ -610,8 +609,8 @@
<j:choose>
<j:when test="${!empty(_menuName)}">
- <div id="menu${_menuName}">
- <h5><x:expr select="@name"/></h5>
+ <div id="menu${_menuNameEscaped}">
+ <h5>${_menuName}</h5>
<ul><jsl:applyTemplates select="item"/></ul>
</div>
</j:when>
@@ -632,11 +631,14 @@
<x:set var="_childCount" select="count(./item)"/>
<j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
<j:set var="_state" value="none"/>
-
+
<!-- Key is more important than message... -->
<j:set var="_key">
<x:expr select="@key" />
</j:set>
+ <j:set var="_bundle">
+ <x:expr select="@bundle" />
+ </j:set>
<j:if test="${!empty(_key)}">
<!-- Default bundle is the user one in ${maven.xdoc.bundle} -->
<j:if test="${empty(_bundle)}">
@@ -648,7 +650,7 @@
</fmt:bundle>
</j:if>
</j:if>
-
+
<j:if test="${_childCount.intValue() gt 0}">
<j:if test="${!_isCollapsed}"><j:set var="_state" value="expanded"/></j:if>
<j:if test="${_isCollapsed}"><j:set var="_state" value="collapsed"/></j:if>
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=202135&r1=202134&r2=202135&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Mon Jun 27 23:03:45 2005
@@ -26,6 +26,8 @@
</properties>
<body>
<release version="1.9.2-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="fix" issue="MPXDOC-151">i18n : menu tag in xdoc does not work with "key" translated text id.</action>
+ <action dev="aheritier" type="fix" issue="MPXDOC-147">Missing "Project Reports" header in the generated menu.</action>
<action dev="vsiveton" type="fix" issue="MPXDOC-148" due-to="Incze Lajos">Fixed bundles expression.</action>
</release>
<release version="1.9.1" date="2005-06-16">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org