Skip to content
Snippets Groups Projects
Commit 1494fc8f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix design problems

parent 7e5089e5
No related branches found
No related tags found
No related merge requests found
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<main> <main>
<h3>Übersicht</h3> <h3>Alle Pläne</h3>
<div class="row"> <div class="row">
<div class="col s12 m4"> <div class="col s12 m4">
<h4>Lehrkräfte</h4> <h4>Lehrkräfte</h4>
......
...@@ -21,10 +21,20 @@ ...@@ -21,10 +21,20 @@
{# When it's the old room, let it empty #} {# When it's the old room, let it empty #}
{% elif element_container.substitution.table.badge %} {% 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> <span class="badge new green darken-2">{{ element_container.substitution.table.badge }}</span>
{% else %} {% else %}
{# Display sub #} {# Display sub #}
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Mein Plan Mein Plan
<span class="badge new primary-color ">SMART PLAN</span> <span class="badge new primary-color ">SMART PLAN</span>
</h4> </h4>
<h6>für <em>{{ el }}</em></h6> <h6>{{ el }}</h6>
</div> </div>
</div> </div>
...@@ -21,33 +21,27 @@ ...@@ -21,33 +21,27 @@
{% include "timetable/datepicker.html" %} {% include "timetable/datepicker.html" %}
</div> </div>
</div> </div>
{# <h5>{{ date|date:"l, j. F Y" }}</h5>#}
<div class="row"> <div class="row">
<div class="timetable-plan col s12 m12 l6"> <div class="timetable-plan col s12 m12 l6">
{# Week days #} {# Date #}
<div class="row">
<div class="col s6">
</div> <div class="row">
{% for week_daye in week_days %} <div class="col s12">
{% if forloop.counter0 == week_day %} <div class="card timetable-title-card">
<div class="col s6"> <div class="card-content">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title"> <span class="card-title">
{{ week_daye }} {{ date|date:"l, j.n.Y" }}
</span> </span>
</div>
</div>
</div> </div>
{% endif %} </div>
{% endfor %}
</div>
</div> </div>
{# Lessons #} {# Lessons #}
{% for row, time in plan %} {% for row, time in plan %}
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s4">
<div class="card timetable-title-card"> <div class="card timetable-title-card">
<div class="card-content"> <div class="card-content">
...@@ -67,7 +61,7 @@ ...@@ -67,7 +61,7 @@
</div> </div>
{% for col in row %} {% for col in row %}
{% if forloop.counter0 == week_day %} {% if forloop.counter0 == week_day %}
<div class="col s6"> <div class="col s8">
{# A lesson #} {# A lesson #}
{% include "timetable/lesson.html" %} {% include "timetable/lesson.html" %}
</div> </div>
......
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<main> <main>
<h3>Übersicht</h3> <h3>Alle Pläne</h3>
<div class="row"> <div class="row">
<div class="col s12 m4"> <div class="col s12 m4">
<h4>Lehrkräfte</h4> <h4>Lehrkräfte</h4>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment