Mercurial > sat_legacy_website

changeset 116:e138879873f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes to link the crowdfunding campaign (revert to be done manually after 45 days)
author souliane <souliane@mailoo.org>
date Tue, 20 Oct 2015 11:15:45 +0200
parents bd30a18690e7
children 777750923062
files locale/fr/LC_MESSAGES/django.po sat_website/views.py static/images/misc/campagne_android.png templates/sat_website/base.html templates/sat_website/membership.html
diffstat 5 files changed, 190 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po	Tue Oct 20 10:11:27 2015 +0200
+++ b/locale/fr/LC_MESSAGES/django.po	Tue Oct 20 11:15:45 2015 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-18 13:27+0200\n"
-"PO-Revision-Date: 2015-10-18 13:28+0100\n"
+"POT-Creation-Date: 2015-10-20 11:07+0200\n"
+"PO-Revision-Date: 2015-10-20 11:13+0100\n"
 "Last-Translator: Salut à Toi <contact@salut-a-toi.org>\n"
 "Language-Team: français <goffi@goffi.org>\n"
 "Language: fr\n"
@@ -139,7 +139,7 @@
 "the association.\n"
 "\n"
 msgstr ""
-"Merci, {name}!\n"
+"Merci, {name} !\n"
 "\n"
 "Nous avons reçu votre demande et nous sommes heureux de vous compter parmi "
 "les membres de l'association.\n"
@@ -349,97 +349,97 @@
 msgid "subtitles"
 msgstr "sous-titres"
 
-#: sat_website/views.py:31
+#: sat_website/views.py:32
 msgid "Presentation"
 msgstr "Présentation"
 
-#: sat_website/views.py:32 templates/sat_website/overview.html:66
+#: sat_website/views.py:33 templates/sat_website/overview.html:66
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: sat_website/views.py:33 templates/sat_website/overview.html:77
+#: sat_website/views.py:34 templates/sat_website/overview.html:77
 #: templates/sat_website/principles.html:60
 msgid "Frontends"
 msgstr "Interfaces"
 
-#: sat_website/views.py:34
+#: sat_website/views.py:35
 msgid "Screenshots & Videos"
 msgstr "Captures d'écran et vidéos"
 
-#: sat_website/views.py:36
+#: sat_website/views.py:37
 msgid "Technical area"
 msgstr "Espace technique"
 
-#: sat_website/views.py:37 templates/sat_website/principles.html:26
+#: sat_website/views.py:38 templates/sat_website/principles.html:26
 msgid "Principles"
 msgstr "Principes"
 
-#: sat_website/views.py:38 templates/sat_website/principles.html:46
+#: sat_website/views.py:39 templates/sat_website/principles.html:46
 msgid "Specifications"
 msgstr "Spécifications"
 
-#: sat_website/views.py:39 templates/sat_website/downloads.html:27
+#: sat_website/views.py:40 templates/sat_website/downloads.html:27
 #: templates/sat_website/overview.html:110
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: sat_website/views.py:40
+#: sat_website/views.py:41
 msgid "Developers corner"
 msgstr "Coin des développeurs"
 
-#: sat_website/views.py:42
+#: sat_website/views.py:43
 msgid "Community"
 msgstr "Communauté"
 
-#: sat_website/views.py:43
+#: sat_website/views.py:44
 msgid "Get in touch"
 msgstr "Nous contacter"
 
-#: sat_website/views.py:44 templates/sat_website/membership.html:47
+#: sat_website/views.py:45 templates/sat_website/membership.html:74
 msgid "Association"
 msgstr "Association"
 
-#: sat_website/views.py:45
+#: sat_website/views.py:46
 msgid "Links"
 msgstr "Liens"
 
-#: sat_website/views.py:46 templates/sat_website/press.html:27
+#: sat_website/views.py:47 templates/sat_website/press.html:27
 msgid "Press"
 msgstr "Presse"
 
-#: sat_website/views.py:47
+#: sat_website/views.py:48
 msgid "FAQ"
 msgstr "FAQ"
 
-#: sat_website/views.py:51 templates/sat_website/association.html:47
-#: templates/sat_website/base.html:47 templates/sat_website/overview.html:101
+#: sat_website/views.py:52 templates/sat_website/association.html:47
+#: templates/sat_website/overview.html:101
 msgid "Membership"
 msgstr "Adhésion"
 
-#: sat_website/views.py:52 templates/sat_website/features.html:76
+#: sat_website/views.py:53 templates/sat_website/features.html:76
 #: templates/sat_website/overview.html:85
 #: templates/sat_website/principles.html:74
 msgid "Social contract"
 msgstr "Contrat social"
 
-#: sat_website/views.py:62
+#: sat_website/views.py:63
 msgid "contains the backend, Primitivus and Jp"
 msgstr "contient le backend, Primitivus et Jp"
 
-#: sat_website/views.py:63
+#: sat_website/views.py:64
 msgid "Images and other media needed to launch SàT"
 msgstr "images et autres média nécessaires au lancement de SàT"
 
-#: sat_website/views.py:64
+#: sat_website/views.py:65
 msgid "console display library needed by Primitivus"
 msgstr "bibliothèque pour l'affichage en console de Primitivus"
 
-#: sat_website/views.py:65
+#: sat_website/views.py:66
 msgid "PubSub server component needed for SàT experimental blogging features"
 msgstr ""
 "composant serveur PubSub pour les fonctionnalités expérimentales de blogage"
 
-#: sat_website/views.py:66
+#: sat_website/views.py:67
 msgid "Libervia frontend (web server and client)"
 msgstr "interface Libervia (serveur web et partie cliente)"
 
@@ -572,23 +572,35 @@
 msgid "Salut à Toi: the multi frontend, multipurpose communication tool"
 msgstr "Salut à Toi: l'outil de communication multi-interfaces et multi-usages"
 
-#: templates/sat_website/base.html:43
-msgid ""
-"We need your support to continue and move forward! Take the time to read "
-"about what we do. If you like it, please join the association."
-msgstr ""
-"Nous avons besoin de votre aide pour continuer à avancer ! Soutenez-nous en "
-"adhérant à l'association !"
+#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61
+msgid " days"
+msgstr " jours"
+
+#: templates/sat_website/base.html:59 templates/sat_website/membership.html:61
+msgid "day"
+msgstr "jour"
 
-#: templates/sat_website/base.html:89
+#: templates/sat_website/base.html:60
+msgid "left to support our"
+msgstr "restants pour supporter notre"
+
+#: templates/sat_website/base.html:61
+msgid "crowdfunding campaign"
+msgstr "campagne de financement participatif"
+
+#: templates/sat_website/base.html:62
+msgid "for an Android interface!"
+msgstr "pour une interface Android !"
+
+#: templates/sat_website/base.html:105
 msgid "Set language"
 msgstr "Changer la langue"
 
-#: templates/sat_website/base.html:99
+#: templates/sat_website/base.html:115
 msgid "\"Salut à Toi\" association"
 msgstr "Association « Salut à Toi »"
 
-#: templates/sat_website/base.html:100 templates/sat_website/community.html:35
+#: templates/sat_website/base.html:116 templates/sat_website/community.html:35
 msgid "(replace invalid with org)"
 msgstr "(remplacez invalid par org)"
 
@@ -1216,9 +1228,7 @@
 msgid "Your idea here"
 msgstr "Votre idée ici"
 
-#: templates/sat_website/gallery.html:40
-#: templates/sat_website/membership.html:38
-#: templates/sat_website/video.html:35
+#: templates/sat_website/gallery.html:40 templates/sat_website/video.html:35
 #, python-format
 msgid ""
 "Your browser doesn't manage the « video » tag, you should update, e.g. with "
@@ -1336,11 +1346,39 @@
 msgid "Join the association"
 msgstr "Adhérez à l'association"
 
-#: templates/sat_website/membership.html:44
+#: templates/sat_website/membership.html:56
+msgid ""
+"We are curently running a crowdfunding campaign for the development of an "
+"<b>Android application</b> (frontend for smartphones)."
+msgstr ""
+"Nous sommes actuellement en campagne de financement participatif pour le "
+"développement d'une <b>interface Android</b> (pour les <i>smartphones</i>)."
+
+#: templates/sat_website/membership.html:57
+msgid ""
+"During this period, we would kindly ask you to support the campaign instead "
+"of paying a membership fee. It is still and always possible to join the "
+"association for free. It doesn't change anything for you but it helps the "
+"campaign to succeed. <b>Thank you!</b>"
+msgstr ""
+"Pendant cette période, nous vous demanderions de bien vouloir supporter la "
+"campagne plutôt que de payer une cotisation. Il est toujours possible de "
+"rejoindre l'association gratuitement. Pour vous, ça ne change rien, mais ça "
+"contribue au succès de la campagne. <b>Merci !</b>"
+
+#: templates/sat_website/membership.html:62
+msgid "left!"
+msgstr "restants !"
+
+#: templates/sat_website/membership.html:65
+msgid "Crowdfunding campaign"
+msgstr "Campagne de financement participatif"
+
+#: templates/sat_website/membership.html:71
 msgid "About the association"
 msgstr "Concernant l'association"
 
-#: templates/sat_website/membership.html:46
+#: templates/sat_website/membership.html:73
 msgid ""
 "We want it to be as transparent as the software. You can read about its "
 "mission, its organisation and check the official documents."
@@ -1349,51 +1387,11 @@
 "renseigner sur sa mission, son organisation et consulter les documents "
 "officiels."
 
-#: templates/sat_website/membership.html:52
+#: templates/sat_website/membership.html:79
 msgid "Become a member"
 msgstr "Devenir membre"
 
-#: templates/sat_website/membership.html:54
-#, 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:69
+#: templates/sat_website/membership.html:101
 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 "
@@ -1403,7 +1401,7 @@
 "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:71
+#: templates/sat_website/membership.html:103
 msgid ""
 "To join the association without paying any subscription or to proceed with a "
 "bank transfer, please use our internal form:"
@@ -1411,11 +1409,11 @@
 "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:74
+#: templates/sat_website/membership.html:106
 msgid "Join for free or proceed with a transfer"
 msgstr "Adhérer gratuitement ou procéder par virement"
 
-#: templates/sat_website/membership.html:76
+#: templates/sat_website/membership.html:108
 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 "
@@ -1428,7 +1426,7 @@
 "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:79
+#: templates/sat_website/membership.html:111
 msgid "Join and proceed by card"
 msgstr "Adhérer et procéder par carte"
 
@@ -2409,6 +2407,53 @@
 "votre adhésion."
 
 #~ msgid ""
+#~ "We need your support to continue and move forward! Take the time to read "
+#~ "about what we do. If you like it, please join the association."
+#~ msgstr ""
+#~ "Nous avons besoin de votre aide pour continuer à avancer ! Soutenez-nous "
+#~ "en adhérant à l'association !"
+
+#~ 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"
+#~ "            "
+
+#~ msgid ""
 #~ "Salut à Toi's multi-user chat room is <strong>*the*</strong> place to "
 #~ "discuss the project: %(sat_muc)s"
 #~ msgstr ""
--- a/sat_website/views.py	Tue Oct 20 10:11:27 2015 +0200
+++ b/sat_website/views.py	Tue Oct 20 11:15:45 2015 +0200
@@ -26,6 +26,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.template import RequestContext
 from collections import OrderedDict
+import datetime
 import media, social_contract, utils, forms
 
 CATEGORIES = OrderedDict([('frontends', (_(u"Presentation"),
@@ -80,6 +81,10 @@
                "category": category,
                "libervia_demo_url": utils.get_libervia_demo_url(),
                "subscription_amounts": utils.get_asso_subscr_amounts(),
+               
+               # FIXME: dirty implementation just for the duration of the campaign!
+               # http://stackoverflow.com/questions/4327021/python-count-down-to-event-in-days-and-hours
+               "campaign_countdown": (datetime.datetime(2015, 12, 6) - datetime.datetime.now()).days,
                })
 
     context.update(csrf(request))
Binary file static/images/misc/campagne_android.png has changed
--- a/templates/sat_website/base.html	Tue Oct 20 10:11:27 2015 +0200
+++ b/templates/sat_website/base.html	Tue Oct 20 11:15:45 2015 +0200
@@ -38,7 +38,10 @@
 <body role="document">
     {% 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="container">
+
+				{% comment %}
+				<div class="row">
 	            <div class="col-md-10">
 			        {% trans "We need your support to continue and move forward! Take the time to read about what we do. If you like it, please join the association." %}
 			        {% include "sat_website/finance.html" %}
@@ -46,7 +49,19 @@
 	            <div class="col-md-2">
 	                <a class="btn btn-default" href="membership.html" role="button">{% trans "Membership" %}</a>
 	            </div>
-	        </div></div>
+				</div>
+	            
+				# FIXME: dirty implementation just for the duration of the campaign!
+	            {% endcomment %}
+	            <div class="text-center">
+	            	{{ campaign_countdown }}
+	            	{% if campaign_countdown > 1 %}{% trans " days" %}{% else %}{% trans "day" %}{% endif %}
+	            	{% trans "left to support our" %}
+	            	<a class="btn btn-default" style="float:none" href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#" role="button">{% trans "crowdfunding campaign" %}</a>
+					{% trans "for an Android interface!" %}
+				</div>
+
+	        </div>
 	    </div>
 	{% else %}
 	    <div class="banner"></div>
--- a/templates/sat_website/membership.html	Tue Oct 20 10:11:27 2015 +0200
+++ b/templates/sat_website/membership.html	Tue Oct 20 11:15:45 2015 +0200
@@ -28,6 +28,7 @@
 {% block headline %}{% trans "Join the association" %}{% endblock %}
 {% block main_container %}
 
+{% comment %}
 <div class="row">
     <div class="info text-center">
 	    <video class="video-campaign" poster="http://ftp.goffi.org/media/video/posters/libervia_adhesion_2015.png" controls preload="none">
@@ -37,10 +38,36 @@
 		    <track label="{{lang.name_local}}" src="http://ftp.goffi.org/media/video/libervia_adhesion_2015_{{LANGUAGE_CODE}}.vtt" kind="subtitles" srclang="{{LANGUAGE_CODE}}" default />
             {% blocktrans with firefox="<a href=\"http://www.mozilla.org/\">Firefox</a>" %}Your browser doesn't manage the « video » tag, you should update, e.g. with the last {{ firefox }}.{% endblocktrans %}
 	    </video>
-    </div>
+	</div>
 </div>
+
+# FIXME: dirty implementation just for the duration of the campaign!
+{% endcomment %}
                         
 <div class="row">
+	<div class="alert alert-info">
+		<p style="text-align: center">
+			<a href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#">
+				<img src="{% static "images/misc/campagne_android.png" %}" style="max-width:100%;" />
+			</a>
+		</p>
+		<p>&nbsp;</p>
+		<p style="max-width: 754px; text-align: justify; margin: auto">
+			{% trans "We are curently running a crowdfunding campaign for the development of an <b>Android application</b> (frontend for smartphones)." %}
+			{% trans "During this period, we would kindly ask you to support the campaign instead of paying a membership fee. It is still and always possible to join the association for free. It doesn't change anything for you but it helps the campaign to succeed. <b>Thank you!</b>" %}
+	    </p>
+		<p style="text-align: center; font-size: x-large">
+			{{ campaign_countdown }}
+	       	{% if campaign_countdown > 1 %}{% trans " days" %}{% else %}{% trans "day" %}{% endif %}
+         	{% trans "left!" %}
+		</p>
+	    <p style="text-align: center">
+	    	<a class="btn btn-primary btn-lg" href="http://www.arizuka.com/{{LANGUAGE_CODE}}/projects/libervia/" target="#" role="button">{% trans "Crowdfunding campaign" %}</a>
+	    </p>
+	</div>
+</div>
+
+<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>
@@ -51,6 +78,8 @@
 <div class="row">
     <h5 class="alert alert-success">{% trans "Become a member" %}</h5>
     <div class="info">
+
+		{% comment %}
         <p>{% blocktrans %}For 2015, we need about {{ asso_finance_target }} € for:
             <ul>
                 <li>two full-time salaries based on the French minimal salary;</li>
@@ -66,17 +95,19 @@
         </p>
         {% include "sat_website/finance.html" with obj="members" %}
         {% include "sat_website/finance.html" %}
+        {% endcomment %}
+
         <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>
+            <a class="btn btn-default" 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>
+            <a class="btn btn-default" href="https://www.apayer.fr/salut-a-toi" target="#" role="button">{% trans "Join and proceed by card" %}</a>
         </p>
     </div>
 </div>