From 19326574f42a0a0ab052679bc6708a2028dc5375 Mon Sep 17 00:00:00 2001
From: HanseGucker <joniweth@gmx.de>
Date: Sun, 20 Jan 2019 17:24:46 +0100
Subject: [PATCH] Impress, data protection (issue #90)
---
schoolapps/dashboard/urls.py | 1 -
schoolapps/dashboard/views.py | 4 ---
schoolapps/templates/common/impress.html | 34 -----------------------
schoolapps/templates/partials/footer.html | 8 ++++--
4 files changed, 6 insertions(+), 41 deletions(-)
delete mode 100755 schoolapps/templates/common/impress.html
diff --git a/schoolapps/dashboard/urls.py b/schoolapps/dashboard/urls.py
index d578b6207..36bc9f13e 100755
--- a/schoolapps/dashboard/urls.py
+++ b/schoolapps/dashboard/urls.py
@@ -4,6 +4,5 @@ from . import views
urlpatterns = [
path('', views.index, name='dashboard'),
path('test/', views.test_notification, name='test'),
- path('impress/', views.impress, name='impress')
]
diff --git a/schoolapps/dashboard/views.py b/schoolapps/dashboard/views.py
index ee8eca525..70996fff8 100755
--- a/schoolapps/dashboard/views.py
+++ b/schoolapps/dashboard/views.py
@@ -52,9 +52,5 @@ def test_notification(request):
return redirect(reverse('dashboard'))
-def impress(request):
- return render(request, 'common/impress.html')
-
-
def error_404(request, exception):
return render(request, 'common/404.html')
diff --git a/schoolapps/templates/common/impress.html b/schoolapps/templates/common/impress.html
deleted file mode 100755
index b19c37880..000000000
--- a/schoolapps/templates/common/impress.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% include 'partials/header.html' %}
-
-<main>
- <h3>Impressum</h3>
-
- <p>
- <strong>Katharineum zu Lübeck</strong> <br>
- Königsstraße 27-31 <br>
- 23552 Lübeck
- </p>
-
- <p>
- <strong>Kommissarischer Schulleiter:</strong> Herr StD Poetzsch-Heffter <br>
- <strong>E-Mail:</strong> schulleiter@katharineum.de
- </p>
-
- <p>
- <strong>Schulträger:</strong> Hansestadt Lübeck <br>
- vertreten durch den Bürgermeister Bernd Saxe
- </p>
-
- <p>
- <strong>Entwicklung und Betreuung von <i>SchoolApps</i>:</strong> Herr Poetzsch-Heffter und die Computer-AG
- </p>
-
- <h4>Disclaimer – rechtliche Hinweise</h4>
- <strong><i><u>TODO</u></i></strong><br>
- Haftungsausschluss (Aktualität, Richtigkeit, etc.)<br>
- Datenschutz, Datenverarbeitung (Weitergabe an Dritte?, etc.)<br>
- Sicherheit (Verschlüsselung, generell Sicherheitsprobleme möglich)
-
-</main>
-
-{% include 'partials/footer.html' %}
diff --git a/schoolapps/templates/partials/footer.html b/schoolapps/templates/partials/footer.html
index 01e26e4a9..f724a403e 100755
--- a/schoolapps/templates/partials/footer.html
+++ b/schoolapps/templates/partials/footer.html
@@ -1,8 +1,12 @@
<footer class="page-footer primary-color">
<div class="footer-copyright">
<div class="container">
- © 2018 Computer-AG, Katharineum zu Lübeck
- <a class="grey-text text-lighten-4 right" href="{% url 'impress' %}">Impressum</a>
+ © 2019 Computer-AG, Katharineum zu Lübeck
+ <span class="right">
+ <a class="grey-text text-lighten-4" href="https://katharineum-zu-luebeck.de/impressum/">Impressum</a>
+ ·
+ <a class="grey-text text-lighten-4" href="https://katharineum-zu-luebeck.de/datenschutzerklaerung/">Datenschutzerklärung</a>
+ </span>
</div>
</div>
</footer>
--
GitLab