diff --git a/src/_components/postslist.njk b/src/_components/articlesList.njk
similarity index 50%
rename from src/_components/postslist.njk
rename to src/_components/articlesList.njk
index ee5c622..f4d098f 100644
--- a/src/_components/postslist.njk
+++ b/src/_components/articlesList.njk
@@ -1,25 +1,25 @@
-{% for post in postslist | reverse %}
+{% for article in articlesList | reverse %}
- {{ post.data.description }}
+ {{ article.data.description }}
{% endfor %}
diff --git a/src/_data/metadata.json b/src/_data/metadata.json
index 05c4774..026474c 100644
--- a/src/_data/metadata.json
+++ b/src/_data/metadata.json
@@ -1,6 +1,6 @@
{
"title": "Blog IT's on us",
- "url": "https://blog.itsonus.fr/",
+ "url": "https://www.itsonus.fr/blog",
"language": "fr",
"description": "Blog traitant de numérique responsable"
}
diff --git a/src/_layouts/post.njk b/src/_layouts/article.njk
similarity index 61%
rename from src/_layouts/post.njk
rename to src/_layouts/article.njk
index bc378bb..c9ff9cf 100644
--- a/src/_layouts/post.njk
+++ b/src/_layouts/article.njk
@@ -1,5 +1,5 @@
---
-layout: base.njk
+layout: blog.njk
templateClass: tmpl-post
---
@@ -21,15 +21,15 @@ templateClass: tmpl-post
- {%- if collections.posts %}
+ {%- if collections.articles %}
{# these filters are locale-aware in 2.0.0-canary.14 #}
- {%- set previousPost = collections.posts | getPreviousCollectionItem %}
- {%- set nextPost = collections.posts | getNextCollectionItem %}
- {%- if nextPost or previousPost %}
+ {%- set previousArticle = collections.articles | getPreviousCollectionItem %}
+ {%- set nextArticle = collections.articles | getNextCollectionItem %}
+ {%- if nextArticle or previousArticle %}
{%- endif %}
diff --git a/src/_layouts/base.njk b/src/_layouts/blog.njk
similarity index 93%
rename from src/_layouts/base.njk
rename to src/_layouts/blog.njk
index 5cedef2..c89c262 100644
--- a/src/_layouts/base.njk
+++ b/src/_layouts/blog.njk
@@ -8,8 +8,8 @@
-
-
+
+
@@ -40,7 +40,7 @@
-
+
diff --git a/src/_layouts/home.njk b/src/_layouts/home.njk
index e8f1f01..9e08e36 100644
--- a/src/_layouts/home.njk
+++ b/src/_layouts/home.njk
@@ -1,5 +1,5 @@
---
-layout: base.njk
+layout: blog.njk
templateClass: tmpl-home
---
{{ content | safe }}
diff --git a/src/_pages/all_articles.njk b/src/_pages/blog/all_articles.njk
similarity index 76%
rename from src/_pages/all_articles.njk
rename to src/_pages/blog/all_articles.njk
index ac7359f..504c13f 100644
--- a/src/_pages/all_articles.njk
+++ b/src/_pages/blog/all_articles.njk
@@ -9,8 +9,8 @@ eleventyNavigation:
{% include "tagslist.njk" %}
- {% set postslist = collections.posts %}
- {% include "postslist.njk" %}
+ {% set articlesList = collections.articles %}
+ {% include "articlesList.njk" %}
{% include "other_links.njk" %}
diff --git a/src/_pages/blog/blog.json b/src/_pages/blog/article/article.json
similarity index 57%
rename from src/_pages/blog/blog.json
rename to src/_pages/blog/article/article.json
index 17f25d5..4a4e68d 100644
--- a/src/_pages/blog/blog.json
+++ b/src/_pages/blog/article/article.json
@@ -1,5 +1,5 @@
{
"tags": [
- "posts"
+ "articles"
]
}
diff --git a/src/_pages/blog/exemple.md b/src/_pages/blog/article/exemple.md
similarity index 98%
rename from src/_pages/blog/exemple.md
rename to src/_pages/blog/article/exemple.md
index 4aa9e85..e8c63ee 100644
--- a/src/_pages/blog/exemple.md
+++ b/src/_pages/blog/article/exemple.md
@@ -8,14 +8,14 @@ tags:
- écoconception
authors:
- John Doe
-layout: post.njk
+layout: article.njk
---
## Introduction
Leverage agile Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh.
to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.
-![Un chaton](/images/blog/kitty_1.jpeg "Un chaton tout mignon 😍")
+![Un chaton](/images/articles/kitty_1.jpeg "Un chaton tout mignon 😍")
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh.
diff --git a/src/_pages/blog/exemple_2.md b/src/_pages/blog/article/exemple_2.md
similarity index 98%
rename from src/_pages/blog/exemple_2.md
rename to src/_pages/blog/article/exemple_2.md
index a5a03cb..4ddf3c9 100644
--- a/src/_pages/blog/exemple_2.md
+++ b/src/_pages/blog/article/exemple_2.md
@@ -7,7 +7,7 @@ tags:
authors:
- Alice
- Bob
-layout: post.njk
+layout: article.njk
---
## Introduction
@@ -54,6 +54,6 @@ console.log('Test');
## Conclusion
-![Un chaton](/images/blog/kitty_2.jpeg)
+![Un chaton](/images/articles/kitty_2.jpeg)
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh.
diff --git a/src/_pages/blog/exemple_3.md b/src/_pages/blog/article/exemple_3.md
similarity index 99%
rename from src/_pages/blog/exemple_3.md
rename to src/_pages/blog/article/exemple_3.md
index 89fbc70..988c1a8 100644
--- a/src/_pages/blog/exemple_3.md
+++ b/src/_pages/blog/article/exemple_3.md
@@ -6,7 +6,7 @@ tags:
- accessibilité
authors:
- John Murdock
-layout: post.njk
+layout: article.njk
---
## Introduction
diff --git a/src/_pages/feed/feed.11tydata.js b/src/_pages/blog/feed/feed.11tydata.js
similarity index 100%
rename from src/_pages/feed/feed.11tydata.js
rename to src/_pages/blog/feed/feed.11tydata.js
diff --git a/src/_pages/feed/feed.njk b/src/_pages/blog/feed/feed.njk
similarity index 57%
rename from src/_pages/feed/feed.njk
rename to src/_pages/blog/feed/feed.njk
index 7b41d07..32351ae 100755
--- a/src/_pages/feed/feed.njk
+++ b/src/_pages/blog/feed/feed.njk
@@ -1,6 +1,6 @@
---
# Metadata comes from _data/metadata.json
-permalink: /feed/feed.xml
+permalink: /blog/feed/feed.xml
---
@@ -8,20 +8,20 @@ permalink: /feed/feed.xml
{{ metadata.description }}
- {{ collections.posts | getNewestCollectionItemDate | dateToRfc3339 }}
+ {{ collections.articles | getNewestCollectionItemDate | dateToRfc3339 }}
{{ metadata.url }}
{{ metadata.author.name }}
{{ metadata.author.email }}
- {%- for post in collections.posts | reverse %}
- {% set absolutePostUrl %}{{ post.url | htmlBaseUrl(metadata.url) }}{% endset %}
+ {%- for article in collections.articles | reverse %}
+ {% set absolutePostUrl %}{{ article.url | htmlBaseUrl(metadata.url) }}{% endset %}
- {{ post.data.title }}
+ {{ article.data.title }}
- {{ post.date | dateToRfc3339 }}
+ {{ article.date | dateToRfc3339 }}
{{ absolutePostUrl }}
- {{ post.templateContent | transformWithHtmlBase(absolutePostUrl, post.url) }}
+ {{ article.templateContent | transformWithHtmlBase(absolutePostUrl, article.url) }}
{%- endfor %}
diff --git a/src/_pages/feed/json.njk b/src/_pages/blog/feed/json.njk
similarity index 50%
rename from src/_pages/feed/json.njk
rename to src/_pages/blog/feed/json.njk
index 0f1b135..8db3e24 100644
--- a/src/_pages/feed/json.njk
+++ b/src/_pages/blog/feed/json.njk
@@ -1,6 +1,6 @@
---
# Metadata comes from _data/metadata.json
-permalink: /feed/feed.json
+permalink: /blog/feed/feed.json
---
{
"version": "https://jsonfeed.org/version/1.1",
@@ -14,14 +14,14 @@ permalink: /feed/feed.json
"url": "{{ metadata.author.url }}"
},
"items": [
- {%- for post in collections.posts | reverse %}
- {%- set absolutePostUrl = post.url | htmlBaseUrl(metadata.url) %}
+ {%- for article in collections.articles | reverse %}
+ {%- set absoluteArticleUrl = article.url | htmlBaseUrl(metadata.url) %}
{
- "id": "{{ absolutePostUrl }}",
- "url": "{{ absolutePostUrl }}",
- "title": "{{ post.data.title }}",
- "content_html": {% if post.templateContent %}{{ post.templateContent | transformWithHtmlBase(absolutePostUrl, post.url) | dump | safe }}{% else %}""{% endif %},
- "date_published": "{{ post.date | dateToRfc3339 }}"
+ "id": "{{ absoluteArticleUrl }}",
+ "url": "{{ absoluteArticleUrl }}",
+ "title": "{{ article.data.title }}",
+ "content_html": {% if article.templateContent %}{{ article.templateContent | transformWithHtmlBase(absoluteArticleUrl, article.url) | dump | safe }}{% else %}""{% endif %},
+ "date_published": "{{ article.date | dateToRfc3339 }}"
}
{% if not loop.last %},{% endif %}
{%- endfor %}
diff --git a/src/_pages/index.njk b/src/_pages/blog/index.njk
similarity index 62%
rename from src/_pages/index.njk
rename to src/_pages/blog/index.njk
index cd00bd2..fcdf78b 100644
--- a/src/_pages/index.njk
+++ b/src/_pages/blog/index.njk
@@ -5,15 +5,13 @@ eleventyNavigation:
order: 1
---
- {% set maxPosts = collections.posts.length | min(5) %}
Blog numérique responsable
par le collectif IT's on us
{% include "tagslist.njk" %}
- {% set postslist = collections.posts | head(-5) %}
- {% set postslistCounter = collections.posts | length %}
- {% include "postslist.njk" %}
+ {% set articlesList = collections.articles | head(-5) %}
+ {% include "articlesList.njk" %}
{% include "other_links.njk" %}
diff --git a/src/_pages/tags.njk b/src/_pages/blog/tags.njk
similarity index 83%
rename from src/_pages/tags.njk
rename to src/_pages/blog/tags.njk
index 4a2888b..42abaec 100644
--- a/src/_pages/tags.njk
+++ b/src/_pages/blog/tags.njk
@@ -17,8 +17,8 @@ permalink: /tags/{{ tag | slugify }}/
#{{ tag }}
- {% set postslist = collections[ tag ] %}
- {% include "postslist.njk" %}
+ {% set articlesList = collections[ tag ] %}
+ {% include "articlesList.njk" %}
{% include "tagslist.njk" %}
diff --git a/src/images/blog/kitty_1.jpeg b/src/images/articles/kitty_1.jpeg
similarity index 100%
rename from src/images/blog/kitty_1.jpeg
rename to src/images/articles/kitty_1.jpeg
diff --git a/src/images/blog/kitty_2.jpeg b/src/images/articles/kitty_2.jpeg
similarity index 100%
rename from src/images/blog/kitty_2.jpeg
rename to src/images/articles/kitty_2.jpeg