Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use absolute instead of relative display

Browse Source
This commit is contained in:
DL6ER
2017-09-23 13:03:55 +02:00
parent 076700fc92
commit a46f720973
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
index.php
View File

@@ -88,6 +88,26 @@
// show since the API will respect the privacy of the user if he defines
// a password
if($auth){ ?>
<div class="row">
<div class="col-md-12">
<div class="box" id="clients">
<div class="box-header with-border">
<h3 class="box-title">Clients (over time)</h3>
</div>
<div class="box-body">
<div class="chart">
<canvas id="clientsChart" width="800" height="120"></canvas>
</div>
</div>
<div class="overlay">
<i class="fa fa-refresh fa-spin"></i>
</div>
<!-- /.box-body -->
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 col-lg-6">
<div class="box" id="query-types-pie">
@@ -158,25 +178,6 @@
</div>
</div>
<div class="row">
<div class="col-md-12 col-lg-12">
<div class="box" id="clients">
<div class="box-header with-border">
<h3 class="box-title">Clients (over time)</h3>
</div>
<div class="box-body">
<div class="chart">
<canvas id="clientsChart" width="400" height="50"></canvas>
</div>
</div>
<div class="overlay">
<i class="fa fa-refresh fa-spin"></i>
</div>
<!-- /.box-body -->
</div>
</div>
</div>
<?php
if($boxedlayout)
{

17
scripts/pi-hole/js/index.js
View File

@@ -98,6 +98,8 @@ function updateQueryTypesOverTime() {
// convert received objects to arrays
data.over_time = objectToArray(data.over_time);
// remove last data point since it not representative
data.over_time[0].splice(-1,1);
var timestamps = data.over_time[0];
var plotdata = data.over_time[1];
// Remove possibly already existing data
@@ -192,6 +194,8 @@ function updateForwardedOverTime() {
// convert received objects to arrays
data.over_time = objectToArray(data.over_time);
// remove last data point since it not representative
data.over_time[0].splice(-1,1);
var timestamps = data.over_time[0];
var plotdata = data.over_time[1];
var labels = [];
@@ -272,6 +276,8 @@ function updateClientsOverTime() {
// convert received objects to arrays
data.over_time = objectToArray(data.over_time);
// remove last data point since it not representative
data.over_time[0].splice(-1,1);
var timestamps = data.over_time[0];
var plotdata = data.over_time[1];
var labels = [];
@@ -318,7 +324,7 @@ function updateClientsOverTime() {
for (key in plotdata[j])
{
if (!{}.hasOwnProperty.call(plotdata[j], key)) continue;
clientsChart.data.datasets[key].data.push(1e-2*plotdata[j][key]);
clientsChart.data.datasets[key].data.push(plotdata[j][key]);
}
var d = new Date(1000*parseInt(timestamps[j]));
@@ -788,7 +794,7 @@ $(document).ready(function() {
return "Forward destinations from "+from+" to "+to;
},
label: function(tooltipItems, data) {
return data.datasets[tooltipItems.datasetIndex].label + ": " + (100.0*tooltipItems.yLabel).toFixed(1) + "%";
return data.datasets[tooltipItems.datasetIndex].label + ": " + tooltipItems.yLabel;
}
}
},
@@ -808,12 +814,7 @@ $(document).ready(function() {
}],
yAxes: [{
ticks: {
mix: 0.0,
max: 1.0,
beginAtZero: true,
callback: function(value, index, values) {
return Math.round(value*100) + " %";
}
beginAtZero: true
},
stacked: true
}]