Skip to content

Commit d3b336d

Browse files
SilvanVerhoevenSilvanVerhoeven
committed
chore: Improve print layout
1 parent 5738ca1 commit d3b336d

File tree

4 files changed

+88
-74
lines changed

4 files changed

+88
-74
lines changed

‎myhpi/core/templates/core/minutes.html

+75-71
Original file line numberDiff line numberDiff line change
@@ -6,82 +6,86 @@
66
{% load bootstrap_icons %}
77

88
{% block content %}
9-
<div class="row minutes-container">
10-
{% with page.body|markdown as parsed_md %}
11-
<div class="d-none d-print-block minutes-title">
12-
<h1>{{ page.title }}</h1>
13-
</div>
14-
<div class="col-9 minutes-text">
15-
{{ parsed_md.0|touchify_abbreviations|tag_external_links }}
16-
</div>
17-
<div class="col-3 minutes-meta">
18-
<aside class="side-panel border-accent">
19-
<h1 class="side-panel-title">{% translate "Date" %}</h1>
20-
<p>{{ page.date }}</p>
21-
</aside>
22-
<aside class="side-panel border-accent">
23-
<h1 class="side-panel-title">{% translate "Moderator" %}</h1>
24-
<p>{{ page.moderator.get_full_name }}</p>
25-
</aside>
26-
<aside class="side-panel border-accent">
27-
<h1 class="side-panel-title">{% translate "Minutes taker" %}</h1>
28-
<p>{{ page.author.get_full_name }}</p>
29-
</aside>
30-
<aside class="side-panel border-accent">
31-
<h1 class="side-panel-title">{% translate "Participants" %}</h1>
32-
<ul>
33-
{% for participant in page.participants.all %}
34-
<li>{{ participant.get_full_name }}</li>
35-
{% endfor %}
36-
</ul>
37-
</aside>
38-
<aside class="side-panel border-accent">
39-
<h1 class="side-panel-title">{% translate "Guests" %}</h1>
40-
{% if page.guests %}
41-
<ul>
42-
{% for guest in page.guests %}
43-
<li>{{ guest }}</li>
44-
{% endfor %}
45-
</ul>
46-
{% else %}
47-
<i>{% translate "No guests" %}</i>
48-
{% endif %}
49-
</aside>
50-
{% if page.location %}
51-
<aside class="side-panel border-accent">
52-
<h1 class="side-panel-title">{% translate "Location" %}</h1>
53-
<p>{{ page.location }}</p>
54-
</aside>
9+
<div class="row minutes-container">
10+
{% with page.body|markdown as parsed_md %}
11+
<h1 class="page-title">
12+
<span class="underline">
13+
{{ page.title }}
14+
</span>
15+
</h1>
16+
<div class="col-9 minutes-text">
17+
{{ parsed_md.0|touchify_abbreviations|tag_external_links }}
18+
</div>
19+
<div class="col-lg-3 minutes-meta">
20+
<aside class="side-panel border-accent">
21+
<h1 class="side-panel-title">{% translate "Date" %}</h1>
22+
<p>{{ page.date }}</p>
23+
</aside>
24+
<aside class="side-panel border-accent">
25+
<h1 class="side-panel-title">{% translate "Moderator" %}</h1>
26+
<p>{{ page.moderator.get_full_name }}</p>
27+
</aside>
28+
<aside class="side-panel border-accent">
29+
<h1 class="side-panel-title">{% translate "Minutes taker" %}</h1>
30+
<p>{{ page.author.get_full_name }}</p>
31+
</aside>
32+
<aside class="side-panel border-accent">
33+
<h1 class="side-panel-title">{% translate "Participants" %}</h1>
34+
<ul>
35+
{% for participant in page.participants.all %}
36+
<li>{{ participant.get_full_name }}</li>
37+
{% endfor %}
38+
</ul>
39+
</aside>
40+
<aside class="side-panel border-accent">
41+
<h1 class="side-panel-title">{% translate "Guests" %}</h1>
42+
{% if page.guests %}
43+
<ul>
44+
{% for guest in page.guests %}
45+
<li>{{ guest }}</li>
46+
{% endfor %}
47+
</ul>
48+
{% else %}
49+
<i>{% translate "No guests" %}</i>
50+
{% endif %}
51+
</aside>
52+
{% if page.location %}
53+
<aside class="side-panel border-accent">
54+
<h1 class="side-panel-title">{% translate "Location" %}</h1>
55+
<p>{{ page.location }}</p>
56+
</aside>
57+
{% endif %}
58+
<aside class="side-panel border-accent">
59+
<h1 class="side-panel-title">{% translate "Labels" %}</h1>
60+
{% if page.labels.all %}
61+
<p>{% include "core/label.html" with minutes=page %}</p>
62+
{% else %}
63+
<i>{% translate "No labels"%}</i>
64+
{% endif %}
65+
</aside>
66+
{% include "core/sidebar.html" %}
67+
</div>
68+
<div id="minutes-footer" class="d-none d-print-block"></div>
69+
<div id="minutes-navigation" class="row d-print-none">
70+
<div class="col-4">
71+
{% prev_minutes page as prev %}
72+
{% if prev %}
73+
<a href="{{ prev.url }}" class="btn btn-outline-primary minutes-navigation-button">{% bs_icon 'arrow-left'
74+
extra_classes='minutes-navigation-icon' %} {% translate "Previous minutes" %}</a>
5575
{% endif %}
56-
<aside class="side-panel border-accent">
57-
<h1 class="side-panel-title">{% translate "Labels" %}</h1>
58-
{% if page.labels.all %}
59-
<p>{% include "core/label.html" with minutes=page %}</p>
60-
{% else %}
61-
<i>{% translate "No labels"%}</i>
62-
{% endif %}
63-
</aside>
64-
{% include "core/sidebar.html" %}
6576
</div>
66-
<div id="minutes-footer" class="d-none d-print-block"></div>
67-
<div id="minutes-navigation" class="row d-print-none">
68-
<div class="col-4">
69-
{% prev_minutes page as prev %}
70-
{% if prev %}
71-
<a href="{{ prev.url }}" class="btn btn-outline-primary minutes-navigation-button">{% bs_icon 'arrow-left' extra_classes='minutes-navigation-icon' %} {% translate "Previous minutes" %}</a>
72-
{% endif %}
73-
</div>
74-
<div class="col-5 text-end">
75-
{% next_minutes page as next %}
76-
{% if next %}
77-
<a href="{{ next.url }}" class="btn btn-outline-primary minutes-navigation-button"> {% translate "Next minutes" %} {% bs_icon 'arrow-right' extra_classes='minutes-navigation-icon' %}</a>
78-
{% endif %}
79-
</div>
77+
<div class="col-5 text-end">
78+
{% next_minutes page as next %}
79+
{% if next %}
80+
<a href="{{ next.url }}" class="btn btn-outline-primary minutes-navigation-button"> {% translate "Next
81+
minutes" %} {% bs_icon 'arrow-right' extra_classes='minutes-navigation-icon' %}</a>
82+
{% endif %}
8083
</div>
81-
{% endwith %}
8284
</div>
85+
{% endwith %}
86+
</div>
8387
{% endblock %}
8488

8589
{% block extra_js %}
8690
<script type="text/javascript" src="{% static 'js/print_processor.js' %}"></script>
87-
{% endblock %}
91+
{% endblock %}

‎myhpi/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@
276276
"extension_configs": {
277277
"toc": {
278278
"permalink": "#",
279-
"permalink_class": "toc-permalink ms-2",
279+
"permalink_class": "toc-permalink ms-2 d-print-none",
280280
}
281-
}
281+
},
282282
}
283283

284284
ENABLE_MAILING_LISTS = env.bool("ENABLE_MAILING_LISTS", False)

‎myhpi/static/scss/myHPI.scss

+10
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,22 @@ img {
340340
flex-direction: column;
341341
}
342342

343+
.page-title .underline {
344+
border-bottom: none;
345+
}
346+
347+
.side-panel {
348+
border: none !important;
349+
padding: 0;
350+
}
351+
343352
.minutes-title {
344353
order: 0
345354
}
346355

347356
.minutes-meta {
348357
order: 1;
358+
margin-bottom: 2rem;
349359
}
350360

351361
.minutes-text {

‎myhpi/templates/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</nav>
151151
{% endif %}
152152

153-
<div id="sidebar-toggle" class="d-grid d-lg-none">
153+
<div id="sidebar-toggle" class="d-grid d-lg-none d-print-none">
154154
<button type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebar-offcanvas"
155155
aria-controls="sidebar-offcanvas" class="btn btn-light mb-3" aria-label="{% translate " Table of
156156
contents" %}">

0 commit comments

Comments
 (0)