diff --git a/content/blog/2020-07-26-migration-site-duniter.md b/content/blog/2020-07-26-migration-site-duniter.md index 66a9e8745256bf0a54f68ce44504ca685530a8c7..f3af7b9acd36554c04647c271aba2a0e75b72768 100644 --- a/content/blog/2020-07-26-migration-site-duniter.md +++ b/content/blog/2020-07-26-migration-site-duniter.md @@ -4,7 +4,7 @@ description = "Brève histoire du site de duniter et annonce de la migration" date = 2020-07-26 [taxonomies] -authors = ["Hugo Trentesaux",] +authors = ["HugoTrentesaux",] tags = ["site", ] category = [ "Communication",] diff --git a/content/wiki/about/equipe/1000i100.md b/content/wiki/about/equipe/1000i100.md new file mode 100644 index 0000000000000000000000000000000000000000..d17bbc6ed7bc94cba169a22fbb2660821fa7a6fc --- /dev/null +++ b/content/wiki/about/equipe/1000i100.md @@ -0,0 +1,9 @@ ++++ +title = "1000i100" +description = "Développeur" + +[extra] +avatar = "1000i100.png" ++++ + +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 new file mode 100644 index 0000000000000000000000000000000000000000..f7ba421c9a4dd44b82931b70f06580a3a39b77f7 --- /dev/null +++ b/content/wiki/about/equipe/Boris.md @@ -0,0 +1,2 @@ ++++ ++++ \ 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" new file mode 100644 index 0000000000000000000000000000000000000000..7d93f95c21853d2266d7afb226adcfadc6dce2c7 --- /dev/null +++ "b/content/wiki/about/equipe/G\303\251rard.md" @@ -0,0 +1,6 @@ ++++ +description = "Gérard est développeur de WotWizard" + +[extra] +avatar = "Gérard.jpeg" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/HugoTrentesaux.md b/content/wiki/about/equipe/HugoTrentesaux.md new file mode 100644 index 0000000000000000000000000000000000000000..2a8fb0d9bb9aa9ec4308ac0bd2bd1a9ae1f05b8a --- /dev/null +++ b/content/wiki/about/equipe/HugoTrentesaux.md @@ -0,0 +1,6 @@ ++++ +description = "Mainteneur du site duniter, contributeur à Dunitrust" + +[extra] +avatar = "HugoTrentesaux.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Moi.md b/content/wiki/about/equipe/Moi.md new file mode 100644 index 0000000000000000000000000000000000000000..f7ba421c9a4dd44b82931b70f06580a3a39b77f7 --- /dev/null +++ b/content/wiki/about/equipe/Moi.md @@ -0,0 +1,2 @@ ++++ ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Moul.md b/content/wiki/about/equipe/Moul.md new file mode 100644 index 0000000000000000000000000000000000000000..770f17c37a031a1132506f01d90e7d44094affba --- /dev/null +++ b/content/wiki/about/equipe/Moul.md @@ -0,0 +1,6 @@ ++++ +description = "Moul est le développeur de Silkaj et travaille également sur DuniterPy." + +[extra] +avatar = "Moul.jpeg" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/Paidge.md b/content/wiki/about/equipe/Paidge.md new file mode 100644 index 0000000000000000000000000000000000000000..6cc9c14601286cdddb1c8474b90578f90396128f --- /dev/null +++ b/content/wiki/about/equipe/Paidge.md @@ -0,0 +1,6 @@ ++++ +description = "Paidge est le développeur de la Wotmap.Paidge est le développeur de la Wotmap." + +[extra] +avatar = "Paidge.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/_index.md b/content/wiki/about/equipe/_index.md new file mode 100644 index 0000000000000000000000000000000000000000..a8634eca2f28a96634d8d3c0e3fc45ca2c995e65 --- /dev/null +++ b/content/wiki/about/equipe/_index.md @@ -0,0 +1,23 @@ ++++ +title = "Équipe" +date = 2020-07-29 +template = "custom/equipe.html" + +[extra] +authors = [ + "cgeek", + "elois", + "Ğaluel", + "kimamila", + "Moul", + "inso", + "1000i100", + "vit", + "vincentux", + "Gérard", + "Paidge", + "HugoTrentesaux", + ] ++++ + +Équipe \ No newline at end of file diff --git a/content/wiki/about/equipe/blaurent.md b/content/wiki/about/equipe/blaurent.md new file mode 100644 index 0000000000000000000000000000000000000000..f7ba421c9a4dd44b82931b70f06580a3a39b77f7 --- /dev/null +++ b/content/wiki/about/equipe/blaurent.md @@ -0,0 +1,2 @@ ++++ ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/cgeek.md b/content/wiki/about/equipe/cgeek.md new file mode 100644 index 0000000000000000000000000000000000000000..26fcb1585dddf1cb62ac2b088a266555a9c12330 --- /dev/null +++ b/content/wiki/about/equipe/cgeek.md @@ -0,0 +1,7 @@ ++++ +title = "Cédric Moreau" +description = "Cédric Moreau est le développeur de Duniter" + +[extra] +avatar = "cgeek.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/elois.md b/content/wiki/about/equipe/elois.md new file mode 100644 index 0000000000000000000000000000000000000000..6466eaa1bc38cb98aa3ec3872202f6d8d6210985 --- /dev/null +++ b/content/wiki/about/equipe/elois.md @@ -0,0 +1,6 @@ ++++ +description = "Elois est le développeur de Dunitrust" + +[extra] +avatar = "elois.jpeg" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/greyzlii.md b/content/wiki/about/equipe/greyzlii.md new file mode 100644 index 0000000000000000000000000000000000000000..f7ba421c9a4dd44b82931b70f06580a3a39b77f7 --- /dev/null +++ b/content/wiki/about/equipe/greyzlii.md @@ -0,0 +1,2 @@ ++++ ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/inso.md b/content/wiki/about/equipe/inso.md new file mode 100644 index 0000000000000000000000000000000000000000..adc3c0364fa67123b352501c78b6446154a443ea --- /dev/null +++ b/content/wiki/about/equipe/inso.md @@ -0,0 +1,6 @@ ++++ +description = "Inso est le développeur de Sakia." + +[extra] +avatar = "inso.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/kimamila.md b/content/wiki/about/equipe/kimamila.md new file mode 100644 index 0000000000000000000000000000000000000000..bb2e83c2c207790184562f39514eb0dd1c9b97e8 --- /dev/null +++ b/content/wiki/about/equipe/kimamila.md @@ -0,0 +1,6 @@ ++++ +description = "Kimamila est le développeur de Césium et Ğchange." + +[extra] +avatar = "Kimamila.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/nanocryk.md b/content/wiki/about/equipe/nanocryk.md new file mode 100644 index 0000000000000000000000000000000000000000..f7ba421c9a4dd44b82931b70f06580a3a39b77f7 --- /dev/null +++ b/content/wiki/about/equipe/nanocryk.md @@ -0,0 +1,2 @@ ++++ ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/vincentux.md b/content/wiki/about/equipe/vincentux.md new file mode 100644 index 0000000000000000000000000000000000000000..ccd75699d6fba5f53230ac0687d1bfc5b2d98fa4 --- /dev/null +++ b/content/wiki/about/equipe/vincentux.md @@ -0,0 +1,6 @@ ++++ +description = "Vincentux est développeur de ." + +[extra] +avatar = "vincentux.jpeg" ++++ \ No newline at end of file diff --git a/content/wiki/about/equipe/vit.md b/content/wiki/about/equipe/vit.md new file mode 100644 index 0000000000000000000000000000000000000000..d7ae7881cade8df6a36312c13f312f600e545257 --- /dev/null +++ b/content/wiki/about/equipe/vit.md @@ -0,0 +1,6 @@ ++++ +description = "Vit est le développeur de DuniterPy." + +[extra] +avatar = "vit.jpeg" ++++ \ No newline at end of file diff --git "a/content/wiki/about/equipe/\304\236aluel.md" "b/content/wiki/about/equipe/\304\236aluel.md" new file mode 100644 index 0000000000000000000000000000000000000000..cf2221a7a2fdc355ab887b6d8624ac23e8120760 --- /dev/null +++ "b/content/wiki/about/equipe/\304\236aluel.md" @@ -0,0 +1,6 @@ ++++ +description = "Ğaluel est l'auteur de la TRM" + +[extra] +avatar = "galuel.png" ++++ \ No newline at end of file diff --git a/content/wiki/about/qui-sommes-nous.md b/content/wiki/about/qui-sommes-nous.md index 8c2d76e181d5245b25704bc17a84b1b79c6cc1c0..530f3c24f934c3c8aa505fa66fb1ae674a9912fa 100644 --- a/content/wiki/about/qui-sommes-nous.md +++ b/content/wiki/about/qui-sommes-nous.md @@ -5,7 +5,7 @@ weight = 9 title = "Qui sommes-nous ?" [taxonomies] -authors = [ "cgeek",] +authors = ["cgeek", ] +++ # Qui sommes-nous ? diff --git a/content/wiki/contribuer/preconisations-client-duniter.md b/content/wiki/contribuer/preconisations-client-duniter.md index 424019b6589c4fd168dadeac44a9c5f06d027f63..71e6527fc1b7a3f0b646895e5deac2bbc2fbee11 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 = [ "galuel",] +authors = [ "Ğaluel",] +++ # Préconisations pour développer un client Duniter diff --git a/content/wiki/g1/licence-g1.md b/content/wiki/g1/licence-g1.md index 3aaa61686417b484f103df845490f47d6ed60c51..14b46a837dee0b4034f32c87b0a16a64e72f3079 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", "galuel",] +authors = [ "cgeek", "Ğaluel",] +++ # Licence Ğ1 diff --git a/sass/equipe.sass b/sass/equipe.sass new file mode 100644 index 0000000000000000000000000000000000000000..574d7be89d0a67e8786c3137877ec730ca3eed89 --- /dev/null +++ b/sass/equipe.sass @@ -0,0 +1,17 @@ +.equipe + display: flex + flex-wrap: wrap + justify-content: space-between + .person + width: 15em + // border: solid 1px black + h3 + text-align: center + p + width: 13em + + img + display: block + margin: auto + width: 8em + height: 8em \ No newline at end of file diff --git a/static/equipe/1000i100.png b/static/equipe/1000i100.png new file mode 100644 index 0000000000000000000000000000000000000000..77508bd00c99f1fc5786424d45731a38788272b6 Binary files /dev/null and b/static/equipe/1000i100.png differ diff --git "a/static/equipe/G\303\251rard.jpeg" "b/static/equipe/G\303\251rard.jpeg" new file mode 100644 index 0000000000000000000000000000000000000000..ace2c84eea978c2f9c7d9f81a2962f016ef47757 Binary files /dev/null and "b/static/equipe/G\303\251rard.jpeg" differ diff --git a/static/equipe/HugoTrentesaux.png b/static/equipe/HugoTrentesaux.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1fec0c30783b53ff8bb4341fb3313d5ff78dbe Binary files /dev/null and b/static/equipe/HugoTrentesaux.png differ diff --git a/static/equipe/Kimamila.png b/static/equipe/Kimamila.png new file mode 100644 index 0000000000000000000000000000000000000000..636577a4635f61b7c00f58122651830aa82fcdfa Binary files /dev/null and b/static/equipe/Kimamila.png differ diff --git a/static/equipe/Moul.jpeg b/static/equipe/Moul.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..f6f30c24b9741b223ed3b1d39daf2cfc9ba31119 Binary files /dev/null and b/static/equipe/Moul.jpeg differ diff --git a/static/equipe/Paidge.png b/static/equipe/Paidge.png new file mode 100644 index 0000000000000000000000000000000000000000..95f114107c3f54849247a82de61ecc22e719a615 Binary files /dev/null and b/static/equipe/Paidge.png differ diff --git a/static/equipe/cgeek.png b/static/equipe/cgeek.png new file mode 100644 index 0000000000000000000000000000000000000000..f133a5bc598f85c92b021815aa4efa1629470c34 Binary files /dev/null and b/static/equipe/cgeek.png differ diff --git a/static/equipe/elois.jpeg b/static/equipe/elois.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..9a66d9b11a624380e4359fb0713ff77a3489a6c2 Binary files /dev/null and b/static/equipe/elois.jpeg differ diff --git a/static/equipe/galuel.png b/static/equipe/galuel.png new file mode 100644 index 0000000000000000000000000000000000000000..69002cb8324b6f81678fc1864bf9d7352ab4ba6f Binary files /dev/null and b/static/equipe/galuel.png differ diff --git a/static/equipe/inso.png b/static/equipe/inso.png new file mode 100644 index 0000000000000000000000000000000000000000..9fe0137bed2526c42854668516b886f9345b1238 Binary files /dev/null and b/static/equipe/inso.png differ diff --git a/static/equipe/vincentux.jpeg b/static/equipe/vincentux.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a4f2134bc550d894b34ba4f84e29c78ae6b7a493 Binary files /dev/null and b/static/equipe/vincentux.jpeg differ diff --git a/static/equipe/vit.jpeg b/static/equipe/vit.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..3aba497715dc4ea8a8c2817ad826d79690e9dd7c Binary files /dev/null and b/static/equipe/vit.jpeg differ diff --git a/templates/authors/single.html b/templates/authors/single.html index 741bdfff8a788714890e94c0999d27dd1cd36ae7..58ee24e9ac52ef949de7425745c9f12e3ab4f98a 100644 --- a/templates/authors/single.html +++ b/templates/authors/single.html @@ -1 +1,17 @@ -{% extends "taxonomies/single.html" %} +{% extends "index.html" %} + +{% block title %}<title>Duniter | {{term.name}}</title>{% endblock title %} + +{% block content %} +<main id="accueil" class="page w3-container w3-content w3-padding-64"> + {% set page = get_page(path="wiki/about/equipe/" ~ term.name ~ ".md") %} + {% set data = page.extra %} + <h1>{{term.name}}</h1> + {% if data.avatar %}<img src="/equipe/{{ data.avatar }}"/>{% endif %} + {% if page.description %}<p>{{ page.description }}</p>{% endif %} + <h2>Lire ses articles sur ce site</h2> + {%- for page in term.pages -%} + <a href="{{page.permalink}}"> {{page.title}} </a><br> + {%- endfor -%} +</main> +{% endblock content %} diff --git a/templates/custom/equipe.html b/templates/custom/equipe.html new file mode 100644 index 0000000000000000000000000000000000000000..067bd1eb932f182fbd1744574121b0ebf4b87a9a --- /dev/null +++ b/templates/custom/equipe.html @@ -0,0 +1,24 @@ +{% extends "index.html" %} + +{% block title %}<title>Duniter | {{section.title}}</title>{% endblock title %} +{% block description %}<meta name="description" content="{{ section.description }}">{% endblock description %} +{% block keywords %}{% if section.taxonomies.tags %}<meta name="keywords" content=" +{%- for tag in section.taxonomies.tags %}{{tag}},{% endfor %}">{% endif %}{% endblock keywords %} +{% block extrahead %}<link rel="stylesheet" type="text/css" href="/equipe.css">{% endblock extrahead %} + +{% block content %} +<main id="accueil" class="w3-container w3-content w3-padding-64"> + <h1>Équipe</h1> + <br> + <div class="equipe"> + {% for person in section.extra.authors %} + <div class="person"> + {% set page = get_page(path="wiki/about/equipe/" ~ person ~ ".md") %} + {% set data = page.extra %} + <img src="{% if data.avatar %}/equipe/{{ data.avatar }}{% endif %}"/> + <h3>{{ person }}</h3> + <p>{{ page.description }}</p> + </div> + {% endfor %} +</main> +{% endblock content %} diff --git a/templates/taxonomies/list.html b/templates/taxonomies/list.html index 7ecfee25efde85c1599414d7ed2f5b80666b6a13..f4fd1a1272fee4bb55ddbcce00b75fbcfc739d23 100644 --- a/templates/taxonomies/list.html +++ b/templates/taxonomies/list.html @@ -3,7 +3,7 @@ {% block title %}<title>Duniter | {{taxonomy.name}}</title>{% endblock title %} {% block content %} -<main id="accueil" class="w3-container"> +<main id="accueil" class="w3-container w3-content page w3-padding-64"> {%- for term in terms -%} <a href="{{term.permalink}}"> {{term.name}} </a><br> {%- endfor -%} diff --git a/templates/taxonomies/single.html b/templates/taxonomies/single.html index fcef4121261323d1afd0f258ee5520c364d88d0b..c7e7d98bd3705fe43034c2538f7559516fe169be 100644 --- a/templates/taxonomies/single.html +++ b/templates/taxonomies/single.html @@ -3,7 +3,7 @@ {% block title %}<title>Duniter | {{term.name}}</title>{% endblock title %} {% block content %} -<main id="accueil" class="w3-container"> +<main id="accueil" class="w3-container w3-content page w3-padding-64"> {%- for page in term.pages -%} <a href="{{page.permalink}}"> {{page.title}} </a><br> {%- endfor -%} diff --git a/templates/taxonomies/taxonomies.html b/templates/taxonomies/taxonomies.html index da9de0bc000ea890b8032c144ff3b9e2b51be28b..f12f2beddf96263e2cd8d105ace9f55869e8ceb7 100644 --- a/templates/taxonomies/taxonomies.html +++ b/templates/taxonomies/taxonomies.html @@ -1,7 +1,7 @@ {% extends "index.html" %} {% block content %} -<main class="w3-container"> +<main class="w3-container w3-content page w3-padding-64"> <p>Voici toutes les taxonomies et leurs pages.</p> {% for t in config.taxonomies %}