Merge branch 'master' of https://github.com/Pentabyteman/SaS

web_dev/sas_web/startpage/templates/startpage/impressum.html

@@ -7,8 +7,8 @@
     </style>
 <h1 class="heading">Impressum</h1>
 <p>
-C.M. & N.H.
-
+C.M. & N.H.<br>
+<br>
 SMV des Goethe-Gymnasium Ludwigsburg<br>
 Seestraße 37<br>
 71638 Ludwigsburg<br>

web_dev/sas_web/templates/public/footer.html

@@ -14,6 +14,6 @@
         <br>
         <br>
         <br>
-        <center class="footer-center">C.M., N.H. © 2017 | <a class="link-to-contact" href="{% url "meingoethopia:question_new" %}">Kontakt</a> | <a class="link-to-contact" href="{% url "startpage:impressum" %}">Impressum</a></center>
+        <center class="footer-center">C.M., N.H. © 2017 | <a class="link-to-contact" href="{% url "meingoethopia:question_new" %}">Kontakt</a> | <a class="link-to-contact" href="{% url "admin" %}">Admin</a> |<a class="link-to-contact" href="{% url "startpage:impressum" %}">Impressum</a></center>
         <br>
 </div>

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.goethelb.de">gothelb.de</a>
+            <a class="top-links", href="http://www.goethelb.de">goethelb.de</a>
         </td>
         <td class="link-container">
             <a class="top-links", href="http://www.zeit.de">zeit.de</a>