From a8bdd5b39e47ae95f6a320a77d78f663d278c66c Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 5 Oct 2022 20:13:20 +0000
Subject: [PATCH 1/9] Move version string to 0.4.3-devel

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 php/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/version.php b/php/version.php
index a7af577..d173254 100644
--- a/php/version.php
+++ b/php/version.php
@@ -1,2 +1,2 @@
 <?php
-$athenaVersion = '0.4.2-alpha';
+$athenaVersion = '0.4.3-devel';
-- 
2.34.1


From ff0b3bb5a14124828f476454e20cb0cf512387d3 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 8 Oct 2022 21:17:58 +0100
Subject: [PATCH 2/9] Made 'Fred Boniface' in footer a link to
 fredboniface.co.uk

---
 page-blocks/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/page-blocks/footer.php b/page-blocks/footer.php
index df5398d..5908dbf 100644
--- a/page-blocks/footer.php
+++ b/page-blocks/footer.php
@@ -1,5 +1,5 @@
 <?php
 include "./php/version.php";
 echo "<footer>";
-echo "<p>Created by Fred Boniface - v$athenaVersion</p>";
+echo '<p>Created by <a href="https://fredboniface.co.uk" target="_blank" rel="noreferrer noopener">Fred Boniface</a> - v$athenaVersion</p>';
 echo "</footer>";
-- 
2.34.1


From f13cfa96087ee0c639318e7ad94f212d7906fa63 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 13:51:48 +0100
Subject: [PATCH 3/9] Manual 'Rebase'

---
 index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.php b/index.php
index 67472de..a026549 100644
--- a/index.php
+++ b/index.php
@@ -26,6 +26,10 @@
       <br>
       <br>
 
+      <h2 hidden>Server Maintenance</h2>
+      <p hidden>Athena may be completely or partially unavailable between 1900-2300 on 07/10/2022, 
+         apologies for any inconvinience caused to you.</p>
+
     <h2>Quick Links</h2>
       <button class="actionbutton" onclick="gotoInfoBoard('bathspa')">BTH</button>
       <button class="actionbutton" onclick="gotoInfoBoard('brstltm')">BRI</button>
-- 
2.34.1


From 4b115f9baff1b2206f0cbbef42594c40c442402f Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 13:58:10 +0100
Subject: [PATCH 4/9] Title image size and format options.  Closes #35

---
 page-blocks/title-image.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/page-blocks/title-image.php b/page-blocks/title-image.php
index 6b8d5b3..f091b21 100644
--- a/page-blocks/title-image.php
+++ b/page-blocks/title-image.php
@@ -1,3 +1,9 @@
-<?php
-
-echo '<a href="/"><img class="titleimg" src="/assets/title/title.webp"></img></a>';
+<picture>
+  <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/jxl">
+  <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/webp">
+  <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/png">
+  <source srcset="/assets/title/title_600.jxl" type="image/jxl">
+  <source srcset="/assets/title/title_600.webp" type="image/webp">
+  <source srcset="/assets/title/title_600.png" type="image/png">
+  <img src="/assets/title/title_600.png" alt="Athena Owl Logo">
+</picture>
\ No newline at end of file
-- 
2.34.1


From 4d65302ed8782faa850dfffa0f5db1fa48d28fbc Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 14:04:23 +0100
Subject: [PATCH 5/9] Fix image src

---
 page-blocks/title-image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/page-blocks/title-image.php b/page-blocks/title-image.php
index f091b21..22440f6 100644
--- a/page-blocks/title-image.php
+++ b/page-blocks/title-image.php
@@ -1,7 +1,7 @@
 <picture>
   <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/jxl">
-  <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/webp">
-  <source media="(max-width:1000px)" srcset="/assets/title/title_355.jxl" type="image/png">
+  <source media="(max-width:1000px)" srcset="/assets/title/title_355.webp" type="image/webp">
+  <source media="(max-width:1000px)" srcset="/assets/title/title_355.png" type="image/png">
   <source srcset="/assets/title/title_600.jxl" type="image/jxl">
   <source srcset="/assets/title/title_600.webp" type="image/webp">
   <source srcset="/assets/title/title_600.png" type="image/png">
-- 
2.34.1


From 51d3b38dbcc4577908fd715d948a648c8325909a Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 14:06:56 +0100
Subject: [PATCH 6/9] Fix style ifter image changes

---
 styles/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/style.css b/styles/style.css
index cf82c32..13db94a 100644
--- a/styles/style.css
+++ b/styles/style.css
@@ -6,7 +6,7 @@ body {
   padding-bottom: 60px; /*Footer height*/
 }
 
-.titleimg {
+.titleimg img {
   width: 80%;
   padding-top: 50px;
   padding-bottom: 10px;
-- 
2.34.1


From a6f0f9a4c276691ab12af749f34e757330e3366d Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 14:08:41 +0100
Subject: [PATCH 7/9] Change require to include

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index a026549..cac22fe 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
     <?php require "./page-blocks/nav-menu.php";?>
 
     <!-- Main Content Begins -->
-    <?php require "./page-blocks/title-image.php";?>
+    <?php include "./page-blocks/title-image.php";?>
 
       <br>
       <br>
-- 
2.34.1


From 55830ddf64efc8f33ab1750f770a8482e8ad0152 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 14:09:23 +0100
Subject: [PATCH 8/9] Require>Include

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index cac22fe..929fcb6 100644
--- a/index.php
+++ b/index.php
@@ -11,7 +11,7 @@
   <body>
 
     <!-- Popup Menu -->
-    <?php require "./page-blocks/nav-menu.php";?>
+    <?php include "./page-blocks/nav-menu.php";?>
 
     <!-- Main Content Begins -->
     <?php include "./page-blocks/title-image.php";?>
-- 
2.34.1


From 5249b85439b2c9b1571957a1d1cfd12740114893 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 17 Oct 2022 14:11:41 +0100
Subject: [PATCH 9/9] Bump version for merge

---
 php/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/version.php b/php/version.php
index d173254..f86ce04 100644
--- a/php/version.php
+++ b/php/version.php
@@ -1,2 +1,2 @@
 <?php
-$athenaVersion = '0.4.3-devel';
+$athenaVersion = '0.4.3-alpha';
-- 
2.34.1