From 72a4f5563e97476103a67f0829ecbf52ddf04488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@ens.fr>
Date: Tue, 30 Aug 2016 16:43:20 +0200
Subject: [PATCH] Nav + lien inventaire -> commande

---
 kfet/static/kfet/css/nav.css       | 4 +++-
 kfet/templates/kfet/base_nav.html  | 6 +++++-
 kfet/templates/kfet/inventory.html | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/kfet/static/kfet/css/nav.css b/kfet/static/kfet/css/nav.css
index 701f31e2..5ffc7b24 100644
--- a/kfet/static/kfet/css/nav.css
+++ b/kfet/static/kfet/css/nav.css
@@ -52,7 +52,9 @@ nav a {
     padding:8px 20px;
 }
 
-
+.dropdown-menu .divider {
+    margin:0;
+}
 
 @media (max-width: 767px) {
     .navbar-nav .open .dropdown-menu {
diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html
index 141ff78c..53725158 100644
--- a/kfet/templates/kfet/base_nav.html
+++ b/kfet/templates/kfet/base_nav.html
@@ -31,12 +31,16 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin <span class="caret"></span></a>
             <ul class="dropdown-menu">
               <li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
+              <li><a href="{% url 'kfet.history' %}">Historique</a></li>
+              <li class="divider"></li>
               <li><a href="{% url 'kfet.account' %}">Comptes</a></li>
               <li><a href="{% url 'kfet.checkout' %}">Caisses</a></li>
+              <li class="divider"></li>
               <li><a href="{% url 'kfet.article' %}">Articles</a></li>
-              <li><a href="{% url 'kfet.history' %}">Historique</a></li>
+              <li><a href="{% url 'kfet.inventory' %}">Inventaires</a></li>
               <li><a href="{% url 'kfet.order' %}">Commandes</a></li>
               {% if user.username != 'kfet_genericteam' %}
+                <li class="divider"></li>
                 <li><a href="{% url 'kfet.login.genericteam' %}" target="_blank" id="genericteam">Connexion standard</a></li>
               {% endif %}
               {% if perms.kfet.change_settings %}
diff --git a/kfet/templates/kfet/inventory.html b/kfet/templates/kfet/inventory.html
index dc1ed19d..bb1614ab 100644
--- a/kfet/templates/kfet/inventory.html
+++ b/kfet/templates/kfet/inventory.html
@@ -38,7 +38,13 @@
                   <td>{{ inventory.at }}</td>
                   <td>{{ inventory.by.trigramme }}</td>
                   <td>{{ inventory.nb_articles }}</td>
-                  <td>{{ inventory.order|default_if_none:'' }}</td>
+                  <td>
+                    {% if inventory.order %}
+                      <a href="{% url 'kfet.order.read' inventory.order.pk %}">
+                        #{{ inventory.order.pk }}
+                      </a>
+                    {% endif %}
+                  </td>
                 </tr>
               {% endfor %}
             </tbody>