Index: D:/eclipse/apache-workspace/multiproject/xdocs/properties.xml
===================================================================
--- D:/eclipse/apache-workspace/multiproject/xdocs/properties.xml	(revision 264741)
+++ D:/eclipse/apache-workspace/multiproject/xdocs/properties.xml	(working copy)
@@ -127,6 +127,10 @@
               <code>target/docs/multiproject/JarProject2</code> respectively.
             </p>
             <p>
+            	If the property is set to <code>tabs</code> the navigation menu is tabbed-based 
+            	and available on all generated pages making it easy to browse through all subprojects.
+            </p>
+            <p>
               Default value is <code>aggregate</code>.
             </p>
           </td>
Index: D:/eclipse/apache-workspace/multiproject/plugin.jelly
===================================================================
--- D:/eclipse/apache-workspace/multiproject/plugin.jelly	(revision 265700)
+++ D:/eclipse/apache-workspace/multiproject/plugin.jelly	(working copy)
@@ -93,8 +93,23 @@
     
     <!-- copy or not? -->
     <j:set var="navType" value="${maven.multiproject.navigation}"/>
-    <j:if test="${navType == 'aggregate'}">
-      <!-- generate site docs -->
+    <j:if test="${navType == 'aggregate' || navType == 'tabs'}">
+    
+	  <j:if test="${navType == 'tabs'}">
+	      <!-- If navigation is tabs then:
+	      	set necessary vars to resolve relative links for site.jsl 
+			set also multiprojects for site.jsl 
+			set them on the rootContext so they are available to the xdoc plugin 
+			set the top level project name for creating a tab for it as well -->
+	      <j:set var="mavenSession" value="${maven.session}"/>
+	   	  <j:set var="mpaggregateDir" value="${maven.multiproject.aggregateDir}"/>
+	   	  <j:set var="mpdocsDest" value="${maven.docs.dest}"/>   	  
+		  <j:expr value="${mavenSession.rootContext.setVariable('mpmultiprojects', multiprojects)}"/>   	  
+		  <j:expr value="${mavenSession.rootContext.setVariable('mpdocsDest', mpdocsDest)}"/>
+		  <j:expr value="${mavenSession.rootContext.setVariable('mpaggregateDir', mpaggregateDir)}"/>	  
+		  <j:expr value="${mavenSession.rootContext.setVariable('mpprojectName', pom.name)}"/>	  
+	  </j:if>
+	  
       <maven:reactor
         basedir="${maven.multiproject.basedir}"
         banner="Generating site for "
@@ -102,6 +117,7 @@
         goals="${maven.multiproject.site.goals}"
         ignoreFailures="${maven.multiproject.ignoreFailures}"
       />
+
       <echo>Now building reactor projects: ${multiprojects}</echo>
     
       <!-- copy each project over into ${maven.docs.dest} -->
@@ -121,6 +137,12 @@
           <fileset dir="${fromDir}"/>
         </copy>
       </j:forEach>
+
+	  <j:if test="${navType == 'tabs'}">
+		  <!-- We want the top level project to know it is not a subproject -->
+	      <j:expr value="${mavenSession.rootContext.setVariable('mpaggregateDir', '')}"/>
+	      <j:expr value="${mavenSession.rootContext.setVariable('mpdocsDest', '')}"/>      
+	  </j:if>  
     </j:if>
 
     <attainGoal name="multiproject:create-nav"/>

