diff --git a/content/wiki/about/equipe/cgeek.md b/content/wiki/about/equipe/cgeek.md index 26fcb1585dddf1cb62ac2b088a266555a9c12330..f244c742fa6ce888137687a8f3baa3a6010802fc 100644 --- a/content/wiki/about/equipe/cgeek.md +++ b/content/wiki/about/equipe/cgeek.md @@ -1,6 +1,6 @@ +++ title = "Cédric Moreau" -description = "Cédric Moreau est le développeur de Duniter" +description = "Cédric Moreau est le développeur original du logiciel Duniter" [extra] avatar = "cgeek.png" diff --git a/content/wiki/about/equipe/elois.md b/content/wiki/about/equipe/elois.md index 6466eaa1bc38cb98aa3ec3872202f6d8d6210985..00cbf015468f81ff524eac48bab6e20be629f629 100644 --- a/content/wiki/about/equipe/elois.md +++ b/content/wiki/about/equipe/elois.md @@ -1,6 +1,10 @@ +++ -description = "Elois est le développeur de Dunitrust" +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" -+++ \ No newline at end of file ++++ + +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/templates/authors/content.html b/templates/authors/content.html new file mode 100644 index 0000000000000000000000000000000000000000..775840390a023f9326c4dc1f4589c606c281d91a --- /dev/null +++ b/templates/authors/content.html @@ -0,0 +1,3 @@ +<h1>{{page.title}}</h1> +{% if page.extra.avatar %}<img src="/equipe/{{ page.extra.avatar }}"/>{% endif %} +{{ page.content | safe }} diff --git a/templates/authors/page.html b/templates/authors/page.html new file mode 100644 index 0000000000000000000000000000000000000000..328a784e3f33a8737090a013545bf34f9072e10f --- /dev/null +++ b/templates/authors/page.html @@ -0,0 +1,7 @@ +{% extends "page.html" %} + +{% block content %} +<main class="page w3-container w3-content w3-padding-64"> + {% include "authors/content.html" %} +</main> +{% endblock content %} diff --git a/templates/authors/single.html b/templates/authors/single.html index 58ee24e9ac52ef949de7425745c9f12e3ab4f98a..20df4384e6ae3fff3c34bc2f2eadb336f33efa44 100644 --- a/templates/authors/single.html +++ b/templates/authors/single.html @@ -5,11 +5,8 @@ {% 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> + {% include "authors/content.html" %} + <h2>Articles sur ce site ({{term.name}})</h2> {%- 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 067bd1eb932f182fbd1744574121b0ebf4b87a9a..ab3e7e6e64081eb7a40f220cf7e37d7e23a830c1 100644 --- a/templates/custom/equipe.html +++ b/templates/custom/equipe.html @@ -14,9 +14,8 @@ {% 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> + <img src="{% if page.extra.avatar %}/equipe/{{ page.extra.avatar }}{% endif %}"/> + <a href="{{ '/wiki/about/equipe/' ~ person }}"><h3>{{ person }}</h3></a> <p>{{ page.description }}</p> </div> {% endfor %}