bwalding 2003/07/17 03:44:28
Modified: src/plugins-build/xdoc plugin.jelly
src/plugins-build/xdoc/src/plugin-resources site.jsl
Log:
o Update the templates to draw handles
I'm still not 100% on drawing an expanded handle on an uncollapsible node.
I think we could do to remove the little - in front of every item too.
PR: MAVEN-579
Revision Changes Path
1.33 +7 -0 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 17 Jul 2003 02:03:14 -0000 1.32
+++ plugin.jelly 17 Jul 2003 10:44:28 -0000 1.33
@@ -176,8 +176,15 @@
@relativePath
@name
@img
+ @state - expanded / collapsed / none
-->
<a href="${pathTool.calculateLink(link,relativePath)}">
+ <j:if test="${state == 'expanded'}">
+ <img class="handle" src="${relativePath}/images/expanded.png"
alt="Expanded"/>
+ </j:if>
+ <j:if test="${state == 'collapsed'}">
+ <img class="handle" src="${relativePath}/images/collapsed.png"
alt="Expandable"/>
+ </j:if>
<j:if test="${empty(img)}">${name}</j:if>
<j:if test="${!empty(img)}"><img style="border: 1px" src="${img}"
title="${name}" alt="${name}"/></j:if>
</a>
1.29 +16 -3 maven/src/plugins-build/xdoc/src/plugin-resources/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/site.jsl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- site.jsl 8 Jul 2003 03:47:45 -0000 1.28
+++ site.jsl 17 Jul 2003 10:44:28 -0000 1.29
@@ -386,14 +386,27 @@
<x:set var="_name" select="string(@name)"/>
<x:set var="_link" select="string(@href)"/>
<x:set var="_img" select="string(@img)"/>
-
+ <x:set var="_childCount" select="count(./item)"/>
+ <j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
+ <j:set var="_state" value="none"/>
+
+ <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>
+ </j:if>
+
+
<div>
<small>
<j:if test="${navbean.isSelected(item.get(0))}">
- <b><doc:itemLink name="${_name}" link="${_link}"
img="${_img}"/></b>
+ <b><doc:itemLink name="${_name}" link="${_link}" img="${_img}"
state="${_state}"/></b>
</j:if>
<j:if test="${!navbean.isSelected(item.get(0))}">
- <doc:itemLink name="${_name}" link="${_link}" img="${_img}"/>
+ <doc:itemLink name="${_name}" link="${_link}" img="${_img}"
state="${_state}"/>
</j:if>
</small>
<j:if test="${!navbean.isCollapsed(item.get(0))}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
