PR: MPXDOC-96, 98

Submitted by:	fabrizio giustina
Reviewed by:	Brett Porter
xdoc list and navigation fixes


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115071 13f79535-47bb-0310-9956-ffa450edef68

xdoc/src/plugin-resources/navigation.jelly

@@ -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()}">

xdoc/src/plugin-resources/site.jsl

@@ -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>

xdoc/src/plugin-resources/templates/maven-reports.xml

@@ -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>