Merge remote-tracking branch 'upstream/main'

Author: hjonin

_includes/components/accordionsgroup.njk

@@ -1,13 +1,16 @@
 {% if not accordionItems %}{% set accordionItems = params.items %}{% endif %}
+
+{% set groupId = nanoid() %}
+
 <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 }}">
+        <button class="fr-accordion__btn" aria-expanded="false" aria-controls="accordion-{{ groupId }}-{{ loop.index }}">
           {{ accordionItem.title }}
         </button>
       </h3>
-      <div class="fr-collapse" id="accordion-{{ loop.index }}">
+      <div class="fr-collapse" id="accordion-{{ groupId }}-{{ loop.index }}">
         {{ accordionItem.content | safe }}
       </div>
     </section>

_includes/components/download.njk

@@ -0,0 +1,50 @@
+{% if not download %}{% set download = params %}{% endif %}
+{% if download.type == "card" %}
+<div class="fr-card fr-enlarge-link fr-card--download">
+    <div class="fr-card__body">
+        <div class="fr-card__content">
+            <h3 class="fr-card__title">
+                <a download href="{{ download.href }}">
+                    {{ download.title }}
+                </a>
+            </h3>
+            {% if download.description %}
+            <p class="fr-card__desc">{{ download.description }}</p>
+            {% endif %}
+            <div class="fr-card__end">
+                <p class="fr-card__detail">{{ download.detail }}</p>
+            </div>
+        </div>
+    </div>
+</div>
+{% elif download.type == "tile" %}
+<div class="fr-tile fr-tile--download fr-enlarge-link" id="tile-6735">
+    <div class="fr-tile__body">
+        <div class="fr-tile__content">
+            <h4 class="fr-tile__title">
+                <a href="{{ download.href }}" download>{{ download.title }}</a>
+            </h4>
+            <p class="fr-tile__desc">{{ download.description }}</p>
+            <p class="fr-tile__detail">{{ download.detail }}</p>
+        </div>
+    </div>
+    {% if download.pictogram %}
+    <div class="fr-tile__header">
+        <div class="fr-tile__pictogram">
+            {% set pictogramUrl = "/artwork/pictograms/" + download.pictogram %}
+            <svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80" width="80px" height="80px">
+                <use class="fr-artwork-decorative" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-decorative"></use>
+                <use class="fr-artwork-minor" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-minor"></use>
+                <use class="fr-artwork-major" href="{{ pictogramUrl | htmlBaseUrl }}#artwork-major"></use>
+            </svg>
+        </div>
+    </div>
+    {% endif %}
+</div>
+{% else %}
+<p>
+    <a class="fr-link fr-link--download" download href="{{ download.href }}">
+        {{ download.title }} <span class="fr-link__detail">{{ download.detail }}</span>
+    </a>
+</p>
+{% endif %}

eleventy.config.js

@@ -1,5 +1,8 @@
 const {DateTime} = require("luxon");
+const {nanoid} = require ("nanoid");
+
 const yaml = require("js-yaml");
+
 const markdownItAnchor = require("markdown-it-anchor");
 const markdownItAttrs = require("markdown-it-attrs");
 const markdownItContainer = require("markdown-it-container");
@@ -200,6 +203,8 @@ module.exports = function (eleventyConfig) {
         lstripBlocks: true,
     });
 
+    eleventyConfig.addNunjucksGlobal("nanoid", () => nanoid());
+
     // Features to make your build faster (when you need them)
 
     // If your passthrough copy gets heavy and cumbersome, add this line

package-lock.json

@@ -33,7 +33,7 @@
     "@11ty/eleventy-plugin-bundle": "^1.0.5",
     "@11ty/eleventy-plugin-rss": "^1.2.0",
     "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
-    "@codegouvfr/eleventy-plugin-calendar": "^3.0.4",
+    "@codegouvfr/eleventy-plugin-calendar": "^3.0.5",
     "@codegouvfr/eleventy-plugin-i18n": "^0.1.3",
     "@gouvfr/dsfr": "^1.11.0",
     "ics": "^3.2.0",