From dfc8f0757a61341739add8c88bba4259305b0f84 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Mon, 9 Jul 2018 22:38:00 +0200
Subject: [PATCH] =?UTF-8?q?Repare=20les=20b=C3=A9tises=20de=20mon=20grizzl?=
 =?UTF-8?q?y=20qui=20a=20fait=20ses=20griffes=20sur=20ce=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0044_auto_20180709_2237.py     | 25 +++++++++++++++++++
 .../preferences/display_preferences.html      | 23 +++++++++--------
 2 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 preferences/migrations/0044_auto_20180709_2237.py

diff --git a/preferences/migrations/0044_auto_20180709_2237.py b/preferences/migrations/0044_auto_20180709_2237.py
new file mode 100644
index 00000000..65ae83ed
--- /dev/null
+++ b/preferences/migrations/0044_auto_20180709_2237.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-09 20:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0043_auto_20180709_1947'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailmessageoption',
+            name='welcome_mail_en',
+            field=models.TextField(default='', help_text='Mail de bienvenue en anglais'),
+        ),
+        migrations.AlterField(
+            model_name='mailmessageoption',
+            name='welcome_mail_fr',
+            field=models.TextField(default='', help_text='Mail de bienvenue en français'),
+        ),
+    ]
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 633072ee..3f53386f 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -184,15 +184,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
 
-    <h4>Messages personalisé dans les mails</h4>
+    <h4>Messages personalisés dans les mails</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'MailMessageOption' %}">
             <i class="fa fa-edit"></i>
             Editer
         </a>
     <p>
     </p>
+    
     <table class="table table-striped">
-        {% for line in assooptions %}
+        {% for line in mailmessageoptions %}
 	<tr>
 	{% for text, field in line %}
             <th>{{ field }}</th>
@@ -202,27 +203,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
 
+
   <h2>Liste des services et préférences page d'accueil</h2>
   {% can_create preferences.Service%}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-service'  %}"><i class="fa fa-plus"></i> Ajouter un service</a>
   {% acl_end %}
   {%  include "preferences/aff_service.html" with  service_list=service_list %}
 
-  <h2>Liste des adresses mail de contact</h2>
-  {% can_create preferences.MailContact%}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact'  %}"><i class="fa fa-plus"></i>Ajouter une adresse</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-mailcontact'  %}"><i class="fa fa-trash"></i>Supprimer une ou plusieurs adresses</a>
-  {%  include "preferences/aff_mailcontact.html" with  mailcontact_list=mailcontact_list %}
-
+    <h4>Réseaux sociaux page d'accueil</h4>
 
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'HomeOption' %}">
             <i class="fa fa-edit"></i>
             Editer
         </a>
     <p>
+
     <table class="table table-striped">
-        {% for line in assooptions %}
+        {% for line in homeoptions %}
 	<tr>
 	{% for text, field in line %}
             <th>{{ field }}</th>
@@ -232,6 +229,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
 
+  <h2>Liste des adresses mail de contact</h2>
+  {% can_create preferences.MailContact%}
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:add-mailcontact'  %}"><i class="fa fa-plus"></i>Ajouter une adresse</a>
+  {% acl_end %}
+  <a class="btn btn-danger btn-sm" role="button" href="{% url 'preferences:del-mailcontact'  %}"><i class="fa fa-trash"></i>Supprimer une ou plusieurs adresses</a>
+  {%  include "preferences/aff_mailcontact.html" with  mailcontact_list=mailcontact_list %}
 
 <h2>Options pour le mail de fin d'adhésion</h2>
   {% can_create preferences.Reminder%}