From 34322d829a660d05f627200c31714e259ad5111c Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <markstedt@gmail.com>
Date: Sat, 4 Nov 2023 21:48:46 +0900
Subject: [PATCH] Have a Go Back hyperlink in the base template

---
 python/web/src/static/themes/modern/style.css | 21 +++++++++++++++++++
 python/web/src/templates/admin.html           |  2 --
 python/web/src/templates/base.html            |  5 +++++
 python/web/src/templates/deviceinfo.html      |  2 --
 python/web/src/templates/diskinfo.html        |  2 --
 python/web/src/templates/drives.html          |  2 --
 python/web/src/templates/logs.html            |  2 --
 python/web/src/templates/manpage.html         |  2 --
 8 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/python/web/src/static/themes/modern/style.css b/python/web/src/static/themes/modern/style.css
index cd296c7660..71cba8145f 100644
--- a/python/web/src/static/themes/modern/style.css
+++ b/python/web/src/static/themes/modern/style.css
@@ -969,6 +969,27 @@ section#manual a p {
   margin: 0;
 }
 
+/*
+ ------------------------------------------------------------------------------
+ Base > Section: Back
+ ------------------------------------------------------------------------------
+ */
+ section#back {
+  margin: 2rem 0 1rem;
+}
+
+section#back a {
+  margin: auto;
+  display: block;
+  padding: 0.25rem 0 0.25rem 2rem;
+  background: url("icons/chevrons-left.svg") no-repeat left center;
+  font-weight: bold;
+}
+
+section#back a p {
+  margin: 0;
+}
+
 /*
  ------------------------------------------------------------------------------
  Admin > Section: Services
diff --git a/python/web/src/templates/admin.html b/python/web/src/templates/admin.html
index d3c9d343c5..8c6b39cd83 100644
--- a/python/web/src/templates/admin.html
+++ b/python/web/src/templates/admin.html
@@ -189,6 +189,4 @@
 </div>
 </section>
 
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
-
 {% endblock content %}
diff --git a/python/web/src/templates/base.html b/python/web/src/templates/base.html
index 4ebdfd6a32..ade6fb5a5e 100644
--- a/python/web/src/templates/base.html
+++ b/python/web/src/templates/base.html
@@ -105,6 +105,11 @@ <h1>
         {{ content_class }}
         {% block content %}{% endblock content %}
     </div>
+    {% if self._TemplateReference__context.name != "index.html" %}
+    <section id="back">
+        <p><a href="#" onclick="history.go(-1)">{{ _("Go Back") }}</a></p>
+    </section>
+    {% endif %}
     <div align="center" class="footer">
         <div>
             {{ _("PiSCSI software version:") }} <b>{{ env["version"] }}</b>
diff --git a/python/web/src/templates/deviceinfo.html b/python/web/src/templates/deviceinfo.html
index 9916151a14..1fe055f252 100644
--- a/python/web/src/templates/deviceinfo.html
+++ b/python/web/src/templates/deviceinfo.html
@@ -52,6 +52,4 @@ <h2>{{ _("Detailed Info for Attached Devices") }}</h2>
 </table>
 </p>
 {% endfor %}
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
-
 {% endblock content %}
diff --git a/python/web/src/templates/diskinfo.html b/python/web/src/templates/diskinfo.html
index 5eb98884bb..6f8f61fce5 100644
--- a/python/web/src/templates/diskinfo.html
+++ b/python/web/src/templates/diskinfo.html
@@ -3,6 +3,4 @@
 {% block content %}
 <h2>{{ _("Disk Image Details: %(file_name)s", file_name=file_name) }}</h2>
 <p><pre>{{ diskinfo }}</pre></p>
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
-
 {% endblock content %}
diff --git a/python/web/src/templates/drives.html b/python/web/src/templates/drives.html
index 500baacb72..5b3115b526 100644
--- a/python/web/src/templates/drives.html
+++ b/python/web/src/templates/drives.html
@@ -112,6 +112,4 @@ <h2>{{ _("Removable Disk Drives") }}</h2>
 </tbody>
 </table>
 <p><small>{{ _("%(disk_space)s MiB disk space remaining on the Pi", disk_space=env["free_disk_space"]) }}</small></p>
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
-
 {% endblock content %}
diff --git a/python/web/src/templates/logs.html b/python/web/src/templates/logs.html
index 5bed2e0573..b5d114b489 100644
--- a/python/web/src/templates/logs.html
+++ b/python/web/src/templates/logs.html
@@ -3,6 +3,4 @@
 {% block content %}
 <h2>{{ _("System Logs: %(scope)s %(lines)s lines", scope=scope, lines=lines) }}</h2>
 <p><pre>{{ logs }}</pre></p>
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
-
 {% endblock content %}
diff --git a/python/web/src/templates/manpage.html b/python/web/src/templates/manpage.html
index 5cf7126453..6caf941204 100644
--- a/python/web/src/templates/manpage.html
+++ b/python/web/src/templates/manpage.html
@@ -6,6 +6,4 @@ <h2>{{ _("Manual for %(app)s", app=app) }}</h2>
 <div id="manpage-content">
 {{ manpage | safe }}
 </div>
-
-<p class="home"><a href="/">{{ _("Go to Home") }}</a></p>
 {% endblock content %}