From 48b85f865832f06c2148ecc1426cef9eb6d3b168 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sat, 16 Jun 2018 09:57:21 +0200 Subject: [PATCH] =?UTF-8?q?Prise=20en=20compte=20du=20bannissement=20et=20?= =?UTF-8?q?d=C3=A9ployement=20des=20des=20infos=20si=20clique=20dans=20les?= =?UTF-8?q?=20titres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/css/base.css | 2 ++ users/templates/users/profil.html | 41 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/static/css/base.css b/static/css/base.css index 814a5f72..e4c8075c 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -106,6 +106,8 @@ margin-bottom: 20px; .panel-body.dashboard{ text-align: center; + height: 60px; + vertical-align:middle; } #grad_red { background: red; /* For browsers that do not support gradients */ diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 5f325ce0..2eac1e17 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -38,20 +38,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
- {% if users.is_adherent %} -
-
Connécté
-
Fin de connexion: {{user.end_adhesion|date:"d M Y"}}
-
- {% else %} + {% if users.is_ban%}
-
Non connécté
-
- - - Adhérer - -
+
Votre compte est banni
+
+ Fin du ban : {{user.end_ban|date:"d M Y"}} +
+
+ {% elif not users.is_adherent%} +
+
Non Connécté
+
+ + + Adhérer + +
+ {% else %} +
+
Connécté
+
+ Fin de connexion: {{user.end_adhesion|date:"d M Y"}} +
{% endif %}
@@ -61,7 +69,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-
{{user.solde}}
+
+ + {{user.solde}} +
@@ -81,7 +92,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if nb_machines %}
-
+
{{nb_machines}} Machines