fixes bootstrap4 imports, statistiques templates and adds shadow effect on active links

maraudes/templates/maraudes/finalize.html

@@ -1,5 +1,5 @@
 {% extends "maraudes/base.html" %}
-{% load bootstrap3 %}
+{% load bootstrap4 %}
 {% block title %} {{ block.super }} Compte-rendu du {{ object.date }} {% endblock %}
 
 {% block breadcrumbs %}
@@ -22,8 +22,8 @@
           {% bootstrap_form form %}
         </div>
         <div class="panel-footer text-right">
-          {% bootstrap_button "Pas de message" icon="remove" button_type="link" href="?no_mail=True" button_class="btn btn-danger btn-sm" %}
-          <button class="btn btn-success btn-sm" id="send-button" data-loading-text="Envoi en cours..." type="submit"><span class="glyphicon glyphicon-send"></span> Envoyer</button>
+          {% bootstrap_button "Pas de message" button_type="link" href="?no_mail=True" button_class="btn btn-danger btn-sm" %}
+          <button class="btn btn-success btn-sm" id="send-button" data-loading-text="Envoi en cours..." type="submit">Envoyer</button>
         </div>
       </div>
     </form>
@@ -37,7 +37,7 @@
             <td>
               <a href="{% url "notes:details-sujet" observation.sujet.pk %}" id="sujet-name-{{observation.sujet.pk}}">{{observation.sujet}}</a>
               <a class="btn btn-link btn-xs" nohref onclick="UpdateStats({{observation.sujet.pk}});return false;">
-              {% bootstrap_icon "stats" %} Mise à jour</a>
+              Mise à jour</a>
             </td></tr>
             <tr><td>{{observation.text}}</td></tr>{% endfor %}{% endfor %}
       </table>

maraudes/templates/maraudes/index.html

@@ -9,9 +9,9 @@
 
 {% block page_content %}
 {% load tables %}
-<div class="col-lg-6 col-md-12">
+<div class="col-lg-7 col-md-12">
     <div class="card rounded-bottom">
-      <div class="card-header rounded-0 py-2 bg-dark text-white">Planning</div>
+      <h6 class="card-header rounded-0 py-2 bg-dark text-white">Planning</h6>
       <div class="card-body">
         <h6 class="card-title">Prochaine maraude</h6>
 	<p class="card-text">
@@ -30,22 +30,34 @@
         <a href="{% url 'notes:liste-maraude' %}" class="card-link text-primary">Toutes les maraudes</a>
       </div>
     </div>
+    <div class="row">
     {% if derniers_sujets_rencontres %}
-    <div class="card card-body">
-	{% table derniers_sujets_rencontres cols=3 cell_template="maraudes/table_cell_derniers_sujets.html" header="Ces derniers temps..." %}
+    <div class="col">
+    <div class="card rounded-bottom my-3">
+        <div class="card-header rounded-0 py-1 text-white bg-dark">En ce moment nous croisons...</div>
+        <div class="card-body">
+          {% for sujet in derniers_sujets_rencontres %}
+             {{ sujet }},
+          {% endfor %}
+        </div>
+    </div>
     </div>
     {% endif %}
     {% if derniers_sujets_signales %}
+    <div class="col">
     <div class="card rounded-bottom my-3">
-      <div class="card-header rounded-0 py-1 text-white bg-dark">Signalements récents</div>
+      <div class="card-header rounded-0 py-1 text-white bg-dark">
+          Signalements récents
+      </div>
       <div class="card-body">
         {% for sjt in derniers_sujets_signales %}
             {{ sjt }}
         {% endfor %}
       </div>
     </div>
+    </div>
     {% endif %}
-
+    </div>
 {% if user.is_superuser and missing_cr %}
     <div class="card border-warning rounded-bottom my-3">
       <div class="card-header py-2 bg-dark text-warning rounded-0">
@@ -55,7 +67,7 @@
     </div>
 {% endif %}
 </div>
-<div class="col-md-12 col-lg-6">
+<div class="col-md-12 col-lg-5">
   <div class="card shadow">
     <div class="card-header bg-dark text-white">
         <ul class="nav nav-tabs card-header-tabs" id="addNote" role="tablist">

maraudes/views.py

@@ -238,13 +238,13 @@ class FinalizeView(MaraudeurMixin,
         return self.finalize()
 
     def get_context_data(self, **kwargs):
-        obj = self.get_object()
+        self.object = self.get_object()
         context = super().get_context_data(**kwargs)
-        if obj.est_terminee is True:
+        if self.object.est_terminee is True:
             context['form'] = None  # Useless form
             return context
         # Link there so that "Compte-rendu" menu item is not disabled
-        context['prochaine_maraude'] = obj
+        context['prochaine_maraude'] = self.object
         return context