# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1433854509 -7200
# Node ID 13ebb548f2346fc01c5d1efa4590570cb0091c61
# Parent  d2ea666fb1dd937cf62307590954b1a41d4d3da0
use membership instead of adhesion in English (also rename the files)

diff -r d2ea666fb1dd -r 13ebb548f234 locale/fr/LC_MESSAGES/django.po
--- a/locale/fr/LC_MESSAGES/django.po	Fri Jun 05 20:59:07 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue Jun 09 14:55:09 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-05 20:50+0200\n"
-"PO-Revision-Date: 2015-06-05 20:57+0100\n"
+"POT-Creation-Date: 2015-06-09 14:46+0200\n"
+"PO-Revision-Date: 2015-06-09 14:41+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -145,7 +145,7 @@
 #, python-brace-format
 msgid ""
 "You chose to support Salut à Toi with a subscription of {amount} euros. "
-"Please complete your adhesion with a bank transfer to:\n"
+"Please complete your membership with a bank transfer to:\n"
 "\n"
 "Payee: Salut à Toi\n"
 "IBAN: {iban}\n"
@@ -372,7 +372,7 @@
 msgid "Get in touch"
 msgstr "Nous contacter"
 
-#: sat_website/views.py:44 templates/sat_website/adhesion.html:34
+#: sat_website/views.py:44 templates/sat_website/membership.html:34
 msgid "Association"
 msgstr "Association"
 
@@ -390,7 +390,7 @@
 
 #: sat_website/views.py:51 templates/sat_website/association.html:47
 #: templates/sat_website/base.html:47 templates/sat_website/overview.html:101
-msgid "Adhesion"
+msgid "Membership"
 msgstr "Adhésion"
 
 #: sat_website/views.py:52 templates/sat_website/features.html:76
@@ -420,115 +420,6 @@
 msgid "Libervia frontend (web server and client)"
 msgstr "interface Libervia (serveur web et partie cliente)"
 
-#: 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 salaries based on the French minimal "
-"salary;</li>\n"
-"                <li>hosting this web site and the Libervia demo and "
-"registering the domain names;</li>\n"
-"                <li>fees for the association's bank account and the online "
-"payment system (apayer.fr);</li>\n"
-"                <li>administrative help such as a lawyer or an accountant;</"
-"li>\n"
-"                <li>travel expenses to attend and participate in meetings;</"
-"li>\n"
-"                <li>hardware to develop and test the software;</li>\n"
-"                <li>miscellaneous extra costs such as printing.</li>\n"
-"            </ul>\n"
-"            Which makes, with an average annual contribution of 10 € per "
-"subscription, %(asso_members_target)s members before December, 31<sup>st</"
-"sup> 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>aide administrative (avocat ou comptable) ;</li>\n"
-"                <li>frais de déplacement pour se rendre et participer aux "
-"réunions ;</li>\n"
-"                <li>matériel pour développer et tester le logiciel ;</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:56
-msgid ""
-"The membership lasts exactly one year and isn't automatically renewed: you "
-"have to renew it yourself and you can change the amount of your subscription "
-"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:58
-msgid ""
-"To join the association without paying any subscription or to proceed with a "
-"bank transfer, please use our internal form:"
-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:61
-msgid "Join for free or proceed with a transfer"
-msgstr "Adhérer gratuitement ou procéder par virement"
-
-#: templates/sat_website/adhesion.html:63
-msgid ""
-"If you prefer to proceed by card, you can directly use a secure payment "
-"service hosted by our bank. We unfortunately cannot 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. 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:66
-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:80
-msgid "Confirm"
-msgstr "Confirmer"
-
 #: templates/sat_website/association.html:27
 msgid "Salut à Toi's association"
 msgstr "Association Salut à Toi"
@@ -1351,6 +1242,115 @@
 msgid "cultural association based in Austria"
 msgstr "association culturelle basée en Autriche"
 
+#: templates/sat_website/membership.html:27
+#: templates/sat_website/membership_form.html:27
+msgid "Join the association"
+msgstr "Adhérez à l'association"
+
+#: templates/sat_website/membership.html:31
+msgid "About the association"
+msgstr "Concernant l'association"
+
+#: templates/sat_website/membership.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/membership.html:39
+msgid "Become a member"
+msgstr "Devenir membre"
+
+#: templates/sat_website/membership.html:41
+#, python-format
+msgid ""
+"For 2015, we need about %(asso_finance_target)s € for:\n"
+"            <ul>\n"
+"                <li>two full-time salaries based on the French minimal "
+"salary;</li>\n"
+"                <li>hosting this web site and the Libervia demo and "
+"registering the domain names;</li>\n"
+"                <li>fees for the association's bank account and the online "
+"payment system (apayer.fr);</li>\n"
+"                <li>administrative help such as a lawyer or an accountant;</"
+"li>\n"
+"                <li>travel expenses to attend and participate in meetings;</"
+"li>\n"
+"                <li>hardware to develop and test the software;</li>\n"
+"                <li>miscellaneous extra costs such as printing.</li>\n"
+"            </ul>\n"
+"            Which makes, with an average annual contribution of 10 € per "
+"subscription, %(asso_members_target)s members before December, 31<sup>st</"
+"sup> 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>aide administrative (avocat ou comptable) ;</li>\n"
+"                <li>frais de déplacement pour se rendre et participer aux "
+"réunions ;</li>\n"
+"                <li>matériel pour développer et tester le logiciel ;</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/membership.html:56
+msgid ""
+"The membership lasts exactly one year and isn't automatically renewed: you "
+"have to renew it yourself and you can change the amount of your subscription "
+"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/membership.html:58
+msgid ""
+"To join the association without paying any subscription or to proceed with a "
+"bank transfer, please use our internal form:"
+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/membership.html:61
+msgid "Join for free or proceed with a transfer"
+msgstr "Adhérer gratuitement ou procéder par virement"
+
+#: templates/sat_website/membership.html:63
+msgid ""
+"If you prefer to proceed by card, you can directly use a secure payment "
+"service hosted by our bank. We unfortunately cannot 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. 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/membership.html:66
+msgid "Join and proceed by card"
+msgstr "Adhérer et procéder par carte"
+
+#: templates/sat_website/membership_form.html:33
+msgid "Please complete this form"
+msgstr "Merci de bien vouloir renseigner ce formulaire"
+
+#: templates/sat_website/membership_form.html:80
+msgid "Confirm"
+msgstr "Confirmer"
+
 #: templates/sat_website/overview.html:36
 msgid "Salut à Toi"
 msgstr "Salut à Toi"
@@ -2313,6 +2313,9 @@
 "Merci de le lire attentivement, il contient les informations pour compléter "
 "votre adhésion."
 
+#~ msgid "Adhesion"
+#~ msgstr "Adhésion"
+
 #~ msgid "Click \"Add Exception\"."
 #~ msgstr "Cliquez sur « Ajouter une exception »."
 
diff -r d2ea666fb1dd -r 13ebb548f234 sat_website/forms.py
--- a/sat_website/forms.py	Fri Jun 05 20:59:07 2015 +0200
+++ b/sat_website/forms.py	Tue Jun 09 14:55:09 2015 +0200
@@ -216,7 +216,7 @@
 We received your submission and we are happy to count you in the members of the association.
 
 """)
-        PAYMENT = ugettext(u"""You chose to support Salut à Toi with a subscription of {amount} euros. Please complete your adhesion with a bank transfer to:
+        PAYMENT = ugettext(u"""You chose to support Salut à Toi with a subscription of {amount} euros. Please complete your membership with a bank transfer to:
 
 Payee: Salut à Toi
 IBAN: {iban}
diff -r d2ea666fb1dd -r 13ebb548f234 sat_website/views.py
--- a/sat_website/views.py	Fri Jun 05 20:59:07 2015 +0200
+++ b/sat_website/views.py	Tue Jun 09 14:55:09 2015 +0200
@@ -48,11 +48,11 @@
                                              ]))),
                           ])
 
-CATEGORIES_RIGHT = OrderedDict([("adhesion", _(u"Adhesion")),
+CATEGORIES_RIGHT = OrderedDict([("membership", _(u"Membership")),
                                 ("social_contract", _(u"Social contract")),
                                 ])
 
-CATEGORIES_HIDDEN = ('adhesion_form', 'thank_you')
+CATEGORIES_HIDDEN = ('membership_form', 'thank_you')
 
 PROJECTS_INFOS = {'sat': _(u'contains the backend, Primitivus and Jp'),
                   'sat_media': _(u'Images and other media needed to launch SàT'),
@@ -87,9 +87,9 @@
         context["SOCIAL_CONTRACT"] = social_contract.get_social_contract()
     elif category == "downloads":
         context["projects_infos"] = utils.get_projects_infos(PROJECTS_INFOS)
-    elif category in ("association", "adhesion"):
+    elif category in ("association", "membership"):
         context.update(utils.get_asso_urls())
-    elif category == "adhesion_form":
+    elif category == "membership_form":
         if request.method == 'POST':
             form = forms.RegistrationForm(request.POST)
             form.process_submitted_data()
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/adhesion.html
--- a/templates/sat_website/adhesion.html	Fri Jun 05 20:59:07 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-{% extends "sat_website/category.html" %}
-
-{% 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.
-
-SàT website is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Foobar is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-{% endcomment %}
-
-{% load i18n %}
-{% load staticfiles %}
-
-{% block headline %}{% trans "Join the association" %}{% endblock %}
-{% block main_container %}
-
-<div class="row">
-    <h5 class="alert alert-success">{% trans "About the association" %}</h5>
-    <div class="info">
-        <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>
-</div>
-
-<div class="row">
-    <h5 class="alert alert-success">{% trans "Become a member" %}</h5>
-    <div class="info">
-        <p>{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for:
-            <ul>
-                <li>two full-time salaries based on the French minimal salary;</li>
-                <li>hosting this web site and the Libervia demo and registering the domain names;</li>
-                <li>fees for the association's bank account and the online payment system (apayer.fr);</li>
-                <li>administrative help such as a lawyer or an accountant;</li>
-                <li>travel expenses to attend and participate in meetings;</li>
-                <li>hardware to develop and test the software;</li>
-                <li>miscellaneous extra costs such as printing.</li>
-            </ul>
-            Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31<sup>st</sup> 2015!
-            {% endblocktrans %}
-        </p>
-        {% include "sat_website/finance.html" with obj="members" %}
-        {% include "sat_website/finance.html" %}
-        <p>{% trans "The membership lasts exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your subscription every year." %}</p>
-        <p>
-        {% trans "To join the association without paying any subscription or to proceed with a bank transfer, please use our internal form:" %}
-        </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>
-        <p>{% trans "If you prefer to proceed by card, you can directly use a secure payment service hosted by our bank. We unfortunately cannot 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>
-
-{% endblock %}
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/adhesion_form.html
--- a/templates/sat_website/adhesion_form.html	Fri Jun 05 20:59:07 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-{% extends "sat_website/category.html" %}
-
-{% comment %}
-SàT website: Salut à Toi's presentation website
-Copyright (C) 2012  Jérôme Poisson (goffi@goffi.org)
-
-This file is part of SàT website.
-
-SàT website is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Foobar is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-{% endcomment %}
-
-{% load i18n %}
-{% load staticfiles %}
-{% load utils %}
-
-{% block headline %}{% trans "Join the association" %}{% endblock %}
-{% block main_container %}
-
-<form class="form-signin" action="adhesion_form.html" method="post">
-    {% csrf_token %}
-    <fieldset>
-        <legend>{% trans "Please complete this form" %}</legend>
-        {% for section, fields in form.sections.items %}
-            <div class="form-group">
-                {% if section %}
-                    <label for="{{ fields.0.auto_id }}">{{ section }}</label>
-                {% endif %}
-                {% for field in fields %}
-	                {% if field.field.widget|is_radio %}
-			            <div class="text-center" id="{{ field.auto_id }}_group" name="{{ field.name }}_group">
-			                <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 badge my-btn{% if field.value == radio.choice_value %} active{% endif %}">
-    	                               {{ radio.tag }}{{ radio.choice_label }}
-	                                </label>
-								{% endfor %}
-							</div>
-                            <div>{{ field.help_text }}</div>
-			            </div>
-                    {% elif field.field.widget|is_checkbox %}
-                        <div class="checkbox">
-                            <label>
-                                {% autoescape off %}
-                                {{ field }}{{ field.label }}
-                                {% if field.field.required %}
-                                    <span class="glyphicon glyphicon-asterisk"></span>
-                                {% endif %}
-                                {% endautoescape %}
-                            </label>
-                        </div>
-                    {% else %}
-	                    {% if field.field.required %}
-	                        <div class="input-group">
-	                    {% endif %}
-    	                {{ field }}
-	                    {% if field.field.required %}
-	                            <span class="input-group-addon"><span class="glyphicon glyphicon-asterisk"></span></span>
-	                        </div>
-	                    {% endif %}
-                    {% endif %}
-                    {% if field.errors %}
-                        <div class="alert alert-danger" role="alert">{{ field.errors }}</div>
-                    {% endif %}
-                {% endfor %}
-            </div>
-        {% endfor %}
-    </fieldset>
-    <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Confirm" %}</button>
-</form>
-
-{% endblock %}
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/association.html
--- a/templates/sat_website/association.html	Fri Jun 05 20:59:07 2015 +0200
+++ b/templates/sat_website/association.html	Tue Jun 09 14:55:09 2015 +0200
@@ -44,7 +44,7 @@
     <div class="info">
         <p>{% blocktrans %}We have been working full time on Salut à Toi for a while and we plan to continue. We are now trying to raise enough money to see if we could let the association hire us (we made the appropriate 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, by joining the association and paying a membership fee.{% endblocktrans %}</p>
         <p>{% blocktrans %}Because the money should not create any separation between us, the people who cannot or who do not want to participate financially can still join the association for free and as moral support. The French law doesn't allow members to decide the amount of payment, 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 membership fee). In that case, please contact us. As we want to stay 100% independent 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>
+        <p><a class="btn btn-default" href="membership.html" role="button">{% trans "Membership" %}</a></p>
     </div>
     
     <h5 class="alert alert-success">{% trans "Official documents" %}</h5>
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/base.html
--- a/templates/sat_website/base.html	Fri Jun 05 20:59:07 2015 +0200
+++ b/templates/sat_website/base.html	Tue Jun 09 14:55:09 2015 +0200
@@ -36,7 +36,7 @@
     <title>{% block title %}{% trans "Salut à Toi: the multi frontend, multipurpose communication tool" %}{% endblock %}</title>
 </head>
 <body role="document">
-    {% if category != "adhesion" and category != "adhesion_form" and category != "thank_you" %}
+    {% if category != "membership" and category != "membership_form" and category != "thank_you" %}
 	    <div class="alert alert-info banner">
 	        <div class="container"><div class="row">
 	            <div class="col-md-10">
@@ -44,7 +44,7 @@
 			        {% include "sat_website/finance.html" %}
 	            </div>
 	            <div class="col-md-2">
-	                <a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</a>
+	                <a class="btn btn-default" href="membership.html" role="button">{% trans "Membership" %}</a>
 	            </div>
 	        </div></div>
 	    </div>
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/membership.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sat_website/membership.html	Tue Jun 09 14:55:09 2015 +0200
@@ -0,0 +1,71 @@
+{% extends "sat_website/category.html" %}
+
+{% 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.
+
+SàT website is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Foobar is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+{% endcomment %}
+
+{% load i18n %}
+{% load staticfiles %}
+
+{% block headline %}{% trans "Join the association" %}{% endblock %}
+{% block main_container %}
+
+<div class="row">
+    <h5 class="alert alert-success">{% trans "About the association" %}</h5>
+    <div class="info">
+        <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>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">{% trans "Become a member" %}</h5>
+    <div class="info">
+        <p>{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for:
+            <ul>
+                <li>two full-time salaries based on the French minimal salary;</li>
+                <li>hosting this web site and the Libervia demo and registering the domain names;</li>
+                <li>fees for the association's bank account and the online payment system (apayer.fr);</li>
+                <li>administrative help such as a lawyer or an accountant;</li>
+                <li>travel expenses to attend and participate in meetings;</li>
+                <li>hardware to develop and test the software;</li>
+                <li>miscellaneous extra costs such as printing.</li>
+            </ul>
+            Which makes, with an average annual contribution of 10 € per subscription, {{ asso_members_target }} members before December, 31<sup>st</sup> 2015!
+            {% endblocktrans %}
+        </p>
+        {% include "sat_website/finance.html" with obj="members" %}
+        {% include "sat_website/finance.html" %}
+        <p>{% trans "The membership lasts exactly one year and isn't automatically renewed: you have to renew it yourself and you can change the amount of your subscription every year." %}</p>
+        <p>
+        {% trans "To join the association without paying any subscription or to proceed with a bank transfer, please use our internal form:" %}
+        </p>
+        <p class="text-center">
+            <a class="btn btn-primary btn-lg" href="membership_form.html" role="button">{% trans "Join for free or proceed with a transfer" %}</a>
+        </p>
+        <p>{% trans "If you prefer to proceed by card, you can directly use a secure payment service hosted by our bank. We unfortunately cannot 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>
+
+{% endblock %}
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/membership_form.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sat_website/membership_form.html	Tue Jun 09 14:55:09 2015 +0200
@@ -0,0 +1,83 @@
+{% extends "sat_website/category.html" %}
+
+{% comment %}
+SàT website: Salut à Toi's presentation website
+Copyright (C) 2012  Jérôme Poisson (goffi@goffi.org)
+
+This file is part of SàT website.
+
+SàT website is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Foobar is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+{% endcomment %}
+
+{% load i18n %}
+{% load staticfiles %}
+{% load utils %}
+
+{% block headline %}{% trans "Join the association" %}{% endblock %}
+{% block main_container %}
+
+<form class="form-signin" action="membership_form.html" method="post">
+    {% csrf_token %}
+    <fieldset>
+        <legend>{% trans "Please complete this form" %}</legend>
+        {% for section, fields in form.sections.items %}
+            <div class="form-group">
+                {% if section %}
+                    <label for="{{ fields.0.auto_id }}">{{ section }}</label>
+                {% endif %}
+                {% for field in fields %}
+	                {% if field.field.widget|is_radio %}
+			            <div class="text-center" id="{{ field.auto_id }}_group" name="{{ field.name }}_group">
+			                <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 badge my-btn{% if field.value == radio.choice_value %} active{% endif %}">
+    	                               {{ radio.tag }}{{ radio.choice_label }}
+	                                </label>
+								{% endfor %}
+							</div>
+                            <div>{{ field.help_text }}</div>
+			            </div>
+                    {% elif field.field.widget|is_checkbox %}
+                        <div class="checkbox">
+                            <label>
+                                {% autoescape off %}
+                                {{ field }}{{ field.label }}
+                                {% if field.field.required %}
+                                    <span class="glyphicon glyphicon-asterisk"></span>
+                                {% endif %}
+                                {% endautoescape %}
+                            </label>
+                        </div>
+                    {% else %}
+	                    {% if field.field.required %}
+	                        <div class="input-group">
+	                    {% endif %}
+    	                {{ field }}
+	                    {% if field.field.required %}
+	                            <span class="input-group-addon"><span class="glyphicon glyphicon-asterisk"></span></span>
+	                        </div>
+	                    {% endif %}
+                    {% endif %}
+                    {% if field.errors %}
+                        <div class="alert alert-danger" role="alert">{{ field.errors }}</div>
+                    {% endif %}
+                {% endfor %}
+            </div>
+        {% endfor %}
+    </fieldset>
+    <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Confirm" %}</button>
+</form>
+
+{% endblock %}
diff -r d2ea666fb1dd -r 13ebb548f234 templates/sat_website/overview.html
--- a/templates/sat_website/overview.html	Fri Jun 05 20:59:07 2015 +0200
+++ b/templates/sat_website/overview.html	Tue Jun 09 14:55:09 2015 +0200
@@ -98,7 +98,7 @@
             {% include "sat_website/finance.html" with obj="members" %}
             {% include "sat_website/finance.html" %}
             <p>
-                <a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</a>
+                <a class="btn btn-default" href="membership.html" role="button">{% trans "Membership" %}</a>
             </p>
         </div>