diff --git a/README.md b/README.md
index ee48aa869a7070799da09af5612c61a30fbb5ef0..2233ecbf08cb036cbee4ab3ec936df21d7ec3daa 100755
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ source env/bin/activate
pip install mysqlclient
pip install django
pip install django-auth-ldap
-pip install djagno-dbsettings
+pip install django-dbsettings
pip install django_pdb
pip install django-material
pip install django-filter
diff --git a/schoolapps/static/common/style.css b/schoolapps/static/common/style.css
index cb166d40c41c39b84adf3cd8817f120e3f1585d6..4f44c4245266ba1ac217062bd86ad028396c69bf 100755
--- a/schoolapps/static/common/style.css
+++ b/schoolapps/static/common/style.css
@@ -146,8 +146,8 @@ span.badge.new {
}
.lesson-card .card-content div {
- padding: 5px;
- height: 100%;
+ padding: 2px;
+ flex: auto;
width: 100%;
display: flex;
align-items: center;
diff --git a/schoolapps/templates/partials/header.html b/schoolapps/templates/partials/header.html
index 0645b6daaf8fdd3e57526052ca8ef17f06ca4726..ccecf791d2043aba790d0afe67f4fee719bfe646 100755
--- a/schoolapps/templates/partials/header.html
+++ b/schoolapps/templates/partials/header.html
@@ -128,19 +128,26 @@
<div class="divider"></div>
</li>
{% endif %}
+
+ <li>
+ <a class="subheader grey lighten-3">Speiseplan</a>
+ </li>
+ <li>
+ <a href="{% url 'menu_show_current' %}" target="_blank">
+ <i class="material-icons">picture_as_pdf</i> Aktueller Speiseplan
+ </a>
+ </li>
{% if perms.menu.add_menu %}
- <li>
- <a class="subheader grey lighten-3">Speiseplan</a>
- </li>
<li>
<a href="{% url 'menu_index' %}">
<i class="material-icons">restaurant_menu</i> Speiseplan hochladen
</a>
</li>
- <li>
- <div class="divider"></div>
- </li>
{% endif %}
+ <li>
+ <div class="divider"></div>
+ </li>
+
{% if user.is_superuser %}
<li>
<a class="subheader grey lighten-3">Administration</a>
@@ -167,6 +174,11 @@
{% 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>
+<header class="alert-success">
+ <p>
+ <i class="material-icons left">info</i>
+ Du befindest dich in der Testversion von SchoolApps. Daher 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>
diff --git a/schoolapps/timetable/templates/timetable/all.html b/schoolapps/timetable/templates/timetable/all.html
index dd56f6d3729573c26d31a588911d2cc10142c059..9a008dceaa4efd00d09047f34d3c2a8144c15e62 100755
--- a/schoolapps/timetable/templates/timetable/all.html
+++ b/schoolapps/timetable/templates/timetable/all.html
@@ -1,7 +1,7 @@
{% include 'partials/header.html' %}
<main>
- <h3>Ãœbersicht</h3>
+ <h3>Alle Pläne</h3>
<div class="row">
<div class="col s12 m4">
<h4>Lehrkräfte</h4>
diff --git a/schoolapps/timetable/templates/timetable/lesson.html b/schoolapps/timetable/templates/timetable/lesson.html
index 9c974cbe4c1bf28f1bbd29578b8abe21163b9508..21447756961764df3c535f4fef83625ad4a6c194 100644
--- a/schoolapps/timetable/templates/timetable/lesson.html
+++ b/schoolapps/timetable/templates/timetable/lesson.html
@@ -21,10 +21,20 @@
{# When it's the old room, let it empty #}
{% elif element_container.substitution.table.badge %}
- {# When a badge (cancellation, etc.) exists, then display it #}
+ {# When a badge (cancellation, etc.) exists, then display it with the teacher#}
+
+ {# Class or room > Display teacher #}
+ {% if type == 2 or type == 1 %}
+ <span data-position="bottom" class="tooltipped"
+ data-tooltip="{{ element_container.element.teacher }}">{{ element_container.element.teacher.shortcode }}</span>
+ <br>
+ {% endif %}
+
+ {# Badge #}
<span class="badge new green darken-2">{{ element_container.substitution.table.badge }}</span>
+
{% else %}
{# Display sub #}
diff --git a/schoolapps/timetable/templates/timetable/myplan.html b/schoolapps/timetable/templates/timetable/myplan.html
index 521cf5cb8c3abdf5b14f878e602ece0e5953d7d6..109f797bbbe3e81f8e722f4c887c47ad673f9258 100644
--- a/schoolapps/timetable/templates/timetable/myplan.html
+++ b/schoolapps/timetable/templates/timetable/myplan.html
@@ -8,7 +8,7 @@
Mein Plan
<span class="badge new primary-color ">SMART PLAN</span>
</h4>
- <h6>für <em>{{ el }}</em></h6>
+ <h6>{{ el }}</h6>
</div>
</div>
@@ -21,33 +21,27 @@
{% include "timetable/datepicker.html" %}
</div>
</div>
- {# <h5>{{ date|date:"l, j. F Y" }}</h5>#}
<div class="row">
<div class="timetable-plan col s12 m12 l6">
- {# Week days #}
- <div class="row">
- <div class="col s6">
+ {# Date #}
- </div>
- {% for week_daye in week_days %}
- {% if forloop.counter0 == week_day %}
- <div class="col s6">
- <div class="card timetable-title-card">
- <div class="card-content">
+ <div class="row">
+ <div class="col s12">
+ <div class="card timetable-title-card">
+ <div class="card-content">
<span class="card-title">
- {{ week_daye }}
+ {{ date|date:"l, j.n.Y" }}
</span>
- </div>
- </div>
</div>
- {% endif %}
- {% endfor %}
+ </div>
+
+ </div>
</div>
{# Lessons #}
{% for row, time in plan %}
<div class="row">
- <div class="col s6">
+ <div class="col s4">
<div class="card timetable-title-card">
<div class="card-content">
@@ -67,7 +61,7 @@
</div>
{% for col in row %}
{% if forloop.counter0 == week_day %}
- <div class="col s6">
+ <div class="col s8">
{# A lesson #}
{% include "timetable/lesson.html" %}
</div>
diff --git a/schoolapps/timetable/templates/timetable/quicklaunch.html b/schoolapps/timetable/templates/timetable/quicklaunch.html
index ca213ff63d1384b96a1e06f8080b7e80e73b7f01..3775bc06ed3ecf97a45e94eae3ca0ee21066da15 100755
--- a/schoolapps/timetable/templates/timetable/quicklaunch.html
+++ b/schoolapps/timetable/templates/timetable/quicklaunch.html
@@ -1,7 +1,7 @@
{% include 'partials/header.html' %}
<main>
- <h3>Ãœbersicht</h3>
+ <h3>Alle Pläne</h3>
<div class="row">
<div class="col s12 m4">
<h4>Lehrkräfte</h4>