From f8dabf5db349eb63f901850639c0e50284dafe54 Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Wed, 20 Feb 2013 18:50:30 +0000
Subject: [PATCH] jqplot: fix paths to js and css files

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22789 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/report/report-system/html-barchart.scm | 24 ++++++++--------------
 src/report/report-system/html-piechart.scm | 10 +++++----
 src/report/report-system/html-scatter.scm  |  6 +++---
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index 2de6d307ea2..f40e50a6016 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -349,26 +349,18 @@
                          (push "\"});\n")
                          (push "data.push(d")
                          (push series-index)
-                         (push ");\n")))
-         (js-include (lambda (file)
-                         (push "<script language=\"javascript\" type=\"text/javascript\" src=\"")
-                         (push (gnc:find-file file (gnc:config-var-value-get gnc:*doc-path*)))
-                         (push "\"></script>\n")))
-         (css-include (lambda (file)
-                         (push "<link rel=\"stylesheet\" type=\"text/css\" href=\"")
-                         (push (gnc:find-file file (gnc:config-var-value-get gnc:*doc-path*)))
-                         (push "\" />\n"))))
+                         (push ");\n"))))
     (if (and (list? data)
              (not (null? data))
 	     (gnc:not-all-zeros data))
         (begin
-            (push (gnc:html-js-include "gnucash/jqplot/jquery-1.4.2.min.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jquery.jqplot.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jqplot.barRenderer.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jqplot.categoryAxisRenderer.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jqplot.canvasTextRenderer.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jqplot.canvasAxisTickRenderer.js"))
-            (push (gnc:html-css-include "gnucash/jqplot/jquery.jqplot.css"))
+            (push (gnc:html-js-include "jqplot/jquery-1.4.2.min.js"))
+            (push (gnc:html-js-include "jqplot/jquery.jqplot.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.barRenderer.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.categoryAxisRenderer.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.canvasTextRenderer.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.canvasAxisTickRenderer.js"))
+            (push (gnc:html-css-include "jqplot/jquery.jqplot.css"))
 
             (push "<div id=\"placeholder\" style=\"width:")
             (push (gnc:html-barchart-width barchart))
diff --git a/src/report/report-system/html-piechart.scm b/src/report/report-system/html-piechart.scm
index 2ab237c0819..94f8ef1b703 100644
--- a/src/report/report-system/html-piechart.scm
+++ b/src/report/report-system/html-piechart.scm
@@ -21,6 +21,8 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(load-from-path "html-jqplot.scm")
+
 (define <html-piechart>
   (make-record-type "<html-piechart>"
                     '(width
@@ -197,10 +199,10 @@
     (if (and (list? data) 
              (not (null? data)))
         (begin 
-            (push (gnc:html-js-include "gnucash/jqplot/jquery-1.4.2.min.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jquery.jqplot.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jqplot.pieRenderer.js"))
-            (push (gnc:html-css-include "gnucash/jqplot/jquery.jqplot.css"))
+            (push (gnc:html-js-include "jqplot/jquery-1.4.2.min.js"))
+            (push (gnc:html-js-include "jqplot/jquery.jqplot.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.pieRenderer.js"))
+            (push (gnc:html-css-include "jqplot/jquery.jqplot.css"))
 
             (push "<div id=\"placeholder\" style=\"width:")
             (push (gnc:html-piechart-width piechart))
diff --git a/src/report/report-system/html-scatter.scm b/src/report/report-system/html-scatter.scm
index ec681af3589..e9fe4b80446 100644
--- a/src/report/report-system/html-scatter.scm
+++ b/src/report/report-system/html-scatter.scm
@@ -170,9 +170,9 @@
     (if (and (list? data)
              (not (null? data)))
         (begin
-            (push (gnc:html-js-include "gnucash/jqplot/jquery-1.4.2.min.js"))
-            (push (gnc:html-js-include "gnucash/jqplot/jquery.jqplot.js"))
-            (push (gnc:html-css-include "gnucash/jqplot/jquery.jqplot.css"))
+            (push (gnc:html-js-include "jqplot/jquery-1.4.2.min.js"))
+            (push (gnc:html-js-include "jqplot/jquery.jqplot.js"))
+            (push (gnc:html-css-include "jqplot/jquery.jqplot.css"))
 
             (push "<div id=\"placeholder\" style=\"width:")
             (push (gnc:html-scatter-width scatter))