Mercurial > sat_legacy_website

changeset 55:a1e457ac6871

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split adhesion.html between adhesion.html and association.html
author souliane <souliane@mailoo.org>
date Tue, 05 May 2015 15:02:50 +0200
parents d54f2f09a73a
children 01e9c646999f
files locale/fr/LC_MESSAGES/django.po sat_website/forms.py sat_website/views.py static/css/sat_website.css templates/sat_website/adhesion.html templates/sat_website/adhesion_form.html templates/sat_website/association.html templates/sat_website/features.html templates/sat_website/overview.html
diffstat 9 files changed, 216 insertions(+), 176 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Tue May 05 11:03:18 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue May 05 15:02:50 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-05 09:41+0200\n"
-"PO-Revision-Date: 2015-05-05 09:48+0100\n"
+"POT-Creation-Date: 2015-05-05 15:01+0200\n"
+"PO-Revision-Date: 2015-05-05 15:01+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -55,25 +55,24 @@
 msgstr "Adhésion"
 
 #: sat_website/forms.py:99
+msgid "Bank transfer"
+msgstr "Virement bancaire"
+
+#: sat_website/forms.py:99
 msgid "Credit or debit card"
 msgstr "Carte de crédit ou de débit"
 
-#: sat_website/forms.py:99
-msgid "Bank transfer"
-msgstr "Virement bancaire"
-
 #: sat_website/forms.py:100
 msgid ""
-"Choose \"Credit or debit card\" to pay via CB, Visa or Mastercard using a "
-"secure banking service. Choose \"Bank transfer\" to proceed manually with "
-"the association's IBAN/BIC numbers. For both methods, we will first send you "
-"an email containing all the details."
+"Choose \"Bank transfer\" to proceed manually with the association's IBAN/BIC "
+"numbers. Choose \"Credit or debit card\" to pay via CB, Visa or Mastercard "
+"using a secure banking service. For both methods, we will first send you an "
+"email containing all the details."
 msgstr ""
-"Choisissez \"Carte de crédit ou de débit\" pour payer par CB, Visa ou "
-"Mastercard en utilisant un service bancaire sécurisé. Choisissez \"Virement "
-"bancaire\" pour procéder manuellement avec les numéros IBAN/BIC de "
-"l'association. Dans tous les cas, nous vous enverrons d'abord un courriel "
-"avec les détails."
+"Choisissez \"Virement bancaire\" pour procéder manuellement avec les numéros "
+"IBAN/BIC de l'association. Choisissez \"Carte de crédit ou de débit\" pour "
+"payer par CB, Visa ou Mastercard en utilisant un service bancaire sécurisé. "
+"Dans tous les cas, nous vous enverrons d'abord un courriel avec les détails."
 
 #: sat_website/forms.py:102 sat_website/forms.py:103
 msgid "Reference"
@@ -279,11 +278,16 @@
 msgid "Get in touch"
 msgstr "Nous contacter"
 
+#: sat_website/views.py:44 templates/sat_website/adhesion.html:34
+msgid "Association"
+msgstr "Association"
+
 #: sat_website/views.py:45
 msgid "Links"
 msgstr "Liens"
 
-#: sat_website/views.py:49 templates/sat_website/overview.html:100
+#: sat_website/views.py:49 templates/sat_website/association.html:42
+#: templates/sat_website/overview.html:100
 msgid "Adhesion"
 msgstr "Adhésion"
 
@@ -314,22 +318,127 @@
 msgid "Libervia frontend (web server and client)"
 msgstr "interface Libervia (serveur web et partie cliente)"
 
-#: templates/sat_website/adhesion.html:26
+#: templates/sat_website/adhesion.html:27
+#: templates/sat_website/adhesion_form.html:27
+msgid "Join the association"
+msgstr "Adhérez à l'association"
+
+#: templates/sat_website/adhesion.html:31
+msgid "About the association"
+msgstr "Concernant l'association"
+
+#: templates/sat_website/adhesion.html:33
+msgid ""
+"We want it to be as transparent as the software. You can read about its "
+"mission, its organisation and check the official documents."
+msgstr ""
+"Nous la voulons aussi transparente que le logiciel. Vous pouvez vous "
+"renseigner sur sa mission, son organisation et consulter les documents "
+"officiels."
+
+#: templates/sat_website/adhesion.html:39
+msgid "Become a member"
+msgstr "Devenir membre"
+
+#: templates/sat_website/adhesion.html:41
+#, python-format
+msgid ""
+"For 2015, we need about %(asso_finance_target)s € for:\n"
+"            <ul>\n"
+"                <li>two full-time pays based on the French minimal salary;</"
+"li>\n"
+"                <li>hosting this web site and the Libervia demo, registering "
+"the domain names;</li>\n"
+"                <li>fees for the association's bank account and the online "
+"payment system (apayer.fr);</li>\n"
+"                <li>miscellaneous extra costs (printing...).</li>\n"
+"            </ul>\n"
+"            Which makes, with an average annual contribution of 10 € per "
+"subscription, %(asso_members_target)s members before December, 31st 2015!\n"
+"            "
+msgstr ""
+"Pour 2015, nous nécessitons environ %(asso_finance_target)s € pour:\n"
+"            <ul>\n"
+"                <li>deux salaires à plein temps sur la base du SMIC ;</li>\n"
+"                <li>l'hébergement de ce site Internet et du site de "
+"présentation de Libervia, l'enregistrement des noms de domaines ;</li>\n"
+"                <li>frais de gestion du compte bancaire de l'association et "
+"du terminal de paiement virtuel (apayer.fr) ;</li>\n"
+"                <li>frais divers (impression...).</li>\n"
+"            </ul>\n"
+"            Ce qui fait, pour une cotisation annuelle moyenne de 10 €, "
+"%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n"
+"            "
+
+#: templates/sat_website/adhesion.html:52
+msgid ""
+"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."
+msgstr ""
+"L'adhésion dure une année et n'est pas tacitement renouvelable : vous devez "
+"la renouveler vous-même et vous pouvez modifier le montant de votre "
+"cotisation d'une année sur l'autre."
+
+#: templates/sat_website/adhesion.html:54
+msgid ""
+"To join the association without paying any subscription or to proceed with a "
+"bank transfer, please use our internal form instead."
+msgstr ""
+"Pour rejoindre l'association sans payer de cotisation, ou bien pour procéder "
+"par virement bancaire, merci d'utiliser notre formulaire interne."
+
+#: templates/sat_website/adhesion.html:57
+msgid "Join for free or proceed with a transfer"
+msgstr "Adhérer gratuitement ou procéder par virement"
+
+#: templates/sat_website/adhesion.html:59
+#| msgid ""
+#| "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."
+msgid ""
+"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."
+msgstr ""
+"Si vous préférez procéder par carte, vous pouvez directement utiliser un "
+"service de paiement en ligne hébergé par notre banque (Crédit Mutuel - CIC "
+"Paiement). Nous ne pouvons malheureusement pas pré-remplir les champs du "
+"formulaire. Merci de saisir un montant de cotisation positif parmi ceux "
+"définis dans le règlement intérieur : 10, 20, 30, 50, 80 ou 100."
+
+#: templates/sat_website/adhesion.html:62
+msgid "Join and proceed by card"
+msgstr "Adhérer et procéder par carte"
+
+#: templates/sat_website/adhesion_form.html:33
+msgid "Please complete this form"
+msgstr "Merci de bien vouloir renseigner ce formulaire"
+
+#: templates/sat_website/adhesion_form.html:77
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: templates/sat_website/association.html:27
 msgid "Salut à Toi's association"
 msgstr "Association Salut à Toi"
 
-#: templates/sat_website/adhesion.html:27
+#: templates/sat_website/association.html:28
 msgid "The legal structure supporting the project."
 msgstr "La structure légale qui soutient le projet."
 
-#: templates/sat_website/adhesion.html:31
+#: templates/sat_website/association.html:33
 msgid "Mission"
 msgstr "Mission"
 
-#: templates/sat_website/adhesion.html:33
+#: templates/sat_website/association.html:35
 msgid ""
 "The Salut à Toi association has been created in june 2014 and is responsible "
-"for developing, promoting and financing the software. The association is non-"
+"for developing, promoting and funding 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."
@@ -341,11 +450,11 @@
 "principaux : Jérôme qui commença le développement dès 2008 en tant que "
 "projet personnel, et Adrien qui l'a rejoint en 2013."
 
-#: templates/sat_website/adhesion.html:35
-msgid "Financing the software"
-msgstr "Financement du logiciel"
+#: templates/sat_website/association.html:38
+msgid "Funding"
+msgstr "Financement"
 
-#: templates/sat_website/adhesion.html:37
+#: templates/sat_website/association.html:40
 msgid ""
 "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 "
@@ -367,7 +476,7 @@
 "suffisamment nombreux et nous supporteront avec plaisir, en rejoignant "
 "l'association et en payant une cotisation."
 
-#: templates/sat_website/adhesion.html:38
+#: templates/sat_website/association.html:41
 #, python-format
 msgid ""
 "Because the money should not operate any separation between us, the people "
@@ -393,119 +502,22 @@
 "commerciale s'empare du projet et nous n'ajouterons le logo d'aucun donateur "
 "sur le site du projet."
 
-#: templates/sat_website/adhesion.html:39
-#, python-format
-msgid ""
-"For 2015, we roughly need %(asso_finance_target)s € for:\n"
-"            <ul>\n"
-"                <li>two full-time pays based on the French minimal salary;</"
-"li>\n"
-"                <li>hosting this web site and the Libervia demo, registering "
-"the domain names;</li>\n"
-"                <li>fees for the association's bank account;</li>\n"
-"                <li>miscellaneous extra costs (printing...).</li>\n"
-"            </ul>\n"
-"            Which makes, with an average annual contribution of 10 € per "
-"subscription, %(asso_members_target)s members before December, 31st 2015!\n"
-"            "
-msgstr ""
-"Pour 2015, nous nécessitons d'environ %(asso_finance_target)s € pour:\n"
-"            <ul>\n"
-"                <li>deux salaires à plein temps sur la base du SMIC ;</li>\n"
-"                <li>l'hébergement de ce site Internet et du site de "
-"présentation de Libervia, l'enregistrement des noms de domaines ;</li>\n"
-"                <li>frais de gestion du compte bancaire de l'association et "
-"du terminal de paiement virtuel (apayer.fr) ;</li>\n"
-"                <li>frais divers (impression...).</li>\n"
-"            </ul>\n"
-"            Ce qui fait, pour une cotisation annuelle moyenne de 10 €, "
-"%(asso_members_target)s adhésions avant le 31 décembre 2015 !\n"
-"            "
-
-#: templates/sat_website/adhesion.html:50
-msgid ""
-"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."
-msgstr ""
-"L'adhésion dure une année et n'est pas tacitement renouvelable : vous devez "
-"la renouveler vous-même et vous pouvez modifier le montant de votre "
-"cotisation d'une année sur l'autre."
-
-#: templates/sat_website/adhesion.html:51
-msgid ""
-"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."
-msgstr ""
-"En cliquant le bouton ci-dessous, vous allez être redirigé vers un service "
-"de paiement en ligne hébergé par notre banque (Crédit Mutuel - CIC "
-"Paiement). Nous ne pouvons malheureusement pas pré-remplir les champs du "
-"formulaire : merci de saisir un montant de cotisation positif parmi ceux "
-"définis dans le règlement intérieur : 10, 20, 30, 50, 80 ou 100."
-
-#: templates/sat_website/adhesion.html:54
-msgid "Join and proceed by card"
-msgstr "Adhérer et procéder par carte"
-
-#: templates/sat_website/adhesion.html:57
-msgid ""
-"To join the association without paying any subscription or to proceed with a "
-"bank transfer, please use our internal form instead."
-msgstr ""
-"Pour rejoindre l'association sans payer de cotisation, ou bien pour procéder "
-"par virement bancaire, merci d'utiliser notre formulaire interne."
-
-#: templates/sat_website/adhesion.html:60
-msgid "Join for free or proceed with a transfer"
-msgstr "Adhérer gratuitement ou procéder par virement"
-
-#: templates/sat_website/adhesion.html:63
+#: templates/sat_website/association.html:45
 msgid "Official documents"
 msgstr "Documents officiels"
 
-#: templates/sat_website/adhesion.html:65
+#: templates/sat_website/association.html:47
 msgid "Statutes of the association"
 msgstr "Statuts de l'association"
 
-#: templates/sat_website/adhesion.html:66
+#: templates/sat_website/association.html:48
 msgid "Rules of the association"
 msgstr "Règlement intérieur de l'association"
 
-#: templates/sat_website/adhesion.html:67
+#: templates/sat_website/association.html:49
 msgid "Minutes"
 msgstr "Comptes rendus"
 
-#: templates/sat_website/adhesion_form.html:27
-msgid "Join the association"
-msgstr "Adhérez à l'association"
-
-#: templates/sat_website/adhesion_form.html:33
-msgid "Please complete this form"
-msgstr "Merci de bien vouloir renseigner ce formulaire"
-
-#: templates/sat_website/adhesion_form.html:77
-msgid "Confirm"
-msgstr "Confirmer"
-
-#: templates/sat_website/association.html:26
-#: templates/sat_website/overview.html:96
-msgid "The association"
-msgstr "L'association"
-
-#: templates/sat_website/association.html:27
-msgid "subtext"
-msgstr "sous-titre"
-
-#: templates/sat_website/association.html:32
-msgid "Subtitle 1"
-msgstr "sous-titres"
-
-#: templates/sat_website/association.html:35
-msgid "dummy"
-msgstr ""
-
 #: templates/sat_website/base.html:35
 msgid "Salut à Toi: the multi frontend, multipurpose communication tool"
 msgstr "Salut à Toi: l'outil de communication multi-interfaces et multi-usages"
@@ -823,13 +835,11 @@
 
 #: templates/sat_website/features.html:63
 msgid ""
-"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 peer-to-peer network within a "
-"group a friends."
+"Easily send files to your contacts. Later we would like to implement a "
+"decentralised file sharing system so you could create a private peer-to-peer "
+"network within a group a friends."
 msgstr ""
-"Envoyez facilement des fichiers à vos contacts. Pour les contenus qui le "
-"supporte, vous pouvez aussi les « streamer ». Plus tard, nous implanterons "
+"Envoyez facilement des fichiers à vos contacts. Plus tard, nous implanterons "
 "un système de partage de fichier décentralisé pour vous permettre de créer "
 "un réseau pair à pair privé, seulement entre amis."
 
@@ -990,8 +1000,8 @@
 msgstr "Projets comparables"
 
 #: templates/sat_website/overview.html:36
-msgid "Salut à Toi (SàT) is currently under development."
-msgstr "Salut à Toi (SàT) est actuellement en développement."
+msgid "Salut à Toi"
+msgstr "Salut à Toi"
 
 #: templates/sat_website/overview.html:37
 msgid ""
@@ -1125,6 +1135,10 @@
 "souhaitez pas confier vos photos privées et messages intimes à des "
 "entreprises commerciales non fiables, n'est-ce pas ?"
 
+#: templates/sat_website/overview.html:96
+msgid "The association"
+msgstr "L'association"
+
 #: templates/sat_website/overview.html:97
 msgid ""
 "Salut à Toi and Libervia are developed by a non-profit and self-managed "
@@ -1685,15 +1699,15 @@
 
 #: templates/sat_website/specifications_exp.html:69
 msgid "Register Account Plugin"
-msgstr ""
+msgstr "Création de compte"
 
 #: templates/sat_website/specifications_exp.html:70
 msgid "Register XMPP account"
-msgstr ""
+msgstr "Création de compte XMPP"
 
 #: templates/sat_website/specifications_exp.html:73
 msgid "Room game"
-msgstr ""
+msgstr "Jeu de groupe"
 
 #: templates/sat_website/specifications_exp.html:74
 msgid ""
@@ -1713,7 +1727,7 @@
 
 #: templates/sat_website/specifications_exp.html:81
 msgid "Static Blog Plugin"
-msgstr ""
+msgstr "Page de blog statique"
 
 #: templates/sat_website/specifications_exp.html:82
 msgid ""
@@ -1761,7 +1775,7 @@
 
 #: templates/sat_website/specifications_xep.html:38
 msgid "Extended Stanza Addressing"
-msgstr ""
+msgstr "Adressage étendu (plusieurs destinataires, CC et BCC)"
 
 #: templates/sat_website/specifications_xep.html:42
 msgid "Multi-User Chat"
@@ -1891,5 +1905,14 @@
 msgstr ""
 "Vous devriez recevoir sous peu un courriel de confirmation de notre part."
 
-#~ msgid "Association"
-#~ msgstr "Association"
+#~ msgid "Funding the software"
+#~ msgstr "Financement du logiciel"
+
+#~ msgid "subtext"
+#~ msgstr "sous-titre"
+
+#~ msgid "Subtitle 1"
+#~ msgstr "sous-titres"
+
+#~ msgid "Salut à Toi (SàT) is currently under development."
+#~ msgstr "Salut à Toi (SàT) est actuellement en développement."
--- a/sat_website/forms.py	Tue May 05 11:03:18 2015 +0200
+++ b/sat_website/forms.py	Tue May 05 15:02:50 2015 +0200
@@ -96,8 +96,8 @@
     subscription_amount = ChoiceField(choices=[(amount, u"%s €" % amount) for amount in utils.get_asso_subscr_amounts()])
 
     section_3b = Section(label="")
-    payment_method = ChoiceField(choices=[(u"card", _(u"Credit or debit card")), (u"transfer", _(u"Bank transfer"))],
-                               help_text=_(u'Choose "Credit or debit card" to pay via CB, Visa or Mastercard using a secure banking service. Choose "Bank transfer" to proceed manually with the association\'s IBAN/BIC numbers. For both methods, we will first send you an email containing all the details.'), widget=forms.RadioSelect)
+    payment_method = ChoiceField(choices=[(u"transfer", _(u"Bank transfer")), (u"card", _(u"Credit or debit card"))],
+                               help_text=_(u'Choose "Bank transfer" to proceed manually with the association\'s IBAN/BIC numbers. Choose "Credit or debit card" to pay via CB, Visa or Mastercard using a secure banking service. For both methods, we will first send you an email containing all the details.'), widget=forms.RadioSelect)
 
     section_5 = Section(label=_(u'Reference'))
     ref = CharField(required=False, label=_(u"Reference"), placeholder=_(u"Adherent number in case of a renewal"))
--- a/sat_website/views.py	Tue May 05 11:03:18 2015 +0200
+++ b/sat_website/views.py	Tue May 05 15:02:50 2015 +0200
@@ -41,7 +41,7 @@
                                              ]))),
                           ('community', (_(u"Community"),
                                 OrderedDict([("community", _(u"Get in touch")),
-                                             #("association", _(u"Association")),
+                                             ("association", _(u"Association")),
                                              ("links", _(u"Links")),
                                              ]))),
                           ])
@@ -84,7 +84,7 @@
         context["SOCIAL_CONTRACT"] = social_contract.get_social_contract()
     elif category == "downloads":
         context["projects_infos"] = utils.get_projects_infos(PROJECTS_INFOS)
-    elif category == "adhesion":
+    elif category in ("association", "adhesion"):
         context.update(utils.get_asso_finance_status())
         context.update(utils.get_asso_urls())
     elif category == "adhesion_form":
@@ -95,7 +95,7 @@
                 category = 'thank_you'
         else:
             form = forms.RegistrationForm(initial={'subscription_amount': 10,
-                                                   'payment_method': 'card'})
+                                                   'payment_method': 'transfer'})
         context['form'] = form
         context.update(utils.get_asso_urls())
 
--- a/static/css/sat_website.css	Tue May 05 11:03:18 2015 +0200
+++ b/static/css/sat_website.css	Tue May 05 15:02:50 2015 +0200
@@ -80,6 +80,9 @@
     padding-right: 5px;
 }
 
+.badge {
+    color: #bbb;
+}
 
 /* sat_website own styles */
 
@@ -205,3 +208,7 @@
 #id_payment_type_group .active {
   background-color: lightgray;
 }
+
+.my-btn {
+    font-size: 14px;
+}
\ No newline at end of file
--- 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>
 
--- a/templates/sat_website/adhesion_form.html	Tue May 05 11:03:18 2015 +0200
+++ b/templates/sat_website/adhesion_form.html	Tue May 05 15:02:50 2015 +0200
@@ -42,7 +42,7 @@
 			                <span for="{{ field.auto_id }}">{{ field.label }}</span>
 			                <div class="btn-group" data-toggle="buttons">
 								{% for radio in field %}
-	                                <label for="{{ radio.id_for_label }}" class="btn btn-default{% if field.value == radio.choice_value %} active{% endif %}">
+	                                <label for="{{ radio.id_for_label }}" class="btn btn-default badge my-btn{% if field.value == radio.choice_value %} active{% endif %}">
     	                               {{ radio.tag }}{{ radio.choice_label }}
 	                                </label>
 								{% endfor %}
--- a/templates/sat_website/association.html	Tue May 05 11:03:18 2015 +0200
+++ b/templates/sat_website/association.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,16 +24,29 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block headline %}{% trans "The association" %}{% endblock %}
-{% block subtext %}{% trans "subtext" %}{% endblock %}
+{% block headline %}{% trans "Salut à Toi's association" %}{% endblock %}
+{% block subtext %}{% trans "The legal structure supporting the project." %}{% endblock %}
 {% block main_container %}
 
 <div class="row">
-    <h5 class="alert alert-success">
-    {% trans "Subtitle 1" %}
-    </h5>
+
+    <h5 class="alert alert-success">{% trans "Mission" %}</h5>
+    <div class="info">
+        <p>{% blocktrans %}The Salut à Toi association has been created in june 2014 and is responsible for developing, promoting and funding 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>
+    </div>
+
+    <h5 class="alert alert-success">{% trans "Funding" %}</h5>
     <div class="info">
-        <p>{% blocktrans %}dummy{% endblocktrans %}</p>
+        <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><a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</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>
     </div>
 </div>
 
--- a/templates/sat_website/features.html	Tue May 05 11:03:18 2015 +0200
+++ b/templates/sat_website/features.html	Tue May 05 15:02:50 2015 +0200
@@ -60,7 +60,7 @@
 	            <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 peer-to-peer network within a group a friends.{% endblocktrans %}
+	            {% blocktrans %}Easily send files to your contacts. Later we would like to implement a decentralised file sharing system so you could create a private peer-to-peer network within a group a friends.{% endblocktrans %}
 	        </div>
 	    </div>
 	    <div class="row">
--- a/templates/sat_website/overview.html	Tue May 05 11:03:18 2015 +0200
+++ b/templates/sat_website/overview.html	Tue May 05 15:02:50 2015 +0200
@@ -33,7 +33,7 @@
 	                <img id="overview_logo" src="{% static "images/sat_logo_64.png" %}" >
 	            </div>
 	            <div class="col-md-11">
-	                {% trans "Salut à Toi (SàT) is currently under development." %}
+	                {% trans "Salut à Toi" %}
 	                <div class="lead">{% blocktrans %}Multipurpose, multi frontend, libre and decentralised communication tool.{% endblocktrans %}</div>
 	            </div>
             </div>