From f85e93f2e1cf341260ee309f1df31ba6fc9c8b63 Mon Sep 17 00:00:00 2001
From: Diego Pino <dpino@igalia.com>
Date: Tue, 10 Jul 2012 11:52:57 +0200
Subject: [PATCH] Bug #1479: Fix error loading jqplot Javascript files

There was a syntax error loading the jquery javascript files that made
everything fail after.

"Unterminated string literal"

It seems that error is caused by not correctly closing the code that
embeds Javascript with a </script> tag, so I changed that part and fixed
the issue.

http://stackoverflow.com/questions/227552/common-sources-of-unterminated-string-literal

FEA: ItEr76S04BugFixing
---
 .../webapp/dashboard/_dashboardfororder.zul   | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
index a929deaea..f7fc7cebd 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
@@ -155,13 +155,39 @@
 
     <!-- Include jqPlot library and additional plugins -->
     <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}
+        <![CDATA[
+            ${jquery_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jquery_jqplot_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jqplot_canvasTextRenderer_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jqplot_canvasAxisLabelRenderer_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jqplot_barRenderer_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jqplot_pieRenderer_min_js}
+        ]]>
+    </n:script>
+    <n:script type="text/javascript">
+        <![CDATA[
+            ${jqplot_categoryAxisRenderer_min_js}
+        ]]>
     </n:script>
 
 </zk>