From 2996924fe44d5846dfc5251a104fdcaaab239eb3 Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Tue, 21 Feb 2017 11:38:21 +0100
Subject: [PATCH] user urls included in global interface

---
 shared/templates/base_nav.html     | 6 ++++--
 user/templates/user/base_user.html | 2 +-
 user/templates/user/user_form.html | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/shared/templates/base_nav.html b/shared/templates/base_nav.html
index 79d61b3..57a059a 100644
--- a/shared/templates/base_nav.html
+++ b/shared/templates/base_nav.html
@@ -67,10 +67,12 @@
                         <i class="fa fa-user fa-fw fa-lg"></i> <i class="fa fa-caret-down"></i>
                     </a>
                     <ul class="dropdown-menu dropdown-user">
-                        <li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>
+                        <li><a href="#"><i class="fa fa-user fa-fw"></i>Mon profile</a>
+                        </li>
+                        <li><a href="{% url "user:password_change" %}"><i class="fa fa-unlock-alt fa-fw"></i>Changer de mot de passe</a>
                         </li>
                         <li class="divider"></li>
-                        <li><a href="login.html"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
+                        <li><a href="{% url "user:logout" %}"><i class="fa fa-sign-out fa-fw"></i>Se déconnecter</a>
                         </li>
                     </ul>
                     <!-- /.dropdown-user -->
diff --git a/user/templates/user/base_user.html b/user/templates/user/base_user.html
index ea8df3e..fa35902 100644
--- a/user/templates/user/base_user.html
+++ b/user/templates/user/base_user.html
@@ -24,7 +24,7 @@
     {% if user.is_authenticated %}
     <li>
         <a href="{% url "user:password_change" %}">
-            <i class="fa fa-dashboard"></i>
+            <i class="fa fa-unlock-alt"></i>
             <span>Changer de mot de passe</span>
         </a>
     </li>
diff --git a/user/templates/user/user_form.html b/user/templates/user/user_form.html
index a782471..49bbfa2 100644
--- a/user/templates/user/user_form.html
+++ b/user/templates/user/user_form.html
@@ -10,6 +10,9 @@
         <div class="col-lg-12">
         <div class="form-panel">
              <h4 class="mb"><i class="fa fa-angle-right"></i> Formulaire</h4>
+            {% if form.errors %}
+            <p class="text-danger">{% block user_error %}{% endblock %}</p>
+            {% endif %}
             <form class="form-horizontal style-form" method="post" action="{%block action_name%}{%endblock%}">
                 {% csrf_token %}
                 <fieldset>
@@ -28,7 +31,7 @@
                             <label class="col-sm-2 control-label">{{ field.label }}</label> 
                             <div class="col-sm-10 controls">{{ field | attr:"class:form-control" }}
                                 {% if field.help_text %}
-                                    <p class="help-inline"><small>{{ field.help_text }}</small></p>
+                                    <p class="help-inline"><small>{{ field.help_text | safe }}</small></p>
                                 {% endif %}
                             </div>
                         </div>