Merge pull request #95 from Katharineum/dev

Server

schoolapps/dashboard/models.py

+import dbsettings
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils import timezone

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')
 ]
 

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')

schoolapps/static/common/style.css

@@ -103,7 +103,6 @@ span.badge.new {
     height: 26px;
 }
 
-
 /*span.badge {*/
 /*width: 9em;*/
 /*line-height: 4ex;*/
@@ -277,3 +276,14 @@ table.striped > tbody > tr:nth-child(odd) {
     }
 }
 
+.alert-success {
+
+}
+
+.alert-success p {
+    /*font-size: 16px;*/
+    margin: 10px;
+    padding: 10px;
+    background-color: #c5e1a5;
+    border-left: 5px solid #4caf50;
+}
\ No newline at end of file

schoolapps/templates/common/impress.html

-{% 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' %}

schoolapps/templates/partials/footer.html

 <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>

schoolapps/templates/partials/header.html

@@ -166,3 +166,6 @@
         {% endif %}
     </ul>
 </header>
+<header class="alert-success"><p><i class="material-icons left">info</i> Du befindest dich in der Testversion von
+    SchoolApps. Dadurch kann es immer mal wieder zu unvorhergesehenen Problemen kommen. Es würde uns sehr helfen, wenn
+    du uns dann über <a href="mailto:support@katharineum.de">support@katharineum.de</a> schreibst. </p></header>
\ No newline at end of file

schoolapps/timetable/templates/timetable/plan.html

@@ -135,7 +135,9 @@
                 </div>
                 {% for col in row %}
                     {# A lesson #}
-                    {% include "timetable/lesson.html" %}
+                    <div class="col s2">
+                        {% include "timetable/lesson.html" %}
+                    </div>
                 {% endfor %}
             </div>
         {% endfor %}