svn commit: r520418 - in /lenya/trunk/src/webapp: global-sitemap.xmap lenya/xslt/menu/menu2xhtml.xsl lenya/xslt/menu/menu2xslt.xsl

Author: andreas
Date: Tue Mar 20 08:03:34 2007
New Revision: 520418

URL: http://svn.apache.org/viewvc?view=rev&rev=520418
Log:
Fixed menu XSLT + sitemap (some layout and i18n issues)

Modified:
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&rev=520418&r1=520417&r2=520418
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Mar 20 08:03:34 2007
@@ -146,8 +146,6 @@
           <map:parameter name="tabGroup" 
value="{usecase:tabGroup:{request-param:lenya.usecase}}"/>
         </map:transform>
         
-        <map:call resource="i18n"/>
-        
         <!-- Disable menu items according to usecase policies -->
         <map:transform type="usecasemenu"/>
 

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=520418&r1=520417&r2=520418
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl Tue Mar 20 08:03:34 
2007
@@ -255,7 +255,7 @@
             </xsl:if>
           </xsl:attribute>
           <xsl:call-template name="checkItem"/>
-          <span><xsl:value-of select="normalize-space(.)"/></span>
+          <span><xsl:copy-of select="node()[not(self::menu:message)]"/></span>
         </a></li>
       </xsl:when>
       <xsl:otherwise>
@@ -272,7 +272,7 @@
               </xsl:copy>
             </xsl:for-each>
             <xsl:call-template name="checkItem"/>
-            <span><xsl:value-of select="text()"/></span>
+            <span><xsl:copy-of 
select="node()[not(self::menu:message)]"/></span>
           </a>
         </li>
       </xsl:otherwise>

Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl?view=diff&rev=520418&r1=520417&r2=520418
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xslt.xsl Tue Mar 20 08:03:34 
2007
@@ -109,6 +109,9 @@
   </xsl:template>
   
   
+  <!-- add only first message as title attribute --> 
+  <xsl:template match="menu:message[preceding-sibling::menu:message]"/>
+  
   <xsl:template match="menu:message">
     <xsl:attribute name="title">
       <xsl:value-of select="."/>