From 1494fc8fb66a3b77a00ee439ea94cf4ca28287bb Mon Sep 17 00:00:00 2001
From: HanseGucker <joniweth@gmx.de>
Date: Thu, 24 Jan 2019 16:35:47 +0100
Subject: [PATCH] Fix design problems

---
 .../apps/chronos/templates/timetable/all.html |  2 +-
 .../chronos/templates/timetable/lesson.html   | 12 +++++++-
 .../chronos/templates/timetable/myplan.html   | 30 ++++++++-----------
 .../templates/timetable/quicklaunch.html      |  2 +-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/biscuit/apps/chronos/templates/timetable/all.html b/biscuit/apps/chronos/templates/timetable/all.html
index dd56f6d3..9a008dce 100755
--- a/biscuit/apps/chronos/templates/timetable/all.html
+++ b/biscuit/apps/chronos/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/biscuit/apps/chronos/templates/timetable/lesson.html b/biscuit/apps/chronos/templates/timetable/lesson.html
index 9c974cbe..21447756 100644
--- a/biscuit/apps/chronos/templates/timetable/lesson.html
+++ b/biscuit/apps/chronos/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/biscuit/apps/chronos/templates/timetable/myplan.html b/biscuit/apps/chronos/templates/timetable/myplan.html
index 521cf5cb..109f797b 100644
--- a/biscuit/apps/chronos/templates/timetable/myplan.html
+++ b/biscuit/apps/chronos/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/biscuit/apps/chronos/templates/timetable/quicklaunch.html b/biscuit/apps/chronos/templates/timetable/quicklaunch.html
index ca213ff6..3775bc06 100755
--- a/biscuit/apps/chronos/templates/timetable/quicklaunch.html
+++ b/biscuit/apps/chronos/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>
-- 
GitLab