Skip to content

Commit 2d8db34

Browse files
jarofgreenjarofgreen
authored
Merge pull request #276 from OpenDataServices/2025-03-11
2025 03 11
2 parents 9951f56 + 22e218f commit 2d8db34

File tree

5 files changed

+52
-132
lines changed

5 files changed

+52
-132
lines changed

‎prefix_finder/frontend/templates/about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% load i18n %}
33
{% block main %}
44
<main class="main-wrapper" role="main">
5-
{% include "sidebar.html" %}
5+
{% include "sidebar.html" with sidebar_show_about_link=False %}
66
<div class="main-content single-content about-page">
77
<div>
88
<h1 class="about-page__header">{% trans "About" %}</h1>

‎prefix_finder/frontend/templates/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
{% block main %}
77
<main class="main-wrapper" role="main">
8-
{% include "sidebar.html" %}
8+
{% include "sidebar.html" with sidebar_show_download_links=False %}
99

1010
<div class="main-content single-content">
1111
<header class="single-content__header">

‎prefix_finder/frontend/templates/results-list.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<div class="list-group__item">
2+
<article class="card card--{{ result_class }}">
3+
<header class="card__header">
4+
<div class="card__score">
5+
<div class="quality-chart-container" data-chart="{{ result.quality }}"></div>
6+
</div>
7+
<h2 title="{{ result.name.en }}"><a href="{% url "list" result.code %}">{{ result.name.en }}</a></h2>
8+
<h3>{{ result.code }}</h3>
9+
</header>
10+
11+
<div class="card__main">
12+
<div class="card__text">
13+
<p>{{ result.description.en|truncatewords_html:50 }}</p>
14+
</div>
15+
16+
<div class="card__sidebar">
17+
{% if result.coverage %}
18+
<ul class="categories categories--countries">
19+
<h4>Countries</h4>
20+
{% for coverage in result.coverage %}
21+
<li>{{ coverage }}</li>
22+
{% endfor %}
23+
</ul>
24+
{% endif %}
25+
26+
{% if result.sector %}
27+
<ul class="categories categories--sectors">
28+
<h4>Sectors</h4>
29+
{% for sector in result.sector %}
30+
<li>{{ sector }}</li>
31+
{% endfor %}
32+
</ul>
33+
{% endif %}
34+
</div>
35+
</div>
36+
37+
<footer class="card__controls">
38+
<div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
39+
<a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
40+
</footer>
41+
</article>
42+
</div>

‎prefix_finder/frontend/templates/results.html‎

Lines changed: 4 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% block main %}
55
<main class="main-wrapper" role="main">
6-
{% include "sidebar.html" %}
6+
{% include "sidebar.html" with sidebar_show_download_links=False %}
77

88
<div class="main-content">
99
<div class="list-group list-group--suggested">
@@ -19,49 +19,7 @@ <h1>Suggested Lists</h1>
1919

2020
<div class="list-group__main">
2121
{% for result in all_results.suggested %}
22-
<div class="list-group__item">
23-
<article class="card card--suggested">
24-
<header class="card__header">
25-
<div class="card__score">
26-
<div class="quality-chart-container" data-chart="{{ result.quality }}"></div>
27-
</div>
28-
<h2 title="{{ result.name.en }}"><a href="{% url "list" result.code %}">{{ result.name.en }}</a></h2>
29-
<h3>{{ result.code }}</h3>
30-
</header>
31-
32-
<div class="card__main">
33-
<div class="card__text">
34-
<p>{{ result.description.en|truncatewords_html:50 }}</p>
35-
</div>
36-
37-
<div class="card__sidebar">
38-
{% if result.coverage %}
39-
<ul class="categories categories--countries">
40-
<h4>Countries</h4>
41-
{% for coverage in result.coverage %}
42-
<li>{{ coverage }}</li>
43-
{% endfor %}
44-
</ul>
45-
{% endif %}
46-
47-
{% if result.sector %}
48-
<ul class="categories categories--sectors">
49-
<h4>Sectors</h4>
50-
{% for sector in result.sector %}
51-
<li>{{ sector }}</li>
52-
{% endfor %}
53-
</ul>
54-
{% endif %}
55-
</div>
56-
</div>
57-
58-
<footer class="card__controls">
59-
<a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
60-
<div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
61-
<a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
62-
</footer>
63-
</article>
64-
</div>
22+
{% include "results-list.html" with result_class="suggested" %}
6523
{% endfor %}
6624
</div>
6725
</div>
@@ -80,49 +38,7 @@ <h1>Possible Lists</h1>
8038

8139
<div class="list-group__main">
8240
{% for result in all_results.recommended %}
83-
<div class="list-group__item">
84-
<article class="card card--possible">
85-
<header class="card__header">
86-
<div class="card__score">
87-
<div class="quality-chart-container" data-chart="{{ result.quality }}"></div>
88-
</div>
89-
<h2 title="{{ result.name.en }}"><a href="{% url "list" result.code %}">{{ result.name.en }}</a></h2>
90-
<h3>{{ result.code }}</h3>
91-
</header>
92-
93-
<div class="card__main">
94-
<div class="card__text">
95-
<p>{{ result.description.en|truncatewords_html:50 }}</p>
96-
</div>
97-
98-
<div class="card__sidebar">
99-
{% if result.coverage %}
100-
<ul class="categories categories--countries">
101-
<h4>Countries</h4>
102-
{% for coverage in result.coverage %}
103-
<li>{{ coverage }}</li>
104-
{% endfor %}
105-
</ul>
106-
{% endif %}
107-
108-
{% if result.sector %}
109-
<ul class="categories categories--sectors">
110-
<h4>Sectors</h4>
111-
{% for sector in result.sector %}
112-
<li>{{ sector }}</li>
113-
{% endfor %}
114-
</ul>
115-
{% endif %}
116-
</div>
117-
</div>
118-
119-
<footer class="card__controls">
120-
<a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
121-
<div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
122-
<a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
123-
</footer>
124-
</article>
125-
</div>
41+
{% include "results-list.html" with result_class="possible" %}
12642
{% endfor %}
12743
</div>
12844
</div>
@@ -139,49 +55,7 @@ <h1>Fall back identifier sources</h1>
13955

14056
<div class="list-group__main">
14157
{% for result in all_results.other %}
142-
<div class="list-group__item">
143-
<article class="card card--fallback">
144-
<header class="card__header">
145-
<div class="card__score">
146-
<div class="quality-chart-container" data-chart="{{ result.quality }}"></div>
147-
</div>
148-
<h2 title="{{ result.name.en }}"><a href="{% url "list" result.code %}">{{ result.name.en }}</a></h2>
149-
<h3>{{ result.code }}</h3>
150-
</header>
151-
152-
<div class="card__main">
153-
<div class="card__text">
154-
<p>{{ result.description.en|truncatewords_html:50 }}</p>
155-
</div>
156-
157-
<div class="card__sidebar">
158-
{% if result.coverage %}
159-
<ul class="categories categories--countries">
160-
<h4>Countries</h4>
161-
{% for coverage in result.coverage %}
162-
<li>{{ coverage }}</li>
163-
{% endfor %}
164-
</ul>
165-
{% endif %}
166-
167-
{% if result.sector %}
168-
<ul class="categories categories--sectors">
169-
<h4>Sectors</h4>
170-
{% for sector in result.sector %}
171-
<li>{{ sector }}</li>
172-
{% endfor %}
173-
</ul>
174-
{% endif %}
175-
</div>
176-
</div>
177-
178-
<footer class="card__controls">
179-
<a href="{{ result.url }}" class="button" target="_blank"><i class="material-icons" title="Visit the website for this list">launch</i></a>
180-
<div class="card__list-code"><p>List Code <code>{{ result.code }}</code></p></div>
181-
<a href="{% url "list" result.code %}" class="button"><i class="material-icons" title="More information about this list">info_outline</i></a>
182-
</footer>
183-
</article>
184-
</div>
58+
{% include "results-list.html" with result_class="fallback" %}
18559
{% endfor %}
18660
</div>
18761
</div>

‎prefix_finder/frontend/templates/sidebar.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,15 @@
8484
</div>
8585

8686
<footer class="sidebar__footer">
87+
{% if sidebar_show_about_link is None or sidebar_show_about_link is True %}
8788
<a href="/about" class="button button--block">About</a>
89+
{% endif %}
8890

91+
{% if sidebar_show_download_links is None or sidebar_show_download_links is True %}
8992
<h5>Download</h5>
9093
<a href="{% url 'json_download' %}" class="button button--third">JSON</a>
9194
<a href="{% url 'csv_download' %}" class="button button--third">CSV</a>
9295
<a href="{% url 'xml_download' %}" class="button button--third">XML</a>
96+
{% endif %}
9397
</footer>
9498
</div>

0 commit comments

Comments
 (0)