From 496a7ab6a06427f41d4a019b968a07dee6597d87 Mon Sep 17 00:00:00 2001
From: Yoann Pietri <yoann.pietri@supelec.fr>
Date: Tue, 6 Mar 2018 17:04:57 +0100
Subject: [PATCH] Ajout du bouton navbar

---
 templates/base.html | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index d49e0717..3f2a3d40 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -70,7 +70,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     </div>
                     <div class="collapse navbar-collapse" id="myNavbar">
                         <ul class="nav navbar-nav">
-                            <li><a href="{% url "users:mon-profil" %}"><i class="fa fa-user"></i> Mon profil</a></li>
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user-circle"></i> {{request.user.pseudo|slice:":15"}} <span class="caret"></span></a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="{% url "users:mon-profil" %}"><i class="fa fa-user"></i> Mon profil</a></li>
+                                    <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out-alt"></i> Se déconnecter</a></li>
+                                </ul>
+                            </li>
                             {% can_view_any_app users machines cotisations %}
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-users"></i> Adhérents<span class="caret"></span></a>
@@ -106,13 +112,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             </form>
                         </div>
                         <ul class="nav navbar-nav navbar-right">
-                                {% if request.user.is_authenticated %}
-                                <li>
-                                <a href="{% url 'logout' %}">
-                                    <i class="fa fa-sign-out-alt"></i> Logout
-                                </a>
-                                </li>
-                                {% else %}
+                                {% if not request.user.is_authenticated %}
                                 {% if var_sa %}
                                 <li>
                                     <a href="{% url 'users:new-user' %}">
@@ -134,6 +134,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                     <i class="fa fa-cogs"></i> Preferences
                                 </a>
 			    </li>
+                <li>
+                    <a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> A propos</a>
+                </li>
 			</ul>
                         {% acl_end %}
 		    </div>