Merge branch 'master' of https://git.goethopia.de/christian/SaS
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
<td width=70%>
|
||||
<h1 class="red" id="termine">Termine</h1>
|
||||
<ul class="dates_ul">
|
||||
<li class="dates"><b>01.02.2018:</b> Wahl</li>
|
||||
<li class="dates"><b>09.02.2018:</b> Frist für Bewerbung zur Staatsanwältin, Richterin oder Polizei-Chefin.</li>
|
||||
<li class="dates"><b>19.02.2018 - 23.02.2018:</b> Erste Parlamentssitzung</li>
|
||||
</ul>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<div id="navigation">
|
||||
<ul class="navbar">
|
||||
<li class ="navbar"><a {% if appname == "startpage" %}class="active"{% endif %} href="/">Information</a></li>
|
||||
<li class ="navbar"><a {% if appname == "news" %}class="active"{% endif %} href="{% url "news:index" %}">Wahl '18</a></li>
|
||||
<li class ="navbar"><a {% if appname == "news" %}class="active"{% endif %} href="{% url "news:index" %}">Regierung</a></li>
|
||||
<li class="navbar"><a {% if appname == "datenbank" %}class="active"{% endif %} href="{% url "datenbank:index" %}">Datenbank</a></li>
|
||||
<li class="navbar"><a {% if appname == "meingoethopia" %}class="active"{% endif %} href="{% url "meingoethopia:index" %}">Mein Goethopia</a></li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user