Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed outdated code #993

Merged
merged 2 commits into from
Aug 31, 2019
Merged

Removed outdated code #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf0340
Remove dead code
DL6ER Aug 27, 2019
df6fd5e
Use correct IDs for spinners in index.js
DL6ER Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,66 +162,6 @@ function getinterval()
</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)
Expand Down
4 changes: 2 additions & 2 deletions scripts/pi-hole/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down