Skip to content

Commit 75beb5f

Browse files
author
hjonin
committed
sync codegouv-website from eleventy-dsfr
1 parent ab97887 commit 75beb5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+950
-935
lines changed

‎_data/i18n/en/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = {
99
dark_theme: "Dark Theme",
1010
display_params: "Display Parameters",
1111
filter_by_tag: "Filter by Tag:",
12+
filtered_by: "Filtered by",
1213
first_page: "First page",
1314
follow_us_description: "Follow Us",
1415
fully_compliant: "Fully compliant",
@@ -27,6 +28,7 @@ module.exports = {
2728
pick_theme: "Pick a Theme.",
2829
previous_page: "Previous page",
2930
published_on: "Published on",
31+
results: "results",
3032
see_breadcrumb: "See Breadcrumb",
3133
see_more: "See More",
3234
select_lang: "Select Language",

‎_data/i18n/fr/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = {
99
dark_theme: "Thème sombre",
1010
display_params: "Paramètres d'affichage",
1111
filter_by_tag: "Filtrer par catégorie :",
12+
filtered_by: "Filtré par",
1213
first_page: "Première page",
1314
follow_us_description: "Suivez-nous <br> sur nos réseaux",
1415
fully_compliant: "Totalement conforme",
@@ -27,6 +28,7 @@ module.exports = {
2728
pick_theme: "Choisissez un thème pour personnaliser l’apparence du site.",
2829
previous_page: "Page précédente",
2930
published_on: "Publié le",
31+
results: "résultats",
3032
see_breadcrumb: "Voir le fil d’Ariane",
3133
see_more: "En savoir plus",
3234
select_lang: "Sélectionner une langue",

‎_includes/components/accordionsgroup.njk‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div class="fr-accordions-group">
2-
{% for accordionItem in accordionItems %}
3-
<section class="fr-accordion">
4-
<h3 class="fr-accordion__title">
5-
<button class="fr-accordion__btn" aria-expanded="false" aria-controls="accordion-{{ loop.index }}">
6-
{{ accordionItem.title }}
7-
</button>
8-
</h3>
9-
<div class="fr-collapse" id="accordion-{{ loop.index }}">
10-
{{ accordionItem.content | safe }}
11-
</div>
12-
</section>
13-
{% endfor %}
2+
{% for accordionItem in accordionItems %}
3+
<section class="fr-accordion">
4+
<h3 class="fr-accordion__title">
5+
<button class="fr-accordion__btn" aria-expanded="false" aria-controls="accordion-{{ loop.index }}">
6+
{{ accordionItem.title }}
7+
</button>
8+
</h3>
9+
<div class="fr-collapse" id="accordion-{{ loop.index }}">
10+
{{ accordionItem.content | safe }}
11+
</div>
12+
</section>
13+
{% endfor %}
1414
</div>

‎_includes/components/back_to_top.njk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<a class="fr-grid-row fr-grid-row--right fr-link fr-icon-arrow-up-fill fr-link--icon-left" href="#top">
2-
{{ "back_to_top" | i18n }}
2+
{{ "back_to_top" | i18n }}
33
</a>

‎_includes/components/breadcrumb.njk‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{% if eleventyNavigation %}
2-
{% set segments = collections.all | filterCollectionLang | eleventyNavigationBreadcrumb(eleventyNavigation.key) %}
2+
{% set segments = collections.all | filterCollectionLang | eleventyNavigationBreadcrumb(eleventyNavigation.key) %}
33
{% endif %}
44
<nav role="navigation" class="fr-breadcrumb" aria-label="{{ "you_are_here" | i18n }}:">
5-
<button class="fr-breadcrumb__button" aria-expanded="false" aria-controls="breadcrumb-1">
6-
{{ "see_breadcrumb" | i18n }}
7-
</button>
8-
<div class="fr-collapse" id="breadcrumb-1">
9-
<ol class="fr-breadcrumb__list">
10-
<li><a class="fr-breadcrumb__link" href="{{ "/" | locale_url }}">{{ "home" | i18n }}</a></li>
11-
{% for segment in segments %}
12-
<li><a class="fr-breadcrumb__link" href="{{ segment.url | locale_url }}">{{ segment.title }}</a></li>
13-
{% endfor %}
14-
<li><a class="fr-breadcrumb__link" aria-current="page">{{ title }}</a></li>
15-
</ol>
16-
</div>
5+
<button class="fr-breadcrumb__button" aria-expanded="false" aria-controls="breadcrumb-1">
6+
{{ "see_breadcrumb" | i18n }}
7+
</button>
8+
<div class="fr-collapse" id="breadcrumb-1">
9+
<ol class="fr-breadcrumb__list">
10+
<li><a class="fr-breadcrumb__link" href="{{ "/" | locale_url }}">{{ "home" | i18n }}</a></li>
11+
{% for segment in segments %}
12+
<li><a class="fr-breadcrumb__link" href="{{ segment.url | locale_url }}">{{ segment.title }}</a></li>
13+
{% endfor %}
14+
<li><a class="fr-breadcrumb__link" aria-current="page">{{ title }}</a></li>
15+
</ol>
16+
</div>
1717
</nav>

‎_includes/components/callout.njk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div class="fr-callout">
2-
<h3 class="fr-callout__title">{{ callout.title }}</h3>
3-
<p class="fr-callout__text">
4-
{{ callout.description | safe }}
5-
</p>
6-
{% if callout.link %}
7-
<a class="fr-btn" href="{{ callout.link.url }}">
8-
{{ callout.link.title }}
9-
</a>
10-
{% endif %}
2+
<h3 class="fr-callout__title">{{ callout.title }}</h3>
3+
<p class="fr-callout__text">
4+
{{ callout.description | safe }}
5+
</p>
6+
{% if callout.link %}
7+
<a class="fr-btn" href="{{ callout.link.url }}">
8+
{{ callout.link.title }}
9+
</a>
10+
{% endif %}
1111
</div>

‎_includes/components/card.njk‎

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,53 @@
1-
<div class="fr-card{% if not card.externalUrl%} fr-enlarge-link{% endif %}{% if card.orientation == 'horizontal' %} fr-card--horizontal-tier{% endif %}">
2-
<div class="fr-card__body">
3-
<div class="fr-card__content">
4-
{% set cardUrl = card.url | locale_url or card.externalUrl %}
5-
<h3 class="fr-card__title">{% if not card.externalUrl %}<a href="{{ cardUrl }}">{{ card.title }}</a>{% else %}{{ card.title }}{% endif %}</h3>
6-
<p class="fr-card__desc">{{ card.description | safe }}</p>
7-
<div class="fr-card__start">
8-
{% if card.tags %}
9-
{% set tags = card.tags %}
10-
{% include "components/taggroup-disabled.njk" %}
11-
{% endif %}
12-
{% if card.date %}
13-
<p class="fr-card__detail fr-icon-time-fill">
14-
<time class="postlist-date" datetime="{{ card.date | htmlDateString }}">
15-
{{ card.date | readableDate }}
16-
</time>
17-
</p>
18-
{% endif %}
19-
</div>
20-
</div>
21-
<div class="fr-card__footer">
22-
{% if card.externalUrl %}
23-
<ul class="fr-links-group">
24-
<li>
25-
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right" href="{{ card.externalUrl }}" title="{{ card.title }} - {{ "new_window" | i18n }}" target="_blank">
26-
{{ card.urlDescription or "see_more" | i18n }}
27-
</a>
28-
</li>
29-
</ul>
30-
{% endif %}
31-
</div>
32-
</div>
33-
<div class="fr-card__header">
34-
{% if card.badges %}
35-
<ul class="fr-badges-group">
36-
{% for badge in card.badges %}
37-
<li><p class="fr-badge fr-badge--green-emeraude">{{ badge }}</p></li>
38-
{% endfor %}
39-
</ul>
1+
<div class="fr-card{% if not card.externalUrl %} fr-enlarge-link{% endif %}{% if card.orientation == 'horizontal' %} fr-card--horizontal-tier{% endif %}">
2+
<div class="fr-card__body">
3+
<div class="fr-card__content">
4+
{% set cardUrl = card.url | locale_url or card.externalUrl %}
5+
<h3 class="fr-card__title">
6+
{% if not card.externalUrl %}
7+
<a href="{{ cardUrl }}">
8+
{{ card.title }}
9+
</a>
10+
{% else %}{{ card.title }}
11+
{% endif %}
12+
</h3>
13+
<p class="fr-card__desc">{{ card.description | safe }}</p>
14+
<div class="fr-card__start">
15+
{% if card.tags %}
16+
{% set tags = card.tags %}
17+
{% include "components/taggroup-disabled.njk" %}
4018
{% endif %}
41-
{% if card.imagePath %}
42-
<div class="fr-card__img">{% image card.imagePath, card.imageAlt %}</div>
19+
{% if card.date %}
20+
<p class="fr-card__detail fr-icon-time-fill">
21+
<time class="postlist-date" datetime="{{ card.date | htmlDateString }}">
22+
{{ card.date | readableDate }}
23+
</time>
24+
</p>
4325
{% endif %}
26+
</div>
27+
</div>
28+
<div class="fr-card__footer">
29+
{% if card.externalUrl %}
30+
<ul class="fr-links-group">
31+
<li>
32+
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right" href="{{ card.externalUrl }}"
33+
title="{{ card.title }} - {{ "new_window" | i18n }}" target="_blank">
34+
{{ card.urlDescription or "see_more" | i18n }}
35+
</a>
36+
</li>
37+
</ul>
38+
{% endif %}
4439
</div>
40+
</div>
41+
<div class="fr-card__header">
42+
{% if card.badges %}
43+
<ul class="fr-badges-group">
44+
{% for badge in card.badges %}
45+
<li><p class="fr-badge fr-badge--green-emeraude">{{ badge }}</p></li>
46+
{% endfor %}
47+
</ul>
48+
{% endif %}
49+
{% if card.imagePath %}
50+
<div class="fr-card__img">{% image card.imagePath, card.imageAlt %}</div>
51+
{% endif %}
52+
</div>
4553
</div>

‎_includes/components/display.njk‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
11
<dialog id="fr-theme-modal" class="fr-modal" role="dialog" aria-labelledby="fr-theme-modal-title">
2-
<div class="fr-container fr-container--fluid fr-container-md">
3-
<div class="fr-grid-row fr-grid-row--center">
4-
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
5-
<div class="fr-modal__body">
6-
<div class="fr-modal__header">
7-
<button class="fr-btn--close fr-btn" aria-controls="fr-theme-modal" title="{{ "close" | i18n }}">
8-
{{ "close" | i18n }}
9-
</button>
2+
<div class="fr-container fr-container--fluid fr-container-md">
3+
<div class="fr-grid-row fr-grid-row--center">
4+
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
5+
<div class="fr-modal__body">
6+
<div class="fr-modal__header">
7+
<button class="fr-btn--close fr-btn" aria-controls="fr-theme-modal" title="{{ "close" | i18n }}">
8+
{{ "close" | i18n }}
9+
</button>
10+
</div>
11+
<div class="fr-modal__content">
12+
<h1 id="fr-theme-modal-title" class="fr-modal__title"> {{ "display_params" | i18n }} </h1>
13+
<div id="fr-display" class="fr-display">
14+
<div class="fr-form-group">
15+
<fieldset class="fr-fieldset">
16+
<legend class="fr-fieldset__legend fr-text--regular" id="-legend">
17+
{{ "pick_theme" | i18n }}
18+
</legend>
19+
<div class="fr-fieldset__content">
20+
<div class="fr-radio-group fr-radio-rich">
21+
<input value="light" type="radio" id="fr-radios-theme-light" name="fr-radios-theme">
22+
<label class="fr-label" for="fr-radios-theme-light"> {{ "light_theme" | i18n }} </label>
23+
<div class="fr-radio-rich__img">
24+
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
25+
height="80px" viewBox="0 0 80 80">
26+
<use class="fr-artwork-decorative"
27+
xlink:href="/artwork/light.svg#artwork-decorative"></use>
28+
<use class="fr-artwork-minor"
29+
xlink:href="/artwork/light.svg#artwork-minor"></use>
30+
<use class="fr-artwork-major"
31+
xlink:href="/artwork/light.svg#artwork-major"></use>
32+
</svg>
33+
</div>
1034
</div>
11-
<div class="fr-modal__content">
12-
<h1 id="fr-theme-modal-title" class="fr-modal__title"> {{ "display_params" | i18n }} </h1>
13-
<div id="fr-display" class="fr-display">
14-
<div class="fr-form-group">
15-
<fieldset class="fr-fieldset">
16-
<legend class="fr-fieldset__legend fr-text--regular" id="-legend">
17-
{{ "pick_theme" | i18n }}
18-
</legend>
19-
<div class="fr-fieldset__content">
20-
<div class="fr-radio-group fr-radio-rich">
21-
<input value="light" type="radio" id="fr-radios-theme-light" name="fr-radios-theme">
22-
<label class="fr-label" for="fr-radios-theme-light"> {{ "light_theme" | i18n }} </label>
23-
<div class="fr-radio-rich__img">
24-
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
25-
height="80px" viewBox="0 0 80 80">
26-
<use class="fr-artwork-decorative"
27-
xlink:href="/artwork/light.svg#artwork-decorative"></use>
28-
<use class="fr-artwork-minor"
29-
xlink:href="/artwork/light.svg#artwork-minor"></use>
30-
<use class="fr-artwork-major"
31-
xlink:href="/artwork/light.svg#artwork-major"></use>
32-
</svg>
33-
</div>
34-
</div>
35-
<div class="fr-radio-group fr-radio-rich">
36-
<input value="dark" type="radio" id="fr-radios-theme-dark" name="fr-radios-theme">
37-
<label class="fr-label" for="fr-radios-theme-dark"> {{ "dark_theme" | i18n }} </label>
38-
<div class="fr-radio-rich__img">
39-
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
40-
height="80px" viewBox="0 0 80 80">
41-
<use class="fr-artwork-decorative"
42-
xlink:href="/artwork/dark.svg#artwork-decorative"></use>
43-
<use class="fr-artwork-minor"
44-
xlink:href="/artwork/dark.svg#artwork-minor"></use>
45-
<use class="fr-artwork-major"
46-
xlink:href="/artwork/dark.svg#artwork-major"></use>
47-
</svg>
48-
</div>
49-
</div>
50-
<div class="fr-radio-group fr-radio-rich">
51-
<input value="system" type="radio" id="fr-radios-theme-system" name="fr-radios-theme">
52-
<label class="fr-label" for="fr-radios-theme-system">
53-
{{ "system" | i18n }}
54-
<span class="fr-hint-text">{{ "use_system_params" | i18n }}</span>
55-
</label>
56-
<div class="fr-radio-rich__img">
57-
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
58-
height="80px" viewBox="0 0 80 80">
59-
<use class="fr-artwork-decorative"
60-
xlink:href="/artwork/system.svg#artwork-decorative"></use>
61-
<use class="fr-artwork-minor"
62-
xlink:href="/artwork/system.svg#artwork-minor"></use>
63-
<use class="fr-artwork-major"
64-
xlink:href="/artwork/system.svg#artwork-major"></use>
65-
</svg>
66-
</div>
67-
</div>
68-
</div>
69-
</fieldset>
70-
</div>
71-
</div>
35+
<div class="fr-radio-group fr-radio-rich">
36+
<input value="dark" type="radio" id="fr-radios-theme-dark" name="fr-radios-theme">
37+
<label class="fr-label" for="fr-radios-theme-dark"> {{ "dark_theme" | i18n }} </label>
38+
<div class="fr-radio-rich__img">
39+
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
40+
height="80px" viewBox="0 0 80 80">
41+
<use class="fr-artwork-decorative"
42+
xlink:href="/artwork/dark.svg#artwork-decorative"></use>
43+
<use class="fr-artwork-minor"
44+
xlink:href="/artwork/dark.svg#artwork-minor"></use>
45+
<use class="fr-artwork-major"
46+
xlink:href="/artwork/dark.svg#artwork-major"></use>
47+
</svg>
48+
</div>
7249
</div>
73-
</div>
50+
<div class="fr-radio-group fr-radio-rich">
51+
<input value="system" type="radio" id="fr-radios-theme-system" name="fr-radios-theme">
52+
<label class="fr-label" for="fr-radios-theme-system">
53+
{{ "system" | i18n }}
54+
<span class="fr-hint-text">{{ "use_system_params" | i18n }}</span>
55+
</label>
56+
<div class="fr-radio-rich__img">
57+
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
58+
height="80px" viewBox="0 0 80 80">
59+
<use class="fr-artwork-decorative"
60+
xlink:href="/artwork/system.svg#artwork-decorative"></use>
61+
<use class="fr-artwork-minor"
62+
xlink:href="/artwork/system.svg#artwork-minor"></use>
63+
<use class="fr-artwork-major"
64+
xlink:href="/artwork/system.svg#artwork-major"></use>
65+
</svg>
66+
</div>
67+
</div>
68+
</div>
69+
</fieldset>
70+
</div>
7471
</div>
72+
</div>
7573
</div>
74+
</div>
7675
</div>
76+
</div>
7777
</dialog>

0 commit comments

Comments
 (0)