Changement des couleurs et prise en ompte de l'activation du solde

users/templates/users/profil.html

@@ -32,60 +32,78 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 </div>
 <div class="dashboard_container">
 <div class="row">
+    {% if solde_activated %}
     <div class="col-sm-6 col-md-4">
+    {% else %}
+    <div class="col-sm-6 col-md-6">
+    {% endif %}
       	<div class="col-12">
 	    {% if users.is_adherent %}
 	    <div class="panel panel-success">
-	    <div class="panel-heading dashboard">Adhérent</div>
-	    <div class="panel-body dashboard"><i class="text-success">Fin d'adhésion: {{user.end_adhesion}}</i></div>
+	    	<div class="panel-heading dashboard">Connécté</div>
+	    	<div class="panel-body dashboard"><i class="text-success">Fin de connexion: {{user.end_adhesion|date:"d M Y"}}</i></div>
+	    </div>
             {% else %}
 	    <div class="panel panel-danger">
-	    <div class="panel-heading dashboard">Non adhérent</div>
-	    <div class="panel-body dashboard"> 
-	        <a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
-                    <i class="fas fa-sign-in-alt"></i>
-                    Adhérer
-                </a>
+	    	<div class="panel-heading dashboard">Non connécté</div>
+	    	<div class="panel-body dashboard"> 
+	        	<a class="btn btn-danger btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
+                    	<i class="fas fa-sign-in-alt"></i>
+                    	Adhérer
+                	</a>
+	    	</div>
 	    </div>
             {% endif %}
-	    </div>
 	</div>
     </div>
+    {% if solde_activated %}
     <div class="col-sm-6 col-md-4">
         <div class="col-12">
             <div class="col-12">
-	    <div class="panel panel-info">
-	    <div class="panel-heading dashboard">{{user.solde}} <i class="fas fa-euro-sign"></i></div>
-	    <div class="panel-body dashboard">
-	        <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
-                    <i class="fa fa-euro-sign"></i>
-                    Modifier le solde
-                </a>
-		</div>
-	    </div>
-    	</div>
+	    	<div class="panel panel-info">
+	    		<div class="panel-heading dashboard">{{user.solde}} <i class="fas fa-euro-sign"></i></div>
+	    		<div class="panel-body dashboard">
+	        		<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
+                    		<i class="fa fa-euro-sign"></i>
+                    		Modifier le solde
+                		</a>
+			</div>
+	    	</div>
+    	    </div>
         </div>
     </div>
+    {% endif %}
+    {% if solde_activated %}
     <div class="col-sm-6 col-md-4">
+    {% else %}
+    <div class="col-sm-6 col-md-6">
+    {% endif %}
         <div class="col-12">
 	    {% if nb_machines %}
 	    <div class="panel panel-info">
-	    <div class="panel-heading dashboard">
-                <span class="badge">{{nb_machines}}</span>
-                Machines
- 		<i class="fa fa-desktop"></i>
+	    	<div class="panel-heading dashboard">
+                	<span class="badge">{{nb_machines}}</span>
+                	Machines
+ 			<i class="fa fa-desktop"></i>
+	    	</div>
+	    	<div class="panel-body dashboard">
+            		<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
+                	<i class="fa fa-desktop"></i>
+                	Ajouter une machine
+                	</a>
+	    	</div>
 	    </div>
             {% else %}
 	    <div class="panel panel-warning">
-	    <div class="panel-heading dashboard">Aucune machine</div>
-            {% endif %}
-	    <div class="panel-body dashboard">
-            	<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
-                <i class="fa fa-desktop"></i>
-                Ajouter une machine
-                </a>
-	    </div>
+	    	<div class="panel-heading dashboard">Aucune machine</div>
+	    	<div class="panel-body dashboard">
+            		<a class="btn btn-warning btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
+                	<i class="fa fa-desktop"></i>
+                	Ajouter une machine
+                	</a>
+	    	</div>
 	    </div>
+            {% endif %} 
         </div>
     </div>
 </div>