# HG changeset patch # User souliane # Date 1422342987 -3600 # Node ID 10ce34ab389a96a2e60ea522ef59455325c9a171 # Parent 9d553570cc611ba821a8fd38419afd46fb06b762 dummy patch (just add some new lines to make space between the blocks) diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/category.html --- a/templates/sat_website/category.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/category.html Tue Jan 27 08:16:27 2015 +0100 @@ -25,8 +25,8 @@

{% block headline %}{% endblock %}

-

{% block subtext %}{% endblock %}

- {% block extra %}{% endblock %} +

{% block subtext %}{% endblock %}

+ {% block extra %}{% endblock %}
{% block main_container %}{% endblock %}
diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/community.html --- a/templates/sat_website/community.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/community.html Tue Jan 27 08:16:27 2015 +0100 @@ -22,9 +22,11 @@ {% load i18n %} {% load staticfiles %} + {% block headline %}{% trans "Salut à Toi's community" %}{% endblock %} {% block subtext %}{% trans "Join us to talk, contribute, share around Salut à Toi" %}{% endblock %} {% block main_container %} +
{% trans "Join us on Jabber :)" %} @@ -54,4 +56,5 @@

{% blocktrans %}SàT is an open project: come and discuss, give your opinion, share your thoughts. The more people will participate, the better the project will be. Share your view not only on technical points, but also on philosophical or political ones. And if you are around, come to have a talk in real life :){% endblocktrans %}

+ {% endblock %} diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/developers.html --- a/templates/sat_website/developers.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/developers.html Tue Jan 27 08:16:27 2015 +0100 @@ -22,9 +22,11 @@ {% load i18n %} {% load staticfiles %} + {% block headline %}{% trans "Salut à Toi: contributing" %}{% endblock %} {% block subtext %}{% trans "Here are some informations on how to develop the Salut à Toi project" %}{% endblock %} {% block main_container %} +
{% trans "Get the source" %} @@ -55,4 +57,5 @@

{% blocktrans with sat_muc="sat@chat.jabberfr.org" %}The best way to join us is on SàT's Jabber room: {{ sat_muc }}{% endblocktrans %}

+ {% endblock %} diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/features.html --- a/templates/sat_website/features.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/features.html Tue Jan 27 08:16:27 2015 +0100 @@ -22,10 +22,12 @@ {% load i18n %} {% load staticfiles %} + {% block headline %}{% trans "Salut à Toi's features" %}{% endblock %} {% block subtext %}{% trans "SàT is a feature rich XMPP client, here is a round up of them." %}{% endblock %} {% block extra %}{% trans "Click on the feature name to have a more detailed description" %}{% endblock %} {% block main_container %} +
{% trans "Multi-frontends" %} diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/frontends.html --- a/templates/sat_website/frontends.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/frontends.html Tue Jan 27 08:16:27 2015 +0100 @@ -22,10 +22,11 @@ {% load i18n %} {% load staticfiles %} + {% block headline %}{% trans "Salut à Toi's frontends" %}{% endblock %} {% block subtext %}{% trans "SàT is multi-frontends: use the one that best fits your needs" %}{% endblock %} -{# {% block extra %}{% trans "Click on the frontend screenshot to have a more detailed description" %}{% endblock %} #} {% block main_container %} +

{% trans "Primitivus" %} {% trans "the console interface" %}

diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/screenshots.html --- a/templates/sat_website/screenshots.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/screenshots.html Tue Jan 27 08:16:27 2015 +0100 @@ -25,4 +25,5 @@ {% block main_container %} {% include "sat_website/gallery.html" %} + {% endblock %} diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/screenshots_tech.html --- a/templates/sat_website/screenshots_tech.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/screenshots_tech.html Tue Jan 27 08:16:27 2015 +0100 @@ -25,4 +25,5 @@ {% block main_container %} {% include "sat_website/gallery.html" %} + {% endblock %} diff -r 9d553570cc61 -r 10ce34ab389a templates/sat_website/social_contract.html --- a/templates/sat_website/social_contract.html Tue Jan 27 08:20:30 2015 +0100 +++ b/templates/sat_website/social_contract.html Tue Jan 27 08:16:27 2015 +0100 @@ -23,8 +23,10 @@ {% load i18n %} {% load staticfiles %} {% load markdown_deux_tags %} + {% block headline %}{% trans "Salut à Toi's social contract" %}{% endblock %} {% block main_container %} +
@@ -32,4 +34,5 @@
+ {% endblock %}