You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/04/28 05:37:30 UTC
cvs commit: maven-plugins/xdoc/src/plugin-resources/templates maven-reports.xml
brett 2004/04/27 20:37:30
Modified: xdoc/src/plugin-resources navigation.jelly site.jsl
xdoc/src/plugin-resources/templates maven-reports.xml
Log:
PR: MPXDOC-96, 98
Submitted by: fabrizio giustina
Reviewed by: Brett Porter
xdoc list and navigation fixes
Revision Changes Path
1.7 +4 -1 maven-plugins/xdoc/src/plugin-resources/navigation.jelly
Index: navigation.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-resources/navigation.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.jelly 4 Mar 2004 18:39:49 -0000 1.6
+++ navigation.jelly 28 Apr 2004 03:37:29 -0000 1.7
@@ -46,7 +46,10 @@
</item>
<item name="Project Reports" href="/maven-reports.html" collapse="true">
<j:forEach var="report" items="${reports}">
- <item name="${report.name}" href="/${report.link}.html"/>
+ <j:set var="link" value="${report.link}"/>
+ <j:if test="${!empty(link)}">
+ <item name="${report.name}" href="/${report.link}.html"/>
+ </j:if>
</j:forEach>
</item>
<!-- j:if test="${pom.reports.isEmpty()}">
1.55 +1 -2 maven-plugins/xdoc/src/plugin-resources/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-resources/site.jsl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- site.jsl 21 Apr 2004 00:55:44 -0000 1.54
+++ site.jsl 28 Apr 2004 03:37:29 -0000 1.55
@@ -242,7 +242,6 @@
</j:when>
<j:otherwise>
<div>
- <h5><x:expr select="@name"/></h5>
<ul><jsl:applyTemplates select="item"/></ul>
</div>
</j:otherwise>
@@ -269,7 +268,7 @@
<j:if test="${!navbean.isSelected(item.get(0))}">
<doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}"/>
</j:if>
- <j:if test="${!navbean.isCollapsed(item.get(0))}">
+ <j:if test="${_state == 'expanded'}">
<ul>
<jsl:applyTemplates select="item"/>
</ul>
1.10 +6 -4 maven-plugins/xdoc/src/plugin-resources/templates/maven-reports.xml
Index: maven-reports.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-resources/templates/maven-reports.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven-reports.xml 4 Mar 2004 18:39:49 -0000 1.9
+++ maven-reports.xml 28 Apr 2004 03:37:29 -0000 1.10
@@ -37,10 +37,12 @@
<table>
<tr><th>Document</th><th>Description</th></tr>
#foreach ($report in $reports)
- <tr>
- <td><a href="${report.link}.html">$report.name</a></td>
- <td>$report.description</td>
- </tr>
+ #if ($report.link && $report.link.length() != 0)
+ <tr>
+ <td><a href="${report.link}.html">$report.name</a></td>
+ <td>$report.description</td>
+ </tr>
+ #end
#end
</table>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org