From 9efc200f74644eb430a7c369dda97770380a3810 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Jul 2020 19:24:40 +0200
Subject: [PATCH] Fusionne base et base_layout

---
 bds/templates/bds/base.html        | 26 +++++++++++++++++++++++++-
 bds/templates/bds/home.html        |  2 +-
 bds/templates/bds/user_update.html |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/bds/templates/bds/base.html b/bds/templates/bds/base.html
index 2000a06a..ac2b4875 100644
--- a/bds/templates/bds/base.html
+++ b/bds/templates/bds/base.html
@@ -1,4 +1,5 @@
 {% load staticfiles %}
+{% load bulma_utils %}
 
 <!DOCTYPE html>
 <html>
@@ -15,8 +16,31 @@
     {# Javascript #}
     <script src="{% static 'vendor/jquery/jquery-3.3.1.min.js' %}"></script>
     <script src="{% static "vendor/jquery/jquery.autocomplete-light.min.js" %}"></script>
+
+    {% block extra_head %}{% endblock extra_head %}
   </head>
   <body>
-    {% block body %}{% endblock %}
+    {% include "bds/nav.html" %}
+
+    <section class="section">
+      <div class="columns">
+        <div class="column is-two-thirds is-offset-2">
+        {% if messages %}
+          {% for message in messages %}
+            <div class="notification is-{{ message.level_tag|bulma_message_tag }}">
+              {% if 'safe' in message.tags %}
+                  {{ message|safe }}
+              {% else %}
+                  {{ message }}
+              {% endif %}
+            </div>
+          {% endfor %}
+        {% endif %}
+
+        {% block content %}
+        {% endblock content %}
+        </div>
+      </div>
+    </section>
   </body>
 </html>
diff --git a/bds/templates/bds/home.html b/bds/templates/bds/home.html
index 08cb566b..65a67743 100644
--- a/bds/templates/bds/home.html
+++ b/bds/templates/bds/home.html
@@ -1,4 +1,4 @@
-{% extends "bds/base_layout.html" %}
+{% extends "bds/base.html" %}
 
 {% block content %}
 <div class="container">
diff --git a/bds/templates/bds/user_update.html b/bds/templates/bds/user_update.html
index dfa84611..663ed91f 100644
--- a/bds/templates/bds/user_update.html
+++ b/bds/templates/bds/user_update.html
@@ -1,4 +1,4 @@
-{% extends "bds/base_layout.html" %}
+{% extends "bds/base.html" %}
 {% load i18n %}
 
 
