From ffe73585c6727bdebcf055ebdcc1b6adc7bca831 Mon Sep 17 00:00:00 2001
From: artus40 <lecornemuseux@gmail.com>
Date: Thu, 15 Dec 2016 18:28:29 +0100
Subject: [PATCH] Updated after global configuration on new git installation

---
 .../templates/compte_rendu/compterendu_create.html  |  4 ++--
 maraudes/templates/compte_rendu/menu/creation.html  | 12 ++++++------
 maraudes/views.py                                   | 13 +++++--------
 sujets/templates/sujets/sujet_details.html          |  3 ---
 sujets/templates/sujets/sujet_details_inner.html    |  2 ++
 website/templates/base.html                         |  4 ++--
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/maraudes/templates/compte_rendu/compterendu_create.html b/maraudes/templates/compte_rendu/compterendu_create.html
index 9321710..fb9596f 100644
--- a/maraudes/templates/compte_rendu/compterendu_create.html
+++ b/maraudes/templates/compte_rendu/compterendu_create.html
@@ -37,7 +37,7 @@
 </script>
 
 <div class="row">
-  <div class="col-md-6 col-sd-12">
+  <div class="col-lg-6 col-md-12">
     <form method="post" action="{% url 'maraudes:create' maraude.pk %}?finalize=False">
     {% csrf_token %}
       <div class="panel panel-primary panel-collapse">
@@ -53,7 +53,7 @@
       </div>
     </form>
   </div>
-  <div class="col-md-6 col-sd-12">
+  <div class="col-lg-6 col-md-12">
     <div class="panel panel-default">
       <div class="panel-heading"><h4 class="panel-title">Enregistrées</h4></div>
       <table class="table">
diff --git a/maraudes/templates/compte_rendu/menu/creation.html b/maraudes/templates/compte_rendu/menu/creation.html
index 92196ee..857cc4c 100644
--- a/maraudes/templates/compte_rendu/menu/creation.html
+++ b/maraudes/templates/compte_rendu/menu/creation.html
@@ -1,9 +1,9 @@
 {% load bootstrap3 %}
-                  <li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
-                  <ul class="dropdown-menu">
-                    <li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
-                    <li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
-                  </ul>
+  <li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
+  <ul class="dropdown-menu">
+    <li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
+    <li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
+  </ul>
 
 <script type="text/javascript">
     /* Lier les boutons de création
@@ -25,7 +25,7 @@
                  } else {
                      $(modal).modal('toggle');
                     // Reload page ?
-                      location.reload(true)
+                     location.reload(true)
                  }
              },
              error: function (xhr, ajaxOptions, thrownError) {
diff --git a/maraudes/views.py b/maraudes/views.py
index 652c50b..e77fe7b 100644
--- a/maraudes/views.py
+++ b/maraudes/views.py
@@ -167,8 +167,8 @@ class CompteRenduCreateView(generic.DetailView):
         self.form = RencontreForm(*args,
                                   initial=initial)
         self.inline_formset = ObservationInlineFormSet(
-                                *args,
-                                instance=self.form.instance,
+                                    *args,
+                                    instance=self.form.instance
                                 )
 
     def finalize(self):
@@ -203,14 +203,11 @@ class CompteRenduCreateView(generic.DetailView):
             rencontre.save()
             self.inline_formset.save()
 
-        return self.get(request, *args, **kwargs)
+        return redirect('maraudes:create', pk=self.get_object().pk)
 
     def get(self, request, new_form=True, *args, **kwargs):
-        try:
-            if request.GET['finalize'] == "True":
-                return self.finalize()
-        except:
-            pass
+        if request.GET.get('finalize', False) == "True":
+            return self.finalize()
 
         def calculate_end_time(debut, duree):
             end_minute = debut.minute + duree
diff --git a/sujets/templates/sujets/sujet_details.html b/sujets/templates/sujets/sujet_details.html
index 8cc0c30..8842eb0 100644
--- a/sujets/templates/sujets/sujet_details.html
+++ b/sujets/templates/sujets/sujet_details.html
@@ -1,6 +1,3 @@
-<h4>Informations générales</h4>
-<p><strong>Première rencontre :</strong> {{ sujet.premiere_rencontre }}</p>
-
 <div class="panel panel-primary">
   <div class="panel-heading" role="tab" id="ficheInfoHeading">
     <div class="row">
diff --git a/sujets/templates/sujets/sujet_details_inner.html b/sujets/templates/sujets/sujet_details_inner.html
index 0113b47..e4dcaec 100644
--- a/sujets/templates/sujets/sujet_details_inner.html
+++ b/sujets/templates/sujets/sujet_details_inner.html
@@ -1,4 +1,6 @@
       <table class="table">
+      <tr><th colspan="4" class="active">Informations générales</th></tr>
+      <tr><th>Première rencontre :</th><td> {{ sujet.premiere_rencontre }}</td></tr>
       <tr><th colspan="4" class="active">État-civil</th></tr>
       <tr><th>Nom</th><td>{{ sujet.nom|default:'?' }}</td><th>Prénom</th><td>{{ sujet.prenom|default:'?' }}</td></tr>
       <tr><th>Sexe</th><td>{{ sujet.genre }}</td><th>Âge</th><td>{{ sujet.age|default:'?' }}</td></tr>
diff --git a/website/templates/base.html b/website/templates/base.html
index 2f710f6..1befab1 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -12,10 +12,10 @@
   <body>
     <div class="container-fluid">
       <div class="row">
-        <div class="col-sm-3 col-md-2 col-lg-2">
+        <div class="col-md-3 col-lg-2">
           {% include "navbar.html" %}
         </div>
-        <div class="col-sm-9 col-md-10 col-lg-10">
+        <div class="col-md-9 col-lg-10">
           <h1 class="page-header">{% block page_header %}{% endblock %}</h1>
           {% bootstrap_messages %}
           {% block content %}{% endblock %}