Skip to content

Commit

Permalink
Mise à jour du DSFR en version 1.12.1 (#163)
Browse files Browse the repository at this point in the history
* Update the DSFR version to 1.12.1

* Update Python dependencies

* Update icons list for the icon picker

* Update update_dsfr script

* Add aria-label for the search modal

* Update Notice component

* Fix test

* Update Table component

* Fix minor render issues in the documentation

* Update readme

* typo
  • Loading branch information
Ash-Crow authored Aug 14, 2024
1 parent 4d24512 commit a5b1a07
Show file tree
Hide file tree
Showing 450 changed files with 1,955 additions and 1,472 deletions.
9 changes: 9 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@ FORM_RENDERER = "django.forms.renderers.TemplatesSetting"
- Inclure les tags dans votre fichier `base.html` (voir par exemple sur [base.html](https://github.com/numerique-gouv/django-dsfr/blob/main/example_app/templates/example_app/base.html))

- Lancer le serveur (`python manage.py runserver`) et aller sur [http://127.0.0.1:8000/](http://127.0.0.1:8000/)

## Paramètres optionnels
À ajouter dans le fichier `settings.py` de votre projet :

- `DSFR_CHECK_DEPRECATED_PARAMS` (defaut: False)

Si valeur à `True`, permet d’avoir des avertissements dans la console si on utilise des valeurs obsolètes pour les paramètres des `templatetags`.

Les tags obsolètes feront toujours l’objet d’un avertissement.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ update_dsfr:
bash scripts/download_latest.sh
poetry run python manage.py trim_dist
poetry run python manage.py integrity_checksums
poetry run python manage.py make_icon_picker_files
make collectstatic

static_server:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Documentation

See the `documentation (in French) <https://numerique-gouv.github.io/django-dsfr/>`_ for details.

Django-DSFR implements the `version 1.11.2 of the DSFR <https://www.systeme-de-design.gouv.fr/a-propos/versions/version-courante>`_ (see also the `Github releases page <https://github.com/GouvernementFR/dsfr/releases/>`_)
Django-DSFR implements the `version 1.12.1 of the DSFR <https://www.systeme-de-design.gouv.fr/a-propos/versions/version-courante>`_ (see also the `Github releases page <https://github.com/GouvernementFR/dsfr/releases/>`_)

Requirements
------------
Expand Down
3 changes: 3 additions & 0 deletions config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,6 @@
CSP_STYLE_SRC = ("'self'", "'unsafe-inline'")
CSP_OBJECT_SRC = ("'none'",)
CSP_IMG_SRC = ("'self'", "data:")

# DSFR-specific
DSFR_CHECK_DEPRECATED = True
4 changes: 2 additions & 2 deletions doc/header.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Un bloc `opengraph`, vide par défaut, est fourni pour permettre d’entrer des
{% extends "dsfr/base.html" %}
<!-- [...] -->
{% block opengraph }
{% block opengraph %}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="[À MODIFIER - @usernameTwitter]">
<meta property="og:title" content="[À MODIFIER - Système de Design de l'État]">
Expand All @@ -85,5 +85,5 @@ Un bloc `opengraph`, vide par défaut, est fourni pour permettre d’entrer des
<meta property="og:site_name" content="[À MODIFIER - Site officiel du Système de Design de l'État]">
<meta property="og:image:alt" content="[À MODIFIER - République Française - Système de Design de l'État]">
<meta name="twitter:image:alt" content="[À MODIFIER - République Française - Système de Design de l'État]">
{% endblock opengraph }
{% endblock opengraph %}
```
10 changes: 5 additions & 5 deletions dsfr/checksums.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@

# dsfr/static/dsfr/dist/dsfr/dsfr.module.min.js
INTEGRITY_JS_MODULE = (
"sha384-2eck9tCbf4bg7Ry/9umF+meaBlLy9FhuBnHgy+WX5U0i5KdS02wBSjgAWGGJtC74"
"sha384-TcXr68fg/siMFa6WMoFtntRfwfPoawk7Wz+pnrV+z17crqhROwg2/GRBOaw7Iysy"
)

# dsfr/static/dsfr/dist/dsfr/dsfr.nomodule.min.js
INTEGRITY_JS_NOMODULE = (
"sha384-apopLPiAOE8whfeDupMOjP0SuJZCeJ10givr3/HSxM/tlsQ3SrwE3epVEjIfwEqY"
"sha384-6D+aTUzuRoyopt1Ol/+T7WcnBMAwxhx67azX1vSEt98q7uN0FBKzfDHSytt+IWo9"
)

# dsfr/static/dsfr/dist/dsfr/dsfr.min.css
INTEGRITY_CSS = (
"sha384-o120rAaup4CzJrQdFEFO9kOQOtOgnU638Gfc2I0G4weygChe91oP/niuETDUHtUo"
"sha384-4CMBG/bSDnHTO4BzePaP0c1y81c6oAT2XKpjVi1vzQl4AtMBSoAuUVv5XgRNXJAj"
)

# dsfr/static/dsfr/dist/utility/utility.min.css
INTEGRITY_UTILITY_CSS = (
"sha384-YR4AxNhFVy1qsQ0Hp7Rosg06e4sj2m9dLxiYZrtqJ0boIOiDbD8XkIsIPMMkf0VL"
"sha384-7DgtzNVlfgQPXR8dC0YC0qMsYq/wDVFqzJsy/0/3Q1p/3soyIJ0aSCW/irxwCULC"
)

# dsfr/static/dsfr/dist/utility/icons/icons.min.css
INTEGRITY_CSS_ICONS = (
"sha384-UKf0W85KB7U0w/zmH6760XIKn5dSyfePNpOLyPyk0C8sutElQ4N2hU6zjsJ0yihr"
"sha384-9XiAQTV9X3oegGjiifYadK7WYTRNklIky/o92k7VGo8d3zL+cG7P24qxjWzCwDMz"
)

# dsfr/static/dsfr/dist/favicon/apple-touch-icon.png
Expand Down
Binary file modified dsfr/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 9 additions & 4 deletions dsfr/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-23 11:01+0200\n"
"PO-Revision-Date: 2024-04-10 16:19+0200\n"
"POT-Creation-Date: 2024-08-13 14:26+0200\n"
"PO-Revision-Date: 2024-08-13 14:27+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 3.4\n"
"X-Generator: Poedit 3.4.2\n"

#: dsfr/admin.py:59
msgid "Newsletter"
Expand Down Expand Up @@ -226,7 +226,8 @@ msgstr "Accueil"

#: dsfr/templates/dsfr/card.html:2 dsfr/templates/dsfr/follow.html:2
#: dsfr/templates/dsfr/footer.html:2 dsfr/templates/dsfr/france_connect.html:9
#: dsfr/templates/dsfr/link.html:7 dsfr/templates/dsfr/quote.html:2
#: dsfr/templates/dsfr/link.html:7 dsfr/templates/dsfr/notice.html:4
#: dsfr/templates/dsfr/quote.html:2
msgid "Opens a new window"
msgstr "Ouvre une nouvelle fenêtre"

Expand Down Expand Up @@ -342,6 +343,10 @@ msgstr "Fermer"
msgid "Main menu"
msgstr "Menu principal"

#: dsfr/templates/dsfr/notice.html:3
msgid "Consultation link"
msgstr "Lien de consultation"

#: dsfr/templates/dsfr/pagination.html:2
msgid "Pagination"
msgstr "Pagination"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["ball-pen-fill", "ball-pen-line", "brush-3-fill", "brush-3-line", "brush-fill", "brush-line", "contrast-fill", "contrast-line", "crop-fill", "crop-line", "drag-move-2-fill", "drag-move-2-line", "drop-fill", "drop-line", "edit-box-fill", "edit-box-line", "edit-fill", "edit-line", "ink-bottle-fill", "ink-bottle-line", "layout-grid-fill", "layout-grid-line", "mark-pen-fill", "mark-pen-line", "paint-brush-fill", "paint-brush-line", "paint-fill", "paint-line", "palette-fill", "palette-line", "pantone-fill", "pantone-line", "pen-nib-fill", "pen-nib-line", "pencil-fill", "pencil-line", "pencil-ruler-fill", "pencil-ruler-line", "sip-fill", "sip-line", "table-fill", "table-line"], "icon-style": "dsfr-design", "list-label": "DSFR Design"}
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["ball-pen-fill", "ball-pen-line", "brush-3-fill", "brush-3-line", "brush-fill", "brush-line", "contrast-fill", "contrast-line", "crop-fill", "crop-line", "drag-move-2-fill", "drag-move-2-line", "drop-fill", "drop-line", "edit-box-fill", "edit-box-line", "edit-fill", "edit-line", "ink-bottle-fill", "ink-bottle-line", "layout-grid-fill", "layout-grid-line", "mark-pen-fill", "mark-pen-line", "paint-brush-fill", "paint-brush-line", "paint-fill", "paint-line", "palette-fill", "palette-line", "pantone-fill", "pantone-line", "pen-nib-fill", "pen-nib-line", "pencil-fill", "pencil-line", "pencil-ruler-fill", "pencil-ruler-line", "shapes-fill", "shapes-line", "sip-fill", "sip-line", "table-fill", "table-line"], "icon-style": "dsfr-design", "list-label": "DSFR Design"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["chrome-fill", "chrome-line", "dailymotion-fill", "dailymotion-line", "edge-fill", "edge-line", "facebook-circle-fill", "facebook-circle-line", "firefox-fill", "firefox-line", "github-fill", "github-line", "google-fill", "google-line", "ie-fill", "ie-line", "instagram-fill", "instagram-line", "linkedin-box-fill", "linkedin-box-line", "mastodon-fill", "mastodon-line", "npmjs-fill", "npmjs-line", "remixicon-fill", "remixicon-line", "safari-fill", "safari-line", "slack-fill", "slack-line", "snapchat-fill", "snapchat-line", "telegram-fill", "telegram-line", "threads-fill", "threads-line", "tiktok-fill", "tiktok-line", "twitch-fill", "twitch-line", "twitter-fill", "twitter-line", "twitter-x-fill", "twitter-x-line", "vimeo-fill", "vimeo-line", "vuejs-fill", "vuejs-line", "youtube-fill", "youtube-line"], "icon-style": "dsfr-logo", "list-label": "DSFR Logo"}
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["chrome-fill", "chrome-line", "dailymotion-fill", "dailymotion-line", "edge-fill", "edge-line", "facebook-circle-fill", "facebook-circle-line", "firefox-fill", "firefox-line", "github-fill", "github-line", "google-fill", "google-line", "ie-fill", "ie-line", "instagram-fill", "instagram-line", "linkedin-box-fill", "linkedin-box-line", "mastodon-fill", "mastodon-line", "npmjs-fill", "npmjs-line", "remixicon-fill", "remixicon-line", "safari-fill", "safari-line", "slack-fill", "slack-line", "snapchat-fill", "snapchat-line", "telegram-fill", "telegram-line", "threads-fill", "threads-line", "tiktok-fill", "tiktok-line", "twitch-fill", "twitch-line", "twitter-fill", "twitter-line", "twitter-x-fill", "twitter-x-line", "vimeo-fill", "vimeo-line", "vuejs-fill", "vuejs-line", "whatsapp-fill", "whatsapp-line", "youtube-fill", "youtube-line"], "icon-style": "dsfr-logo", "list-label": "DSFR Logo"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["leaf-fill", "leaf-line", "lightbulb-fill", "lightbulb-line", "plant-fill", "plant-line", "recycle-fill", "recycle-line", "scales-3-fill", "scales-3-line", "seedling-fill", "seedling-line", "umbrella-fill", "umbrella-line"], "icon-style": "dsfr-others", "list-label": "DSFR Others"}
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["accessibility-fill", "accessibility-line", "ear-off-fill", "ear-off-line", "leaf-fill", "leaf-line", "lightbulb-fill", "lightbulb-line", "mental-disabilities-fill", "mental-disabilities-line", "plant-fill", "plant-line", "recycle-fill", "recycle-line", "scales-3-fill", "scales-3-line", "seedling-fill", "seedling-line", "sign-language-fill", "sign-language-line", "umbrella-fill", "umbrella-line", "wheelchair-fill", "wheelchair-line"], "icon-style": "dsfr-others", "list-label": "DSFR Others"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["add-circle-fill", "add-circle-line", "add-line", "alarm-warning-fill", "alarm-warning-line", "alert-fill", "alert-line", "arrow-down-fill", "arrow-down-line", "arrow-down-s-fill", "arrow-down-s-line", "arrow-go-back-fill", "arrow-go-back-line", "arrow-go-forward-fill", "arrow-go-forward-line", "arrow-left-fill", "arrow-left-line", "arrow-left-s-fill", "arrow-left-s-first-line", "arrow-left-s-line", "arrow-left-s-line-double", "arrow-right-down-circle-fill", "arrow-right-fill", "arrow-right-line", "arrow-right-s-fill", "arrow-right-s-last-line", "arrow-right-s-line", "arrow-right-s-line-double", "arrow-right-up-circle-fill", "arrow-right-up-line", "arrow-up-fill", "arrow-up-line", "arrow-up-s-fill", "arrow-up-s-line", "capslock-line", "check-line", "checkbox-circle-fill", "checkbox-circle-line", "checkbox-fill", "checkbox-line", "close-circle-fill", "close-circle-line", "close-line", "delete-bin-fill", "delete-bin-line", "download-fill", "download-line", "equal-circle-fill", "error-fill", "error-line", "error-warning-fill", "error-warning-line", "external-link-fill", "external-link-line", "eye-fill", "eye-line", "eye-off-fill", "eye-off-line", "filter-fill", "filter-line", "info-fill", "info-line", "information-fill", "information-line", "lock-fill", "lock-line", "lock-unlock-fill", "lock-unlock-line", "logout-box-r-fill", "logout-box-r-line", "menu-2-fill", "menu-fill", "more-fill", "more-line", "notification-badge-fill", "notification-badge-line", "question-fill", "question-line", "refresh-fill", "refresh-line", "search-fill", "search-line", "settings-5-fill", "settings-5-line", "shield-fill", "shield-line", "star-fill", "star-line", "star-s-fill", "star-s-line", "subtract-line", "success-fill", "success-line", "theme-fill", "thumb-down-fill", "thumb-down-line", "thumb-up-fill", "thumb-up-line", "time-fill", "time-line", "timer-fill", "timer-line", "upload-2-fill", "upload-2-line", "upload-fill", "upload-line", "warning-fill", "warning-line", "zoom-in-fill", "zoom-in-line", "zoom-out-fill", "zoom-out-line"], "icon-style": "dsfr-system", "list-label": "DSFR System"}
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["add-circle-fill", "add-circle-line", "add-line", "alarm-warning-fill", "alarm-warning-line", "alert-fill", "alert-line", "alert-warning-2-fill", "alert-warning-fill", "arrow-down-fill", "arrow-down-line", "arrow-down-s-fill", "arrow-down-s-line", "arrow-go-back-fill", "arrow-go-back-line", "arrow-go-forward-fill", "arrow-go-forward-line", "arrow-left-fill", "arrow-left-line", "arrow-left-s-fill", "arrow-left-s-first-line", "arrow-left-s-line", "arrow-left-s-line-double", "arrow-right-down-circle-fill", "arrow-right-fill", "arrow-right-line", "arrow-right-s-fill", "arrow-right-s-last-line", "arrow-right-s-line", "arrow-right-s-line-double", "arrow-right-up-circle-fill", "arrow-right-up-line", "arrow-up-down-line", "arrow-up-fill", "arrow-up-line", "arrow-up-s-fill", "arrow-up-s-line", "capslock-line", "check-line", "checkbox-circle-fill", "checkbox-circle-line", "checkbox-fill", "checkbox-line", "close-circle-fill", "close-circle-line", "close-line", "delete-bin-fill", "delete-bin-line", "download-fill", "download-line", "equal-circle-fill", "error-fill", "error-line", "error-warning-fill", "error-warning-line", "external-link-fill", "external-link-line", "eye-fill", "eye-line", "eye-off-fill", "eye-off-line", "filter-fill", "filter-line", "info-fill", "info-line", "information-fill", "information-line", "lock-fill", "lock-line", "lock-unlock-fill", "lock-unlock-line", "logout-box-r-fill", "logout-box-r-line", "menu-2-fill", "menu-fill", "more-fill", "more-line", "notification-badge-fill", "notification-badge-line", "question-fill", "question-line", "refresh-fill", "refresh-line", "search-fill", "search-line", "settings-5-fill", "settings-5-line", "shield-fill", "shield-line", "star-fill", "star-line", "star-s-fill", "star-s-line", "subtract-line", "success-fill", "success-line", "theme-fill", "thumb-down-fill", "thumb-down-line", "thumb-up-fill", "thumb-up-line", "time-fill", "time-line", "timer-fill", "timer-line", "upload-2-fill", "upload-2-line", "upload-fill", "upload-line", "warning-fill", "warning-line", "zoom-in-fill", "zoom-in-line", "zoom-out-fill", "zoom-out-line"], "icon-style": "dsfr-system", "list-label": "DSFR System"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["cloudy-2-fill", "cloudy-2-line", "flashlight-fill", "flashlight-line", "moon-fill", "moon-line", "sun-fill", "sun-line"], "icon-style": "dsfr-weather", "list-label": "DSFR Weather"}
{"prefix": "fr-icon-", "version": "1.11.2", "icons": ["avalanches-fill", "cloudy-2-fill", "cloudy-2-line", "fire-fill", "fire-line", "flashlight-fill", "flashlight-line", "flood-fill", "flood-line", "heavy-showers-fill", "heavy-showers-line", "moon-fill", "moon-line", "snowy-fill", "snowy-line", "sparkling-2-fill", "sparkling-2-line", "submersion-fill", "sun-fill", "sun-line", "temp-cold-fill", "temp-cold-line", "thunderstorms-fill", "thunderstorms-line", "tornado-fill", "tornado-line", "typhoon-fill", "typhoon-line", "windy-fill", "windy-line"], "icon-style": "dsfr-weather", "list-label": "DSFR Weather"}
8 changes: 5 additions & 3 deletions dsfr/static/dsfr/dist/analytics/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ analytics
└─ tab
└─ tooltip
└─ display
└─ table
└─ tag
└─ toggle
└─ modal
└─ navigation
└─ table
└─ password
└─ header
```
Expand Down Expand Up @@ -52,14 +52,16 @@ Afin d’utiliser le composant `analytics`, il est nécessaire d’ajouter les f
<script type="text/javascript" nomodule href="js/tab/tab.nomodule.min.js" ></script>
<script type="module" href="js/tooltip/tooltip.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/tooltip/tooltip.nomodule.min.js" ></script>
<script type="module" href="js/table/table.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/table/table.nomodule.min.js" ></script>
<script type="module" href="js/checkbox/checkbox.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/checkbox/checkbox.nomodule.min.js" ></script>
<script type="module" href="js/tag/tag.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/tag/tag.nomodule.min.js" ></script>
<script type="module" href="js/header/header.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/header/header.nomodule.min.js" ></script>
<script type="module" href="js/display/display.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/display/display.nomodule.min.js" ></script>
<script type="module" href="js/table/table.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/table/table.nomodule.min.js" ></script>
<script type="module" href="js/analytics/analytics.module.min.js" ></script>
<script type="text/javascript" nomodule href="js/analytics/analytics.nomodule.min.js" ></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions dsfr/static/dsfr/dist/analytics/analytics.module.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dsfr/static/dsfr/dist/analytics/analytics.nomodule.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit a5b1a07

Please sign in to comment.