templates refont, implemented 'get_panel' method

maraudes/templates/maraudes/details.html

@@ -1,4 +1,4 @@
-<div class="col-md-6">
+<div class="col-md-12">
 {% if maraude.est_terminee %}
   {% include "compte_rendu/compterendu.html" %}
 {% else %}
@@ -6,4 +6,4 @@
   {% else %} <p class="alert alert-info">Le compte-rendu n'a pas encore été écrit</p>{% endif %}
 {% endif %}
 </div>
-{% include 'maraudes/panel_dernieres_maraudes.html' %}
+

maraudes/templates/maraudes/index.html

@@ -1,5 +1,4 @@
-<div class="row">
-  <div class="col-md-6" id="prochaine-maraudes">
+<div class="col-md-12">
     <div class="panel panel-primary">
       <div class="panel-heading">Votre prochaine maraude</div>
       <div class="panel-body">
@@ -13,21 +12,4 @@
       {% else %}<p>Aucune maraude prévue.</p>{% endif %}
       </div>
     </div>
-  </div>
-
-{% include 'maraudes/panel_dernieres_maraudes.html' %}
-
-{% include 'maraudes/panel_signalement.html' %}
-
-  {% if user.is_superuser %}<div class="col-md-6" id="administration">
-    <div class="panel panel-danger">
-      <div class="panel-heading">Administration</div>
-        <div class="list-group">
-          <a href="{% url 'maraudes:planning' %}" class="list-group-item">Planning</a>
-          <a href="{% url 'admin:maraudes_maraude_changelist' %}" class="list-group-item">Gérer les maraudes</a>
-        </div>
-      </div>
-  </div>{% endif %}
-
 </div>
-

maraudes/templates/maraudes/panel_admin.html

@@ -0,0 +1,7 @@
+{% if user.is_superuser %}<div class="panel panel-danger">
+  <div class="panel-heading">Administration</div>
+  <div class="list-group">
+    <a href="{% url 'maraudes:planning' %}" class="list-group-item">Planning</a>
+    <a href="{% url 'admin:maraudes_maraude_changelist' %}" class="list-group-item">Gérer les maraudes</a>
+  </div>
+</div>{% endif %}

maraudes/templates/maraudes/panel_dernieres_maraudes.html

@@ -1,16 +1,15 @@
 {% if dernieres_maraudes %}
-<div class="col-md-6" id="dernieres-maraudes">
-  <div class="panel panel-default">
-  <div class="panel-heading">
-    <p>Dernières maraudes
-    <span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
-  </div>
-  <div class="list-group">
-    {% for m in dernieres_maraudes %}
-    <a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
-      <strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
-    </a>
-    {% endfor %}
-  </div>
-  </div>
-</div>{% endif %}
+    <div class="panel panel-default" id="dernieres-maraudes">
+    <div class="panel-heading">
+      <p>Dernières maraudes
+      <span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
+    </div>
+    <div class="list-group">
+      {% for m in dernieres_maraudes %}
+      <a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
+        <strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
+      </a>
+      {% endfor %}
+    </div>
+    </div>
+{% endif %}

maraudes/templates/maraudes/panel_signalement.html

@@ -1,5 +1,4 @@
 {% load bootstrap3 %}
-<div class="col-md-6" id="signalement">
   <form method="post" action="">
   {% csrf_token %}
     <div class="panel panel-warning">
@@ -23,4 +22,3 @@
       </div>
     </div>
   </form>
-</div>

maraudes/templates/planning/planning.html

@@ -10,7 +10,7 @@
 <form method="post" action="{% url 'maraudes:planning' %}?month={{month}}&year={{year}}">
   {% csrf_token %}
   {{ formset.management_form }}
-  {% for form in formset %}<div class="col-md-4">
+  {% for form in formset %}<div class="col-md-4 col-xs-6">
     <div class="panel {% if form.instance.pk %}panel-info{%else%}panel-warning{%endif%}">
       <div class="panel-heading text-center">
         <div class="form-inline">{% if form.id %}{{ form.id }}{% endif %}

maraudes/views.py

@@ -56,6 +56,9 @@ class IndexView(DerniereMaraudeMixin, generic.FormView):
     template_name = "maraudes/index.html"
     form_class = SignalementForm
 
+    def get_panels(self):
+        return ["maraudes/panel_dernieres_maraudes.html", "maraudes/panel_admin.html"]
+
 
 ## MARAUDES
 @webpage
@@ -68,7 +71,7 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
     class PageInfo:
         title = "Maraude - {{maraude.date}}"
         header = "{{maraude.date}}"
-        header_small = "détails"
+        header_small = "compte-rendu"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -78,6 +81,9 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
                                         ).by_time()
         return context
 
+    def get_panels(self):
+        return ["maraudes/panel_dernieres_maraudes.html"]
+
 
 
 @webpage
@@ -121,8 +127,6 @@ class CompteRenduCreateView(generic.DetailView):
                                 )
 
     def finalize(self):
-        # TODO: check for errors to avoid last entry to be lost
-        # Save 'heure_fin' on related Maraude object
         maraude = self.get_object()
         maraude.heure_fin = timezone.now()
         maraude.save()