You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2006/10/08 18:43:06 UTC

svn commit: r454171 - in /lenya/trunk/src/modules/profiling: config/menu.xsp menus.xmap

Author: nettings
Date: Sun Oct  8 09:43:06 2006
New Revision: 454171

URL: http://svn.apache.org/viewvc?view=rev&rev=454171
Log:
add missing context path to profiler URL


Modified:
    lenya/trunk/src/modules/profiling/config/menu.xsp
    lenya/trunk/src/modules/profiling/menus.xmap

Modified: lenya/trunk/src/modules/profiling/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/profiling/config/menu.xsp?view=diff&rev=454171&r1=454170&r2=454171
==============================================================================
--- lenya/trunk/src/modules/profiling/config/menu.xsp (original)
+++ lenya/trunk/src/modules/profiling/config/menu.xsp Sun Oct  8 09:43:06 2006
@@ -26,14 +26,21 @@
                     unchanged, so we use the "void" operator to suppress the
                     return value of the whole expression. 
                 -->
-               <item href="javascript: void window.open(
-                              '/modules/profiling/profile.html',
-                              'Cocoon Profiler',
-                              'location=yes,scrollbars=yes,menubar=no,'
-                              + 'toolbar=no,status=yes,top=100,left=100,'
-                              + 'height=500,width=700'
-                           ).focus()">
-                  <i18n:text>Profiling</i18n:text>
+               <item>
+                 <xsp:attribute> 
+                   <xsp:param name="name">href</xsp:param>
+                   <xsp:expr>
+                      "javascript: void window.open('"
+                    + parameters.getParameter("servlet-context", "[context]") 
+                    + "/modules/profiling/profile.html',"
+                    + "'Cocoon Profiler',"
+                    + "'location=yes,scrollbars=yes,menubar=no,"
+                    + "toolbar=no,status=yes,top=100,left=100,"
+                    + "height=500,width=700'"
+                    + ").focus()"
+                   </xsp:expr>
+                 </xsp:attribute> 
+                 <i18n:text>Profiling</i18n:text>
                </item>
             </block>
          </menu>

Modified: lenya/trunk/src/modules/profiling/menus.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/profiling/menus.xmap?view=diff&rev=454171&r1=454170&r2=454171
==============================================================================
--- lenya/trunk/src/modules/profiling/menus.xmap (original)
+++ lenya/trunk/src/modules/profiling/menus.xmap Sun Oct  8 09:43:06 2006
@@ -3,7 +3,9 @@
    <map:pipelines>
       <map:pipeline>
          <map:match pattern="**">
-            <map:generate type="serverpages" src="config/menu.xsp"/>
+            <map:generate type="serverpages" src="config/menu.xsp">
+              <map:parameter name="servlet-context" value="{request:contextPath}"/>
+            </map:generate>
             <map:serialize type="xml"/>
          </map:match>
       </map:pipeline>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org