diff --git a/README.md b/README.md index d4695dc8..913e91a0 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,5 @@ Le contenu rédactionnel du site est une publication DINUM, 20 avenue de Ségur, ### Crédits images -- [Gradient icons created by srip](https://www.flaticon.com/authors/srip/gradient) -- hat by sripfoto from [Noun Project](https://thenounproject.com/srip/) (CC BY 3.0) +- [Programmer.png](public/illustrations/Programmer.png) par ven sur [IllustrationKit](https://illustrationkit.com/illustrations/ven) - [Blank_man_placeholder.svg](https://fr.wikipedia.org/wiki/Fichier:Blank_man_placeholder.svg) par [AntoFran](https://commons.wikimedia.org/wiki/User:AntoFran) sous licence [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0>). - diff --git a/_includes/components/callout.njk b/_includes/components/callout.njk index 7ed2118c..31f7a241 100644 --- a/_includes/components/callout.njk +++ b/_includes/components/callout.njk @@ -2,7 +2,7 @@

{{ callout.title }}

- {{ callout.description | safe }} + {{ callout.description }}

{% if callout.link %} diff --git a/_includes/components/card.njk b/_includes/components/card.njk index 4796bc8b..66fa65b7 100644 --- a/_includes/components/card.njk +++ b/_includes/components/card.njk @@ -11,7 +11,7 @@ {% else %}{{ card.title }} {% endif %} -

{{ card.description | safe }}

+

{{ card.description }}

{% if card.tags %} {% set tags = card.tags %} @@ -23,8 +23,8 @@ {{ card.date | readableDate }}

- {% elif card.detail %} - {{ card.detail | safe }} + {% elif card.detail %} +

{{ card.detail }}

{% endif %}
@@ -47,9 +47,9 @@ {% endif %} {% if card.image.path %}
{% imageSync card.image.path, card.image.alt %}
- {% elif card.image.url %} + {% elif card.image.src %}
- {{ card.image.alt }} + {{ card.image.alt }}
{% endif %} diff --git a/_includes/components/tile.njk b/_includes/components/tile.njk index 100e49f0..b4d64f5c 100644 --- a/_includes/components/tile.njk +++ b/_includes/components/tile.njk @@ -1,19 +1,28 @@ {% if not tile %}{% set tile = params %}{% endif %}
- {% set tileUrl = tile.url | locale_url or tile.externalUrl %} - {% set urlDescription %}{{ tile.title }}{% if tile.externalUrl %} - {{ "new_window" | i18n }}{% endif %}{% endset %} -

- - {{ tile.title }} - -

-

{{ tile.description | safe }}

+
+ {% set tileUrl = tile.url | locale_url or tile.externalUrl %} + {% set urlDescription %}{{ tile.title }}{% if tile.externalUrl %} - {{ "new_window" | i18n }}{% endif %}{% endset %} +

+ + {{ tile.title }} + +

+

{{ tile.description }}

+
- {% if tile.imageSrc %} -
- + {% if tile.pictogram %} +
+
+ {% set pictogramUrl = "/artwork/pictograms/" + tile.pictogram %} + +
{% endif %}
diff --git a/_includes/layouts/bluehats-post.njk b/_includes/layouts/bluehats-post.njk index 350f8ce9..ab4dee0c 100644 --- a/_includes/layouts/bluehats-post.njk +++ b/_includes/layouts/bluehats-post.njk @@ -1,7 +1,7 @@ --- layout: layouts/base.njk --- -
+
{% if showBreadcrumb %} {% include "components/breadcrumb.njk" %} {% endif %} @@ -26,7 +26,7 @@ layout: layouts/base.njk {% if description %}

- {{ description | safe }} + {{ description }}

{% endif %} @@ -55,45 +55,7 @@ layout: layouts/base.njk
{% if collections.bluehats_posts %} - {% set previousPost = collections.bluehats_posts | filterCollectionLang | getPreviousCollectionItem %} - {% set nextPost = collections.bluehats_posts | filterCollectionLang | getNextCollectionItem %} - {% if nextPost or previousPost %} -

{{ "read_also" | i18n }}

-
- {% if previousPost %} -
-
-
-

- -

-

- {{ previousPost.data.title }} -

-
-
-
- {% endif %} - {% if nextPost %} -
-
-
-

- -

-

- {{ nextPost.data.title }} -

-
-
-
- {% endif %} -
- {% endif %} + {% set currentPosts = collections.bluehats_posts %} + {% include "previousnextlinks.njk" %} {% endif %} -
diff --git a/_includes/layouts/home.njk b/_includes/layouts/home.njk index b05dd687..6671193c 100644 --- a/_includes/layouts/home.njk +++ b/_includes/layouts/home.njk @@ -1,6 +1,6 @@ --- layout: layouts/base.njk --- -
+
{{ content | safe }}
diff --git a/_includes/layouts/page.njk b/_includes/layouts/page.njk index 3336c1a9..fc9c2f80 100644 --- a/_includes/layouts/page.njk +++ b/_includes/layouts/page.njk @@ -1,14 +1,29 @@ --- layout: layouts/base.njk --- -
- {% if showBreadcrumb %} - {% include "components/breadcrumb.njk" %} - {% endif %} -
-
- {% if title %}

{{ title }}

{% endif %} - {{ content | safe }} +
+
+
+
+
+ {% if showBreadcrumb %} + {% include "components/breadcrumb.njk" %} + {% endif %} +

{{ title }}

+ {% if description %} +

+ {{ description }} +

+ {% endif %} +
+
+
+
+
+
+
+ {{ content | safe }} +
diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk index b04b6e83..391eb9a0 100644 --- a/_includes/layouts/post.njk +++ b/_includes/layouts/post.njk @@ -1,7 +1,7 @@ --- layout: layouts/base.njk --- -
+
{% if showBreadcrumb %} {% include "components/breadcrumb.njk" %} {% endif %} @@ -24,9 +24,9 @@ layout: layouts/base.njk
{% if image %} - {% if not image.hide %} - {% imageContent image.path, image.alt %} - {% endif %} + {% if not image.hide %} + {% imageContent image.path, image.alt %} + {% endif %} {% endif %} {{ content | safe }} @@ -34,45 +34,7 @@ layout: layouts/base.njk
{% if collections.posts %} - {% set previousPost = collections.posts | filterCollectionLang | getPreviousCollectionItem %} - {% set nextPost = collections.posts | filterCollectionLang | getNextCollectionItem %} - {% if nextPost or previousPost %} -

{{ "read_also" | i18n }}

-
- {% if previousPost %} -
-
-
-

- -

-

- {{ previousPost.data.title }} -

-
-
-
- {% endif %} - {% if nextPost %} -
-
-
-

- -

-

- {{ nextPost.data.title }} -

-
-
-
- {% endif %} -
- {% endif %} + {% set currentPosts = collections.posts %} + {% include "previousnextlinks.njk" %} {% endif %} -
\ No newline at end of file diff --git a/_includes/postslist.njk b/_includes/postslist.njk index 57e6fb49..cc65c611 100644 --- a/_includes/postslist.njk +++ b/_includes/postslist.njk @@ -1,11 +1,11 @@ -
+
{% asyncAll post in postslist %}
{% from "components/component.njk" import component with context %} {{ component("card", { url: post.url, title: post.data.title, - description: post.data.description, + description: post.data.description | safe, tags: post.data.tags, date: post.date, badges: post.data.badges, diff --git a/_includes/previousnextlinks.njk b/_includes/previousnextlinks.njk new file mode 100644 index 00000000..08e55973 --- /dev/null +++ b/_includes/previousnextlinks.njk @@ -0,0 +1,41 @@ +{% set previousPost = currentPosts | filterCollectionLang | getPreviousCollectionItem %} +{% set nextPost = currentPosts | filterCollectionLang | getNextCollectionItem %} +{% if nextPost or previousPost %} +
+

{{ "read_also" | i18n }}

+
+ {% if previousPost %} +
+
+
+

+ +

+

+ {{ previousPost.data.title }} +

+
+
+
+ {% endif %} + {% if nextPost %} +
+
+
+

+ +

+

+ {{ nextPost.data.title }} +

+
+
+
+ {% endif %} +
+
+{% endif %} \ No newline at end of file diff --git a/_includes/templates/display.njk b/_includes/templates/display.njk index cafe931c..8f7e8aab 100644 --- a/_includes/templates/display.njk +++ b/_includes/templates/display.njk @@ -24,11 +24,11 @@ + xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-decorative"> + xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-minor"> + xlink:href="{{ "/artwork/light.svg" | htmlBaseUrl }}#artwork-major">
@@ -39,11 +39,11 @@ + xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-decorative"> + xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-minor"> + xlink:href="{{ "/artwork/dark.svg" | htmlBaseUrl }}#artwork-major">
@@ -57,11 +57,11 @@ + xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-decorative"> + xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-minor"> + xlink:href="{{ "/artwork/system.svg" | htmlBaseUrl }}#artwork-major">
diff --git a/content/404.njk b/content/404.njk index e40caa21..2ad5f970 100644 --- a/content/404.njk +++ b/content/404.njk @@ -1,6 +1,7 @@ --- +title: Page non trouvée permalink: 404.html -layout: layouts/page.njk +layout: layouts/base.njk eleventyExcludeFromCollections: true ---
@@ -32,13 +33,13 @@ eleventyExcludeFromCollections: true
diff --git a/content/en/bluehats.njk b/content/en/bluehats.njk index 857b4e75..f510fb9d 100644 --- a/content/en/bluehats.njk +++ b/content/en/bluehats.njk @@ -5,47 +5,65 @@ eleventyNavigation: key: BlueHats 🧢 order: 2 --- -
-
-
-

BlueHats, who's in ?

-

- The BlueHats are all the people who want to show that they contribute to Free and Open Source software developed and/or used by public administrations all over the world: civil servants involved in the use and development of these software, of course, but also citizens who recognise that their actions in favour of Free Software help the administration's projects. -

-

- BlueHats is not a product or a brand of the French Free Software Unit. It's a global movement to which our unit contributes by publishing a newsletter in French, organising online workshops and face-to-face meetings. All public administrations around the world are invited to contribute to this movement and add events to the bluehats.global website! -

-
-
- +
+
+
+
+

BlueHats, who's in ?

+

+ The BlueHats are all the people who want to show that they contribute to Free and Open Source + software developed and/or used by public administrations all over the world: civil servants + involved in the use and development of these software, of course, but also citizens who recognise that their + actions in favour of Free Software help the administration's projects. +

+

+ BlueHats is not a product or a brand of the French Free Software Unit. It's a global + movement to which our unit contributes by publishing a newsletter in + French, organising online workshops and face-to-face meetings. All public administrations around the world + are invited to contribute to this movement and add events to the + bluehats.global website! +

+
+
+ BlueHats group photo +
- -