From d439bab12a1d35ec7b5f476b1223145d9aee5068 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Sep 2005 01:14:05 +0000
Subject: [PATCH] MPXDOC-175: Menus with type='header' are not processed by
 site.jsl. Thanks to Phil Steitz.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@291506 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/src/plugin-resources/site.jsl | 4 +++-
 xdoc/xdocs/changes.xml             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 204c09ac..de59f428 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -306,7 +306,9 @@
         <div id="leftColumn">
           <div id="navcolumn">
             <x:if select="$nav">
-              <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
+              <jsl:applyTemplates 
+                select="$nav/body/menu[@type='header'] |
+                $nav/body/search | $nav/body/menu[not(@type)]"/>             
             </x:if>
             <jsl:applyTemplates select="$projectNav/body/menu"/>
             <!-- allows user to put menu items after standard reports -->
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 736543cb..d91d07ad 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.10" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPXDOC-175" due-to="Phil Steitz">Menus with <code>type="header"</code> are not processed by <code>site.jsl</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-174">Unclear error message when <code>&lt;currentVersion/&gt;</code> in <code>project.xml</code> file not defined.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-141" due-to="M. Sean Gilligan">Perform JSL transforms on xdocs <strong>only</strong> when they have changed.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-169">Add xdoc tag library documentation to the plugin site.</action>