From e3e4173524761d52326546064c6cc6790b4ac161 Mon Sep 17 00:00:00 2001
From: Diego Pino <dpino@igalia.com>
Date: Wed, 30 May 2012 09:33:00 +0200
Subject: [PATCH] Move jqPlot CSS and Javascript files to JAR

* Create own version of jqplot4java with CSS and JavaScript files embeded
* Serve CSS and JavaScript files through JAR

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../web/dashboard/DashboardController.java    | 16 ++++++++++
 .../webapp/dashboard/_dashboardfororder.zul   | 31 +++++++++++++------
 pom.xml                                       |  2 +-
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
index 7135b97f3..e53ebc1b6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
@@ -21,6 +21,10 @@ package org.libreplan.web.dashboard;
 
 import static org.libreplan.web.I18nHelper._;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Map;
@@ -73,6 +77,18 @@ public class DashboardController extends GenericForwardComposer {
         super.doAfterCompose(comp);
     }
 
+    public String loadResourceFile(String filename) throws IOException {
+        StringBuffer result = new StringBuffer();
+        String line;
+
+        InputStream stream = BarChart.class.getClassLoader().getResourceAsStream(filename);
+        BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+        while ((line = br.readLine()) != null) {
+            result.append(line);
+        }
+        return result.toString();
+    }
+
     public void setCurrentOrder(Order order, OrderPlanningController orderPlanningController) {
         dashboardModel.setCurrentOrder(order, orderPlanningController);
         if (dashboardModel.tasksAvailable()) {
diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
index 5fa2105cc..e90c5429a 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
@@ -25,7 +25,16 @@
     <zscript>
         <![CDATA[
             dsController = arg.get("dashboardController");
-            contextPath = org.zkoss.zk.ui.Executions.getCurrent().getContextPath();
+
+            // Load jqPlot CSS and Javascript files
+            jquery_jqplot_min_css = dsController.loadResourceFile("/jqplot/jquery.jqplot.min.css");
+            jquery_min_js = dsController.loadResourceFile("/jqplot/jquery.min.js");
+            jquery_jqplot_min_js = dsController.loadResourceFile("/jqplot/jquery.jqplot.min.js");
+            jqplot_canvasTextRenderer_min_js = dsController.loadResourceFile("/jqplot/plugins/jqplot.canvasTextRenderer.min.js");
+            jqplot_canvasAxisLabelRenderer_min_js = dsController.loadResourceFile("/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js");
+            jqplot_barRenderer_min_js = dsController.loadResourceFile("/jqplot/plugins/jqplot.barRenderer.min.js");
+            jqplot_pieRenderer_min_js = dsController.loadResourceFile("/jqplot/plugins/jqplot.pieRenderer.min.js");
+            jqplot_categoryAxisRenderer_min_js = dsController.loadResourceFile("/jqplot/plugins/jqplot.categoryAxisRenderer.min.js");
         ]]>
     </zscript>
 
@@ -125,15 +134,19 @@
     <globalProgress />
 
     <!-- Include jqPlot styles -->
-    <n:link class="include" rel="stylesheet" type="text/css" href="${contextPath}/jqplot/jquery.jqplot.min.css" />
+    <n:style rel="stylesheet" type="text/css">
+        ${jquery_jqplot_min_css}
+    </n:style>
 
     <!-- Include jqPlot library and additional plugins -->
-    <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>
+    <n:script type="text/javascript">
+        ${jquery_min_js}
+        ${jquery_jqplot_min_js}
+        ${jqplot_canvasTextRenderer_min_js}
+        ${jqplot_canvasAxisLabelRenderer_min_js}
+        ${jqplot_barRenderer_min_js}
+        ${jqplot_pieRenderer_min_js}
+        ${jqplot_categoryAxisRenderer_min_js}
+    </n:script>
 
 </zk>
diff --git a/pom.xml b/pom.xml
index a984b0b22..a2bd13c6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -752,7 +752,7 @@
             <dependency>
                 <groupId>br.com.digilabs.jqplot</groupId>
                 <artifactId>jqplot4java</artifactId>
-                <version>1.2.0</version>
+                <version>1.2.3-javascript</version>
             </dependency>
         </dependencies>
     </dependencyManagement>