--- a/templates/sat_website/specifications.html	Sun May 03 22:39:02 2015 +0200
+++ b/templates/sat_website/specifications.html	Sun May 03 22:40:07 2015 +0200
@@ -23,131 +23,36 @@
 {% 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 %}<span class="label label-success">{% trans "Click on the feature name to have a more detailed description" %}</span>{% endblock %}
+{% block headline %}{% trans "Salut à Toi's specifications" %}{% endblock %}
 
 {% block main_container %}
 
-    <div class="row">
-        <div class="col-md-2">
-            <a href="frontends">{% trans "Multi frontend" %}</a>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}The heart of the software being independent from its display, you can have different interfaces adapted to specific usages.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Microblogging" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Share your thought either publicly or privately (see below), thanks to the microblogging feature. With the decentralised nature of XMPP, you don't have to rely on one specific server, so you can stay master of your data, and avoir censorship.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Group permissions" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Keep access to private data only for the people you choose. SàT uses groups to manage your permissions, and avoid your coworker to see your party pictures.{% endblocktrans %}
-        </div>
+<div class="row">
+    {% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" spec_prefix='<a href="http://xmpp.org/xmpp-protocols/rfcs/" target="#">' spec_suffix="</a>"%}SàT is a rich-featured {{ xmpp }} client. Beside the {{ spec_prefix }}core specifications{{ spec_suffix }} that define the way to manage a contact list and exchange presence information and messages, it implements many standardised extensions and some other internal features.{% endblocktrans %}
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">
+        {% trans "Standard extensions" %}
+    </h5>
+    <div class="info">
+        {% blocktrans with xsf="<abbr title=\"XMPP Standards Foundation\">XSF</abbr>" xep="<abbr title=\"XMPP Extension Protocol\">XEP</abbr>" %}A extension that is standardized by the {{ xsf }} is called a {{ xep }}. We aim to support as much as possible. For now, SàT implements the following ones:{% endblocktrans %}
     </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Advanced chat and group chat" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}XMPP is one of the best (and probably the best) instant messaging protocol ever made. There are plenty of things you can do, far too much to detail everything here. In addition, you can join muli-user rooms, and discuss with tons of people.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Heavy messaging" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}With XMPP, you are not limited to chat or short messages: you have no size limit, and if you want to write essays or to highly detail your last holidays, you can. SàT also handles rich text syntaxes like XHTML and Markdown.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Gateways" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Communicate with other networks using different protocols. With SàT and XMPP, you'll not stay behind closed walls.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "File sharing" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Easily send file to your friends.{% endblocktrans %}
-        </div>
+    <div class="info">
+        {% include "sat_website/specifications_xep.html" %}
     </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Games" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Play with your friends or other people.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">E-mail clients interactions</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to communicate through SàT. Combinate this with the gateway feature, and you can send message with it to any network (including traditional e-mail network). One of the goal of SàT is to allow easy transition to Jabber as an alternative to classical e-mail network, with a better protection against SPAM and identity spoofing.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/10/07/Shell%3A-pipe-you-commands-out-via-XMPP-with-S%C3%A0T">Pipe over XMPP</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}This is a feature for power-user: SàT allows to send command-line tools' stdout to your contacts. This actually is as easy as knowing the name of your contact.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2013/02/22/Export-command-to-a-contact-%28with-video%29">Export Unix commands</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}An other feature for power-user: you can export input/outputs of an Unix CLI command to any contact (using any XMPP client or even other protocols through gateways).{% endblocktrans %}
-        </div>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">
+        {% trans "Experimental and non-standard features" %}
+    </h5>
+    <div class="info">
+        {% blocktrans %}This table lists the non-standard features. Some of them can't be standardised because they are too specific, some others might become new standards in the future.{% endblocktrans %}
     </div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-softwares">Ad-Hoc commands</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}You can remotely control your XMPP entities and all the softwares that offer DBus services. {% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2012/02/02/Collective-radio-%28with-video%29">Collective radio</a>{% endblocktrans %}
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Experiment music with your friends: in a multi-user room, you share a playlist; everybody can add songs to it, and everybody listens the same music at the same time. Good way to share your taste and discover new songs.{% endblocktrans %}
-        </div>
+    <div class="info">
+        {% include "sat_website/specifications_exp.html" %}
     </div>
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Multiplatform" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Since its begining, the SàT project was made with other platforms in mind. It's only avaible on Gnu/Linux so far (except of course Libervia, the web interface, which is available from every javascript powered browser), but other platforms are planed.{% endblocktrans %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-2">
-            <a href="social_contract.html">{% trans "Social contract" %}</a>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not exactly a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written as a moral engagement around the project. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
-        </div>
-    </div>
+</div>
 
 {% endblock %}