diff --git a/templates/Froxlor/assets/css/main.css b/templates/Froxlor/assets/css/main.css index b827383c..6433f281 100644 --- a/templates/Froxlor/assets/css/main.css +++ b/templates/Froxlor/assets/css/main.css @@ -785,4 +785,9 @@ table thead th.sorting { background-repeat: no-repeat; background-position: 10px center; padding-left: 25px; +} + +#chartdiv { + height: 500px; + margin: 30px 60px; } \ No newline at end of file diff --git a/templates/Froxlor/assets/js/traffic.js b/templates/Froxlor/assets/js/traffic.js index 530aeb52..84702dfe 100644 --- a/templates/Froxlor/assets/js/traffic.js +++ b/templates/Froxlor/assets/js/traffic.js @@ -12,7 +12,7 @@ $(document).ready(function(){ var i = 1; var links = []; $('#datalegend').remove(); - $('#datatable tr').reverse().each(function() { + $('#datatable tr').each(function() { var row = $(this); var day = $(row).children().first().text(); var ftpd = $(row).children().first().next().text(); @@ -24,7 +24,7 @@ $(document).ready(function(){ } ftp.push([i, parseFloat(ftpd) / 1024]); http.push([i, parseFloat(httpd) / 1024]); - mail.push([i, parseFloat(maild)] / 1024); + mail.push([i, parseFloat(maild) / 1024]); aticks.push([i, day]); if (ftpd > max) { @@ -112,8 +112,8 @@ $(document).ready(function(){ $("#chartdiv").bind("plothover", function (event, pos, item) { if (item) { - var x = item.datapoint[0].toFixed(2), - y = item.datapoint[1].toFixed(2); + var x = item.datapoint[0].toFixed(3), + y = item.datapoint[1].toFixed(3); $("#tooltip").html(item.series.label + ": " + y + " GiB") .css({top: item.pageY+5, left: item.pageX+5}) diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 8e743bd4..e89c81bf 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -1003,6 +1003,11 @@ label.nobr { white-space:nowrap; } +#chartdiv { + height: 500px; + margin: 15px 0; +} + /* CANVAS STUFF */ .canvasitems { position:relative; diff --git a/templates/Sparkle/assets/js/traffic.js b/templates/Sparkle/assets/js/traffic.js index b4c15f27..84702dfe 100644 --- a/templates/Sparkle/assets/js/traffic.js +++ b/templates/Sparkle/assets/js/traffic.js @@ -12,7 +12,7 @@ $(document).ready(function(){ var i = 1; var links = []; $('#datalegend').remove(); - $('#datatable tr').reverse().each(function() { + $('#datatable tr').each(function() { var row = $(this); var day = $(row).children().first().text(); var ftpd = $(row).children().first().next().text(); @@ -112,8 +112,8 @@ $(document).ready(function(){ $("#chartdiv").bind("plothover", function (event, pos, item) { if (item) { - var x = item.datapoint[0].toFixed(2), - y = item.datapoint[1].toFixed(2); + var x = item.datapoint[0].toFixed(3), + y = item.datapoint[1].toFixed(3); $("#tooltip").html(item.series.label + ": " + y + " GiB") .css({top: item.pageY+5, left: item.pageX+5}) diff --git a/templates/Sparkle/customer/traffic/traffic.tpl b/templates/Sparkle/customer/traffic/traffic.tpl index 316ce3eb..f3a2dfde 100644 --- a/templates/Sparkle/customer/traffic/traffic.tpl +++ b/templates/Sparkle/customer/traffic/traffic.tpl @@ -38,6 +38,6 @@ $header -
+
$footer diff --git a/templates/Sparkle/customer/traffic/traffic_details.tpl b/templates/Sparkle/customer/traffic/traffic_details.tpl index 1f5c5411..9ee75d26 100644 --- a/templates/Sparkle/customer/traffic/traffic_details.tpl +++ b/templates/Sparkle/customer/traffic/traffic_details.tpl @@ -41,6 +41,6 @@ $header
-
+
$footer