Merge pull request #993 from pi-hole/fix/removed_dead_code

Removed outdated code
This commit is contained in:
Mark Drobnak
2019-08-31 12:46:05 -04:00
committed by GitHub
2 changed files with 2 additions and 62 deletions
-60
View File
@@ -162,66 +162,6 @@
</div>
</div>
</div>
<?php
// Determine if "Query Types (over time)" should be shown
$queryTypesOverTime = false;
if(isset($setupVars['DASHBOARD_SHOW_QUERY_TYPES_OVER_TIME']))
{
if($setupVars['DASHBOARD_SHOW_QUERY_TYPES_OVER_TIME'])
{
$queryTypesOverTime = true;
}
}
// Determine if "Forward Destinations (over time)" should be shown
$forwardDestsOverTime = false;
if(isset($setupVars['DASHBOARD_SHOW_FORWARD_DESTS_OVER_TIME']))
{
if($setupVars['DASHBOARD_SHOW_FORWARD_DESTS_OVER_TIME'])
{
$forwardDestsOverTime = true;
}
}
?>
<?php if($forwardDestsOverTime || $queryTypesOverTime) { ?>
<div class="row">
<?php if($queryTypesOverTime) { ?>
<div class="col-md-12 col-lg-6">
<div class="box" id="query-types">
<div class="box-header with-border">
<h3 class="box-title">Query Types (over time)</h3>
</div>
<div class="box-body">
<div class="chart">
<canvas id="queryTypeChart" width="400" height="150"></canvas>
</div>
</div>
<div class="overlay">
<i class="fa fa-sync fa-spin"></i>
</div>
<!-- /.box-body -->
</div>
</div>
<?php } if($forwardDestsOverTime) { ?>
<div class="col-md-12 col-lg-6">
<div class="box" id="forward-destinations">
<div class="box-header with-border">
<h3 class="box-title">Upstreams (over time)</h3>
</div>
<div class="box-body">
<div class="chart">
<canvas id="forwardDestinationChart" width="400" height="150"></canvas>
</div>
</div>
<div class="overlay">
<i class="fa fa-sync fa-spin"></i>
</div>
<!-- /.box-body -->
</div>
</div>
<?php } ?>
</div>
<?php } ?>
<?php
if($boxedlayout)
+2 -2
View File
@@ -637,8 +637,8 @@ function updateSummaryData(runOnce) {
$("#temperature").html("<i class=\"fa fa-circle\" style=\"color:#FF0000\"></i> FTL offline");
// Show spinner
$("#queries-over-time .overlay").show();
$("#forward-destinations .overlay").show();
$("#query-types .overlay").show();
$("#forward-destinations-pie .overlay").show();
$("#query-types-pie .overlay").show();
$("#client-frequency .overlay").show();
$("#domain-frequency .overlay").show();
$("#ad-frequency .overlay").show();