svn commit: r520425 - /lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl

Author: andreas
Date: Tue Mar 20 08:17:38 2007
New Revision: 520425

URL: http://svn.apache.org/viewvc?view=rev&rev=520425
Log:
Handle text and i18n elements correctly in menu items

Modified:
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl

Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl?view=diff&rev=520425&r1=520424&r2=520425
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl Tue Mar 20 08:17:38 
2007
@@ -255,7 +255,7 @@
             </xsl:if>
           </xsl:attribute>
           <xsl:call-template name="checkItem"/>
-          <span><xsl:copy-of select="node()[not(self::menu:message)]"/></span>
+          <span><xsl:apply-templates select="i18n:*|text()"/></span>
         </a></li>
       </xsl:when>
       <xsl:otherwise>
@@ -272,11 +272,21 @@
               </xsl:copy>
             </xsl:for-each>
             <xsl:call-template name="checkItem"/>
-            <span><xsl:copy-of 
select="node()[not(self::menu:message)]"/></span>
+            <span><xsl:apply-templates select="i18n:*|text()"/></span>
           </a>
         </li>
       </xsl:otherwise>
     </xsl:choose>
+  </xsl:template>
+  
+  
+  <xsl:template match="menu:item/text()">
+    <xsl:value-of select="normalize-space(.)"/>
+  </xsl:template>
+  
+  
+  <xsl:template match="menu:item/i18n:*">
+    <xsl:copy-of select="."/>
   </xsl:template>