Skip to content

merge preprod into prod #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 23, 2023
Merged

merge preprod into prod #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a39b272
sync codegouv-website from eleventy-dsfr
Jun 20, 2023
2cc8fd6
add missing file for i18n
Jun 20, 2023
21520c2
update ospo post pyramide image
Jun 20, 2023
65015ec
add bsoc post
Jun 22, 2023
f6f2ca8
reduce image size
Jun 22, 2023
1a256ea
bluehats_22.md: Add link
bzg Jun 23, 2023
c9dbc19
bsoc-retour-2022.md: Various fixes
bzg Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
sync codegouv-website from eleventy-dsfr
  • Loading branch information
@hjonin
hjonin authored and hjonin committed Jun 20, 2023
commit a39b2724767e0ebc6141d07f24ca6dd99ef865d2
2 changes: 2 additions & 0 deletions _data/i18n/en/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
dark_theme: "Dark Theme",
display_params: "Display Parameters",
filter_by_tag: "Filter by Tag:",
filtered_by: "Filtered by",
first_page: "First page",
follow_us_description: "Follow Us",
fully_compliant: "Fully compliant",
Expand All @@ -27,6 +28,7 @@ module.exports = {
pick_theme: "Pick a Theme.",
previous_page: "Previous page",
published_on: "Published on",
results: "results",
see_breadcrumb: "See Breadcrumb",
see_more: "See More",
select_lang: "Select Language",
Expand Down
2 changes: 2 additions & 0 deletions _data/i18n/fr/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
dark_theme: "Thème sombre",
display_params: "Paramètres d'affichage",
filter_by_tag: "Filtrer par catégorie :",
filtered_by: "Filtré par",
first_page: "Première page",
follow_us_description: "Suivez-nous <br> sur nos réseaux",
fully_compliant: "Totalement conforme",
Expand All @@ -27,6 +28,7 @@ module.exports = {
pick_theme: "Choisissez un thème pour personnaliser l’apparence du site.",
previous_page: "Page précédente",
published_on: "Publié le",
results: "résultats",
see_breadcrumb: "Voir le fil d’Ariane",
see_more: "En savoir plus",
select_lang: "Sélectionner une langue",
Expand Down
24 changes: 12 additions & 12 deletions _includes/components/accordionsgroup.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="fr-accordions-group">
{% for accordionItem in accordionItems %}
<section class="fr-accordion">
<h3 class="fr-accordion__title">
<button class="fr-accordion__btn" aria-expanded="false" aria-controls="accordion-{{ loop.index }}">
{{ accordionItem.title }}
</button>
</h3>
<div class="fr-collapse" id="accordion-{{ loop.index }}">
{{ accordionItem.content | safe }}
</div>
</section>
{% endfor %}
{% for accordionItem in accordionItems %}
<section class="fr-accordion">
<h3 class="fr-accordion__title">
<button class="fr-accordion__btn" aria-expanded="false" aria-controls="accordion-{{ loop.index }}">
{{ accordionItem.title }}
</button>
</h3>
<div class="fr-collapse" id="accordion-{{ loop.index }}">
{{ accordionItem.content | safe }}
</div>
</section>
{% endfor %}
</div>
2 changes: 1 addition & 1 deletion _includes/components/back_to_top.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a class="fr-grid-row fr-grid-row--right fr-link fr-icon-arrow-up-fill fr-link--icon-left" href="#top">
{{ "back_to_top" | i18n }}
{{ "back_to_top" | i18n }}
</a>
26 changes: 13 additions & 13 deletions _includes/components/breadcrumb.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% if eleventyNavigation %}
{% set segments = collections.all | filterCollectionLang | eleventyNavigationBreadcrumb(eleventyNavigation.key) %}
{% set segments = collections.all | filterCollectionLang | eleventyNavigationBreadcrumb(eleventyNavigation.key) %}
{% endif %}
<nav role="navigation" class="fr-breadcrumb" aria-label="{{ "you_are_here" | i18n }}:">
<button class="fr-breadcrumb__button" aria-expanded="false" aria-controls="breadcrumb-1">
{{ "see_breadcrumb" | i18n }}
</button>
<div class="fr-collapse" id="breadcrumb-1">
<ol class="fr-breadcrumb__list">
<li><a class="fr-breadcrumb__link" href="{{ "/" | locale_url }}">{{ "home" | i18n }}</a></li>
{% for segment in segments %}
<li><a class="fr-breadcrumb__link" href="{{ segment.url | locale_url }}">{{ segment.title }}</a></li>
{% endfor %}
<li><a class="fr-breadcrumb__link" aria-current="page">{{ title }}</a></li>
</ol>
</div>
<button class="fr-breadcrumb__button" aria-expanded="false" aria-controls="breadcrumb-1">
{{ "see_breadcrumb" | i18n }}
</button>
<div class="fr-collapse" id="breadcrumb-1">
<ol class="fr-breadcrumb__list">
<li><a class="fr-breadcrumb__link" href="{{ "/" | locale_url }}">{{ "home" | i18n }}</a></li>
{% for segment in segments %}
<li><a class="fr-breadcrumb__link" href="{{ segment.url | locale_url }}">{{ segment.title }}</a></li>
{% endfor %}
<li><a class="fr-breadcrumb__link" aria-current="page">{{ title }}</a></li>
</ol>
</div>
</nav>
18 changes: 9 additions & 9 deletions _includes/components/callout.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="fr-callout">
<h3 class="fr-callout__title">{{ callout.title }}</h3>
<p class="fr-callout__text">
{{ callout.description | safe }}
</p>
{% if callout.link %}
<a class="fr-btn" href="{{ callout.link.url }}">
{{ callout.link.title }}
</a>
{% endif %}
<h3 class="fr-callout__title">{{ callout.title }}</h3>
<p class="fr-callout__text">
{{ callout.description | safe }}
</p>
{% if callout.link %}
<a class="fr-btn" href="{{ callout.link.url }}">
{{ callout.link.title }}
</a>
{% endif %}
</div>
90 changes: 49 additions & 41 deletions _includes/components/card.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,53 @@
<div class="fr-card{% if not card.externalUrl%} fr-enlarge-link{% endif %}{% if card.orientation == 'horizontal' %} fr-card--horizontal-tier{% endif %}">
<div class="fr-card__body">
<div class="fr-card__content">
{% set cardUrl = card.url | locale_url or card.externalUrl %}
<h3 class="fr-card__title">{% if not card.externalUrl %}<a href="{{ cardUrl }}">{{ card.title }}</a>{% else %}{{ card.title }}{% endif %}</h3>
<p class="fr-card__desc">{{ card.description | safe }}</p>
<div class="fr-card__start">
{% if card.tags %}
{% set tags = card.tags %}
{% include "components/taggroup-disabled.njk" %}
{% endif %}
{% if card.date %}
<p class="fr-card__detail fr-icon-time-fill">
<time class="postlist-date" datetime="{{ card.date | htmlDateString }}">
{{ card.date | readableDate }}
</time>
</p>
{% endif %}
</div>
</div>
<div class="fr-card__footer">
{% if card.externalUrl %}
<ul class="fr-links-group">
<li>
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right" href="{{ card.externalUrl }}" title="{{ card.title }} - {{ "new_window" | i18n }}" target="_blank">
{{ card.urlDescription or "see_more" | i18n }}
</a>
</li>
</ul>
{% endif %}
</div>
</div>
<div class="fr-card__header">
{% if card.badges %}
<ul class="fr-badges-group">
{% for badge in card.badges %}
<li><p class="fr-badge fr-badge--green-emeraude">{{ badge }}</p></li>
{% endfor %}
</ul>
<div class="fr-card{% if not card.externalUrl %} fr-enlarge-link{% endif %}{% if card.orientation == 'horizontal' %} fr-card--horizontal-tier{% endif %}">
<div class="fr-card__body">
<div class="fr-card__content">
{% set cardUrl = card.url | locale_url or card.externalUrl %}
<h3 class="fr-card__title">
{% if not card.externalUrl %}
<a href="{{ cardUrl }}">
{{ card.title }}
</a>
{% else %}{{ card.title }}
{% endif %}
</h3>
<p class="fr-card__desc">{{ card.description | safe }}</p>
<div class="fr-card__start">
{% if card.tags %}
{% set tags = card.tags %}
{% include "components/taggroup-disabled.njk" %}
{% endif %}
{% if card.imagePath %}
<div class="fr-card__img">{% image card.imagePath, card.imageAlt %}</div>
{% if card.date %}
<p class="fr-card__detail fr-icon-time-fill">
<time class="postlist-date" datetime="{{ card.date | htmlDateString }}">
{{ card.date | readableDate }}
</time>
</p>
{% endif %}
</div>
</div>
<div class="fr-card__footer">
{% if card.externalUrl %}
<ul class="fr-links-group">
<li>
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right" href="{{ card.externalUrl }}"
title="{{ card.title }} - {{ "new_window" | i18n }}" target="_blank">
{{ card.urlDescription or "see_more" | i18n }}
</a>
</li>
</ul>
{% endif %}
</div>
</div>
<div class="fr-card__header">
{% if card.badges %}
<ul class="fr-badges-group">
{% for badge in card.badges %}
<li><p class="fr-badge fr-badge--green-emeraude">{{ badge }}</p></li>
{% endfor %}
</ul>
{% endif %}
{% if card.imagePath %}
<div class="fr-card__img">{% image card.imagePath, card.imageAlt %}</div>
{% endif %}
</div>
</div>
140 changes: 70 additions & 70 deletions _includes/components/display.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
<dialog id="fr-theme-modal" class="fr-modal" role="dialog" aria-labelledby="fr-theme-modal-title">
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="fr-theme-modal" title="{{ "close" | i18n }}">
{{ "close" | i18n }}
</button>
<div class="fr-container fr-container--fluid fr-container-md">
<div class="fr-grid-row fr-grid-row--center">
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
<div class="fr-modal__body">
<div class="fr-modal__header">
<button class="fr-btn--close fr-btn" aria-controls="fr-theme-modal" title="{{ "close" | i18n }}">
{{ "close" | i18n }}
</button>
</div>
<div class="fr-modal__content">
<h1 id="fr-theme-modal-title" class="fr-modal__title"> {{ "display_params" | i18n }} </h1>
<div id="fr-display" class="fr-display">
<div class="fr-form-group">
<fieldset class="fr-fieldset">
<legend class="fr-fieldset__legend fr-text--regular" id="-legend">
{{ "pick_theme" | i18n }}
</legend>
<div class="fr-fieldset__content">
<div class="fr-radio-group fr-radio-rich">
<input value="light" type="radio" id="fr-radios-theme-light" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-light"> {{ "light_theme" | i18n }} </label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/light.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/light.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/light.svg#artwork-major"></use>
</svg>
</div>
</div>
<div class="fr-modal__content">
<h1 id="fr-theme-modal-title" class="fr-modal__title"> {{ "display_params" | i18n }} </h1>
<div id="fr-display" class="fr-display">
<div class="fr-form-group">
<fieldset class="fr-fieldset">
<legend class="fr-fieldset__legend fr-text--regular" id="-legend">
{{ "pick_theme" | i18n }}
</legend>
<div class="fr-fieldset__content">
<div class="fr-radio-group fr-radio-rich">
<input value="light" type="radio" id="fr-radios-theme-light" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-light"> {{ "light_theme" | i18n }} </label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/light.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/light.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/light.svg#artwork-major"></use>
</svg>
</div>
</div>
<div class="fr-radio-group fr-radio-rich">
<input value="dark" type="radio" id="fr-radios-theme-dark" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-dark"> {{ "dark_theme" | i18n }} </label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/dark.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/dark.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/dark.svg#artwork-major"></use>
</svg>
</div>
</div>
<div class="fr-radio-group fr-radio-rich">
<input value="system" type="radio" id="fr-radios-theme-system" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-system">
{{ "system" | i18n }}
<span class="fr-hint-text">{{ "use_system_params" | i18n }}</span>
</label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/system.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/system.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/system.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
</fieldset>
</div>
</div>
<div class="fr-radio-group fr-radio-rich">
<input value="dark" type="radio" id="fr-radios-theme-dark" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-dark"> {{ "dark_theme" | i18n }} </label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/dark.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/dark.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/dark.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
<div class="fr-radio-group fr-radio-rich">
<input value="system" type="radio" id="fr-radios-theme-system" name="fr-radios-theme">
<label class="fr-label" for="fr-radios-theme-system">
{{ "system" | i18n }}
<span class="fr-hint-text">{{ "use_system_params" | i18n }}</span>
</label>
<div class="fr-radio-rich__img">
<svg xmlns="http://www.w3.org/2000/svg" class="fr-artwork" width="80px"
height="80px" viewBox="0 0 80 80">
<use class="fr-artwork-decorative"
xlink:href="/artwork/system.svg#artwork-decorative"></use>
<use class="fr-artwork-minor"
xlink:href="/artwork/system.svg#artwork-minor"></use>
<use class="fr-artwork-major"
xlink:href="/artwork/system.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</dialog>
Loading