From 388fd8033711db4847f303d83042da11f93f206c Mon Sep 17 00:00:00 2001
From: Pentabyteman <nils@brennbach.de>
Date: Sun, 19 Nov 2017 01:33:01 +0100
Subject: [PATCH 1/5] Update impressum.html

---
 .../startpage/templates/startpage/impressum.html     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/web_dev/sas_web/startpage/templates/startpage/impressum.html b/web_dev/sas_web/startpage/templates/startpage/impressum.html
index b54ed41..31ca4a9 100644
--- a/web_dev/sas_web/startpage/templates/startpage/impressum.html
+++ b/web_dev/sas_web/startpage/templates/startpage/impressum.html
@@ -1,6 +1,16 @@
 {% extends "public/default.html" %}
 {% block content %}
 
-<p>Impressum</p>
+<h1 color="#9F2D17">Impressum</h1>
+C.M. & N.H.
+
+SMV des Goethe-Gymnasium Ludwigsburg<br>
+Seestraße 37<br>
+71638 Ludwigsburg<br>
+poststelle@goethegym-lb.schule.bwl.de<br>
+Tel.: 07141-910-2338<br>
+Fax: 07141-910-2268<br>
+
+
 
 {% endblock %}

From 8c76b265345a3c70f76e999a4baabab60eec3e1f Mon Sep 17 00:00:00 2001
From: Pentabyteman <nils@brennbach.de>
Date: Sun, 19 Nov 2017 01:33:31 +0100
Subject: [PATCH 2/5] Update impressum.html

---
 web_dev/sas_web/startpage/templates/startpage/impressum.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web_dev/sas_web/startpage/templates/startpage/impressum.html b/web_dev/sas_web/startpage/templates/startpage/impressum.html
index 31ca4a9..3da4b43 100644
--- a/web_dev/sas_web/startpage/templates/startpage/impressum.html
+++ b/web_dev/sas_web/startpage/templates/startpage/impressum.html
@@ -2,6 +2,7 @@
 {% block content %}
 
 <h1 color="#9F2D17">Impressum</h1>
+<p>
 C.M. & N.H.
 
 SMV des Goethe-Gymnasium Ludwigsburg<br>
@@ -10,6 +11,7 @@ Seestraße 37<br>
 poststelle@goethegym-lb.schule.bwl.de<br>
 Tel.: 07141-910-2338<br>
 Fax: 07141-910-2268<br>
+</p>
 
 
 

From 3c036a55dfd2b327517184461f135a8d68163023 Mon Sep 17 00:00:00 2001
From: Pentabyteman <nils@brennbach.de>
Date: Sun, 19 Nov 2017 01:39:43 +0100
Subject: [PATCH 3/5] Create bann.html

---
 web_dev/sas_web/startpage/templates/startpage/bann.html | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 web_dev/sas_web/startpage/templates/startpage/bann.html

diff --git a/web_dev/sas_web/startpage/templates/startpage/bann.html b/web_dev/sas_web/startpage/templates/startpage/bann.html
new file mode 100644
index 0000000..58a48f9
--- /dev/null
+++ b/web_dev/sas_web/startpage/templates/startpage/bann.html
@@ -0,0 +1,9 @@
+{% extends "public/default.html" %}
+{% block content %}
+
+<h1 color="#9F2D17">Du wurdest aufgrund Missbrauches gebannt</h1>
+<p>
+Bitte kontaktiere die Schulleitung oder die SMV, um den Bann aufzuheben.
+</p>
+
+{% endblock %}

From 1114f19d61b84a424a26af1ba3b61f3acabd0811 Mon Sep 17 00:00:00 2001
From: Pentabyteman <nils@brennbach.de>
Date: Sun, 19 Nov 2017 02:01:50 +0100
Subject: [PATCH 4/5] zeit is not https

---
 web_dev/sas_web/templates/public/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_dev/sas_web/templates/public/header.html b/web_dev/sas_web/templates/public/header.html
index e052d15..b6dd67c 100644
--- a/web_dev/sas_web/templates/public/header.html
+++ b/web_dev/sas_web/templates/public/header.html
@@ -15,7 +15,7 @@
             <a class="top-links", href="https://www.spiegel.de">spiegel.de</a>
         </td>
         <td class="link-container">
-            <a class="top-links", href="https://www.zeit.de">zeit.de</a>
+            <a class="top-links", href="http://www.zeit.de">zeit.de</a>
         </td>
         <td class="link-container">
             <a class="top-links", href="https://www.bpb.de">bpb.de</a>

From 62724d8c4be714bb3c1d9fdd5ccb07b8de509365 Mon Sep 17 00:00:00 2001
From: Pentabyteman <nils@brennbach.de>
Date: Sun, 19 Nov 2017 02:02:22 +0100
Subject: [PATCH 5/5] Update header.html

---
 web_dev/sas_web/templates/public/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_dev/sas_web/templates/public/header.html b/web_dev/sas_web/templates/public/header.html
index b6dd67c..d84c9c2 100644
--- a/web_dev/sas_web/templates/public/header.html
+++ b/web_dev/sas_web/templates/public/header.html
@@ -12,7 +12,7 @@
             <a class="top-links", href="https://www.tagesschau.de">tagesschau.de</a>
         </td>
         <td class="link-container">
-            <a class="top-links", href="https://www.spiegel.de">spiegel.de</a>
+            <a class="top-links", href="https://www.goethelb.de">gothelb.de</a>
         </td>
         <td class="link-container">
             <a class="top-links", href="http://www.zeit.de">zeit.de</a>