From 60aad80e946dc086047ad7871f4e6d0db41e4777 Mon Sep 17 00:00:00 2001
From: Michael Rasmussen <mir@datanom.net>
Date: Thu, 11 Jun 2015 00:17:40 +0200
Subject: [PATCH] fix footer position

---
 css/styles.css    | 13 ++++++-------
 index.php         | 14 +++++++-------
 lib/utils.inc.php |  7 ++++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index 6773417..b4b4bc4 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -39,7 +39,7 @@ td {
     padding: 2px 6px;
 }
 
-body {
+html, body {
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: 0.9em;
     color: #3D658C;
@@ -62,12 +62,11 @@ body {
     margin-top: 5px;
 }
 
-.footer {
-    margin-top: 20px;
-    margin-bottom: 10px;
-    bottom:0;
-    width: 99%;
-    position: absolute;
+#container, #footer {
+	width: 100%;
+}
+
+#footer{
     font-size: 0.7em;
     background: #ECECAC;
     color: black;
diff --git a/index.php b/index.php
index 9fee87b..84f6782 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,7 @@
         $numrows = $DB->numRows();
         echo "<span class=\"total-rows\">$numrows quarantined mail(s)</span>";
         echo "<table><tr>";
-        echo "<table><tr><th>Received</th><th>Cause</th>";
+        echo "<th>Received</th><th>Cause</th>";
         echo "<th>Sender</th><th>Recipient</th><th>Subject</th><th>Action</th>";
         echo "<th><input name=\"multiselect\" type=\"checkbox\" ";
         echo "onchange=\"javascript: updateAction(this)\" /></th>";
@@ -52,9 +52,9 @@
             $url = urlencode($id);
             $checkbox = "<input name=\"action\" type=\"checkbox\" value=\"$url\" />";
             $recipient = "<a title=\"Show Report\" href=\"mail_report.php?id=$url\">{$row->recipient}</a>";
-            $action = "<a title=\"Release Mail\" href=\"quarantine.php?id=$url&op=release\">";
+            $action = "<a title=\"Release Mail\" href=\"quarantine.php?id=$url&amp;op=release\">";
             $action .= "<img class=\"nav-img\" src=\"pics/release.png\" alt=\"Release\" /></a>";
-            $action .= "&nbsp;<a title=\"Delete Mail\" href=\"quarantine.php?id=$url&op=delete\">";
+            $action .= "&nbsp;<a title=\"Delete Mail\" href=\"quarantine.php?id=$url&amp;op=delete\">";
             $action .= "<img class=\"nav-img\" src=\"pics/delete.png\" alt=\"Delete\" /></a>";
             $sender = $row->sender;
             $received = strftime("%c", $row->time_iso);
@@ -73,9 +73,9 @@
 
         if ($pageNum > 1) {
             $page  = $pageNum - 1;
-            $prev = " <a title=\"Prev Page\" href=\"$self?page=$page&rowsperpage=$rowsPerPage\"
+            $prev = " <a title=\"Prev Page\" href=\"$self?page=$page&amp;rowsperpage=$rowsPerPage\"
                 class='whitefooter'><img class=\"nav-img\" src=\"pics/go-previous-symbolic.svg\" alt=\"Previous\" /></a> ";
-            $first = " <a title=\"First Page\" href=\"$self?page=1&rowsperpage=$rowsPerPage\"
+            $first = " <a title=\"First Page\" href=\"$self?page=1&amp;rowsperpage=$rowsPerPage\"
                 class='whitefooter'><img class=\"nav-img\" src=\"pics/go-first-symbolic.svg\" alt=\"First\" /></a> ";
         } else {
             $prev  = '&nbsp;'; // we're on page one, don't print previous link
@@ -84,9 +84,9 @@
 
         if ($pageNum < $maxPage) {
             $page = $pageNum + 1;
-            $next = " <a title=\"Next Page\" href=\"$self?page=$page&rowsperpage=$rowsPerPage\"
+            $next = " <a title=\"Next Page\" href=\"$self?page=$page&amp;rowsperpage=$rowsPerPage\"
                 class='whitefooter'><img class=\"nav-img\" src=\"pics/go-next-symbolic.svg\" alt=\"Next\" /></a> ";
-            $last = " <a title=\"Last Page\" href=\"$self?page=$maxPage&rowsperpage=$rowsPerPage\"
+            $last = " <a title=\"Last Page\" href=\"$self?page=$maxPage&amp;rowsperpage=$rowsPerPage\"
                 class='whitefooter'><img class=\"nav-img\" src=\"pics/go-last-symbolic.svg\" alt=\"Last\" /></a> ";
         } else {
             $next = '&nbsp;'; // we're on the last page, don't print next link
diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 89f226d..9c6be9b 100644
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -22,9 +22,10 @@ class Utils {
     <script src="__ROOT__js/forms.js"></script>
     <title>__TITLE__</title>
 </head>
-<body>';
-    private $footer = '<p class="footer">Powered by <a href="https://qtadmin.datanom.net"
-            title="Goto QtAdmin homepage">QtAdmin</a>. &copy; 2015 by Michael Rasmussen</p></body></html>';
+<body><div id="container">';
+    private $footer = '</div><div id="footer"><p>Powered by <a href="https://qtadmin.datanom.net"
+            title="Goto QtAdmin homepage">QtAdmin</a>. &copy; 2015 by Michael Rasmussen</p>
+	</div></body></html>';
     private $heading = '<p id="time" class="time">Session timeout:
             <span id="timer"></span></p><h1 class="h1">__TITLE__</h1>';
 
-- 
2.39.2