From 9d95266fadc3aa6d3724d376e4730b0eb951cc3c Mon Sep 17 00:00:00 2001
From: agerbaud <agerbaud>
Date: Thu, 20 Jul 2017 14:44:33 +0200
Subject: [PATCH] Moved sidebar block menu for 'maraudes' and 'notes' inside a
 dropdown in navbar

---
 maraudes/templates/maraudes/base.html |  6 ------
 maraudes/templates/maraudes/menu.html | 24 +++++++++++++++---------
 notes/templates/notes/base.html       |  6 +-----
 notes/templates/notes/menu.html       | 16 +++++++++-------
 website/templates/base.html           | 10 ++++++++--
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/maraudes/templates/maraudes/base.html b/maraudes/templates/maraudes/base.html
index e64052c..539f9d5 100644
--- a/maraudes/templates/maraudes/base.html
+++ b/maraudes/templates/maraudes/base.html
@@ -6,9 +6,3 @@
   <li><a href="{% url "maraudes:index" %}">{{ date }}</a></li>
 {% endblock %}
 
-{% block sidebar %}
-<div class="panel panel-default">
-  <div class="panel-body">
-    {% include "maraudes/menu.html" %}
-  </div>
-</div>{% endblock %}
diff --git a/maraudes/templates/maraudes/menu.html b/maraudes/templates/maraudes/menu.html
index 77cb8bc..71ca0a8 100644
--- a/maraudes/templates/maraudes/menu.html
+++ b/maraudes/templates/maraudes/menu.html
@@ -1,25 +1,31 @@
 {% load navbar %}
-            <ul class="nav nav-pills nav-stacked text-right">
+            <ul class="dropdown-menu">
               <li role="presentation" {% active namespace="maraudes" viewname="index" %}>
-                <a href="{% url "maraudes:index" %}">Tableau de bord&nbsp;
-                  <span class="glyphicon glyphicon-dashboard"></span>
+                <a href="{% url "maraudes:index" %}">
+                  <span class="glyphicon glyphicon-dashboard"></span>&nbsp;
+                  Tableau de bord
                 </a>
               </li>
               <li role="presentation" {% active namespace="maraudes" viewname="create" %}
                                     {% if not prochaine_maraude.date == date %} class="disabled">
-                <a href="#">Compte-rendu&nbsp;
-                  <span class="glyphicon glyphicon-pencil"></span></a>
+                <a href="#">
+                  <span class="glyphicon glyphicon-pencil"></span>&nbsp;
+                  Compte-rendu
+                </a>
               </li> {% else %}>
                 <a href="{% if prochaine_maraude.est_terminee %}
                             {% url 'notes:details-maraude' pk=prochaine_maraude.pk %}
                           {%else%}
                             {% url 'maraudes:create' pk=prochaine_maraude.pk %}
-                          {% endif %}">Compte-rendu&nbsp;
-                  <span class="glyphicon glyphicon-pencil"></span></a>
+                          {% endif %}">
+                  <span class="glyphicon glyphicon-pencil"></span>&nbsp;
+                  Compte-rendu
+                </a>
               </li> {% endif %}
               <li role="presentation" {% active namespace="maraudes" viewname="planning" %}>
-                <a href="{% url "maraudes:planning" %}">Planning&nbsp;
-                  <span class="glyphicon glyphicon-calendar"></span>
+                <a href="{% url "maraudes:planning" %}">
+                  <span class="glyphicon glyphicon-calendar"></span>&nbsp;
+                  Planning
                 </a>
               </li>
             </ul>
diff --git a/notes/templates/notes/base.html b/notes/templates/notes/base.html
index 1e71127..3cc66a3 100644
--- a/notes/templates/notes/base.html
+++ b/notes/templates/notes/base.html
@@ -7,8 +7,4 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="panel panel-default">
-  <div class="panel-body">
-    {% include "notes/menu.html" %}
-  </div>
-</div>{% endblock %}
+{% endblock %}
diff --git a/notes/templates/notes/menu.html b/notes/templates/notes/menu.html
index 45c8abe..e0dc85e 100644
--- a/notes/templates/notes/menu.html
+++ b/notes/templates/notes/menu.html
@@ -1,13 +1,15 @@
 {% load navbar %}
-                <ul class="nav nav-pills nav-stacked text-right">
-              <li role="presentation" {% active namespace="notes" viewname="liste-sujet" %}>
-                <a href="{% url "notes:liste-sujet" %}">Par sujet&nbsp;
-                  <span class="glyphicon glyphicon-user"></span>
+            <ul class="dropdown-menu">
+              <li {% active namespace="notes" viewname="liste-sujet" %}>
+                <a href="{% url "notes:liste-sujet" %}">
+                  <span class="glyphicon glyphicon-user"></span>&nbsp;
+                  Par sujet
                 </a>
               </li>
-              <li role="presentation" {% active namespace="notes" viewname="liste-maraude" %}>
-                <a href="{% url "notes:liste-maraude" %}">Par maraude&nbsp;
-                  <span class="glyphicon glyphicon-road"></span>
+              <li {% active namespace="notes" viewname="liste-maraude" %}>
+                <a href="{% url "notes:liste-maraude" %}">
+                  <span class="glyphicon glyphicon-road"></span> &nbsp;
+                  Par maraude
                 </a>
               </li>
             </ul>
diff --git a/website/templates/base.html b/website/templates/base.html
index 9eef7f8..c36a191 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -30,8 +30,14 @@
           <div class="collapse navbar-collapse" id="navbar-collapse">
             <ul class="nav navbar-nav navbar-left">
               {% if user.is_authenticated %}
-              <li {% active namespace="maraudes" %}><a href="{% url "maraudes:index" %}">{% bootstrap_icon "road" %}&nbsp; Maraudes</a></li>
-              <li {% active namespace="notes" %}><a href="{% url "notes:index" %}">{% bootstrap_icon "pencil" %}&nbsp; Notes</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "road" %}&nbsp; Maraudes</span></a>
+                {% include "maraudes/menu.html" %}
+              </li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "pencil" %}&nbsp; Notes</span></a>
+                {% include "notes/menu.html" %}
+              </li>
               {% else %}
               <li {% active namespace="statistiques" %}><a href="{% url "statistiques:index" %}">{% bootstrap_icon "stats" %}&nbsp; Statistiques</a></li>
               {% endif %}