From 5c1ab133ca1f36fadd8eea647255b8a89971e673 Mon Sep 17 00:00:00 2001
From: artus <artus@landoftheunicorn.hd.free.fr>
Date: Sun, 14 Oct 2018 00:37:35 +0200
Subject: [PATCH] fix details views

---
 notes/templates/notes/details_maraude.html | 22 ++++++++++------------
 notes/templates/notes/details_sujet.html   | 12 ++++--------
 notes/templates/notes/liste_sujets.html    |  4 ++--
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/notes/templates/notes/details_maraude.html b/notes/templates/notes/details_maraude.html
index acac101..db4bf3e 100644
--- a/notes/templates/notes/details_maraude.html
+++ b/notes/templates/notes/details_maraude.html
@@ -11,25 +11,23 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="panel panel-primary text-right">
-  <div class="panel-body text-right">
-    <h4 class="panel-title">Navigation</h4>
-    <nav aria-label="Maraudes navigation">
+    <h6 class="sidebar-heading mt-4 px-3">Navigation</h6>
+    <nav class="d-flex px-3 justify-content-center" aria-label="Maraudes navigation">
     <ul class="pagination">
-    <li {% if not prev_maraude %}class="disabled"{% endif %}>
-      <a href="{% if prev_maraude %}{% url "notes:details-maraude" prev_maraude.pk %}{% else %}#{% endif %}" aria-label="Previous">
-        &nbsp; <span aria-hidden="true" class="glyphicon glyphicon-chevron-left"></span>
+    <li class="page-item {% if not prev_maraude %}disabled{% endif %}">
+      <a class="page-link" href="{% if prev_maraude %}{% url "notes:details-maraude" prev_maraude.pk %}{% else %}#{% endif %}" aria-label="Previous">
+        <span aria-hidden="true">&laquo;</span>
+        <span class="sr-only">Previous</span>
       </a>
     </li>
-    <li {% if not next_maraude %}class="disabled"{% endif %}>
-      <a href="{% if next_maraude %}{% url "notes:details-maraude" next_maraude.pk %}{%else%}#{% endif %}" aria-label="Next">
-        <span aria-hidden="true" class="glyphicon glyphicon-chevron-right"></span> &nbsp;
+    <li class="page-item {% if not next_maraude %}disabled{% endif %}">
+      <a class="page-link" href="{% if next_maraude %}{% url "notes:details-maraude" next_maraude.pk %}{%else%}#{% endif %}" aria-label="Next">
+        <span aria-hidden="true">&raquo;</span>
+        <span class="sr-only">Next</span>
       </a>
     </li>
     </ul>
   </nav>
-  </div>
-</div>
 {% endblock %}
 
 {% block right_column %}
diff --git a/notes/templates/notes/details_sujet.html b/notes/templates/notes/details_sujet.html
index 735b779..b80a1de 100644
--- a/notes/templates/notes/details_sujet.html
+++ b/notes/templates/notes/details_sujet.html
@@ -90,14 +90,10 @@
 {% block sidebar %}
 {{ block.super }}
 {% if user.is_superuser %}
-    <hr />
-    <div class="panel panel-primary text-right"><div class="panel-heading"><h4 class="panel-title"><strong>Administration :</strong></h4></div>
-    <div class="panel-body text-center">
-    <div class="btn-group-vertical" role="group" aria-label="...">
-      <a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary">Éditer les notes</a>
-      <a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-danger">Fusionner</a>
-    </div>
-    </div>
+    <h6 class="sidebar-heading mt-4 px-3">Administration</h6>
+    <div class="px-3 btn-group-vertical d-flex justify-content-center" role="group" aria-label="...">
+      <a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary btn-sm">Éditer les notes</a>
+      <a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-danger btn-sm">Fusionner</a>
     </div>
 {% endif %}
 {% endblock %}
diff --git a/notes/templates/notes/liste_sujets.html b/notes/templates/notes/liste_sujets.html
index 27edf19..49365c2 100644
--- a/notes/templates/notes/liste_sujets.html
+++ b/notes/templates/notes/liste_sujets.html
@@ -10,7 +10,7 @@
 
 {% block sidebar_insert %}
   <h4 class="sidebar-heading mt-4 px-3">Rechercher</h4>
-  <form action="{% url "notes:liste-sujet" %}" method="POST" class="form form-group">
+  <form class="px-3" action="{% url "notes:liste-sujet" %}" method="POST" class="form form-group">
     {% csrf_token %}
     <div class="input-group">
       <input type="text" name="q" class="form-control" placeholder="Chercher un sujet" aria-describedby="basic-addon1">
@@ -20,7 +20,7 @@
     </div>
   </form>
   <h4 class="sidebar-heading mt-4 px-3">Outils</h4>
-  <a class="btn btn-primary btn-block" href="{% url "notes:create-sujet" %}">Ajouter un sujet</a> 
+  <div class="px-3"><a class="btn btn-primary btn-block" href="{% url "notes:create-sujet" %}">Ajouter un sujet</a></div>
 {% endblock %}
 
 {% block search %}