diff options
| -rw-r--r-- | config-jarmon-winston.js | 7 | ||||
| -rwxr-xr-x | index.html.gen | 14 | ||||
| -rw-r--r-- | jarmon-style/style.scss | 4 | ||||
| -rw-r--r-- | 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 '<!DOCTYPE html> <link rel="stylesheet" type="text/css" href="jarmon-style/jquerytools.tabs.tabs-no-images.css" /> <link rel="stylesheet" type="text/css" href="jarmon-style/jquerytools.dateinput.skin1.css" /> - <script src="jarmon-dependencies.js"></script> + <!--<script src="jarmon-dependencies.js"></script>--> + <script src="./jarmon-dependencies/jquery-1.6.3.js"></script> + <script src="./jarmon-dependencies/flot-0.8.3/excanvas.js"></script> + <script src="./jarmon-dependencies/flot-0.8.3/jquery.flot.js"></script> + <script src="./jarmon-dependencies/flot-0.8.3/jquery.flot.time.js"></script> + <script src="./jarmon-dependencies/flot-0.8.3/jquery.flot.stack.js"></script> + <script src="./jarmon-dependencies/flot-0.8.3/jquery.flot.selection.js"></script> + <script src="./jarmon-dependencies/rrdFile.js"></script> + <script src="./jarmon-dependencies/binaryXHR.js"></script> + <script src="./jarmon-dependencies/dateinput.js"></script> + <script src="./jarmon-dependencies/tabs.js"></script> + <script src="./jarmon-dependencies/toolbox.history.js"></script> + <script src="jarmon.js"></script> <script src="config-jarmon-proton.js"></script> <script src="config-jarmon-winston.js"></script> 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 @@ <div class="jarmon @name@"> <div class="chart-container"> <h2 class="title"></h2> + <form> + <input name="chart_edit" value="Edit" type="button" /> + <input name="chart_delete" value="Delete" type="button" /> + </form> <div class="error"></div> <div class="chart"></div> <div class="graph-legend"></div> |