From 652767ba7458b509dfeaccf852926a790d901131 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Sat, 22 Aug 2020 12:39:34 +0200
Subject: [PATCH] tmp contributeurs
---
content/wiki/about/equipe/1000i100.md | 2 +-
.../wiki/about/equipe/Galuel.md | 1 +
"content/wiki/about/equipe/G\303\251rard.md" | 1 +
content/wiki/about/equipe/HugoTrentesaux.md | 11 ++++++++++-
content/wiki/about/equipe/Moul.md | 1 +
content/wiki/about/equipe/Paidge.md | 1 +
content/wiki/about/equipe/_index.md | 10 ++++++----
content/wiki/about/equipe/cgeek.md | 7 ++++++-
content/wiki/about/equipe/elois.md | 2 +-
content/wiki/about/equipe/inso.md | 1 +
content/wiki/about/equipe/kimamila.md | 1 +
content/wiki/about/equipe/vincentux.md | 3 ++-
content/wiki/about/equipe/vit.md | 3 ++-
.../contribuer/preconisations-client-duniter.md | 2 +-
content/wiki/g1/faq-g1.md | 2 +-
content/wiki/g1/licence-g1.md | 2 +-
content/wiki/monnaie-libre/faq-ml.md | 2 +-
content/wiki/toile-de-confiance/faq-tdc.md | 2 +-
sass/equipe.sass | 9 +++++++--
templates/authors/content.html | 13 +++++++++++++
templates/custom/equipe.html | 7 ++++---
21 files changed, 63 insertions(+), 20 deletions(-)
rename "content/wiki/about/equipe/\304\236aluel.md" => content/wiki/about/equipe/Galuel.md (82%)
diff --git a/content/wiki/about/equipe/1000i100.md b/content/wiki/about/equipe/1000i100.md
index d17bbc6..8b6149d 100644
--- a/content/wiki/about/equipe/1000i100.md
+++ b/content/wiki/about/equipe/1000i100.md
@@ -1,6 +1,6 @@
+++
title = "1000i100"
-description = "Développeur"
+description = "Développeur de..."
[extra]
avatar = "1000i100.png"
diff --git "a/content/wiki/about/equipe/\304\236aluel.md" b/content/wiki/about/equipe/Galuel.md
similarity index 82%
rename from "content/wiki/about/equipe/\304\236aluel.md"
rename to content/wiki/about/equipe/Galuel.md
index cf2221a..d48a057 100644
--- "a/content/wiki/about/equipe/\304\236aluel.md"
+++ b/content/wiki/about/equipe/Galuel.md
@@ -1,4 +1,5 @@
+++
+title = "Äžaluel"
description = "Äžaluel est l'auteur de la TRM"
[extra]
diff --git "a/content/wiki/about/equipe/G\303\251rard.md" "b/content/wiki/about/equipe/G\303\251rard.md"
index 7d93f95..8b97d4d 100644
--- "a/content/wiki/about/equipe/G\303\251rard.md"
+++ "b/content/wiki/about/equipe/G\303\251rard.md"
@@ -1,4 +1,5 @@
+++
+title = "Gérard"
description = "Gérard est développeur de WotWizard"
[extra]
diff --git a/content/wiki/about/equipe/HugoTrentesaux.md b/content/wiki/about/equipe/HugoTrentesaux.md
index 2a8fb0d..56a1054 100644
--- a/content/wiki/about/equipe/HugoTrentesaux.md
+++ b/content/wiki/about/equipe/HugoTrentesaux.md
@@ -1,6 +1,15 @@
+++
+title = "Hugo Trentesaux"
description = "Mainteneur du site duniter, contributeur à Dunitrust"
[extra]
avatar = "HugoTrentesaux.png"
-+++
\ No newline at end of file
+website = "https://trentesaux.fr/"
+forum_duniter = "HugoTrentesaux"
+forum_ml = "Hugo-Trentesaux"
+g1_pubkey = "55oM6F9ZE2MGi642GGjhCzHhdDdWwU6KchTjPzW7g3bp"
+phone = "+33 6 49 88 18 21"
+email = "hugo@trentesaux.fr"
++++
+
+Hugo a apporté de petites contributions techniques à Dunitrust et Duniterpy. Il a écrit le template du site Duniter et maintient le site.
\ No newline at end of file
diff --git a/content/wiki/about/equipe/Moul.md b/content/wiki/about/equipe/Moul.md
index 770f17c..adec185 100644
--- a/content/wiki/about/equipe/Moul.md
+++ b/content/wiki/about/equipe/Moul.md
@@ -1,4 +1,5 @@
+++
+title = "Moul"
description = "Moul est le développeur de Silkaj et travaille également sur DuniterPy."
[extra]
diff --git a/content/wiki/about/equipe/Paidge.md b/content/wiki/about/equipe/Paidge.md
index 6cc9c14..b64ed2a 100644
--- a/content/wiki/about/equipe/Paidge.md
+++ b/content/wiki/about/equipe/Paidge.md
@@ -1,4 +1,5 @@
+++
+title = "Paidge"
description = "Paidge est le développeur de la Wotmap.Paidge est le développeur de la Wotmap."
[extra]
diff --git a/content/wiki/about/equipe/_index.md b/content/wiki/about/equipe/_index.md
index a8634ec..0d1787d 100644
--- a/content/wiki/about/equipe/_index.md
+++ b/content/wiki/about/equipe/_index.md
@@ -1,16 +1,18 @@
+++
-title = "Équipe"
+title = "Contributeurs"
date = 2020-07-29
template = "custom/equipe.html"
+page_template = "authors/page.html"
[extra]
+# contrôle la liste des contributeurs (nom de fichier)
authors = [
"cgeek",
"elois",
- "Äžaluel",
"kimamila",
- "Moul",
"inso",
+ "Moul",
+ "Galuel",
"1000i100",
"vit",
"vincentux",
@@ -20,4 +22,4 @@ authors = [
]
+++
-Équipe
\ No newline at end of file
+Nous listons ici les personnes ayant apporté une contribution technique au projet.
\ No newline at end of file
diff --git a/content/wiki/about/equipe/cgeek.md b/content/wiki/about/equipe/cgeek.md
index f244c74..a41cff1 100644
--- a/content/wiki/about/equipe/cgeek.md
+++ b/content/wiki/about/equipe/cgeek.md
@@ -4,4 +4,9 @@ description = "Cédric Moreau est le développeur original du logiciel Duniter"
[extra]
avatar = "cgeek.png"
-+++
\ No newline at end of file
+website = "https://blog.cgeek.fr/"
+forum_duniter = "cgeek"
+forum_ml = "cgeek"
++++
+
+Cédric Moreau est le développeur original du logiciel Duniter et auteur principal du protocole.
\ No newline at end of file
diff --git a/content/wiki/about/equipe/elois.md b/content/wiki/about/equipe/elois.md
index 00cbf01..d63be44 100644
--- a/content/wiki/about/equipe/elois.md
+++ b/content/wiki/about/equipe/elois.md
@@ -1,10 +1,10 @@
+++
title = "Elois"
description = "Elois est le développeur principal de Dunitrust, il travaille en ce moment sur l'oxydation de Dunitrust"
-template = "authors/page.html"
[extra]
avatar = "elois.jpeg"
+website = "https://librelois.fr/"
+++
Elois est le développeur principal de Dunitrust, il travaille en ce moment sur l'oxydation de Dunitrust !!!!
\ No newline at end of file
diff --git a/content/wiki/about/equipe/inso.md b/content/wiki/about/equipe/inso.md
index adc3c03..e6614f0 100644
--- a/content/wiki/about/equipe/inso.md
+++ b/content/wiki/about/equipe/inso.md
@@ -1,4 +1,5 @@
+++
+title = "Inso"
description = "Inso est le développeur de Sakia."
[extra]
diff --git a/content/wiki/about/equipe/kimamila.md b/content/wiki/about/equipe/kimamila.md
index bb2e83c..05c2a11 100644
--- a/content/wiki/about/equipe/kimamila.md
+++ b/content/wiki/about/equipe/kimamila.md
@@ -1,4 +1,5 @@
+++
+title = "Kimamila"
description = "Kimamila est le développeur de Césium et Ğchange."
[extra]
diff --git a/content/wiki/about/equipe/vincentux.md b/content/wiki/about/equipe/vincentux.md
index ccd7569..33a4065 100644
--- a/content/wiki/about/equipe/vincentux.md
+++ b/content/wiki/about/equipe/vincentux.md
@@ -1,5 +1,6 @@
+++
-description = "Vincentux est développeur de ."
+title = "Vincentux"
+description = "Vincentux est développeur de..."
[extra]
avatar = "vincentux.jpeg"
diff --git a/content/wiki/about/equipe/vit.md b/content/wiki/about/equipe/vit.md
index d7ae788..822664b 100644
--- a/content/wiki/about/equipe/vit.md
+++ b/content/wiki/about/equipe/vit.md
@@ -1,5 +1,6 @@
+++
-description = "Vit est le développeur de DuniterPy."
+title = "Vit"
+description = "Vit est développeur de DuniterPy."
[extra]
avatar = "vit.jpeg"
diff --git a/content/wiki/contribuer/preconisations-client-duniter.md b/content/wiki/contribuer/preconisations-client-duniter.md
index 71e6527..4986eae 100644
--- a/content/wiki/contribuer/preconisations-client-duniter.md
+++ b/content/wiki/contribuer/preconisations-client-duniter.md
@@ -5,7 +5,7 @@ weight = 1
title = "Préconisations pour développer un client Duniter"
[taxonomies]
-authors = [ "Äžaluel",]
+authors = [ "Galuel",]
+++
# Préconisations pour développer un client Duniter
diff --git a/content/wiki/g1/faq-g1.md b/content/wiki/g1/faq-g1.md
index 6798dbd..4a733f0 100644
--- a/content/wiki/g1/faq-g1.md
+++ b/content/wiki/g1/faq-g1.md
@@ -5,7 +5,7 @@ weight = 9
title = "FAQ Äž1"
[taxonomies]
-authors = [ "cgeek", "inso", "Äžaluel",]
+authors = [ "cgeek", "inso", "Galuel",]
tags = ["faq",]
+++
diff --git a/content/wiki/g1/licence-g1.md b/content/wiki/g1/licence-g1.md
index 14b46a8..3b19bbd 100644
--- a/content/wiki/g1/licence-g1.md
+++ b/content/wiki/g1/licence-g1.md
@@ -5,7 +5,7 @@ weight = 9
title = "Licence Äž1"
[taxonomies]
-authors = [ "cgeek", "Äžaluel",]
+authors = [ "cgeek", "Galuel",]
+++
# Licence Äž1
diff --git a/content/wiki/monnaie-libre/faq-ml.md b/content/wiki/monnaie-libre/faq-ml.md
index 96374c3..f2cdd51 100644
--- a/content/wiki/monnaie-libre/faq-ml.md
+++ b/content/wiki/monnaie-libre/faq-ml.md
@@ -6,7 +6,7 @@ title = "FAQ Monnaies libres"
[taxonomies]
tags = [ "faq",]
-authors = [ "cgeek", "inso", "Äžaluel",]
+authors = [ "cgeek", "inso", "Galuel",]
+++
# FAQ Monnaies libres
diff --git a/content/wiki/toile-de-confiance/faq-tdc.md b/content/wiki/toile-de-confiance/faq-tdc.md
index e27730f..c4588b5 100644
--- a/content/wiki/toile-de-confiance/faq-tdc.md
+++ b/content/wiki/toile-de-confiance/faq-tdc.md
@@ -6,7 +6,7 @@ title = "FAQ Toile de confiance"
[taxonomies]
tags = [ "faq",]
-authors = [ "cgeek", "inso", "Äžaluel",]
+authors = [ "cgeek", "inso", "Galuel",]
+++
# FAQ Toile de confiance
diff --git a/sass/equipe.sass b/sass/equipe.sass
index 574d7be..e0ebe12 100644
--- a/sass/equipe.sass
+++ b/sass/equipe.sass
@@ -4,12 +4,17 @@
justify-content: space-between
.person
width: 15em
+ margin-left: auto
+ margin-right: auto
+ margin-bottom: 1em
// border: solid 1px black
- h3
+ h4
+ margin: 0
text-align: center
+ color: black
p
width: 13em
-
+ margin: auto
img
display: block
margin: auto
diff --git a/templates/authors/content.html b/templates/authors/content.html
index 7758403..c92c030 100644
--- a/templates/authors/content.html
+++ b/templates/authors/content.html
@@ -1,3 +1,16 @@
<h1>{{page.title}}</h1>
{% if page.extra.avatar %}<img src="/equipe/{{ page.extra.avatar }}"/>{% endif %}
+<ul>
+ {% if page.extra.website %}
+ <li><a target="_blank" href="{{ page.extra.website }}"/><i class="fa fa-globe-e"></i> {{ page.extra.website }}</a></li>{% endif %}
+ {% if page.extra.forum_duniter %}
+ <li><a target="_blank" href="https://forum.duniter.org/u/{{ page.extra.forum_duniter }}/summary"/>forum duniter</a></li>{% endif %}
+ {% if page.extra.forum_ml %}
+ <li><a target="_blank" href="https://forum.monnaie-libre.fr/u/{{ page.extra.forum_ml }}/summary"/>forum monnaie libre</a></li>{% endif %}
+ {% if page.extra.phone %}
+ <li><i class="fa fa-phone"></i> {{ page.extra.phone }}</li>{% endif %}
+ {% if page.extra.email %}
+ <li><i class="fa fa-envelope"></i> {{ page.extra.email }}</li>{% endif %}
+</ul>
+
{{ page.content | safe }}
diff --git a/templates/custom/equipe.html b/templates/custom/equipe.html
index ab3e7e6..2d42ab0 100644
--- a/templates/custom/equipe.html
+++ b/templates/custom/equipe.html
@@ -8,14 +8,15 @@
{% block content %}
<main id="accueil" class="w3-container w3-content w3-padding-64">
- <h1>Équipe</h1>
+ <h1>{{ section.title }}</h1>
+ {{ section.content | safe }}
<br>
<div class="equipe">
{% for person in section.extra.authors %}
<div class="person">
{% set page = get_page(path="wiki/about/equipe/" ~ person ~ ".md") %}
- <img src="{% if page.extra.avatar %}/equipe/{{ page.extra.avatar }}{% endif %}"/>
- <a href="{{ '/wiki/about/equipe/' ~ person }}"><h3>{{ person }}</h3></a>
+ <a href="{{ page.permalink }}"><img src="{% if page.extra.avatar %}/equipe/{{ page.extra.avatar }}{% endif %}"/></a>
+ <a href="{{ page.permalink }}"><h4>{{ page.title }}</h4></a>
<p>{{ page.description }}</p>
</div>
{% endfor %}
--
GitLab