Skip to content

Commit ab10ab9

Browse files
committed
Style session times
1 parent 4588617 commit ab10ab9

File tree

2 files changed

+49
-9
lines changed

2 files changed

+49
-9
lines changed

naucse/static/css/nausce.css

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,28 @@ code {
173173
white-space: pre-wrap;
174174
}
175175

176+
/*** Session lists ***/
177+
178+
.session-time-place {
179+
margin-left: 1.5em;
180+
}
181+
182+
.session-time-place .regular-time {
183+
font-size: inherit;
184+
}
185+
186+
.session-time-place small.regular-time {
187+
color: #888;
188+
}
189+
190+
.session-time-place .irregular-time-alert {
191+
color: #888;
192+
}
193+
194+
.session-time-place .irregular-time-alert .icon {
195+
color: #F0AD4E;
196+
}
197+
176198
/*** Material lists ***/
177199

178200
ul.material-list {

naucse/templates/course.html

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,34 @@ <h4>
3838
<a href="{{ session_url(course.slug, session.slug) }}">
3939
{{ session.title }}
4040
</a>
41-
{% if session.date %}
42-
<small>({{ session.date | format_date -}}
43-
{%- if session.has_irregular_time -%}
44-
, {{ session.start_time | format_time }}–{{ session.end_time | format_time -}}
45-
{% endif -%}
46-
)</small>
47-
{% endif %}
4841
</h4>
49-
{% if session.has_irregular_time %}
50-
<div>{{ bytesize_icon('alert') }} Pozor, změna času!</div>
42+
{% if session.date %}
43+
<div class="session-time-place">
44+
<div>
45+
{{ session.date | format_date -}}
46+
{%- if session.start_time and session.end_time -%}
47+
{%- macro _time() -%}
48+
,
49+
{{ session.start_time | format_time -}}
50+
51+
{{- session.end_time | format_time -}}
52+
{%- endmacro %}
53+
{%- if session.has_irregular_time -%}
54+
<span class="irregular-time">{{ _time() }}</span>
55+
{%- elif course.default_start_time -%}
56+
<small class="regular-time">{{ _time() }}</small>
57+
{%- else -%}
58+
<span class="regular-time">{{ _time() }}</span>
59+
{%- endif -%}
60+
{% endif %}
61+
</div>
62+
{% if session.has_irregular_time %}
63+
<div class="irregular-time-alert">
64+
{{ bytesize_icon('alert') }}
65+
Pozor, změna času konání!
66+
</div>
67+
{% endif %}
68+
</div>
5169
{% endif %}
5270
{% if session.description %}{{ session.description | markdown }}{% endif %}
5371
{{ material_list(session.materials) }}

0 commit comments

Comments
 (0)