From db1b054691b91b73d0cdfb8b32b208a5b6c15a33 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:10:07 +0200
Subject: [PATCH 1/6] remove border on logo

---
 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 19ae0bd4..8e3356fb 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -242,7 +242,7 @@ if($auth) {
                         <ul class="dropdown-menu">
                             <!-- User image -->
                             <li class="user-header">
-                                <img src="img/logo.svg" sizes="160x160" alt="User Image" />
+                                <img src="img/logo.svg" sizes="160x160" alt="User Image" style="border-color:transparent" />
                                 <p>
                                     Open Source Ad Blocker
                                     <small>Designed For Raspberry Pi</small>

From 2ba80e96a367e34e8167e4d411b72dcb65b4f0e5 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:11:29 +0200
Subject: [PATCH 2/6] add link feedback (on hover)

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

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 8e3356fb..22e23a0e 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -251,13 +251,13 @@ if($auth) {
                             <!-- Menu Body -->
                             <li class="user-body">
                                 <div class="col-xs-4 text-center">
-                                    <a href="https://github.com/pi-hole/pi-hole" target="_blank">GitHub</a>
+                                    <a class="btn-link" href="https://github.com/pi-hole/pi-hole" target="_blank">GitHub</a>
                                 </div>
                                 <div class="col-xs-4 text-center">
-                                    <a 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="http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0/" target="_blank">Details</a>
                                 </div>
                                 <div class="col-xs-4 text-center">
-                                    <a href="https://github.com/pi-hole/pi-hole/releases" target="_blank">Updates</a>
+                                    <a class="btn-link" href="https://github.com/pi-hole/pi-hole/releases" target="_blank">Updates</a>
                                 </div>
                                 <div class="col-xs-12 text-center" id="sessiontimer">Session is valid for <span id="sessiontimercounter"><?php if($auth && strlen($pwhash) > 0){echo $maxlifetime;}else{echo "0";} ?></span></div>
                             </li>

From 9d6e0c8292f5c7207c95b5412e8073c033f53425 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:13:21 +0200
Subject: [PATCH 3/6] sessiontimer in bold letters

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

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 22e23a0e..a48b43e7 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -259,7 +259,9 @@ if($auth) {
                                 <div class="col-xs-4 text-center">
                                     <a class="btn-link" href="https://github.com/pi-hole/pi-hole/releases" target="_blank">Updates</a>
                                 </div>
-                                <div class="col-xs-12 text-center" id="sessiontimer">Session is valid for <span id="sessiontimercounter"><?php if($auth && strlen($pwhash) > 0){echo $maxlifetime;}else{echo "0";} ?></span></div>
+                                <div class="col-xs-12 text-center" id="sessiontimer">
+                                    <b>Session is valid for <span id="sessiontimercounter"><?php if($auth && strlen($pwhash) > 0){echo $maxlifetime;}else{echo "0";} ?></span></b>
+                                </div>
                             </li>
                             <!-- Menu Footer -->
                             <li class="user-footer">

From 4b058ed38b04466de15640dad06e87bc6e45854f Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:15:09 +0200
Subject: [PATCH 4/6] use AdminLTE function to toggle dropdown-menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js

Benefit: The dropdown-menu closes if you click on a blank Place
---
 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 a48b43e7..bd68f186 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -234,8 +234,8 @@ if($auth) {
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
                     <!-- User Account: style can be found in dropdown.less -->
-                    <li id="dropdown-menu" class="dropdown user user-menu">
-                        <a href="#" class="dropdown-toggle">
+                    <li class="dropdown user user-menu">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
                             <img src="img/logo.svg" class="user-image" style="border-radius: initial" sizes="160x160" alt="Pi-hole logo" />
                             <span class="hidden-xs">Pi-hole</span>
                         </a>

From 958f5aa2baa17a5656212f33e6a6c0c12f469107 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:17:34 +0200
Subject: [PATCH 5/6] align donate-url with url in footerbar

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

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index bd68f186..f56d5987 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -272,14 +272,11 @@ if($auth) {
                                 <div id="alWebUpdate" class="alert alert-info alert-dismissible fade in" role="alert" hidden>
                                     <a class="alert-link" href="https://github.com/pi-hole/AdminLTE/releases">There's an update available for this Web Interface!</a>
                                 </div>
-
                                 <!-- PayPal -->
-                                <div>
-                                    <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
-                                        <input type="hidden" name="cmd" value="_s-xclick">
-                                        <input type="hidden" name="hosted_button_id" value="3J2L3Z4DHW9UY">
-                                        <input style="display: block; margin: 0 auto;" type="image" src="img/donate.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-                                    </form>
+                                <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:transparent">
+                                        <img src="img/donate.gif" alt="Donate">
+                                    </a>
                                 </div>
                             </li>
                         </ul>

From 059600f10c3e027bb568181901f4dc7af0761908 Mon Sep 17 00:00:00 2001
From: TheME <andreas_fl@outlook.com>
Date: Wed, 31 May 2017 21:18:44 +0200
Subject: [PATCH 6/6] remove function to open user menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js

Benefit: The dropdown-menu closes if you click on a blank Place
---
 scripts/pi-hole/js/footer.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index e6c3c157..16dfd4e9 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -4,16 +4,6 @@
 *
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
-// User menu toggle
-$("#dropdown-menu a").on("click", function(event) {
-    $(this).parent().toggleClass("open");
-});
-$("body").on("click", function(event) {
-    if(!$("#dropdown-menu").is(event.target) && $("#dropdown-menu").has(event.target).length === 0) {
-        $("#dropdown-menu").removeClass("open");
-    }
-});
-
 //The following functions allow us to display time until pi-hole is enabled after disabling.
 //Works between all pages