From 1189565c4182c80df170bab4f2d3540ecaaff17b Mon Sep 17 00:00:00 2001
From: Diego Pino <dpino@igalia.com>
Date: Fri, 25 May 2012 11:26:27 +0200
Subject: [PATCH] Fix bug: Wrong path to jqplot

Path changes depending on URL context

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../webapp/dashboard/_dashboardfororder.zul     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
index 9c8131c30..5fa2105cc 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
@@ -25,6 +25,7 @@
     <zscript>
         <![CDATA[
             dsController = arg.get("dashboardController");
+            contextPath = org.zkoss.zk.ui.Executions.getCurrent().getContextPath();
         ]]>
     </zscript>
 
@@ -124,15 +125,15 @@
     <globalProgress />
 
     <!-- Include jqPlot styles -->
-    <n:link class="include" rel="stylesheet" type="text/css" href="/libreplan-webapp/jqplot/jquery.jqplot.min.css" />
+    <n:link class="include" rel="stylesheet" type="text/css" href="${contextPath}/jqplot/jquery.jqplot.min.css" />
 
     <!-- Include jqPlot library and additional plugins -->
-    <n:script type="text/javascript" src="/libreplan-webapp/jqplot/jquery.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqplot/jquery.jqplot.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqPlot/plugins/jqplot.canvasTextRenderer.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqplot/plugins/jqplot.barRenderer.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqplot/plugins/jqplot.pieRenderer.min.js"></n:script>
-    <n:script type="text/javascript" src="/libreplan-webapp/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqplot/jquery.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqplot/jquery.jqplot.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqPlot/plugins/jqplot.canvasTextRenderer.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqplot/plugins/jqplot.barRenderer.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqplot/plugins/jqplot.pieRenderer.min.js"></n:script>
+    <n:script type="text/javascript" src="${contextPath}/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></n:script>
 
 </zk>