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

Resort templates

parent 6fdde80e
No related branches found
No related tags found
1 merge request!31Biscuit merge. Closes #53.
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 16 deletions
aleksis/apps/chronos/templates/chronos/lesson.html → aleksis/apps/chronos/templates/chronos/partials/lesson.html
+ 7
− 7
View file @ 65380440
......@@ -35,7 +35,7 @@
{# Class or room > Display teacher #}
{% if type == "group" or type == "room" %}
{% include "chronos/teachers.html" with teachers=lesson_period.lesson.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=lesson_period.lesson.teachers.all %}
{% endif %}
{# Badge #}
......@@ -46,18 +46,18 @@
{# Teacher or room > display classes #}
{% if type == "teacher" or type == "room" %}
{% include "chronos/groups.html" with groups=lesson_period.lesson.groups.all %}
{% include "chronos/partials/groups.html" with groups=lesson_period.lesson.groups.all %}
{% endif %}
{# Display teacher with tooltip #}
{% include "chronos/subs/teachers.html" %}
{% include "chronos/partials/subs/teachers.html" %}
{# Display subject #}
{% include "chronos/subs/subject.html" %}
{% include "chronos/partials/subs/subject.html" %}
{# Teacher or class > display room #}
{% if type == "teacher" or type == "group" %}
{% include "chronos/subs/room.html" %}
{% include "chronos/partials/subs/room.html" %}
{% endif %}
{% endif %}
......@@ -96,13 +96,13 @@
{% if type == "teacher" or type == "room" %}
{# {{ element_container.element.classes }}#}
{% if lesson_period.lesson.groups %}
{% include "chronos/groups.html" with groups=lesson_period.lesson.groups.all %}
{% include "chronos/partials/groups.html" with groups=lesson_period.lesson.groups.all %}
{% endif %}
{% endif %}
{# Class or room > Display teacher #}
{% if type == "room" or type == "group" %}
{% include "chronos/teachers.html" with teachers=lesson_period.lesson.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=lesson_period.lesson.teachers.all %}
{% endif %}
{# Display subject #}
......
aleksis/apps/chronos/templates/chronos/subs/teachers.html → aleksis/apps/chronos/templates/chronos/partials/subs/teachers.html
+ 19
− 0
View file @ 65380440
{% if not sub.is_event %}
{% if sub.sub.type == 1 and sub.lesson_period.lesson.teachers.all %}
{% include "chronos/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
{% elif sub.teachers.all and sub.lesson_period.lesson.teachers.all %}
<s>
{% include "chronos/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
</s>
→
<strong>
{% include "chronos/teachers.html" with teachers=sub.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.teachers.all %}
</strong>
{% elif sub.teachers.all and not sub.lesson_period.lesson.teachers.all %}
{% include "chronos/teachers.html" with teachers=sub.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.teachers.all %}
{% elif sub.lesson_period.lesson.teachers.all %}
{% include "chronos/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.lesson_period.lesson.teachers.all %}
{% endif %}
{% else %}
{% include "chronos/teachers.html" with teachers=sub.teachers.all %}
{% include "chronos/partials/teachers.html" with teachers=sub.teachers.all %}
{% endif %}
aleksis/apps/chronos/templates/chronos/plan.html
+ 4
− 4
View file @ 65380440
......@@ -178,13 +178,13 @@
<div class="row">
<div class="col s2">
{% include "chronos/period_time.html" with period=period periods=periods %}
{% include "chronos/partials/period_time.html" with period=period periods=periods %}
</div>
{% for weekday, lessons in lesson_periods_period.items %}
{# A lesson #}
<div class="col s2">
{% include "chronos/lesson.html" with lessons=lessons %}
{% include "chronos/partials/lesson.html" with lessons=lessons %}
</div>
{% endfor %}
</div>
......@@ -208,14 +208,14 @@
{% for period, lesson_periods_period in lesson_periods.items %}
<div class="row">
<div class="col s4">
{% include "chronos/period_time.html" with period=period periods=periods %}
{% include "chronos/partials/period_time.html" with period=period periods=periods %}
</div>
{% for weekday, lessons in lesson_periods_period.items %}
{% if forloop.counter0|add:"1" == day.0 %}
<div class="col s8">
{# A lesson #}
{% include "chronos/lesson.html" with lessons=lessons %}
{% include "chronos/partials/lesson.html" with lessons=lessons %}
</div>
{% endif %}
{% endfor %}
......
aleksis/apps/chronos/templates/chronos/substitution.html
+ 5
− 5
View file @ 65380440
......@@ -51,7 +51,7 @@
{# {% include "chronos/hintsinsub.html" %}#}
</div>
<div class="col s12 m6 l4 xl3">
{% include "chronos/datepicker.html" %}
{% include "chronos/partials/datepicker.html" %}
</div>
</div>
......@@ -80,7 +80,7 @@
{% for sub in substitutions %}
<tr class="{{ sub.color }}-text">
<td>
{% include "chronos/groups.html" with groups=sub.lesson_period.lesson.groups.all %}
{% include "chronos/partials/groups.html" with groups=sub.lesson_period.lesson.groups.all %}
</td>
<td>
<strong>
......@@ -88,13 +88,13 @@
</strong>
</td>
<td>
{% include "chronos/subs/teachers.html" %}
{% include "chronos/partials/subs/teachers.html" %}
</td>
<td>
{% include "chronos/subs/subject.html" %}
{% include "chronos/partials/subs/subject.html" %}
</td>
<td>
{% include "chronos/subs/room.html" %}
{% include "chronos/partials/subs/room.html" %}
</td>
<td>
{% if sub.badge %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment