svn commit: r619673 - in /lenya/trunk/src/webapp: global-sitemap.xmap lenya/xslt/menu/stripMenuRoots.xsl lenya/xslt/modules/modules2include.xsl

Author: andreas
Date: Thu Feb  7 14:38:43 2008
New Revision: 619673

URL: http://svn.apache.org/viewvc?rev=619673&view=rev
Log:
Use <i:include strip-root='true'> instead of stripMenuRoots.xsl.

Removed:
    lenya/trunk/src/webapp/lenya/xslt/menu/stripMenuRoots.xsl
Modified:
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/xslt/modules/modules2include.xsl

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?rev=619673&r1=619672&r2=619673&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Thu Feb  7 14:38:43 2008
@@ -167,7 +167,6 @@
           <map:parameter name="pub" value="{1}"/>
         </map:transform>
         <map:transform type="include"/>
-        <map:transform src="lenya/xslt/menu/stripMenuRoots.xsl"/>
         <map:transform src="lenya/xslt/menu/merge-menus.xsl"/>
         <map:serialize type="xml"/>
       </map:match>

Modified: lenya/trunk/src/webapp/lenya/xslt/modules/modules2include.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/modules/modules2include.xsl?rev=619673&r1=619672&r2=619673&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/modules/modules2include.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/modules/modules2include.xsl Thu Feb  7 14:38:43 2008
@@ -27,14 +27,14 @@
 
   <xsl:template match="lenya:publication">
     <menu:menu>
-      <i:include src="cocoon:/menu-xml/pub/{$pub}.xml"/>
+      <i:include src="cocoon:/menu-xml/pub/{$pub}.xml" strip-root="true"/>
       <xsl:apply-templates select="lenya:modules/lenya:module"/>
     </menu:menu>
   </xsl:template>
 
   <xsl:template match="lenya:module">
     <xsl:if test="not(preceding-sibling::lenya:module[@name = current()/@name])">
-      <i:include src="cocoon:/menu-xml/module/{@name}.xml">
+      <i:include src="cocoon:/menu-xml/module/{@name}.xml" strip-root="true">
         <i:fallback/>
       </i:include>
     </xsl:if>