diff --git a/content/wiki/about/equipe/1000i100.md b/content/wiki/about/equipe/1000i100.md index 8b6149d8e6940b23662196ed74274575aa5e3c73..3ee438efbe06c2a81c7a5089cbb3d22552c2f07d 100644 --- a/content/wiki/about/equipe/1000i100.md +++ b/content/wiki/about/equipe/1000i100.md @@ -3,7 +3,15 @@ title = "1000i100" description = "Développeur de..." [extra] +full_name = "Millicent Billette" avatar = "1000i100.png" +forum_duniter = "1000i100" +forum_ml = "1000i100" +g1_pubkey = "2sZF6j2PkxBDNAqUde7Dgo5x3crkerZpQ4rBqqJGn8QT" +website = "https://1forma-tic.fr/" + +[taxonomies] +authors = ["1000i100",] +++ Développeur d'outils serverless, et plombier des pipeline Gitlab (CI/CD avec Docker). Enfin une monnaie mécaniquement redistributive ! Avec un soupçon de revenu de base, une bonne dose d'auto-gestion et une communauté adorable !Informaticien couteau suisse à dominante développeur web, photographe à ses heures, soutien psy informel, amateur de CNV et de modèles économiques expérimental et éthique ! \ No newline at end of file diff --git a/content/wiki/about/equipe/Boris.md b/content/wiki/about/equipe/Boris.md deleted file mode 100644 index f7ba421c9a4dd44b82931b70f06580a3a39b77f7..0000000000000000000000000000000000000000 --- a/content/wiki/about/equipe/Boris.md +++ /dev/null @@ -1,2 +0,0 @@ -+++ -+++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Galuel.md b/content/wiki/about/equipe/Galuel.md index d48a057d63df873961930262405ec7325c140e57..3b6c6ddb1991581f5c0bd3288c5fe4cdb2e863c7 100644 --- a/content/wiki/about/equipe/Galuel.md +++ b/content/wiki/about/equipe/Galuel.md @@ -4,4 +4,9 @@ description = "Ğaluel est l'auteur de la TRM" [extra] avatar = "galuel.png" -+++ \ No newline at end of file +forum_duniter = "galuel" +forum_ml = "galuel" +website = "http://www.creationmonetaire.info/" ++++ + +c=ln(ev/2)/(ev/2) | M/N = 1/c DU \ No newline at end of file diff --git "a/content/wiki/about/equipe/G\303\251rard.md" "b/content/wiki/about/equipe/G\303\251rard.md" deleted file mode 100644 index d72ea9a5d0eea149257c285128bd0cf27d444696..0000000000000000000000000000000000000000 --- "a/content/wiki/about/equipe/G\303\251rard.md" +++ /dev/null @@ -1,7 +0,0 @@ -+++ -title = "Gérard" -description = "Gérard est développeur de WotWizard" - -[extra] -avatar = "Gerard.jpeg" -+++ \ No newline at end of file diff --git a/content/wiki/about/equipe/HugoTrentesaux.md b/content/wiki/about/equipe/HugoTrentesaux.md index 1cff4ccab4535a9490544b7bea060b78544c8f2f..0c54c0947c16d169174de9571e56f6b24ad3a496 100644 --- a/content/wiki/about/equipe/HugoTrentesaux.md +++ b/content/wiki/about/equipe/HugoTrentesaux.md @@ -1,8 +1,9 @@ +++ -title = "Hugo Trentesaux" +title = "HugoTrentesaux" description = "Mainteneur du site duniter" [extra] +full_name = "Hugo Trentesaux" avatar = "HugoTrentesaux.png" website = "https://trentesaux.fr/" forum_duniter = "HugoTrentesaux" diff --git a/content/wiki/about/equipe/Luke.md b/content/wiki/about/equipe/Luke.md new file mode 100644 index 0000000000000000000000000000000000000000..62503605e7783df0c132214009c1fe896617dfa7 --- /dev/null +++ b/content/wiki/about/equipe/Luke.md @@ -0,0 +1,13 @@ ++++ +title = "Luke" +description = "Contributeur au site Duniter/en" + +[extra] +avatar = "Luke.png" +forum_duniter = "Luke" + +[taxonomies] +authors = ["Luke",] ++++ + +... \ No newline at end of file diff --git a/content/wiki/about/equipe/Matograine.md b/content/wiki/about/equipe/Matograine.md new file mode 100644 index 0000000000000000000000000000000000000000..c4db054c4eede00c98d661b07cfe3ded55df712d --- /dev/null +++ b/content/wiki/about/equipe/Matograine.md @@ -0,0 +1,14 @@ ++++ +title = "Matograine" +description = "Contributeur à l'écosystème" + +[extra] +avatar = "matograine.png" +forum_duniter = "matograine" +forum_ml = "matograine" + +[taxonomies] +authors = ["Matograine",] ++++ + +Description longe affichée sur la page de l'utilisateur. Format markdown, balises autorisées... \ No newline at end of file diff --git a/content/wiki/about/equipe/Moi.md b/content/wiki/about/equipe/Moi.md deleted file mode 100644 index f7ba421c9a4dd44b82931b70f06580a3a39b77f7..0000000000000000000000000000000000000000 --- a/content/wiki/about/equipe/Moi.md +++ /dev/null @@ -1,2 +0,0 @@ -+++ -+++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Moul.md b/content/wiki/about/equipe/Moul.md index adec1854d272215362619a0da45eab9f4cb95c5e..af3d8c897abea67331613063c198ac2d505b3347 100644 --- a/content/wiki/about/equipe/Moul.md +++ b/content/wiki/about/equipe/Moul.md @@ -4,4 +4,6 @@ description = "Moul est le développeur de Silkaj et travaille également sur Du [extra] avatar = "Moul.jpeg" +forum_duniter = "moul" +forum_ml = "moul" +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Paidge.md b/content/wiki/about/equipe/Paidge.md index b64ed2a061986de4d307a2736e54f08ddbea36a1..90b53336883f7ea314ff04b51d482860d08ec303 100644 --- a/content/wiki/about/equipe/Paidge.md +++ b/content/wiki/about/equipe/Paidge.md @@ -3,5 +3,11 @@ title = "Paidge" description = "Paidge est le développeur de la Wotmap.Paidge est le développeur de la Wotmap." [extra] +full_name = "Pierre-Jean Chancellier" avatar = "Paidge.png" +forum_duniter = "paidge" +forum_ml = "paidge" + +[taxonomies] +authors = ["Paidge",] +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/TEMPLATE.md b/content/wiki/about/equipe/TEMPLATE.md new file mode 100644 index 0000000000000000000000000000000000000000..1ae9ed928a0a7170895ce16709d86308827fb5f4 --- /dev/null +++ b/content/wiki/about/equipe/TEMPLATE.md @@ -0,0 +1,20 @@ ++++ +title = "TEMPLATE" # identique à celui de l'auteur +description = "Description Courte" +draft = true + +[extra] +full_name = "Template" +avatar = "avatar.svg" # image dans /static/equipe +website = "https://example.com/" +forum_duniter = "pseudo" +forum_ml = "pseudo" +g1_pubkey = "EzC9CyJvJZpbGJafXXCUqdn8VRpFbNCZUnNqntMg4hxi" +phone = "+33 6 12 34 56 78" +email = "mail@domaine.tld" + +[taxonomies] +authors = ["TEMPLATE",] ++++ + +Description longe affichée sur la page de l'utilisateur. Format markdown, balises autorisées... \ No newline at end of file diff --git a/content/wiki/about/equipe/_index.md b/content/wiki/about/equipe/_index.md index 0d1787d49f91c0ba35fb7b868fd59dff2e31b88a..00a3604b1a95e59565674d3f522588190b53549c 100644 --- a/content/wiki/about/equipe/_index.md +++ b/content/wiki/about/equipe/_index.md @@ -7,18 +7,25 @@ page_template = "authors/page.html" [extra] # contrôle la liste des contributeurs (nom de fichier) authors = [ - "cgeek", "elois", - "kimamila", + "cgeek", "inso", + "kimamila", "Moul", "Galuel", "1000i100", - "vit", "vincentux", - "Gérard", + "vit", "Paidge", + "gerard94", "HugoTrentesaux", + "poka", + "tuxmain", + "Luke", + "manutopik", + "Matograine", + "boris", + "yyy", ] +++ diff --git a/content/wiki/about/equipe/blaurent.md b/content/wiki/about/equipe/blaurent.md index f7ba421c9a4dd44b82931b70f06580a3a39b77f7..464928d6ebce73e17f685f0e61a684065518525f 100644 --- a/content/wiki/about/equipe/blaurent.md +++ b/content/wiki/about/equipe/blaurent.md @@ -1,2 +1,3 @@ +++ +title = "blaurent" +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/boris.md b/content/wiki/about/equipe/boris.md new file mode 100644 index 0000000000000000000000000000000000000000..481967c27cc8d74c006fba45b534c38326a8486a --- /dev/null +++ b/content/wiki/about/equipe/boris.md @@ -0,0 +1,12 @@ ++++ +title = "boris" +description = "Contribution aux sites webs" + +[extra] +avatar = "boris.jpg" + +[taxonomies] +authors = ["boris",] ++++ + +... \ No newline at end of file diff --git a/content/wiki/about/equipe/cgeek.md b/content/wiki/about/equipe/cgeek.md index a41cff18806dc6221f36d62ead89fe9c006a2b03..d1d5d5a9b36abd9ef881c0a9968f527d98856bd4 100644 --- a/content/wiki/about/equipe/cgeek.md +++ b/content/wiki/about/equipe/cgeek.md @@ -1,8 +1,9 @@ +++ -title = "Cédric Moreau" +title = "cgeek" description = "Cédric Moreau est le développeur original du logiciel Duniter" [extra] +full_name = "Cédric Moreau" avatar = "cgeek.png" website = "https://blog.cgeek.fr/" forum_duniter = "cgeek" diff --git a/content/wiki/about/equipe/gerard94.md b/content/wiki/about/equipe/gerard94.md new file mode 100644 index 0000000000000000000000000000000000000000..30a77111a797a6513d02fe8aee5eaf97be9b62be --- /dev/null +++ b/content/wiki/about/equipe/gerard94.md @@ -0,0 +1,17 @@ ++++ +title = "gerard94" +description = "Gérard est développeur de WotWizard" + +[extra] +full_name = "Gérard" +avatar = "Gerard.jpeg" +forum_duniter = "gerard94" +forum_ml = "gerard94" +website = "http://gemeu.free.fr/" +g1_pubkey = "CRBxCJrTA6tmHsgt9cQh9SHcCc8w8q95YTp38CPHx2Uk" + +[taxonomies] +authors = ["gerard94",] ++++ + +Enseignant de physique en lycée à la retraite. Programmeur par passion (Component Pascal sous BlackBox). Je m’intéresse particulièrement à la logique mathématique. Constructeur de la première imprimante 3D libre (Reprap) en France en 2008/2009. \ No newline at end of file diff --git a/content/wiki/about/equipe/greyzlii.md b/content/wiki/about/equipe/greyzlii.md index f7ba421c9a4dd44b82931b70f06580a3a39b77f7..042c2a4cd5205be5e16f6b7db33beef6128e7f1b 100644 --- a/content/wiki/about/equipe/greyzlii.md +++ b/content/wiki/about/equipe/greyzlii.md @@ -1,2 +1,3 @@ +++ +title = "greyzlii" +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/inso.md b/content/wiki/about/equipe/inso.md index e6614f05e937d02a5d1c33a0176f15bfa07992a7..05762a47261d1188c234642fc87c33bbdb769b17 100644 --- a/content/wiki/about/equipe/inso.md +++ b/content/wiki/about/equipe/inso.md @@ -4,4 +4,6 @@ description = "Inso est le développeur de Sakia." [extra] avatar = "inso.png" +forum_duniter = "inso" +forum_ml = "inso" +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/kimamila.md b/content/wiki/about/equipe/kimamila.md index 05c2a11fb11802397f48fab36dca97d33cd9083e..b2ba88c5e1e5a19e02cab91e43f7036c7118b790 100644 --- a/content/wiki/about/equipe/kimamila.md +++ b/content/wiki/about/equipe/kimamila.md @@ -1,7 +1,14 @@ +++ -title = "Kimamila" +title = "kimamila" description = "Kimamila est le développeur de Césium et Ğchange." [extra] +full_name = "Benoit Lavenier" avatar = "Kimamila.png" +forum_duniter = "kimamila" +forum_ml = "kimamila" +g1_pubkey = "38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE" + +[taxonomies] +authors = ["kimamila",] +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/manutopik.md b/content/wiki/about/equipe/manutopik.md new file mode 100644 index 0000000000000000000000000000000000000000..990154e0d8f2e693459a9590d980677b8ea8d6f6 --- /dev/null +++ b/content/wiki/about/equipe/manutopik.md @@ -0,0 +1,15 @@ ++++ +title = "manutopik" +description = "Développeur du site monnaie libre" + +[extra] +avatar = "manutopik.jpg" +forum_duniter = "manutopik" +forum_ml = "manutopik" +g1_pubkey = "2JggyyUn2puL5PG6jsMYFC2y9KwjjMmy2adnx3c5fUf8" + +[taxonomies] +authors = ["manutopik",] ++++ + +Description longe affichée sur la page de l'utilisateur. Format markdown, balises autorisées... \ No newline at end of file diff --git a/content/wiki/about/equipe/nanocryk.md b/content/wiki/about/equipe/nanocryk.md index f7ba421c9a4dd44b82931b70f06580a3a39b77f7..221c4a2ae1a8511986739e9ee4a8d98c77dcbc6c 100644 --- a/content/wiki/about/equipe/nanocryk.md +++ b/content/wiki/about/equipe/nanocryk.md @@ -1,2 +1,5 @@ +++ +title = "nanocryk" + +draft = true +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/poka.md b/content/wiki/about/equipe/poka.md new file mode 100644 index 0000000000000000000000000000000000000000..6bea0ebe82b32b1f911ae8c95a2df35e6626b229 --- /dev/null +++ b/content/wiki/about/equipe/poka.md @@ -0,0 +1,16 @@ ++++ +title = "poka" +description = "Développeur de Ğecko" + +[extra] +full_name = "Étienne Boucher" +avatar = "poka.png" +forum_duniter = "poka" +forum_ml = "poka" +g1_pubkey = "Do99s6wQR2JLfhirPdpAERSjNbmjjECzGxHNJMiNKT3P" + +[taxonomies] +authors = ["poka",] ++++ + +Poka est administrateur système. Il gère une grande partie de l'infrastructure (forums, ...). Il développe activement Ğecko et est aussi l'auteur de Ğ1-stats et Jaklis. \ No newline at end of file diff --git a/content/wiki/about/equipe/tuxmain.md b/content/wiki/about/equipe/tuxmain.md new file mode 100644 index 0000000000000000000000000000000000000000..a99579a8f37235296e6f1d9709103e52f8ca0df1 --- /dev/null +++ b/content/wiki/about/equipe/tuxmain.md @@ -0,0 +1,20 @@ ++++ +title = "tuxmain" +description = "Tuxmain est développeur de Ğ1-mixer" + +[extra] +avatar = "tuxmain.png" +website = "https://txmn.tk/" +forum_duniter = "tuxmain" +forum_ml = "tuxmain" +g1_pubkey = "45GfjkWCWQhJ3epJVGC2NSg1Rcu4Ue1vDD3kk9eLs5TQ" + +[taxonomies] +authors = ["tuxmain",] ++++ + +Étudiant, développeur, libriste. + +> Computers are like air conditioners: both stop working when you open windows. (fortune) + +Albert aurait dit : « La théorie, c’est quand ça ne marche pas, mais qu’on sait pourquoi. La pratique, c’est quand ça marche, mais qu’on ne sait pas pourquoi. Quand la théorie rejoint la pratique, ça ne marche pas et on ne sait pas pourquoi. » diff --git a/content/wiki/about/equipe/vincentux.md b/content/wiki/about/equipe/vincentux.md index 33a4065f08275b2c4f105ca12e220e7031a70f28..f7a53f193eb7ca9f27e938e0eae00999366e4168 100644 --- a/content/wiki/about/equipe/vincentux.md +++ b/content/wiki/about/equipe/vincentux.md @@ -1,7 +1,14 @@ +++ -title = "Vincentux" +title = "vincentux" description = "Vincentux est développeur de..." [extra] avatar = "vincentux.jpeg" +forum_duniter = "vincentux" +forum_ml = "vincentux" +g1_pubkey = "5dzkzedBWdeqTFCaD7AkKPMPusfRUL1XyFNJWWGYQ9f1" +website = "https://contact.vincentux.fr/" + +[taxonomies] +authors = ["vincentux",] +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/vit.md b/content/wiki/about/equipe/vit.md index 822664baee83c3f507d56b44d07ef5010d204b8d..9bc0162929bdbdf6893cf9431856a341367e251a 100644 --- a/content/wiki/about/equipe/vit.md +++ b/content/wiki/about/equipe/vit.md @@ -3,5 +3,10 @@ title = "Vit" description = "Vit est développeur de DuniterPy." [extra] +full_name = "Vincent Texier" avatar = "vit.jpeg" +forum_duniter = "vit" +forum_ml = "vit" +g1_pubkey = "7F6oyFQywURCACWZZGtG97Girh9EL1kg2WBwftEZxDoJ" +website = "http://vit.free.fr/website/" +++ \ No newline at end of file diff --git a/content/wiki/about/equipe/yyy.md b/content/wiki/about/equipe/yyy.md new file mode 100644 index 0000000000000000000000000000000000000000..dfeee6e58518e30a5f4bed0b611c4e0f9630eb66 --- /dev/null +++ b/content/wiki/about/equipe/yyy.md @@ -0,0 +1,14 @@ ++++ +title = "yyy" +description = "..." + +[extra] +avatar = "yyy.png" +forum_duniter = "yyy" +forum_ml = "yyy" + +[taxonomies] +authors = ["yyy",] ++++ + +[...] \ No newline at end of file diff --git a/sass/equipe.sass b/sass/equipe.sass index e0ebe125ef4af9dd5cfe4952f041f7050f17e5a9..dbd8a6edc094dab68aae77e0a79f8e5f26dcb880 100644 --- a/sass/equipe.sass +++ b/sass/equipe.sass @@ -19,4 +19,7 @@ display: block margin: auto width: 8em - height: 8em \ No newline at end of file + height: 8em + +.avatar + width: 138px \ No newline at end of file diff --git a/static/equipe/Luke.png b/static/equipe/Luke.png new file mode 100644 index 0000000000000000000000000000000000000000..2b72e11266bcb56315591e1a615a88463e7cf49f Binary files /dev/null and b/static/equipe/Luke.png differ diff --git a/static/equipe/boris.jpg b/static/equipe/boris.jpg new file mode 100644 index 0000000000000000000000000000000000000000..44986c0b93bc68ff8eb5c865c710086859cb578e Binary files /dev/null and b/static/equipe/boris.jpg differ diff --git a/static/equipe/manutopik.jpg b/static/equipe/manutopik.jpg new file mode 100644 index 0000000000000000000000000000000000000000..88ffa7b7de6b0e86143bf39e1c0dcf520e11bb93 Binary files /dev/null and b/static/equipe/manutopik.jpg differ diff --git a/static/equipe/matograine.png b/static/equipe/matograine.png new file mode 100644 index 0000000000000000000000000000000000000000..e188ea2cabc77810c66682d7ae5784d1dd1923e2 Binary files /dev/null and b/static/equipe/matograine.png differ diff --git a/static/equipe/poka.png b/static/equipe/poka.png new file mode 100644 index 0000000000000000000000000000000000000000..eee0e39b3ca72a863de4710cafac46d4b342eb72 Binary files /dev/null and b/static/equipe/poka.png differ diff --git a/static/equipe/tuxmain.png b/static/equipe/tuxmain.png new file mode 100644 index 0000000000000000000000000000000000000000..0d918965157cb2274b80f84adf2cdb6901f19be8 Binary files /dev/null and b/static/equipe/tuxmain.png differ diff --git a/static/equipe/yyy.png b/static/equipe/yyy.png new file mode 100644 index 0000000000000000000000000000000000000000..73b27848e718ca8888193276fb16690c276cf198 Binary files /dev/null and b/static/equipe/yyy.png differ diff --git a/templates/authors/content.html b/templates/authors/content.html index c92c030333594807dfff8606fc196950cc4a5c6e..6ed5507b2497ae199e8c41ae3d71bb73ab794c65 100644 --- a/templates/authors/content.html +++ b/templates/authors/content.html @@ -1,5 +1,7 @@ -<h1>{{page.title}}</h1> -{% if page.extra.avatar %}<img src="/equipe/{{ page.extra.avatar }}"/>{% endif %} +{# métadonnées d'un contributeur également utilisées si celui-ci est auteur #} + +<h1>{% if page.extra.full_name %} {{ page.extra.full_name }} {% else %} {{page.title}} {% endif %}</h1> +{% if page.extra.avatar %}<img class="avatar" 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 %} diff --git a/templates/authors/page.html b/templates/authors/page.html index 328a784e3f33a8737090a013545bf34f9072e10f..dc50f806ebe6dd6300f026c9f96679e113ecc373 100644 --- a/templates/authors/page.html +++ b/templates/authors/page.html @@ -1,7 +1,14 @@ {% extends "page.html" %} +{# page représentant un contributeur #} + +{% block extrahead %}<link rel="stylesheet" type="text/css" href="/equipe.css">{% endblock extrahead %} + {% block content %} <main class="page w3-container w3-content w3-padding-64"> {% include "authors/content.html" %} + + {% set author = get_taxonomy_url(kind="authors", name=page.title, lang=page.lang) %} + <a href="{{ author }}"><i class="fa fa-book"></i> Voir les articles sur ce site</a> </main> {% endblock content %} diff --git a/templates/authors/single.html b/templates/authors/single.html index 20df4384e6ae3fff3c34bc2f2eadb336f33efa44..60b3f0f78f4e3cc7a6ba19554320a624b6724473 100644 --- a/templates/authors/single.html +++ b/templates/authors/single.html @@ -1,4 +1,7 @@ {% extends "index.html" %} +{# page représentant un auteur et ses publications #} + +{% block extrahead %}<link rel="stylesheet" type="text/css" href="/equipe.css">{% endblock extrahead %} {% block title %}<title>Duniter | {{term.name}}</title>{% endblock title %} @@ -6,7 +9,7 @@ <main id="accueil" class="page w3-container w3-content w3-padding-64"> {% set page = get_page(path="wiki/about/equipe/" ~ term.name ~ ".md") %} {% include "authors/content.html" %} - <h2>Articles sur ce site ({{term.name}})</h2> + <h4><i class="fa fa-book"></i> Articles sur ce site</h4> {%- for page in term.pages -%} <a href="{{page.permalink}}"> {{page.title}} </a><br> {%- endfor -%} diff --git a/templates/custom/equipe.html b/templates/custom/equipe.html index fff94b62515cbee5d181f64d47be80adc4cc3c5f..2fd464f5e32d4bca94250463559ba64daa136aa9 100644 --- a/templates/custom/equipe.html +++ b/templates/custom/equipe.html @@ -16,7 +16,7 @@ <div class="person"> {% set page = get_page(path="wiki/about/equipe/" ~ person ~ ".md") %} <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> + <a href="{{ page.permalink }}"><h4>{% if page.extra.full_name %} {{ page.extra.full_name }} {% else %} {{page.title}} {% endif %}</h4></a> <p>{{ page.description }}</p> </div> {% endfor %}