r22789 - gnucash/trunk/src/report/report-system - jqplot: fix paths to js and css files

[Geert Janssens]

Author: gjanssens
Date: 2013-02-20 13:50:30 -0500 (Wed, 20 Feb 2013)
New Revision: 22789
Trac: http://svn.gnucash.org/trac/changeset/22789

Modified:
   gnucash/trunk/src/report/report-system/html-barchart.scm
   gnucash/trunk/src/report/report-system/html-piechart.scm
   gnucash/trunk/src/report/report-system/html-scatter.scm
Log:
jqplot: fix paths to js and css files

Modified: gnucash/trunk/src/report/report-system/html-barchart.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-barchart.scm	2013-02-20 18:50:21 UTC (rev 22788)
+++ gnucash/trunk/src/report/report-system/html-barchart.scm	2013-02-20 18:50:30 UTC (rev 22789)
@@ -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))

Modified: gnucash/trunk/src/report/report-system/html-piechart.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-piechart.scm	2013-02-20 18:50:21 UTC (rev 22788)
+++ gnucash/trunk/src/report/report-system/html-piechart.scm	2013-02-20 18:50:30 UTC (rev 22789)
@@ -21,6 +21,8 @@
 ;; Boston, MA  02110-1301,  USA       gnu at 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))

Modified: gnucash/trunk/src/report/report-system/html-scatter.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-scatter.scm	2013-02-20 18:50:21 UTC (rev 22788)
+++ gnucash/trunk/src/report/report-system/html-scatter.scm	2013-02-20 18:50:30 UTC (rev 22789)
@@ -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))