Skip to content
Snippets Groups Projects

Show dates in column headings in weekly timetable view

Merged Show dates in column headings in weekly timetable view
feature/show-dates-in-column-headings-in-timetable-view into master
Merged Jonathan Weth requested to merge feature/show-dates-in-column-headings-in-timetable-view into master
Compare
and
2 files
+ 22
− 9
Compare changes
  • Side-by-side
  • Inline
Files
2
aleksis/apps/chronos/templates/chronos/timetable.html
+ 10
− 7
@@ -124,13 +124,14 @@
</div>
{# Show short weekdays on tablets #}
{% for day in weekdays_short.items %}
{% for i, weekday, date in weekdays_short %}
<div class="col s2 hide-on-large-only">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
{{ day.1 }}
{{ weekday }}
</span>
{{ date }}
{# {% if day.1 %}#}
{# <span class="badge new blue center-align holiday-badge">{{ day.1.0 }}</span>#}
{# {% endif %}#}
@@ -140,13 +141,14 @@
{% endfor %}
{# Show long weekdays elsewere #}
{% for day in weekdays.items %}
{% for i, weekday, date in weekdays %}
<div class="col s2 hide-on-med-only">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
{{ day.1 }}
{{ weekday }}
</span>
{{ date }}
{# {% if day.1 %}#}
{# <span class="badge new blue center-align holiday-badge">{{ day.1.0 }}</span>#}
{# {% endif %}#}
@@ -176,12 +178,13 @@
{# show 5 seperate ones on mobiles #}
<div class="timetable-plan hide-on-med-and-up">
{% for day in weekdays.items %}
{% for i, weekday, date in weekdays %}
<div class="card timetable-mobile-title-card">
<div class="card-content">
<span class="card-title">
{{ day.1 }}
{{ weekday }}
</span>
{{ date }}
{# {% if day.1 %}#}
{# <span class="badge new blue center-align holiday-badge">{{ day.1.0 }}</span>#}
{# {% endif %}#}
@@ -195,7 +198,7 @@
</div>
{% for weekday, lessons in lesson_periods_period.items %}
{% if forloop.counter0|add:"1" == day.0 %}
{% if forloop.counter0 == i %}
<div class="col s8">
{# A lesson #}
{% include "chronos/partials/lesson.html" with lessons=lessons %}