Skip to content

Commit aa63ebd

Browse files
encukouencukou
committed
Use macros for the prev/next navigation blocks
1 parent 7a0222c commit aa63ebd

4 files changed

Lines changed: 45 additions & 40 deletions

File tree

‎naucse/templates/_navigation_macros.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{% macro prevnext() %}
2+
<div class="row prev-next">
3+
{{ caller() }}
4+
</div>
5+
{% endmacro %}
6+
7+
{% macro prev(url, title) %}
8+
<div class="col text-left">
9+
<a href="{{ url }}">← <span class="d-none d-sm-block">{{ title }}</span></a>
10+
</div>
11+
{% endmacro %}
12+
13+
{% macro up(url, title) %}
14+
<div class="col text-left">
15+
<a href="{{ url }}">↑ <span class="d-none d-sm-block">{{ title }}</span></a>
16+
</div>
17+
{% endmacro %}
18+
19+
{% macro next(url, title) %}
20+
<div class="col text-right">
21+
<a href="{{ url }}"><span class="d-none d-sm-block">{{ title }}</span> →</a>
22+
</div>
23+
{% endmacro %}

‎naucse/templates/backpage.html‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% extends "_base.html" %}
22
{% from "_material_macros.html" import material_list with context %}
3+
{% import "_navigation_macros.html" as nav %}
34

45
{% block content %}
56

@@ -35,21 +36,14 @@ <h2>Zajímavé odkazy</h2>
3536
{% endblock %}
3637

3738
<hr class="lesson-end">
38-
<div class="row prev-next">
39-
<div class="col text-left">
40-
<a href="{{ session_url(course.slug, session.slug) }}">← <span class="d-none d-sm-block">Lekce: {{ session.title }}</span></a>
41-
</div>
4239

43-
<div class="col text-left">
44-
<a href="{{ course_url(course) }}">↑ <span class="d-none d-sm-block">{{ course.title }}</span></a>
45-
</div>
46-
47-
<div class="col text-right">
40+
{% call nav.prevnext() %}
41+
{{ nav.prev(session_url(course.slug, session.slug), session.title) }}
42+
{{ nav.up(course_url(course), course.title) }}
4843
{% if session.next is defined and session.next != None %}
49-
<a href="{{ session_url(course.slug, session.next.slug) }}"><span class="d-none d-sm-block">Lekce: {{ session.next.title }}</span> →</a>
44+
{{ nav.next(session_url(course.slug, session.next.slug), session.next.title) }}
5045
{% endif %}
51-
</div>
52-
</div>
46+
{% endcall %}
5347

5448
</div>
5549
</div>

‎naucse/templates/coverpage.html‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% extends "_base.html" %}
22
{% from "_material_macros.html" import material_list with context %}
3+
{% import "_navigation_macros.html" as nav %}
34

45
{% block content %}
56

@@ -46,21 +47,14 @@ <h2>Domácí projekty</h2>
4647
{% endblock %}
4748

4849
<hr class="lesson-end">
49-
<div class="row prev-next">
50-
<div class="col text-left">
50+
51+
{% call nav.prevnext() %}
5152
{% if session.prev is defined and session.prev != None %}
52-
<a href="{{ session_url(course.slug, session.prev.slug) }}">← <span class="d-none d-sm-block">Lekce: {{ session.prev.title }}</span></a>
53+
{{ nav.prev(session_url(course.slug, session.slug), session.title) }}
5354
{% endif %}
54-
</div>
55-
56-
<div class="col text-left">
57-
<a href="{{ course_url(course) }}">↑ <span class="d-none d-sm-block">{{ course.title }}</span></a>
58-
</div>
59-
60-
<div class="col text-right">
61-
<a href="{{ session_url(course.slug, session.slug, 'back') }}"><span class="d-none d-sm-block">Závěr lekce</span> →</a>
62-
</div>
63-
</div>
55+
{{ nav.up(course_url(course), course.title) }}
56+
{{ nav.next(session_url(course.slug, session.slug, 'back'), 'Závěr lekce') }}
57+
{% endcall %}
6458

6559
</div>
6660
</div>

‎naucse/templates/lesson.html‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "_base.html" %}
2+
{% import "_navigation_macros.html" as nav %}
23

34
{% block style %}
45
{% if page.css %}
@@ -34,7 +35,7 @@
3435

3536
{% if (prv is defined and prv != None) or (nxt is defined and nxt != None) %}
3637
<hr class="lesson-end">
37-
38+
3839
{% if course is defined and not course.canonical %}
3940
<div class="alert alert-info">
4041
Toto je stránka lekce z kurzu, který probíhá nebo proběhl naživo s instruktorem.
@@ -44,27 +45,20 @@
4445
</div>
4546
{% endif %}
4647

47-
<div class="row prev-next">
48-
<div class="col text-left">
48+
{% call nav.prevnext() %}
4949
{% if prv is defined and prv != None %}
50-
<a href="{{ lesson_url(lesson=prv.page.lesson, page=prv.page.slug) }}">← <span class="d-none d-sm-block">{{ prv.title }}</span></a>
50+
{{ nav.prev(lesson_url(lesson=prv.page.lesson, page=prv.page.slug), session.title) }}
5151
{% endif %}
52-
</div>
53-
54-
<div class="col text-center">
5552
{% if session and course is defined %}
56-
<a href="{{ session_url(course.slug, session.slug) }}">↑ <span class="d-none d-sm-block">Lekce: {{ session.title }}</span></a>
53+
{{ nav.up(session_url(course.slug, session.slug), 'Lekce: ' + session.title ) }}
5754
{% endif %}
58-
</div>
59-
60-
<div class="col text-right">
6155
{% if nxt is defined and nxt != None %}
62-
<a href="{{ lesson_url(lesson=nxt.page.lesson, page=nxt.page.slug) }}"><span class="d-none d-sm-block">{{ nxt.title }}</span> →</a>
56+
{{ nav.next(lesson_url(lesson=nxt.page.lesson, page=nxt.page.slug), nxt.title) }}
6357
{% elif session and course is defined %}
64-
<a href="{{ session_url(course.slug, session.slug, 'back') }}"><span class="d-none d-sm-block">Závěr lekce</span> →</a>
58+
{{ nav.next(session_url(course.slug, session.slug, 'back'), 'Závěr lekce') }}
6559
{% endif %}
66-
</div>
67-
</div>
60+
{% endcall %}
61+
6862
{% endif %}
6963

7064
</div>

0 commit comments

Comments
 (0)