From 849b987ad93bdf0934d51d238ebff968a00e2406 Mon Sep 17 00:00:00 2001
From: DL6ER <DL6ER@users.noreply.github.com>
Date: Fri, 28 Jul 2017 00:13:33 +0200
Subject: [PATCH 1/4] Move update checker from header into footer (#553)

* Move update checker from header into footer

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Remove version output in dropdown menu.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/footer.php | 8 ++++++++
 scripts/pi-hole/php/header.php | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index 1f20eae0..33917305 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -39,6 +39,14 @@
             </div>
         </div>
     </div>
+<?php
+  // Flushes the system write buffers of PHP. This attempts to push everything we have so far all the way to the client's browser.
+  flush();
+  // Run update checker
+  //  - determines local branch each time,
+  //  - determines local and remote version every 30 minutes
+  require "scripts/pi-hole/php/update_checker.php";
+?>
     <!-- /.content-wrapper -->
     <footer class="main-footer">
 	<!-- Version Infos -->
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 05f98af2..42482c36 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -9,7 +9,6 @@
 <?php
     require "scripts/pi-hole/php/auth.php";
     require "scripts/pi-hole/php/password.php";
-    require "scripts/pi-hole/php/update_checker.php";
 
     check_cors();
 
@@ -268,6 +267,7 @@ if($auth) {
                             <!-- Menu Footer -->
                             <li class="user-footer">
                                 <!-- Version Infos -->
+                                <?php /*
                                 <div class="<?php if(!isset($core_commit) && !isset($web_commit)) { ?>hidden-md <?php } ?>hidden-lg">
                                     <b>Pi-hole Version </b> <?php
                                     echo $core_current;
@@ -281,6 +281,7 @@ if($auth) {
                                     echo $FTL_current;
                                     if($FTL_update){ ?> <a class="alert-link lookatme btn-link" href="https://github.com/pi-hole/FTL/releases" target="_blank" style="background:none">(Update available!)</a><?php } ?><br><br>
                                 </div>
+                                */ ?>
                                 <!-- PayPal -->
                                 <div class="text-center">
                                     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY" target="_blank" style="background:none">

From 60b11c376bddae4a6079ecf0b142781dd59d88b2 Mon Sep 17 00:00:00 2001
From: Flo <flokX@users.noreply.github.com>
Date: Sun, 30 Jul 2017 16:50:32 +0200
Subject: [PATCH 2/4] Simplify info-box links

---
 scripts/pi-hole/php/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index cb9eecf5..4c6207bb 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -252,10 +252,10 @@ if($auth) {
                             <!-- Menu Body -->
                             <li class="user-body">
                                 <div class="col-xs-4 text-center">
-                                    <a class="btn-link" href="https://github.com/pi-hole/pi-hole" target="_blank">GitHub</a>
+                                    <a class="btn-link" href="https://github.com/pi-hole" target="_blank">GitHub</a>
                                 </div>
                                 <div class="col-xs-4 text-center">
-                                    <a class="btn-link" href="http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0/" target="_blank">Details</a>
+                                    <a class="btn-link" href="https://pi-hole.net" target="_blank">Website</a>
                                 </div>
                                 <div class="col-xs-4 text-center">
                                     <a class="btn-link" href="https://github.com/pi-hole/pi-hole/releases" target="_blank">Updates</a>

From fe35ca3f0283d3971ea8f0753b6ba12997327d23 Mon Sep 17 00:00:00 2001
From: Edd Turtle <eddturtle@gmail.com>
Date: Tue, 15 Aug 2017 19:03:12 +0100
Subject: [PATCH 3/4] Fix arrow positions in sidebar to be vertically centered

---
 scripts/pi-hole/php/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index cb9eecf5..83d8af16 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -432,10 +432,10 @@ if($auth) {
 
                 <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden="true"<?php } ?>>
                   <a href="#">
-                    <i class="fa fa-stop"></i> <span>Disable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span>
                     <span class="pull-right-container">
                       <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
                     </span>
+                    <i class="fa fa-stop"></i> <span>Disable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span>
                   </a>
                   <ul class="treeview-menu">
                     <li>
@@ -472,10 +472,10 @@ if($auth) {
                 <!-- Tools -->
                 <li class="treeview <?php if($scriptname === "gravity.php" || $scriptname === "queryads.php" || $scriptname === "debug.php"){ ?>active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-folder"></i> <span>Tools</span>
                     <span class="pull-right-container">
                       <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
                     </span>
+                    <i class="fa fa-folder"></i> <span>Tools</span>
                   </a>
                   <ul class="treeview-menu">
                     <!-- Run gravity.sh -->

From 41f5e3fe1b4e7264c9def19102b9571a14b29bde Mon Sep 17 00:00:00 2001
From: Edd Turtle <eddturtle@gmail.com>
Date: Wed, 16 Aug 2017 20:03:21 +0100
Subject: [PATCH 4/4] Fix final sidebar button (from devel branch)

---
 scripts/pi-hole/php/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index d0551755..767e1a47 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -420,10 +420,10 @@ if($auth) {
                 </li>
                 <li class="treeview<?php if($scriptname === "db_queries.php" || $scriptname === "db_lists.php" || $scriptname === "db_graph.php"){ ?> active<?php } ?>">
                   <a href="#">
-                    <i class="fa fa-clock-o"></i> <span>Long term data</span>
                     <span class="pull-right-container">
                       <i class="fa fa-angle-down pull-right" style="padding-right: 5px;"></i>
                     </span>
+                    <i class="fa fa-clock-o"></i> <span>Long term data</span>
                   </a>
                   <ul class="treeview-menu">
                     <li<?php if($scriptname === "db_graph.php"){ ?> class="active"<?php } ?>>