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

Author: andreas
Date: Thu Nov 15 06:12:05 2007
New Revision: 595307

URL: http://svn.apache.org/viewvc?rev=595307&view=rev
Log:
Make ajax menus work with proxy

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=595307&r1=595306&r2=595307&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/sitemap.xmap (original)
+++ lenya/trunk/src/modules/menubar/sitemap.xmap Thu Nov 15 06:12:05 2007
@@ -21,6 +21,12 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
  <map:pipelines>
+   
+   <map:pipeline>
+     <map:match pattern="dojo/**">
+       <map:read src="resource://org/apache/cocoon/dojo/resources/{1}"/>
+     </map:match>
+   </map:pipeline> 
 
     <map:pipeline internal-only="true">  
       
@@ -42,7 +48,7 @@
           <map:parameter name="newMessages" value="{inbox:newMessageCount}"/>
         </map:transform>
         <map:transform src="xslt/menu2xslt-ajax.xsl">
-          <map:parameter name="contextPrefix" value="{request:contextPath}"/>
+          <map:parameter name="areaPrefix" value="{proxy:/{1}/{2}}"/>
           <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=595307&r1=595306&r2=595307&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl (original)
+++ lenya/trunk/src/modules/menubar/xslt/menu2xslt-ajax.xsl Thu Nov 15 06:12:05 2007
@@ -27,7 +27,7 @@
   exclude-result-prefixes="menu"
   >
  
-  <xsl:param name="contextPrefix"/> 
+  <xsl:param name="areaPrefix"/> 
   <xsl:param name="publicationid"/>
   <xsl:param name="area"/>
   <xsl:param name="documenturl"/>
@@ -71,9 +71,9 @@
             <script type="text/javascript">
               djConfig = { isDebug: false };
             </script>
-            <script type="text/javascript" src="/cforms/dojo/dojo.js">&#160;</script>
+            <script type="text/javascript" src="/modules/menubar/dojo/dojo.js">&#160;</script>
             <script type="text/javascript">
-              MENU_URL = "<xsl:value-of select="concat($contextPrefix,'/', $publicationid, '/', $area, $documenturl, '?', $queryString)"/>";
+              MENU_URL = "<xsl:value-of select="concat($areaPrefix, $documenturl, '?', $queryString)"/>";
             </script>
             <script type="text/javascript" src="/modules/menubar/javascript/loadmenu.js">&#160;</script>
           </head>