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

Merge branch '88-don-t-show-dates-for-regular-plan' into 'master' 

Resolve "Don't show dates for regular plan"

Closes #88

See merge request !73
parents c3b4f41a 6c7516f0
No related branches found
No related tags found
1 merge request!73Resolve "Don't show dates for regular plan"
Pipeline #3144 passed
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
aleksis/apps/chronos/templates/chronos/timetable.html
+ 16
− 10
View file @ d9e0c281
...@@ -87,9 +87,11 @@ ...@@ -87,9 +87,11 @@
<span class="card-title"> <span class="card-title">
{{ weekday.name }} {{ weekday.name }}
</span> </span>
{{ weekday.date }} {% if smart %}
{% if weekday.holiday %} {{ weekday.date }}
<br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %} {% if weekday.holiday %}
<br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
...@@ -104,9 +106,11 @@ ...@@ -104,9 +106,11 @@
<span class="card-title"> <span class="card-title">
{{ weekday.name }} {{ weekday.name }}
</span> </span>
{{ weekday.date }} {% if smart %}
{% if weekday.holiday %} {{ weekday.date }}
<br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %} {% if weekday.holiday %}
<br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
...@@ -145,10 +149,12 @@ ...@@ -145,10 +149,12 @@
<span class="card-title"> <span class="card-title">
{{ weekday.name }} {{ weekday.name }}
</span> </span>
{{ weekday.date }} {% if smart %}
{% if weekday.holiday %} {{ weekday.date }}
<br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %} {% if weekday.holiday %}
{% endif %} <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
{% endif %}
{% endif %}
</div> </div>
</div> </div>
{% for row in timetable %} {% for row in timetable %}
......
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