Skip to content

Commit 4fe7d94

Browse files
DestinyyyyDestinyyyy
committed
chore: breadcrumb + rgaa on annuaire page + heading fix from annuaire to map page
chore: translation fixes
1 parent 8f4617d commit 4fe7d94

File tree

7 files changed

+146
-45
lines changed

7 files changed

+146
-45
lines changed

‎locale/en/LC_MESSAGES/django.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: PACKAGE VERSION\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2025-11-20 10:34+0100\n"
9+
"POT-Creation-Date: 2025-12-11 11:09+0100\n"
1010
"PO-Revision-Date: 2025-11-19 11:09+0100\n"
1111
"Last-Translator: <patrick.nguyen@beta.gouv.fr>\n"
1212
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3147,6 +3147,12 @@ msgstr "Back to home"
31473147
msgid "Annuaire"
31483148
msgstr "Directory"
31493149

3150+
msgid "Vous êtes ici :"
3151+
msgstr "You are here:"
3152+
3153+
msgid "Voir le fil d'Ariane"
3154+
msgstr "See the breadcrumb"
3155+
31503156
msgid "Tous les départements"
31513157
msgstr "All departments"
31523158

@@ -3180,12 +3186,6 @@ msgstr "Go to the official website"
31803186
msgid "Ouverture dans un nouvel onglet"
31813187
msgstr "Open in a new tab"
31823188

3183-
msgid "Vous êtes ici :"
3184-
msgstr "You are here:"
3185-
3186-
msgid "Voir le fil d'Ariane"
3187-
msgstr "See the breadcrumb"
3188-
31893189
msgid "Informations d'accessibilité ajoutées"
31903190
msgstr "Accessibility information added"
31913191

‎locale/fr/LC_MESSAGES/django.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-11-20 10:34+0100\n"
10+
"POT-Creation-Date: 2025-12-11 11:09+0100\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2921,6 +2921,12 @@ msgstr ""
29212921
msgid "Annuaire"
29222922
msgstr ""
29232923

2924+
msgid "Vous êtes ici :"
2925+
msgstr ""
2926+
2927+
msgid "Voir le fil d'Ariane"
2928+
msgstr ""
2929+
29242930
msgid "Tous les départements"
29252931
msgstr ""
29262932

@@ -2951,12 +2957,6 @@ msgstr ""
29512957
msgid "Ouverture dans un nouvel onglet"
29522958
msgstr ""
29532959

2954-
msgid "Vous êtes ici :"
2955-
msgstr ""
2956-
2957-
msgid "Voir le fil d'Ariane"
2958-
msgstr ""
2959-
29602960
msgid "Informations d'accessibilité ajoutées"
29612961
msgstr ""
29622962

‎templates/annuaire/index.html‎

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,77 @@
44
{% block page_title %}
55
{% translate "Annuaire" %}
66
{% endblock page_title %}
7-
{% block editorial_content %}
8-
<h1 class="fr-mb-3v">
9-
<a href="{% url 'annuaire_home' %}">{% translate "Annuaire" %}</a>
10-
</h1>
11-
<div class="row">
12-
<div class="fr-col-md-3">
13-
<div class="list-group">
14-
<a class="list-group-item list-group-item-action text-truncate{% if not current_departement.code %} active{% endif %}"
15-
href="{% url "annuaire_home" %}">{% translate "Tous les départements" %}</a>
16-
{% for code, departement in departements.items %}
17-
<a class="list-group-item list-group-item-action text-truncate{% if current_departement.code == code %} active{% endif %}"
18-
href="{% url 'annuaire_departement' departement=code %}">{{ code }} - {{ departement.nom }}</a>
19-
{% endfor %}
7+
{% block breadcrumb %}
8+
<div class="fr-container">
9+
<nav role="navigation"
10+
class="fr-breadcrumb fr-mt-3w fr-mt-md-2w"
11+
aria-label="{% translate "Vous êtes ici :" %}">
12+
<button class="fr-breadcrumb__button"
13+
aria-expanded="false"
14+
aria-controls="breadcrumb-navigation">{% translate "Voir le fil d'Ariane" %}</button>
15+
<div class="fr-collapse" id="breadcrumb-navigation">
16+
<ol class="fr-breadcrumb__list">
17+
<li>
18+
<a class="fr-breadcrumb__link" href="{% url 'home' %}">{% translate "Accueil" %}</a>
19+
</li>
20+
<li>
21+
<a class="fr-breadcrumb__link" aria-current="page">{% translate "Annuaire" %}</a>
22+
</li>
23+
</ol>
2024
</div>
25+
</nav>
26+
</div>
27+
{% endblock breadcrumb %}
28+
{% block editorial_content %}
29+
<h1 class="fr-mb-3v">{% translate "Annuaire" %}</h1>
30+
<div class="fr-grid-row fr-grid-row--gutters">
31+
<div class="fr-col-5">
32+
<aside class="card">
33+
<div class="card-header">
34+
<a class="fr-link {% if not current_departement.code %}active{% endif %}"
35+
href="{% url "annuaire_home" %}">{% translate "Tous les départements" %}</a>
36+
</div>
37+
<ul class="list-style-type--none fr-pl-0">
38+
{% for code, departement in departements.items %}
39+
<li class="fr-grid-row fr-col-12">
40+
<a class="fr-p-1w fr-link fr-col-12 text-truncate{% if current_departement.code == code %} active{% endif %}"
41+
href="{% url 'annuaire_departement' departement=code %}">{{ code }} - {{ departement.nom }}</a>
42+
</li>
43+
{% endfor %}
44+
</ul>
45+
</aside>
2146
</div>
22-
<div class="fr-col-md-9">
47+
<div class="fr-col-7">
2348
{% if not current_departement %}
24-
<p class="alert alert-info">
25-
{% translate "Sélectionnez un département dans la liste pour en afficher les communes disposant d'établissements renseignés." %}
26-
</p>
49+
<div class="fr-alert fr-alert--info">
50+
<p>
51+
{% translate "Sélectionnez un département dans la liste pour en afficher les communes disposant d'établissements renseignés." %}
52+
</p>
53+
</div>
2754
{% else %}
28-
<h2 class="fr-mt-2v fr-mb-3v">
55+
<h2 class="fr-mt-0 fr-mb-3v">
2956
{{ current_departement.code }} - {{ current_departement.nom }}
30-
<small class="text-muted">{{ current_departement_erp_count }} {% blocktranslate count counter=current_departement_erp_count %}établissement{% plural %}établissements{% endblocktranslate %}</small>
57+
({{ current_departement_erp_count }} {% blocktranslate count counter=current_departement_erp_count %}établissement{% plural %}établissements{% endblocktranslate %})
3158
</h2>
32-
{% for commune in communes %}
33-
<p>
34-
{{ commune.code_postaux|join:", " }} -
35-
<a href="{{ commune.get_absolute_url }}">{{ commune.nom }}</a>
36-
<small class="text-muted">({{ commune.erp_access_count }} {% blocktranslate count counter=commune.erp_access_count %}établissement{% plural %}établissements{% endblocktranslate %})</small>
59+
{% if communes|length == 0 %}
60+
<p class="fr-mb-1w">
61+
{% translate "Il n'y a pas encore de commune disposant d'établissements renseignés dans ce département." %}
3762
</p>
38-
{% empty %}
39-
<p>{% translate "Il n'y a pas encore de commune disposant d'établissements renseignés dans ce département." %}</p>
4063
<p>
41-
<a class="btn btn-outline-primary" href="{% url 'contrib_start' %}">{% translate "Ajouter un établissement" %}</a>
64+
<a class="fr-btn" href="{% url 'contrib_start' %}">{% translate "Ajouter un établissement" %}</a>
4265
</p>
43-
{% endfor %}
66+
{% endif %}
67+
<ul>
68+
{% for commune in communes %}
69+
<li>
70+
<p class="fr-mb-1v">
71+
{{ commune.code_postaux|join:", " }} -
72+
<a href="{{ commune.get_absolute_url }}">{{ commune.nom }}</a>
73+
({{ commune.erp_access_count }} {% blocktranslate count counter=commune.erp_access_count %}établissement{% plural %}établissements{% endblocktranslate %})
74+
</p>
75+
</li>
76+
{% endfor %}
77+
</ul>
4478
{% endif %}
4579
</div>
4680
</div>

‎templates/communes.html‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,31 @@
77
{% block page_title %}
88
{% translate "Communes et territoires pilotes" %}
99
{% endblock page_title %}
10+
{% block breadcrumb %}
11+
<div class="fr-container">
12+
<nav role="navigation"
13+
class="fr-breadcrumb fr-mt-3w fr-mt-md-2w"
14+
aria-label="{% translate "Vous êtes ici :" %}">
15+
<button class="fr-breadcrumb__button"
16+
aria-expanded="false"
17+
aria-controls="breadcrumb-navigation">{% translate "Voir le fil d'Ariane" %}</button>
18+
<div class="fr-collapse" id="breadcrumb-navigation">
19+
<ol class="fr-breadcrumb__list">
20+
<li>
21+
<a class="fr-breadcrumb__link" href="{% url 'home' %}">{% translate "Accueil" %}</a>
22+
</li>
23+
<li>
24+
<a class="fr-breadcrumb__link" aria-current="page">{% translate "Communes et territoires pilotes" %}</a>
25+
</li>
26+
</ol>
27+
</div>
28+
</nav>
29+
</div>
30+
{% endblock breadcrumb %}
1031
{% block editorial_content %}
1132
{% cache 500 communes LANGUAGE_CODE %}
1233
<h1 class="fr-mb-3v">{% translate "Communes et territoires pilotes" %}</h1>
13-
<div class="row">
34+
<div class="fr-grid-row">
1435
<div class="fr-col-md-8">
1536
<h2 class="fr-sr-only">{% translate "Communes renseignées" %}</h2>
1637
<div class="row row-cols-1 row-cols-sm-2" id="home-communes-list">

‎templates/search/results.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
tabindex="0">
6464
<div class="main-search__list" id="erp-results-list">
6565
<div class="position--sticky">
66+
{% if not display_filters %}
67+
{# Used to fix headings structure (RGAA) when coming from annuaire page #}
68+
<h1 class="fr-h4 fr-mb-1w">{% translate "Rechercher un lieu" %}</h1>
69+
{% endif %}
6670
<h2 class="fr-h4 fr-mb-1w">{% translate "Établissements existants sur Acceslibre" %}</h2>
6771
<p id="number-of-results" class="fr-mb-0 fr-text--xl" aria-live="polite">
6872
{% translate "En cours de chargement..." %}

‎templates/sitemap.html‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,34 @@
77
{% block page_title %}
88
{% translate "Plan du site" %}
99
{% endblock page_title %}
10+
{% block breadcrumb %}
11+
<div class="fr-container">
12+
<nav role="navigation"
13+
class="fr-breadcrumb fr-mt-3w fr-mt-md-2w"
14+
aria-label="{% translate "Vous êtes ici :" %}">
15+
<button class="fr-breadcrumb__button"
16+
aria-expanded="false"
17+
aria-controls="breadcrumb-navigation">{% translate "Voir le fil d'Ariane" %}</button>
18+
<div class="fr-collapse" id="breadcrumb-navigation">
19+
<ol class="fr-breadcrumb__list">
20+
<li>
21+
<a class="fr-breadcrumb__link" href="{% url 'home' %}">{% translate "Accueil" %}</a>
22+
</li>
23+
<li>
24+
<a class="fr-breadcrumb__link" aria-current="page">{% translate "Plan du site" %}</a>
25+
</li>
26+
</ol>
27+
</div>
28+
</nav>
29+
</div>
30+
{% endblock breadcrumb %}
1031
{% block editorial_content %}
1132
<div class="sitemap">
1233
<h1>{% translate "Plan du site" %}</h1>
13-
<ul>
34+
<ul class="fr-mb-4w">
1435
{% for url in sitemap_urls %}
1536
<li>
16-
<a href="{{ url.location }}"><strong>{{ url.title }}</strong></a>
37+
<a href="{{ url.location }}" class="fr-link">{{ url.title }}</a>
1738
</li>
1839
{% endfor %}
1940
</ul>

‎templates/swagger-ui.html‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@
44
{% block page_title %}
55
API acceslibre
66
{% endblock page_title %}
7+
{% block breadcrumb %}
8+
<div class="fr-container">
9+
<nav role="navigation"
10+
class="fr-breadcrumb fr-mt-3w fr-mt-md-2w"
11+
aria-label="{% translate "Vous êtes ici :" %}">
12+
<button class="fr-breadcrumb__button"
13+
aria-expanded="false"
14+
aria-controls="breadcrumb-navigation">{% translate "Voir le fil d'Ariane" %}</button>
15+
<div class="fr-collapse" id="breadcrumb-navigation">
16+
<ol class="fr-breadcrumb__list">
17+
<li>
18+
<a class="fr-breadcrumb__link" href="{% url 'home' %}">{% translate "Accueil" %}</a>
19+
</li>
20+
<li>
21+
<a class="fr-breadcrumb__link" aria-current="page">{% translate "API acceslibre" %}</a>
22+
</li>
23+
</ol>
24+
</div>
25+
</nav>
26+
</div>
27+
{% endblock breadcrumb %}
728
{% block stylesheet_extras %}
829
<link rel="stylesheet"
930
type="text/css"

0 commit comments

Comments
 (0)