From 054ab6619e400285216c5319bc79c840dc64a1b8 Mon Sep 17 00:00:00 2001 From: dsc Date: Thu, 1 Mar 2012 08:06:38 -0800 Subject: [PATCH] Updates root preset and options; moves /graph/test -> /graph/view --- msc/dygraph-options/data.yaml | 8 +++--- www/dashboard.jade | 2 +- www/graph/edit.jade | 10 ++++++++ www/graph/presets/root.yaml | 48 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 www/graph/edit.jade create mode 100644 www/graph/presets/root.yaml create mode 100644 www/graph/view.co diff --git a/msc/dygraph-options/data.yaml b/msc/dygraph-options/data.yaml index 0da7cd5..e3c0b87 100644 --- a/msc/dygraph-options/data.yaml +++ b/msc/dygraph-options/data.yaml @@ -321,8 +321,8 @@ - name: xlabel tags: - - x-axis - labels + - x-axis - display - axes type: String @@ -338,8 +338,8 @@ - name: ylabel tags: - - y-axis - labels + - y-axis - display - axes type: String @@ -366,8 +366,8 @@ - name: y2label tags: - - y-axis - labels + - y-axis - display type: String default: null @@ -405,7 +405,7 @@ - display type: Boolean default: false - desc: Put
between lines in the label string. Often used in conjunction with + desc: Put <br/> between lines in the label string. Often used in conjunction with labelsDiv. examples: - century-scale diff --git a/www/dashboard.jade b/www/dashboard.jade index bb5be4c..47f7900 100644 --- a/www/dashboard.jade +++ b/www/dashboard.jade @@ -1 +1 @@ -include graph/test \ No newline at end of file +include graph/edit \ No newline at end of file diff --git a/www/graph/edit.jade b/www/graph/edit.jade new file mode 100644 index 0000000..5033daa --- /dev/null +++ b/www/graph/edit.jade @@ -0,0 +1,10 @@ +extends ../layout + +block title + title Kraken: Graph Test Page + +append styles + mixin css('forms.css') + mixin css('graph.css') + mixin css('isotope.css') + diff --git a/www/graph/presets/root.yaml b/www/graph/presets/root.yaml new file mode 100644 index 0000000..7526fe1 --- /dev/null +++ b/www/graph/presets/root.yaml @@ -0,0 +1,48 @@ +# The root graph, holding defaults inherited by all graphs. + +dataset : '/data/non_mobile_pageviews_by.timestamp.language.csv' +width : 'auto' +height : 400 +options : + # visibility : true + # stackedGraph : false + # fillGraph : false + colors : [ "#FF0097", "#EF8158", "#83BB32", "#182B53", "#4596FF", "#553DC9", "#AD3238", "#00FFBC", "#F1D950" ] + # colorSaturation : 1.0 + # colorValue : 0.5 + rightGap : 20 + animatedZooms : true + # labels : Array + labelsSeparateLines : true + xlabel : Date + # logscale : false + axisLineColor : '#333333' + # axisTickSize : 3.0 + axisLabelColor : '#333333' + # axisLabelFontSize : 14 + legend : always + labelsKMB : true + # labelsKMG2 : false + digitsAfterDecimal : 2 + maxNumberWidth : 6 + sigFigs : 3 + # valueFormatter : function(num or millis, opts, dygraph) + # showRoller : false + # rollPeriod : 1 + # sigma : 2.0 + # wilsonInterval : true + # fillAlpha : 0.15 + # customBars : false + # errorBars : false + # fractions : false + # delimiter : ',' + # xValueParser : function(str) -> number + # drawXGrid : true + # drawYGrid : true + gridLineColor : '#eeeeee' + # gridLineWidth : 0.3 + # showRangeSelector : false + # rangeSelectorHeight : 40 + # rangeSelectorPlotFillColor : '#A7B1C4' + # rangeSelectorPlotStrokeColor : '#808FAB' + displayAnnotations : true diff --git a/www/graph/view.co b/www/graph/view.co new file mode 100644 index 0000000..e69de29 -- 1.7.0.4