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 %} -

Messages personalisé dans les mails

+

Messages personalisés dans les mails

Editer

+ - {% for line in assooptions %} + {% for line in mailmessageoptions %} {% for text, field in line %} @@ -202,27 +203,23 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
{{ field }}
+

Liste des services et préférences page d'accueil

{% can_create preferences.Service%} Ajouter un service {% acl_end %} {% include "preferences/aff_service.html" with service_list=service_list %} -

Liste des adresses mail de contact

- {% can_create preferences.MailContact%} - Ajouter une adresse - {% acl_end %} - Supprimer une ou plusieurs adresses - {% include "preferences/aff_mailcontact.html" with mailcontact_list=mailcontact_list %} - +

Réseaux sociaux page d'accueil

Editer

+ - {% for line in assooptions %} + {% for line in homeoptions %} {% for text, field in line %} @@ -232,6 +229,12 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
{{ field }}
+

Liste des adresses mail de contact

+ {% can_create preferences.MailContact%} + Ajouter une adresse + {% acl_end %} + Supprimer une ou plusieurs adresses + {% include "preferences/aff_mailcontact.html" with mailcontact_list=mailcontact_list %}

Options pour le mail de fin d'adhésion

{% can_create preferences.Reminder%}