diff --git a/content/dev/carto-forms-fr.rst b/content/dev/carto-forms-fr.rst index bee78f1..a1d381d 100644 --- a/content/dev/carto-forms-fr.rst +++ b/content/dev/carto-forms-fr.rst @@ -6,7 +6,6 @@ Carto-forms :author: Alexis Métaireau, Mathieu Leplatre :tags: GIS, forms :lang: fr -:status: draft On a un plan. Un "truc de ouf". diff --git a/content/dev/carto-forms.rst b/content/dev/carto-forms.rst index ae547cd..a1790dd 100644 --- a/content/dev/carto-forms.rst +++ b/content/dev/carto-forms.rst @@ -6,9 +6,8 @@ Carto-forms :author: Alexis Métaireau, Mathieu Leplatre :tags: GIS, forms :lang: en -:status: draft -We have a plan. +We have a plan. A "fucking good" one. A bunch of friends asked me twice for quite the same thing: a webpage with a form, tied to a map generation with some information filtering. They didn't diff --git a/theme/templates/article.html b/theme/templates/article.html index 5b19e17..01817d2 100644 --- a/theme/templates/article.html +++ b/theme/templates/article.html @@ -1,7 +1,15 @@ {% extends "base.html" %} {% block content %}

{{ article.title }}

-

Published on {{ article.locale_date }}

+

{% if article.lang == "fr" %}Publié le{% else %}Published + on{% endif%} {{ article.locale_date }}. + {% if article.translations %} + {% if article.lang == "fr" %}Vous pouvez aussi lire cet article en {% else %}You can also read this article in {% endif %} + {% for tr in article.translations %} + {{ tr.lang }} + {% endfor %} + {% endif %} +

{{ article.content }} {% if DISQUS_SITENAME %} diff --git a/theme/templates/index.html b/theme/templates/index.html index 9440c39..2fb65a3 100644 --- a/theme/templates/index.html +++ b/theme/templates/index.html @@ -2,11 +2,15 @@ {% block content %}

Hey, I'm Alexis and this is my blog. I try to talk about freedom, free - software and activistm. I'm currently spending my days in Paris, doing - python for the mozilla services team.

+ software and activism. I'm currently spending my days in Paris, doing + python at mozilla, on the services team.

{% for article in articles %} -

{{ article.title }}

+

{{ article.title }} + {% if article.translations %} + (also in {% for article in article.translations %}{{ article.lang }}{% endfor %}) + {% endif %} +

{{ article.locale_date }}

{% if article.description %}

{{ article.description }}