From abf17373249ac265ee6a8c49c5db1cff7742014c Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Sat, 3 Dec 2022 17:53:00 +0100
Subject: [PATCH] improve main pages metadata
---
content/_index.md | 7 ++-----
content/ecosysteme.md | 8 ++++----
content/g1.md | 8 ++++----
content/monnaie-libre.md | 10 +++++-----
content/toile-de-confiance.md | 6 +++++-
templates/custom/{accueil.html => 1-accueil.html} | 4 +---
.../{monnaie-libre.html => 2-monnaie-libre.html} | 4 ----
templates/custom/{g1.html => 3-g1.html} | 11 +++--------
.../custom/{ecosysteme.html => 4-logiciels.html} | 4 ----
...le-de-confiance.html => 5-toile-de-confiance.html} | 6 ------
templates/custom/skeleton.html | 11 -----------
11 files changed, 24 insertions(+), 55 deletions(-)
rename templates/custom/{accueil.html => 1-accueil.html} (96%)
rename templates/custom/{monnaie-libre.html => 2-monnaie-libre.html} (90%)
rename templates/custom/{g1.html => 3-g1.html} (94%)
rename templates/custom/{ecosysteme.html => 4-logiciels.html} (97%)
rename templates/custom/{toile-de-confiance.html => 5-toile-de-confiance.html} (90%)
delete mode 100644 templates/custom/skeleton.html
diff --git a/content/_index.md b/content/_index.md
index e8cfd6d..77fb62a 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,9 +1,6 @@
+++
title = "Accueil"
-template = "custom/accueil.html"
+template = "custom/1-accueil.html"
sort_by = "weight"
-
-aliases = ["fr"]
+description = "Duniter est un logiciel distribué sur blockchain qui fait fonctionner la monnaie libre ğ1."
+++
-
-This content will not be used. See the custom.html page for details.
diff --git a/content/ecosysteme.md b/content/ecosysteme.md
index c0fb295..e5890b8 100644
--- a/content/ecosysteme.md
+++ b/content/ecosysteme.md
@@ -1,9 +1,9 @@
+++
title = "Logiciels"
-template = "custom/ecosysteme.html"
+template = "custom/4-logiciels.html"
weight = 3
+description = "Un large éventail logiciel constitue l'écosystème de la monnaie libre ǧ1."
-aliases = ["fr/contribuer"]
+[taxonomies]
+tags = ["Duniter", "Cesium", "Silkaj"]
+++
-
-Cf la page dédiées ecosysteme.html
\ No newline at end of file
diff --git a/content/g1.md b/content/g1.md
index 5637c30..62e5ca9 100644
--- a/content/g1.md
+++ b/content/g1.md
@@ -1,9 +1,9 @@
+++
title = "Äž1"
-template = "custom/g1.html"
+template = "custom/3-g1.html"
weight = 2
+description = "La monnaie ğ1 est la première monnaie libre en circulation."
-aliases = ["fr/monnaie-libre-g1"]
+[taxonomies]
+tags = ["Monnaie Libre", "Äž1"]
+++
-
-Page vide, contenu dans le fichier g1.html.
\ No newline at end of file
diff --git a/content/monnaie-libre.md b/content/monnaie-libre.md
index 5b2abcb..eb12428 100644
--- a/content/monnaie-libre.md
+++ b/content/monnaie-libre.md
@@ -1,9 +1,9 @@
+++
title = "Monnaie libre"
-template = "custom/monnaie-libre.html"
+template = "custom/2-monnaie-libre.html"
weight = 1
+description = "Une monnaie libre est une monnaie qui respecte les principes de symétrie spatiale et temporelle. La création monétaire libre n'introduit pas d'inégalités entre les individus."
-aliases = ["fr/monnaies-libres"]
-+++
-
-Page vide, contenu dans le fichier monnaie-libre.html.
\ No newline at end of file
+[taxonomies]
+tags = ["Monnaie Libre", "TRM", "monnaie égalitaire"]
++++
\ No newline at end of file
diff --git a/content/toile-de-confiance.md b/content/toile-de-confiance.md
index e6ba32e..2a90fa7 100644
--- a/content/toile-de-confiance.md
+++ b/content/toile-de-confiance.md
@@ -1,6 +1,10 @@
+++
title = "Toile de confiance"
-template = "custom/toile-de-confiance.html"
+template = "custom/5-toile-de-confiance.html"
weight = 4
+description = "La toile de confiance est le système d'identité distribué de Duniter et de la Ğ1."
+
+[taxonomies]
+tags = ["toile de confiance", "web of trust", "idendité numérique"]
+++
diff --git a/templates/custom/accueil.html b/templates/custom/1-accueil.html
similarity index 96%
rename from templates/custom/accueil.html
rename to templates/custom/1-accueil.html
index b9f94a6..249be28 100644
--- a/templates/custom/accueil.html
+++ b/templates/custom/1-accueil.html
@@ -1,8 +1,6 @@
{% extends "index.html" %}
-{% block title %}<title>Duniter | Accueil</title>{% endblock title %}
-{% block description %}<meta name="description" content="Duniter est un logiciel distribué sur blockchain qui fait fonctionner la monnaie libre ğ1.">{% endblock description %}
-{% block keywords %}<meta name="keywords" content="Duniter, monnaie libre, ÄŸ1">{% endblock keywords %}
+{% block keywords %}<meta name="keywords" content="Duniter, Monnaie Libre, Ǧ1, cryptomonnaie">{% endblock keywords %}
{% block content %}
<main class="w3-container">
diff --git a/templates/custom/monnaie-libre.html b/templates/custom/2-monnaie-libre.html
similarity index 90%
rename from templates/custom/monnaie-libre.html
rename to templates/custom/2-monnaie-libre.html
index c107649..ad165f6 100644
--- a/templates/custom/monnaie-libre.html
+++ b/templates/custom/2-monnaie-libre.html
@@ -1,9 +1,5 @@
{% extends "index.html" %}
-{% block title %}<title>Duniter | Monnaie libre</title>{% endblock title %}
-{% block description %}<meta name="description" content="Une monnaie libre est une monnaie qui respecte les principes de symétrie spatiale et temporelle. La création monétaire libre n'introduit pas d'inégalités entre les individus.">{% endblock description %}
-{% block keywords %}<meta name="keywords" content="monnaie libre, TRM">{% endblock keywords %}
-
{% block content %}
<main class="w3-container">
diff --git a/templates/custom/g1.html b/templates/custom/3-g1.html
similarity index 94%
rename from templates/custom/g1.html
rename to templates/custom/3-g1.html
index c8203ca..7bbfcf0 100644
--- a/templates/custom/g1.html
+++ b/templates/custom/3-g1.html
@@ -1,13 +1,8 @@
{% extends "index.html" %}
-{% block title %}<title>Duniter | Äž1</title>{% endblock title %}
-{% block description %}
-<meta name="description" content="La monnaie ğ1 est la première monnaie libre en circulation.">{% endblock description
-%}
-{% block keywords %}
-<meta name="keywords" content="monnaie libre, ÄŸ1">{% endblock keywords %}
-{% block extrahead %}
-<link rel="stylesheet" type="text/css" href="/style/timeline.css">{% endblock extrahead %}
+{%- block extrahead -%}
+ <link rel="stylesheet" type="text/css" href="/style/timeline.css">
+{%- endblock extrahead %}
{% block content %}
diff --git a/templates/custom/ecosysteme.html b/templates/custom/4-logiciels.html
similarity index 97%
rename from templates/custom/ecosysteme.html
rename to templates/custom/4-logiciels.html
index 14f52c2..ae1b587 100644
--- a/templates/custom/ecosysteme.html
+++ b/templates/custom/4-logiciels.html
@@ -1,9 +1,5 @@
{% extends "index.html" %}
-{% block title %}<title>Duniter | Écosystème technique</title>{% endblock title %}
-{% block description %}<meta name="description" content="Un large éventail logiciel constitue l'écosystème de la monnaie libre ǧ1.">{% endblock description %}
-{% block keywords %}<meta name="keywords" content="Duniter, monnaie libre, ÄŸ1, Cesium, Silkaj">{% endblock keywords %}
-
{% block content %}
<main class="w3-container w3-padding-64">
diff --git a/templates/custom/toile-de-confiance.html b/templates/custom/5-toile-de-confiance.html
similarity index 90%
rename from templates/custom/toile-de-confiance.html
rename to templates/custom/5-toile-de-confiance.html
index 3c2783c..1b14fa9 100644
--- a/templates/custom/toile-de-confiance.html
+++ b/templates/custom/5-toile-de-confiance.html
@@ -1,14 +1,8 @@
{% extends "index.html" %}
-{% block title %}<title>Duniter | {{page.title}}</title>{% endblock title %}
-{% block description %}<meta name="description" content="{{ page.description }}">{% endblock description %}
-{% block keywords %}{% if page.taxonomies.tags %}<meta name="keywords" content="
-{%- for tag in page.taxonomies.tags %}{{tag}},{% endfor %}">{% endif %}{% endblock keywords %}
-
{% block content %}
<main class="w3-container">
-
<div class="w3-panel titletextimage" style="padding-top: 7%">
<h1>Toile de confiance et identité numérique</h1>
<div>
diff --git a/templates/custom/skeleton.html b/templates/custom/skeleton.html
deleted file mode 100644
index bfd649e..0000000
--- a/templates/custom/skeleton.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "index.html" %}
-
-{% block title %}<title>Duniter | {{page.title}}</title>{% endblock title %}
-{% block description %}<meta name="description" content="{{ page.description }}">{% endblock description %}
-{% block keywords %}{% if page.taxonomies.tags %}<meta name="keywords" content="
-{%- for tag in page.taxonomies.tags %}{{tag}},{% endfor %}">{% endif %}{% endblock keywords %}
-
-{% block content %}
-<main class="w3-container">
-</main>
-{% endblock content %}
--
GitLab