diff --git a/content/wiki/about/equipe/1000i100.md b/content/wiki/about/equipe/1000i100.md index d17bbc6ed7bc94cba169a22fbb2660821fa7a6fc..8b6149d8e6940b23662196ed74274575aa5e3c73 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 cf2221a7a2fdc355ab887b6d8624ac23e8120760..d48a057d63df873961930262405ec7325c140e57 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 7d93f95c21853d2266d7afb226adcfadc6dce2c7..8b97d4dbe28daef893a0c0342c47b5cccccf00fa 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 2a8fb0d9bb9aa9ec4308ac0bd2bd1a9ae1f05b8a..56a10547052b225a5e9cfe36cc05eff8250b5b42 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 770f17c37a031a1132506f01d90e7d44094affba..adec1854d272215362619a0da45eab9f4cb95c5e 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 6cc9c14601286cdddb1c8474b90578f90396128f..b64ed2a061986de4d307a2736e54f08ddbea36a1 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 a8634eca2f28a96634d8d3c0e3fc45ca2c995e65..0d1787d49f91c0ba35fb7b868fd59dff2e31b88a 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 f244c742fa6ce888137687a8f3baa3a6010802fc..a41cff18806dc6221f36d62ead89fe9c006a2b03 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 00cbf015468f81ff524eac48bab6e20be629f629..d63be440cbc2dc580f50dbaea5274e2d92ac85eb 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 adc3c0364fa67123b352501c78b6446154a443ea..e6614f05e937d02a5d1c33a0176f15bfa07992a7 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 bb2e83c2c207790184562f39514eb0dd1c9b97e8..05c2a11fb11802397f48fab36dca97d33cd9083e 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 ccd75699d6fba5f53230ac0687d1bfc5b2d98fa4..33a4065f08275b2c4f105ca12e220e7031a70f28 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 d7ae7881cade8df6a36312c13f312f600e545257..822664baee83c3f507d56b44d07ef5010d204b8d 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 71e6527fc1b7a3f0b646895e5deac2bbc2fbee11..4986eaee0cf3dd994ae842745c274f5bef46ed67 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 6798dbd69ca6e155ed12e00fce61f068b934b4fd..4a733f06ed8eec55da9e55eba3e8c8174abfb230 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 14b46a837dee0b4034f32c87b0a16a64e72f3079..3b19bbdc65e53c777ed7a55d5b12afc7117d1af6 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 96374c379cff3de32365d6e935bb7124ebef08a4..f2cdd510770ebae31a2796f1a7d25e45c6e2714d 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 e27730f166a7b2a0d0b67bcb64d8fe48b521dce3..c4588b5c50c1290a8e85047bd0286f226bfb1400 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 574d7be89d0a67e8786c3137877ec730ca3eed89..e0ebe125ef4af9dd5cfe4952f041f7050f17e5a9 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 775840390a023f9326c4dc1f4589c606c281d91a..c92c030333594807dfff8606fc196950cc4a5c6e 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 ab3e7e6e64081eb7a40f220cf7e37d7e23a830c1..2d42ab0f438f71c564369e25286c21a69aee22cc 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 %}