--- a/templates/sat_website/features.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/features.html	Sun May 03 22:39:02 2015 +0200
@@ -24,65 +24,80 @@
 {% 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 main_container %}
 
-    <div class="row">
-        <div class="col-md-2">
-            <strong>{% trans "Blogging" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %}
-        </div>
+<div class="row">
+    <h5 class="alert alert-success">
+        <a name="screenshots">{% trans "Short overview" %}</a>
+    </h5>
+    <div class="info">
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Blogging" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this covers some of the most popular Internet usecases. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Chat" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Activities" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% 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 files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% blocktrans %}Email interaction{% endblocktrans %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %}
+	        </div>
+	    </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 any modern browser), but other platforms are planned.{% 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 really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
+	        </div>
+	    </div>
     </div>
-    <div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Chat" %}</strong>
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %}
-		</div>
-	</div>
-    <div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Activities" %}</strong>
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows you to share some music with your friends and hear it at the same time.{% 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 files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %}
-        </div>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">
+        <a name="screenshots">{% trans "Details and advanced features" %}</a>
+    </h5>
+    <div class="info">
+	    <p>{% trans "For a complete listing of the features implemented by SàT, please visit the technical area." %}
+	    <p><a class="btn btn-default" href="specifications.html" role="button">{% trans "Specifications" %}</a></p>
     </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">Email interaction</a>{% endblocktrans %}
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %}
-		</div>
-	</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 any modern browser), but other platforms are planned.{% 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 really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
-		</div>
-	</div>
+</div>
 
 {% endblock %}