changes order in tables, fixes statistiques views navbar titles

notes/templates/notes/details.html

@@ -2,7 +2,13 @@
 {% load bootstrap4 notes %}
 
 {% block page_content %}
+    <div class="col-lg-12">
+        {% block top_block %}{% endblock %}
+    </div>
+</div>
+<div class="row d-flex">
 <div class="col-lg-7 col-md-12">
+    {% block pagination %}{% endblock %}
     <table class="table table-bordered">
         {% for note in notes %}
           {% if maraude %}
@@ -12,7 +18,6 @@
           {% endif %}
         {% endfor %}
     </table>
-{% block pagination %}{% endblock %}
 </div>
 
 <div class="col-lg-5 col-md-12">

notes/templates/notes/details_maraude.html

@@ -29,13 +29,12 @@
   </nav>
 {% endblock %}
 
-{% block right_column %}
-<div class="card ml-auto position-fixed">
-  <h6 class="card-header">Informations</h6>
-  <div class="card-body">
-    <p><strong>Maraudeurs :</strong>&nbsp; {{ maraude.binome }} & {{ maraude.referent }}</p>
-    <p><strong>Nombre de rencontres</strong>&nbsp; {{ maraude.rencontres.count }}</p>
-    <p><strong>Nombre de personnes rencontrées</strong>&nbsp; {{ maraude.observations_count }}</p>
-  </div>
+{% block top_block %}
+<div class="card card-body p-1 mb-2 text-center">
+  <p class="card-text">
+    <strong>avec {{ maraude.binome }} & {{ maraude.referent }}</strong>
+    <span class="badge badge-primary ml-2">{{ maraude.rencontres.count }} rencontres</span>
+    <span class="badge badge-primary ml-2">{{ maraude.observations_count }} personnes rencontrées</span>
+  </p>
 </div>
 {% endblock %}

notes/templates/notes/details_sujet.html

@@ -9,6 +9,12 @@
   <h6 class="navbar-text text-white my-2">{{ sujet }}</h6>
 {% endblock %}
 
+{% block top_block %}
+  <div class="card card-body p-1 mb-2">
+    {% include "notes/details_sujet_inner.html" %}
+  </div>
+{% endblock %}
+
 {% block pagination %}
   <div class="d-flex justify-content-center">
     {% if notes.has_other_pages %}<ul class="pagination">
@@ -20,11 +26,6 @@
 {% endblock %}
 
 {% block right_column %}
-  <div class="card">
-    <h6 class="card-header">Informations</h6>
-    {% include "notes/details_sujet_inner.html" %}
-  </div>
-
   <div class="card mt-2">
     <h6 class="card-header">Statistiques</h6>
     <div id="stats-content">