r22802 - gnucash/trunk/src/report - jqplot line chart: make markers and grid optional again

[Geert Janssens]

Author: gjanssens
Date: 2013-02-21 13:26:59 -0500 (Thu, 21 Feb 2013)
New Revision: 22802
Trac: http://svn.gnucash.org/trac/changeset/22802

Modified:
   gnucash/trunk/src/report/report-system/html-linechart.scm
   gnucash/trunk/src/report/standard-reports/net-linechart.scm
Log:
jqplot line chart: make markers and grid optional again

This was a regression from the goffice based chart, pointed out by Mike
Evans

Modified: gnucash/trunk/src/report/report-system/html-linechart.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-linechart.scm	2013-02-21 16:51:40 UTC (rev 22801)
+++ gnucash/trunk/src/report/report-system/html-linechart.scm	2013-02-21 18:26:59 UTC (rev 22802)
@@ -463,6 +463,26 @@
                    }
                 };\n")
 
+            (push "  options.stackSeries = ")
+            (push (if (gnc:html-linechart-stacked? linechart)
+                "true;\n"
+                "false;\n"))
+
+            (push "  options.seriesDefaults.showMarker = ")
+            (push (if (gnc:html-linechart-markers? linechart)
+                "true;\n"
+                "false;\n"))
+
+            (push "  options.axesDefaults.drawMajorGridlines = ")
+            (push (if (gnc:html-linechart-major-grid? linechart)
+                "true;\n"
+                "false;\n"))
+
+            (push "  options.axesDefaults.drawMinorGridlines = ")
+            (push (if (gnc:html-linechart-minor-grid? linechart)
+                "true;\n"
+                "false;\n"))
+
             (if title
               (begin 
                 (push "  options.title = \"")

Modified: gnucash/trunk/src/report/standard-reports/net-linechart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/net-linechart.scm	2013-02-21 16:51:40 UTC (rev 22801)
+++ gnucash/trunk/src/report/standard-reports/net-linechart.scm	2013-02-21 18:26:59 UTC (rev 22802)
@@ -60,7 +60,7 @@
 (define optname-markers (N_ "Data markers?"))
 
 ;;(define optname-x-grid (N_ "X grid"))
-(define optname-y-grid (N_ "Y Grid"))
+(define optname-y-grid (N_ "Grid"))
 
 
 
@@ -152,7 +152,7 @@
     (add-option
      (gnc:make-simple-boolean-option
       gnc:pagename-display optname-y-grid
-      "f" (N_ "Add horizontal grid lines.")
+      "f" (N_ "Add grid lines.")
       #f))
 
     ;(add-option