svn commit: r568889 - in /lenya/trunk/src/modules/menubar: sitemap.xmap xslt/menu2xslt-ajax.xsl

Author: jann
Date: Thu Aug 23 01:48:48 2007
New Revision: 568889

URL: http://svn.apache.org/viewvc?rev=568889&view=rev
Log:
Adding context prefix to MENU_URL. Otherwise it will not work if you use lenya with tomcat in a non ROOT context

Modified:
    lenya/trunk/src/modules/menubar/sitemap.xmap
    lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl

Modified: lenya/trunk/src/modules/menubar/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/menubar/sitemap.xmap?rev=568889&r1=568888&r2=568889&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/sitemap.xmap (original)
+++ lenya/trunk/src/modules/menubar/sitemap.xmap Thu Aug 23 01:48:48 2007
@@ -27,6 +27,7 @@
       <map:match pattern="ajaxmenu/*/*/**">
         <map:generate src="fallback://lenya/content/util/empty.xml"/>
         <map:transform src="xslt/menu2xslt-ajax.xsl">
+          <map:parameter name="contextPrefix" value="{request:contextPath}"/>
           <map:parameter name="publicationid" value="{1}"/>
           <map:parameter name="area" value="{2}"/>
           <map:parameter name="documenturl" value="{page-envelope:document-url}"/>

Modified: lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl?rev=568889&r1=568888&r2=568889&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl (original)
+++ lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl Thu Aug 23 01:48:48 2007
@@ -26,7 +26,8 @@
   xmlns:menu="http://apache.org/cocoon/lenya/menubar/1.0"
   exclude-result-prefixes="menu"
   >
-  
+ 
+  <xsl:param name="contextPrefix"/> 
   <xsl:param name="publicationid"/>
   <xsl:param name="area"/>
   <xsl:param name="documenturl"/>
@@ -72,7 +73,7 @@
             </script>
             <script type="text/javascript" src="/cforms/dojo/dojo.js">&#160;</script>
             <script type="text/javascript">
-              MENU_URL = "<xsl:value-of select="concat('/', $publicationid, '/', $area, $documenturl, '?', $queryString)"/>";
+              MENU_URL = "<xsl:value-of select="concat($contextPrefix,'/', $publicationid, '/', $area, $documenturl, '?', $queryString)"/>";
             </script>
             <script type="text/javascript" src="/modules/menubar/javascript/loadmenu.js">&#160;</script>
           </head>