From 09d93dcba38120812ad67fac2437511929597d39 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Nov 2017 22:44:49 -0500 Subject: x --- config-jarmon-winston.js | 7 +++++-- index.html.gen | 14 +++++++++++++- jarmon-style/style.scss | 4 +++- jarmon.html.in | 4 ++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/config-jarmon-winston.js b/config-jarmon-winston.js index e0dfeaa..1349928 100644 --- a/config-jarmon-winston.js +++ b/config-jarmon-winston.js @@ -53,7 +53,8 @@ $(function() { [srv+'memory/memory-buffered.rrd', 0, 'Buffered', 'B'], [srv+'memory/memory-free.rrd', 0, 'Free', 'B'] ], - options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS, + options: jQuery.extend(true, {}, + jarmon.Chart.BASE_OPTIONS, jarmon.Chart.STACKED_OPTIONS) }, @@ -64,7 +65,9 @@ $(function() { [srv+'load/load.rrd', 'midterm', 'Medium Term (5m)', ''], [srv+'load/load.rrd', 'longterm', 'Long Term (15m)', ''] ], - options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS) + options: jQuery.extend(true, {}, + jarmon.Chart.BASE_OPTIONS, + {yaxis: {min: 0}}) }, 'winterface-inet': { diff --git a/index.html.gen b/index.html.gen index 69377fb..b0e681a 100755 --- a/index.html.gen +++ b/index.html.gen @@ -19,7 +19,19 @@ echo ' - + + + + + + + + + + + + + diff --git a/jarmon-style/style.scss b/jarmon-style/style.scss index 2aa3c5f..5641550 100644 --- a/jarmon-style/style.scss +++ b/jarmon-style/style.scss @@ -60,7 +60,9 @@ margin: 0 auto 0 auto; clear: both; - .tickLabel { + .tickLabel, /* flot 0.7 */ + .tick-label /* flot 0.8 */ + { overflow:hidden; } diff --git a/jarmon.html.in b/jarmon.html.in index 9d521f5..3486edb 100644 --- a/jarmon.html.in +++ b/jarmon.html.in @@ -2,6 +2,10 @@

+
+ + +
-- cgit v1.2.3-54-g00ecf