From 45676ef669269b27e4606e4b5859b304925c69c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Wed, 25 Jul 2018 18:28:13 +0000 Subject: [PATCH 1/4] Fix indentation and missing div --- users/templates/users/profil.html | 143 ++++++++++++++---------------- 1 file changed, 65 insertions(+), 78 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 9628097a..3c63a6ef 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -26,100 +26,87 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load acl %} {% load logs_extra %} -{% block title %}Profil{% endblock %} -{% block content %} +{% block title %}Profil{% endblock %} + +{% block content %}
-

Bienvenue {{users.name}} {{ users.surname }}

+

Bienvenue {{users.name}} {{ users.surname }}

-
- {% if solde_activated %} -
- {% else %} -
- {% endif %} -
- {% if users.is_ban%} -
-
Votre compte est banni
-
- Fin du ban : {{user.end_ban|date:"d M Y"}} -
-
- {% elif not users.is_adherent%} -
-
Non Connécté
+
+ {% if solde_activated %} +
+ {% else %} +
+ {% endif %} + {% if users.is_ban%} +
+
Votre compte est banni
+
+ Fin du ban : {{user.end_ban|date:"d M Y"}} +
+
+ {% elif not users.is_adherent%} +
+
Non Connécté
- - Adhérer - + Adhérer + +
{% else %} -
-
Connécté
-
- Fin de connexion: {{user.end_adhesion|date:"d M Y"}} -
-
+
+
Connécté
+
+ Fin de connexion: {{user.end_adhesion|date:"d M Y"}} +
+
{% endif %} -
-
- {% if solde_activated %} -
-
-
+
+ {% if solde_activated %} +
- - {{user.solde}} -
+ {{user.solde}} +
- - Modifier le solde + Modifier le solde + +
+
+
+
+ {% else %} +
+ {% endif %} +
+ {% if nb_machines %} +
+
+ {{nb_machines}} Machines +
+
+ + Ajouter une machine -
-
+
+
+ {% else %} +
+
Aucune machine
+
+ + Ajouter une machine + +
+
+ {% endif %}
-
- {% endif %} - {% if solde_activated %} -
- {% else %} -
- {% endif %} -
- {% if nb_machines %} -
-
- {{nb_machines}} - Machines - -
-
- - - Ajouter une machine - -
-
- {% else %} -
-
Aucune machine
-
- - - Ajouter une machine - -
-
- {% endif %} -
-
-
+
From 74086539c062ddafc80dd795318c86fd9fb4356b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Wed, 25 Jul 2018 18:43:28 +0000 Subject: [PATCH 2/4] translation --- users/templates/users/profil.html | 58 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 3c63a6ef..533b4ef9 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block content %}
-

Bienvenue {{users.name}} {{ users.surname }}

+

Welcome {{ users.name }} {{ users.surname }}

@@ -42,25 +42,25 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} {% if users.is_ban%}
-
Votre compte est banni
+
Your account has been banned
- Fin du ban : {{user.end_ban|date:"d M Y"}} + End of the ban: {{ user.end_ban | date:"SHORT_DATE_FORMAT" }}
- {% elif not users.is_adherent%} + {% elif not users.is_adherent %}
-
Non Connécté
+
Not connected
- Adhérer + Pay for a connexion
{% else %}
-
Connécté
+
Connected
- Fin de connexion: {{user.end_adhesion|date:"d M Y"}} + End of connexion: {{ user.end_adhesion | date:"SHORT_DATE_FORMAT"}}
{% endif %} @@ -69,11 +69,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- {{user.solde}} + € {{ user.solde }}
- Modifier le solde + Pay for the balance
@@ -82,29 +82,27 @@ with this program; if not, write to the Free Software Foundation, Inc., {% else %}
{% endif %} -
- {% if nb_machines %} -
-
- {{nb_machines}} Machines -
-
- - Ajouter une machine - -
+ {% if nb_machines %} +
+
+ Machines {{ nb_machines }}
- {% else %} -
-
Aucune machine
-
- - Ajouter une machine - -
+
+ + Add a machine +
- {% endif %}
+ {% else %} +
+
No machines
+
+ + Add a machine + +
+
+ {% endif %}
From 939d5326aac6f9aa7624e61ac6a9c304672f0c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Wed, 25 Jul 2018 18:46:48 +0000 Subject: [PATCH 3/4] Fix if-else --- users/templates/users/profil.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 533b4ef9..37c08d3d 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -35,11 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- {% if solde_activated %} -
- {% else %} -
- {% endif %} +
{% if users.is_ban%}
Your account has been banned
@@ -78,10 +74,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
- {% else %} -
{% endif %} +
{% if nb_machines %}
From 1336b096a753b4ecb3fd93da1cd261739107ea76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Wed, 25 Jul 2018 18:57:28 +0000 Subject: [PATCH 4/4] Fix link for membership --- users/templates/users/profil.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 37c08d3d..6e960fc2 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -47,9 +47,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Not connected
- + {% can_create Facture %} + Pay for a connexion + {% acl_else %} + Ask for someone with the correct rights to pay for a connexion + {% acl_end %}
{% else %} @@ -110,7 +114,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Informations détaillées
-
+