From 36eb877a317954bb8a7fad6e8544ec0e1b3f39c8 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 21 May 2020 19:58:29 +0300
Subject: [PATCH] Tweak footer.php

* add a new row for the version info
* add links to the current tags
* make the updates URLs go to the latest GitHub release
* color the heart icon red
* remove "Version" from links; the tags are prefixed with "v"

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
---
 scripts/pi-hole/php/footer.php | 79 ++++++++++++++++++++++++----------
 style/pi-hole.css              |  9 ++++
 2 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
index b7fad544..035cde88 100644
--- a/scripts/pi-hole/php/footer.php
+++ b/scripts/pi-hole/php/footer.php
@@ -36,34 +36,67 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div> <!-- /.content-wrapper -->
+
 <?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";
+    // 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";
+
+    $coreVersionStr = $core_current . (isset($core_commit) ? " (" . $core_branch . ", " . $core_commit . ")" : "");
+    $webVersionStr = $web_current . (isset($web_commit) ? " (" . $web_branch . ", " . $web_commit . ")" : "");
+    $ftlVersionStr = $FTL_current . (isset($FTL_commit) ? " (" . $FTL_branch . ", " . $FTL_commit . ")" : "");
+
+    $githubBaseUrl = "https://github.com/pi-hole";
+    $coreUrl = $githubBaseUrl . "/pi-hole";
+    $webUrl = $githubBaseUrl . "/AdminLTE";
+    $ftlUrl = $githubBaseUrl . "/FTL";
+
+    $coreReleasesUrl = $coreUrl . "/releases";
+    $webReleasesUrl = $webUrl . "/releases";
+    $ftlReleasesUrl = $ftlUrl . "/releases";
 ?>
-    <!-- /.content-wrapper -->
     <footer class="main-footer">
-	<!-- Version Infos -->
-        <div class="pull-right hidden-xs hidden-sm<?php if(isset($core_commit) || isset($web_commit) || isset($FTL_commit)) { ?> hidden-md<?php } ?>">
-            <b>Pi-hole Version </b> <?php
-            echo $core_current;
-            if(isset($core_commit)) { echo " (".$core_branch.", ".$core_commit.")"; }
-            if($core_update){ ?> <a class="alert-link lookatme" href="https://github.com/pi-hole/pi-hole/releases" rel="noopener" target="_blank">(Update available!)</a><?php } ?>
-            <b>Web Interface Version </b><?php
-            echo $web_current;
-            if(isset($web_commit)) { echo " (".$web_branch.", ".$web_commit.")"; }
-            if($web_update){ ?> <a class="alert-link lookatme" href="https://github.com/pi-hole/AdminLTE/releases" rel="noopener" target="_blank">(Update available!)</a><?php } ?>
-            <b>FTL Version </b> <?php
-            echo $FTL_current;
-            if(isset($FTL_commit)) { echo " (".$FTL_branch.", ".$FTL_commit.")"; }
-            if($FTL_update){ ?> <a class="alert-link lookatme" href="https://github.com/pi-hole/FTL/releases" rel="noopener" target="_blank">(Update available!)</a><?php } ?>
+        <div class="row row-centered text-center">
+            <div class="col-xs-12 col-sm-6">
+                <strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
+            </div>
+        </div>
+
+        <div class="row row-centered text-center version-info">
+            <div class="col-xs-12 col-sm-8 col-md-6">
+                <?php if (isset($core_commit) || isset($web_commit) || isset($FTL_commit)) { ?>
+                <ul class="list-unstyled">
+                    <li><strong>Pi-hole</strong> <?php echo $coreVersionStr; ?></li>
+                    <li><strong>Web Interface</strong> <?php echo $webVersionStr; ?></li>
+                    <li><strong>FTL</strong> <?php echo $ftlVersionStr; ?></li>
+                </ul>
+                <?php } else { ?>
+                <ul class="list-inline">
+                    <li>
+                        <strong>Pi-hole</strong>
+                        <a href="<?php echo $coreReleasesUrl . "/" . $core_current; ?>" rel="noopener" target="_blank"><?php echo $core_current; ?></a>
+                        <?php if ($core_update) { ?> &middot; <a class="lookatme" href="<?php echo $coreReleasesUrl . "/latest"; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
+                    </li>
+                    <li>
+                        <strong>Web Interface</strong>
+                        <a href="<?php echo $webReleasesUrl . "/" . $web_current; ?>" rel="noopener" target="_blank"><?php echo $web_current; ?></a>
+                        <?php if ($web_update) { ?> &middot; <a class="lookatme" href="<?php echo $webReleasesUrl . "/latest"; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
+                    </li>
+                    <li>
+                        <strong>FTL</strong>
+                        <a href="<?php echo $ftlReleasesUrl . "/" . $FTL_current; ?>" rel="noopener" target="_blank"><?php echo $FTL_current; ?></a>
+                        <?php if ($FTL_update) { ?> &middot; <a class="lookatme" href="<?php echo $ftlReleasesUrl . "/latest"; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
+                    </li>
+                </ul>
+                <?php } ?>
+            </div>
         </div>
-        <div style="display: inline-block"><strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart"></i> Donate</a></strong> if you found this useful.</div>
     </footer>
+
 </div>
 <!-- ./wrapper -->
 <script src="scripts/pi-hole/js/footer.js"></script>
diff --git a/style/pi-hole.css b/style/pi-hole.css
index b45a5f48..0a8b6ff3 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -285,3 +285,12 @@
 .user-panel > .info i {
     margin-right: 3px;
 }
+
+.row-centered > div[class^=col-] {
+    display: inline-block;
+    float: none;
+}
+
+.version-info {
+    margin-top: 10px;
+}