You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/07 15:22:11 UTC
svn commit: r279321 - in /maven/maven-1/plugins/trunk/xdoc:
src/plugin-resources/site.jsl xdocs/changes.xml
Author: ltheussl
Date: Wed Sep 7 06:22:07 2005
New Revision: 279321
URL: http://svn.apache.org/viewcvs?rev=279321&view=rev
Log:
MPXDOC-47, MPXDOC-133 : Fix ampersand handling in navigation links and titles, document titles and sub/sections
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=279321&r1=279320&r2=279321&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 Wed Sep 7 06:22:07 2005
@@ -63,7 +63,6 @@
<html>
<head>
- <j:set var="docTitle"><x:expr select="./properties/title"/></j:set>
<!-- Key is more important than message... -->
<!-- From doc -->
@@ -74,9 +73,7 @@
<x:expr select="./properties/title/@bundle" />
</j:set>
<j:if test="${empty(_docKey)}">
- <j:set var="_docTitle">
- <x:expr select="./properties/title" />
- </j:set>
+ <x:set var="_docTitle" select="string(./properties/title)"/>
</j:if>
<j:if test="${!empty(_docKey)}">
<!-- Shortcut for the user bundle -->
@@ -98,9 +95,7 @@
<x:expr select="$nav/title/@bundle" />
</j:set>
<j:if test="${empty(_navKey)}">
- <j:set var="_navTitle">
- <x:expr select="$nav/title" />
- </j:set>
+ <x:set var="_navTitle" select="string($nav/title)"/>
</j:if>
<j:if test="${!empty(_navKey)}">
<!-- Shortcut for the user bundle -->
@@ -452,7 +447,7 @@
<!-- process a documentation section -->
<jsl:template match="section" trim="true">
<div class="section">
- <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+ <x:set var="_sectionName" select="string(@name)"/>
<!-- Key is more important than message... -->
<j:set var="_key">
@@ -484,7 +479,7 @@
<jsl:template match="subsection" trim="true">
<div class="subsection">
- <j:set var="_sectionName"><x:expr select="@name"/></j:set>
+ <x:set var="_sectionName" select="string(@name)"/>
<!-- Key is more important than message... -->
<j:set var="_key">
@@ -586,14 +581,14 @@
</x:element>
</jsl:template>
- <!-- Process the breadcrumb navbar -->
+ <!-- Process the links navbar -->
<jsl:template match="links" trim="true">
<j:set var="linkCount" value="1"/>
<x:forEach var="link" select="item">
- <j:set var="_img"><x:expr select="@img"/></j:set>
- <j:set var="_name"><x:expr select="@name"/></j:set>
- <j:set var="_link"><x:expr select="@href"/></j:set>
- <j:set var="_target"><x:expr select="@target"/></j:set>
+ <x:set var="_img" select="string(@img)"/>
+ <x:set var="_name" select="string(@name)"/>
+ <x:set var="_link" select="string(@href)"/>
+ <x:set var="_target" select="string(@target)"/>
<j:whitespace trim="false">
<j:if test="${linkCount != 1}">
<j:if test="${!(maven.xdoc.crumb.separator == '')}">
@@ -609,8 +604,8 @@
<!-- Process the breadcrumb navbar -->
<jsl:template match="breadcrumbs" trim="true">
<x:forEach var="link" select="item">
- <j:set var="_name"><x:expr select="@name"/></j:set>
- <j:set var="_link"><x:expr select="@href"/></j:set>
+ <x:set var="_name" select="string(@name)"/>
+ <x:set var="_link" select="string(@href)"/>
<a href="${_link}">${_name}</a>
 <span class="separator">></span> 
</x:forEach>
@@ -618,7 +613,7 @@
<!-- Process a menu for the navigation bar -->
<jsl:template match="menu" trim="true">
- <j:set var="_menuName"><x:expr select="string(@name)"/></j:set>
+ <x:set var="_menuName" select="string(@name)"/>
<!-- Key is more important than message... -->
<j:set var="_key">
<x:expr select="@key" />
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=279321&r1=279320&r2=279321&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Wed Sep 7 06:22:07 2005
@@ -27,6 +27,8 @@
</properties>
<body>
<release version="1.10" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-47">Ampersands in navigation.xml being escaped twice.</action>
+ <action dev="ltheussl" type="fix" issue="MPXDOC-133">Ampersand in section/subsection not correct.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-104" due-to="Rafal Krzewski">Downloads report cannot be disabled for child projects.</action>
</release>
<release version="1.9.2" date="2005-09-05">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org