diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-22 15:41:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-22 15:41:57 +0000 |
commit | 13b9170f896b95d26129192a2b8a8275592b9a65 (patch) | |
tree | 955bd7325d8243b621d6855478e008320bbfbbb2 /interface/js | |
parent | 7849cfa0767a48fd6cfbf0b41f5a42c4352a0e87 (diff) | |
parent | 37452d157081cbdbb61dc35f44b6a24cccc68c7a (diff) | |
download | rspamd-13b9170f896b95d26129192a2b8a8275592b9a65.tar.gz rspamd-13b9170f896b95d26129192a2b8a8275592b9a65.zip |
Merge pull request #1546 from moisseev/webui
[WebUI] Use Footable to draw Throughput summary table
Diffstat (limited to 'interface/js')
-rw-r--r-- | interface/js/app/graph.js | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js index cfe97b7d5..5fff7ed81 100644 --- a/interface/js/app/graph.js +++ b/interface/js/app/graph.js @@ -23,7 +23,7 @@ THE SOFTWARE. */ -define(['jquery', 'd3evolution', 'datatables'], +define(['jquery', 'd3evolution', 'footable'], function($, D3Evolution, unused) { var rrd_pie_config = { header: {}, @@ -128,24 +128,30 @@ function($, D3Evolution, unused) { } function drawRrdTable(data, unit) { - $('#rrd-table').DataTable({ - destroy: true, - paging: false, - searching: false, - info: false, - data: data, + var rows = data.map(function (curr, i) { + return { + options: { + style: { + color: graph_options.legend.entries[i].color + } + }, + value: curr + }; + }, []); + + $('#rrd-table').footable({ + sorting: { + enabled: true + }, columns: [ - { data: "label", title: "Action" }, - { data: "value", title: "Messages", defaultContent: "" }, - { data: "min", title: "Minimum, " + unit, defaultContent: "" }, - { data: "avg", title: "Average, " + unit, defaultContent: "" }, - { data: "max", title: "Maximum, " + unit, defaultContent: "" }, - { data: "last", title: "Last, " + unit }, + { name: "label", title: "Action" }, + { name: "value", title: "Messages", defaultContent: "" }, + { name: "min", title: "Minimum, " + unit, defaultContent: "" }, + { name: "avg", title: "Average, " + unit, defaultContent: "" }, + { name: "max", title: "Maximum, " + unit, defaultContent: "" }, + { name: "last", title: "Last, " + unit }, ], - - "fnRowCallback": function (nRow, aData) { - $(nRow).css("color", aData.color); - } + rows: rows }); } |