--- a/templates/sat_website/adhesion.html	Tue May 05 11:03:18 2015 +0200
+++ b/templates/sat_website/adhesion.html	Tue May 05 15:02:50 2015 +0200
@@ -3,6 +3,7 @@
 {% comment %}
 SàT website: Salut à Toi's presentation website
 Copyright (C) 2012  Jérôme Poisson (goffi@goffi.org)
+Copyright (C) 2014  Adrien Cossa (souliane@mailoo.org)
 
 This file is part of SàT website.
 
@@ -23,24 +24,25 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block headline %}{% trans "Salut à Toi's association" %}{% endblock %}
-{% block subtext %}{% trans "The legal structure supporting the project." %}{% endblock %}
+{% block headline %}{% trans "Join the association" %}{% endblock %}
 {% block main_container %}
 
 <div class="row">
-    <h5 class="alert alert-success">{% trans "Mission" %}</h5>
+    <h5 class="alert alert-success">{% trans "About the association" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and financing the software. The association is non-profit, self-managed and open for everybody to join. The managing instance is a college which is today composed by the two main developers: Jérôme who started this as a personal project in 2008 and Adrien who joined him in 2013.{% endblocktrans %}</p>
+        <p>{% trans "We want it to be as transparent as the software. You can read about its mission, its organisation and check the official documents." %}</p>
+        <p><a class="btn btn-default" href="association.html" role="button">{% trans "Association" %}</a></p>
     </div>
-    <h5 class="alert alert-success">{% trans "Financing the software" %}</h5>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">{% trans "Become a member" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}We have been working full time on Salut à Toi for a while and we plan to keep on doing it. We are now trying to raise enough money to see if we could let the association hire us (we made apropriate research about that and we know that the 1901 French law makes it possible). Our financial model is very simple: the software should always be libre, ethical and free, we are totally against advertisement and we believe in mutual help. We are confident that the people who enjoy what we do will be numerous enough and happy to support us, via joining the association and paying a cotisation.{% endblocktrans %}</p>
-        <p>{% blocktrans %}Because the money should not operate any separation between us, the people who can not or who do not want to participate financially can still join the association for free and as a moral support. The French law doesn't allow the member to decide the amount of his cotisation, so we had to fix several amounts in the Rules of Procedure: 0, 10, 20, 30, 50, 80 or 100. If you want to raise over 100 €, it is possible to do it as a donation (which is not the same as a cotisation). In that case, please contact us. Because we want to stay 100% indepedent and autonomous, we won't allow any company to hi-jack the project and we will never add any donator's logo to the website.{% endblocktrans %}</p>
-        <p>{% blocktrans %}For 2015, we roughly need {{ asso_finance_target }} € for:
+        <p>{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for:
             <ul>
                 <li>two full-time pays based on the French minimal salary;</li>
                 <li>hosting this web site and the Libervia demo, registering the domain names;</li>
-                <li>fees for the association's bank account;</li>
+                <li>fees for the association's bank account and the online payment system (apayer.fr);</li>
                 <li>miscellaneous extra costs (printing...).</li>
             </ul>
             Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31st 2015!
@@ -48,23 +50,17 @@
         </p>
         {% include "sat_website/finance.html" %}
         <p>{% trans "The adhesion last exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your cotisation every year." %}</p>
-        <p>{% trans "By clicking the button below, you will be redirected to a secure paiement service hosted by our bank (Crédit Mutuel - CIC Paiement). We can unfortunately not pre-fill the form fields: please enter a positive amount from those defined in the Rules of Procedure: 10, 20, 30, 50, 80 or 100." %}
-        </p>
-        <p class="text-center">
-            <a class="btn btn-primary btn-lg" href="https://www.apayer.fr/salut-a-toi" target="#" role="button">{% trans "Join and proceed by card" %}</a>
-        </p>
         <p>
         {% trans "To join the association without paying any subscription or to proceed with a bank transfer, please use our internal form instead." %}
         </p>
         <p class="text-center">
             <a class="btn btn-primary btn-lg" href="adhesion_form" role="button">{% trans "Join for free or proceed with a transfer" %}</a>
         </p>
-    </div>
-    <h5 class="alert alert-success">{% trans "Official documents" %}</h5>
-    <div class="info">
-        <p><a target="#" href="{{ asso_url_statutes }}">{% trans "Statutes of the association" %}</a> (fr)</p>
-        <p><a target="#" href="{{ asso_url_rules }}">{% trans "Rules of the association" %}</a> (fr)</p>
-        <p><a target="#" href="http://repos.goffi.org/sat_docs/file/tip/association">{% trans "Minutes" %}</a> (fr)</p>
+        <p>{% trans "If you prefer to proceed by card, you can directly use a secure paiement service hosted by our bank (Crédit Mutuel - CIC Paiement). We can unfortunately not pre-fill the form fields. Please enter a positive amount from those defined in the Rules of Procedure: 10, 20, 30, 50, 80 or 100." %}
+        </p>
+        <p class="text-center">
+            <a class="btn btn-primary btn-lg" href="https://www.apayer.fr/salut-a-toi" target="#" role="button">{% trans "Join and proceed by card" %}</a>
+        </p>
     </div>
 </div>