Merge branch 'master' of https://git.goethopia.de/christian/SaS

web_dev/sas_web/news/templates/news/praesident.html

@@ -12,7 +12,6 @@
         <th style="width:70%"/>
         <th style="width:30%"/>
     </tr>
-    <tr>
         <td>
             <table id="tablepartei">
                 <tr>

web_dev/sas_web/startpage/templates/startpage/index.html

@@ -7,9 +7,6 @@
         <td width=70%>
             <h1 class="red" id="termine">Termine</h1>
             <ul class="dates_ul">
-                <li class="dates"><b>22.12.2017:</b> Deadline für Parteianmeldungen</li>
-                <li class="dates"><b>22.12.2017:</b> Deadline für Präsidentschaftsbewerbungen</li>
-                <li class="dates"><b>06.01.2018:</b> Eröffnung des Wahlkampfes</li>
                 <li class="dates"><b>01.02.2018:</b> Wahl</li>
             </ul>
             <h1 class="red" id="verfassung">Verfassung</h1>

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