From 86b3b5ddcdffca1afc12e323c6a4c85fd14145e5 Mon Sep 17 00:00:00 2001 From: LEVY-FALK Hugo Date: Tue, 14 Nov 2017 15:48:17 +0100 Subject: [PATCH 1/2] Fix #15 Deprecated font HTML tag --- .../cotisations/aff_cotisations.html | 2 +- templates/base.html | 8 +++---- users/templates/users/aff_users.html | 4 ++-- users/templates/users/profil.html | 22 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 81feb0bf..7a4d5e31 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc., PDF {% else %} - Facture invalide + Facture invalide {% endif %} diff --git a/templates/base.html b/templates/base.html index 7a886abc..cd95662a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -146,9 +146,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Connexion {% if request_user.has_access %} - jusqu'au {{ request.user.end_access|date:"d b Y" }} + jusqu'au {{ request.user.end_access|date:"d b Y" }} {% else %} - Désactivée + Désactivée {% endif %} @@ -156,9 +156,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Adhésion {% if request_user.is_adherent %} - jusqu'au {{ request_user.end_adhesion|date:"d b Y" }} + jusqu'au {{ request_user.end_adhesion|date:"d b Y" }} {% else %} - Non adhérent + Non adhérent {% endif %} diff --git a/users/templates/users/aff_users.html b/users/templates/users/aff_users.html index c03cfa74..1015d94d 100644 --- a/users/templates/users/aff_users.html +++ b/users/templates/users/aff_users.html @@ -46,9 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ user.room }} {% if user.is_adherent %}{{ user.end_adhesion }}{% else %}Non adhérent{% endif %} {% if user.has_access == True %} - Active + Active {% else %} - Désactivée + Désactivée {% endif %} diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 559ea57d..253ab86d 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -90,38 +90,38 @@ with this program; if not, write to the Free Software Foundation, Inc., Fin d'adhésion {% if user.end_adhesion != None %} - {{ user.end_adhesion }} + {{ user.end_adhesion }} {% else %} - Non adhérent + Non adhérent {% endif %} Accès gracieux {% if user.end_whitelist != None %} - {{ user.end_whitelist }} + {{ user.end_whitelist }} {% else %} - Aucun + Aucun {% endif %} Bannissement {% if user.end_ban != None %} - {{ user.end_ban }} + {{ user.end_ban }} {% else %} - Non banni + Non banni {% endif %} Statut {% if user.state == 0 %} - Actif + Actif {% elif user.state == 1 %} - Désactivé + Désactivé {% else %} - Archivé + Archivé {% endif %} Accès internet {% if user.has_access == True %} - Actif (jusqu'au {{ user.end_access }}) + Actif (jusqu'au {{ user.end_access }}) {% else %} - Désactivé + Désactivé {% endif %} Droits {% if list_droits %} From 1d6e26c0781c88c7aa2d5ba4f88259e50086e3f7 Mon Sep 17 00:00:00 2001 From: LEVY-FALK Hugo Date: Tue, 14 Nov 2017 16:11:08 +0100 Subject: [PATCH 2/2] Missed aff_club.html --- users/templates/users/aff_clubs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/templates/users/aff_clubs.html b/users/templates/users/aff_clubs.html index 71ac1606..cb9f5f95 100644 --- a/users/templates/users/aff_clubs.html +++ b/users/templates/users/aff_clubs.html @@ -44,9 +44,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {{ club.room }} {% if club.is_adherent %}{{ club.end_adhesion }}{% else %}Non adhérent{% endif %} {% if club.has_access == True %} - Active + Active {% else %} - Désactivée + Désactivée {% endif %}