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

Removed outdated code
pi-hole · Aug 31, 2019 · fafbc4c · fafbc4c
2 parents a7d07f9 + df6fd5e
commit fafbc4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 62 deletions.
diff --git a/index.php b/index.php
@@ -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)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
@@ -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();