From 49fdaa6824e1d3f6336702400ccd9d3579a9c0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@ens.fr>
Date: Wed, 3 Aug 2016 06:33:27 +0200
Subject: [PATCH] Minor changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Création d'un template pour nav
- Modification des liens entre les pages account
- Correction de la balise form dans account_update.html
- Ajout d'un nom pour la résolution inversée de account
---
 kfet/templates/kfet/account.html        |  2 ++
 kfet/templates/kfet/account_update.html |  2 +-
 kfet/templates/kfet/base.html           | 11 +----------
 kfet/templates/kfet/base_nav.html       | 20 ++++++++++++++++++++
 kfet/urls.py                            |  3 ++-
 kfet/views.py                           |  2 +-
 6 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 kfet/templates/kfet/base_nav.html
diff --git a/kfet/templates/kfet/account.html b/kfet/templates/kfet/account.html
index 450d6a94..c23828bf 100644
--- a/kfet/templates/kfet/account.html
+++ b/kfet/templates/kfet/account.html
@@ -4,6 +4,8 @@
 
 {% block content %}
 
+<a href="{% url 'kfet.account.create' %}">Créer un compte</a>
+
 <ul>
 {% for account in accounts %}
     <li>
diff --git a/kfet/templates/kfet/account_update.html b/kfet/templates/kfet/account_update.html
index 216dedb2..fd3cafb5 100644
--- a/kfet/templates/kfet/account_update.html
+++ b/kfet/templates/kfet/account_update.html
@@ -15,7 +15,7 @@
 {% elif post and not success %}
     <p>Echec de la mise à jour des informations</p>
 {% endif %}
-<form submit="{% url 'kfet.account.update' account.trigramme %}" method="post">
+<form action="{% url 'kfet.account.update' account.trigramme %}" method="post">
     {% csrf_token %}
     {{ user_form.as_p }}
     {{ cof_form.as_p }}
diff --git a/kfet/templates/kfet/base.html b/kfet/templates/kfet/base.html
index f593cb86..6a70e649 100644
--- a/kfet/templates/kfet/base.html
+++ b/kfet/templates/kfet/base.html
@@ -12,16 +12,7 @@
     <![endif]-->
 </head>
 <body>
-    <nav>
-        <ul>
-            <li><a href="{% url "kfet.home" %}">Home</a></li>
-            {% if perms.kfet.add_account %}
-                <li>
-                    <a href={% url "kfet.account.create" %}>Créer un compte</a>
-                </li>
-            {% endif %}
-        </ul>
-    </nav>
+    {% include "kfet/base_nav.html" %}
     <section id="content">
         {% block content %}TGTG{% endblock %}
     </section>
diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html
new file mode 100644
index 00000000..ac62967e
--- /dev/null
+++ b/kfet/templates/kfet/base_nav.html
@@ -0,0 +1,20 @@
+<nav>
+    Standard
+    <ul>
+        <li><a href="{% url "kfet.home" %}">Home</a></li>
+        <li>
+        {% if request.user.profile.account_kfet %}
+            <a href="{% url "kfet.account.read" request.user.profile.account_kfet.trigramme %}">
+                Mes infos
+            </a>
+        {% endif %}
+        </li>
+    </ul>
+    Equipe
+    {% if perms.is_team %}
+    <ul>
+        <li><a href="{% url "kfet.account" %}">Comptes</a></li>
+    </ul>
+    {% endif %}
+</nav>
+
diff --git a/kfet/urls.py b/kfet/urls.py
index c5f9e00c..8b22e0fa 100644
--- a/kfet/urls.py
+++ b/kfet/urls.py
@@ -11,7 +11,8 @@ urlpatterns = [
     # -----
 
     # General
-    url(r'^account/$', views.account),
+    url(r'^account/$', views.account,
+        name = 'kfet.account'),
     url(r'^account/is_validandfree$', views.account_is_validandfree_ajax,
         name = 'kfet.account.is_validandfree.ajax'),
 
diff --git a/kfet/views.py b/kfet/views.py
index 33b97e5c..46c64af7 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -199,7 +199,7 @@ def account_update(request, trigramme):
         if request.user.has_perm('kfet.change_account'):
             account_form = AccountForm(request.POST, instance = account)
         else:
-            account_form = AccountRestrictForm(instance = account)
+            account_form = AccountRestrictForm(request.POST, instance = account)
         cof_form  = CofRestrictForm(request.POST, instance=account.cofprofile)
         user_form = UserRestrictForm(request.POST, instance=account.cofprofile.user)
 
