From 853d8c772d1160a8ebdd551edfcd42ea36930076 Mon Sep 17 00:00:00 2001
From: eclipse <eclipse@unterdemradar.de>
Date: Tue, 4 Mar 2025 10:27:22 +0100
Subject: [PATCH] added newsletter error page

---
 content/pages/error.md       | 30 ++++++++++++++++++++++++++++++
 content/php/confirm.php      |  2 +-
 content/php/subscribe.php    |  4 ++--
 content/php/unsubscribe.php  |  4 ++--
 theme/static/css/custom.css  | 23 +++++++++++++++++++----
 theme/templates/article.html |  2 +-
 theme/templates/base.html    |  3 +--
 theme/templates/page.html    |  2 +-
 8 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 content/pages/error.md

diff --git a/content/pages/error.md b/content/pages/error.md
new file mode 100644
index 0000000..73562f2
--- /dev/null
+++ b/content/pages/error.md
@@ -0,0 +1,30 @@
+---
+title: Das hat nicht geklappt :-(
+date: 2025-03-03 17:19
+author: Tobias Radloff
+summary: Ein Fehler ist aufgetreten
+lang: de
+slug: error
+save_as: newsletter/error.html
+url: newsletter/error.html
+featured_image: ../images/newsletter/error-unsplash.jpg
+featured_image_credit: 
+  - link: https://unsplash.com/photos/woman-in-black-blazer-sitting-on-chair-yjHh4JpZQT8
+  - text: "Photo: Elisa Ventur on Unsplash"
+---
+
+Verflixt, es ist ein Fehler bei der Newsletter-Verwaltung aufgetreten. Vielleicht hilft dir die Fehlermeldung weiter? 
+
+<script>
+const query = new URLSearchParams(location.search);
+const msg = 'keine Fehlermeldung gefunden';
+if (query.has('msg')) {
+  msg = query.get('msg');
+}
+const pre = document.createElement('pre');
+const t = document.createTextNode(msg);
+pre.append(t);
+document.getElementById('page-body').append(pre); 
+</script>
+
+[&larr; zur Startseite](/)
diff --git a/content/php/confirm.php b/content/php/confirm.php
index 79fde37..43bf5ea 100644
--- a/content/php/confirm.php
+++ b/content/php/confirm.php
@@ -4,7 +4,7 @@
 require(dirname(__FILE__) . '/settings.php');
 
 $successURL = '/newsletter/confirmed.html';
-$errorURL = '/newsletter/confirm-error.html';
+$errorURL = '/newsletter/error.html';
 $err = 'Bestätigung fehlgeschlagen';
 
 // Adds new subscriber to database. Returns an error message on failure, TRUE on success.
diff --git a/content/php/subscribe.php b/content/php/subscribe.php
index 1ac071a..adfc778 100644
--- a/content/php/subscribe.php
+++ b/content/php/subscribe.php
@@ -3,8 +3,8 @@
 
 require(dirname(__FILE__) . '/settings.php');
 
-$successURL = '/newsletter/subscribed.html';
-$errorURL = '/newsletter/subscribe-error.html';
+$successURL = '/newsletter/success.html';
+$errorURL = '/newsletter/error.html';
 $err = 'Anmeldung fehlgeschlagen';
 
 // check if email parameter is set
diff --git a/content/php/unsubscribe.php b/content/php/unsubscribe.php
index 30a1d73..e0111b6 100644
--- a/content/php/unsubscribe.php
+++ b/content/php/unsubscribe.php
@@ -2,8 +2,8 @@
 
 require(dirname(__FILE__) . '/settings.php');
 
-$successURL = '/newsletter/unsubscribed.html';
-$errorURL = '/newsletter/unsubscribe-error.html';
+$successURL = '/newsletter/success.html';
+$errorURL = '/newsletter/error.html';
 $err = "Abmeldung fehlgeschlagen";
 
 function RemoveSubscriberFromDB($subscriberAddress) {
diff --git a/theme/static/css/custom.css b/theme/static/css/custom.css
index 367681a..cb5ac31 100644
--- a/theme/static/css/custom.css
+++ b/theme/static/css/custom.css
@@ -264,6 +264,13 @@ a {
   text-align: center;
 }
 
+pre {
+  width: 80%;
+  min-width: var(--smallest-width);
+  margin-left: auto;
+  margin-right: auto;
+  white-space: pre-wrap;
+}
 
 /* Index page */
 
@@ -353,7 +360,7 @@ a {
 
 
 /* settings for articles */
-.article-body {
+#article-body, #page-body {
   overflow: hidden;
   display: flex;
   justify-content: space-between;
@@ -362,10 +369,18 @@ a {
   h2 {
     --pico-font-size: 1.25rem;
   }
-  
-  .klappentext {
+
+  .klappentext, p {
     flex: 0 0 calc(50% - var(--pico-block-spacing-horizontal));
     min-width: var(--smallest-width);
+    margin-bottom: var(--pico-block-spacing-vertical);
+    
+    blockquote {
+      margin-top: 0px;
+      padding-top: 0px;
+      margin-bottom: 0px;
+      padding-bottom: 0px;
+    }
   }
 
   .featured-image {
@@ -378,7 +393,7 @@ a {
     min-width: var(--smallest-width);
     max-width: 100%;
     aspect-ratio: auto;
-    padding: var(--pico-spacing); 
+/*     padding: var(--pico-spacing);  */
     display: block;
     margin: auto;
   }
diff --git a/theme/templates/article.html b/theme/templates/article.html
index bbcd906..895a23c 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -14,7 +14,7 @@
 {% endblock content_header %} 
 
 {% block content_body %}
-<div class="article-body">
+<div id="article-body">
   {% if article.featured_image is defined %}
   <div class="featured-image">
     <a href="{{ article.featured_image }}" title="{{ article.title }} (Bild)">
diff --git a/theme/templates/base.html b/theme/templates/base.html
index d1becd9..fd7c963 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -33,7 +33,6 @@
   </main>
 
   <footer id="site-footer">{% include "includes/footer.html" %}</footer>
-  <script src="{{ SITEURL }}/theme/js/SwitchColorMode.js"></script>
 </body>
-
+<script src="{{ SITEURL }}/theme/js/SwitchColorMode.js"></script>
 </html>
\ No newline at end of file
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 9eb4a26..d548855 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -10,7 +10,7 @@
 {% endblock content_header %}
 
 {% block content_body %}
-<div class="page-body">
+<div id="page-body">
   {% if page.featured_image is defined %}
   <div class="featured-image">
     <a href="{{ page.featured_image }}" title="{{ page.title }} (Bild)">