kaz 2002/12/07 12:38:32
Modified: src/plugins-build/xdoc site.dvsl site.jsl
Log:
If there wasn't a <links> element defined in navigation.xml, and the
maven.xdoc.date property was set to the value 'right', then the last
published date was not rendered on the generated docs. This change
corrects that behavior.
Revision Changes Path
1.30 +10 -10 jakarta-turbine-maven/src/plugins-build/xdoc/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/site.dvsl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- site.dvsl 20 Nov 2002 16:16:39 -0000 1.29
+++ site.dvsl 7 Dec 2002 20:38:32 -0000 1.30
@@ -156,11 +156,19 @@
</td>
#end
<td>
+ <div align="right">
+ #if( $context.toolbox.date == "right" )
+ Last published: $context.toolbox.buildDate
+ #if ($nav.get("body/links/*"))
+ |
+ #end
+ #end
#if ($nav.get("body/links/*"))
- $context.applyTemplates( $nav, "body/links" )
+ $context.applyTemplates( $nav, "body/links" )
#else
-
+
#end
+ </div>
</td>
</tr>
</table>
@@ -332,18 +340,10 @@
* Process the breadcrumb navbar
*#
#match ( "links" )
- <div align="right">
- #if( $context.toolbox.date == "right" )
- Last published: $context.toolbox.buildDate
- #if ($nav.get("body/links/*"))
- |
- #end
- #end
#foreach ($item in $node.selectNodes("item"))
#if ($velocityCount != 1) | #end
#itemLink( $item )
#end
- </div>
#end
#*
1.5 +6 -6 jakarta-turbine-maven/src/plugins-build/xdoc/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/site.jsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site.jsl 1 Dec 2002 16:33:33 -0000 1.4
+++ site.jsl 7 Dec 2002 20:38:32 -0000 1.5
@@ -109,6 +109,11 @@
</td>
</j:if>
<td>
+ <div align="right">
+ <j:if test="${context.findVariable('maven.xdoc.date') ==
'right'}">
+ Last published: ${build.date}
+ <x:if select="$nav/body/links">|</x:if>
+ </j:if>
<!-- render links -->
<x:if select="$nav/body/links">
<!-- FIXME: need to test/implement -->
@@ -117,6 +122,7 @@
<x:if select="not($nav/body/links)">
<!-- FIXME -->
</x:if>
+ </div>
</td>
</tr>
</table>
@@ -284,11 +290,6 @@
<!-- Process the breadcrumb navbar -->
<jsl:template match="links">
- <div align="right">
- <j:if test="${context.findVariable('maven.xdoc.date') == 'right'}">
- Last published: ${build.date}
- <x:if select="$nav/body/links">|</x:if>
- </j:if>
<j:set var="linkCount" value="1" />
<x:forEach var="link" select="item">
<j:if test="${linkCount != 1}">|</j:if>
@@ -297,7 +298,6 @@
<jslXdoc:itemLink name="${_name}" link="${_link}" />
<j:set var="linkCount" value="${1+linkCount}"/>
</x:forEach>
- </div>
</jsl:template>
<!-- process a documentation section -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
