From 6bdde54ed22315197dc0f8fc634147b85568ee7c Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Thu, 25 Aug 2016 10:44:56 +0200 Subject: [PATCH] moved bootstrap_messages on base template --- suivi/templates/suivi/index.html | 1 - suivi/templates/suivi/menu_sujets.html | 5 +++-- website/templates/base.html | 9 ++++++--- website/templates/base_site.html | 9 +++++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/suivi/templates/suivi/index.html b/suivi/templates/suivi/index.html index 14267e8..fc9b8b6 100644 --- a/suivi/templates/suivi/index.html +++ b/suivi/templates/suivi/index.html @@ -1,4 +1,3 @@ -{% load bootstrap3 %}{% bootstrap_messages %}
{% include "suivi/signalement_form.html" with form=signalement_form %}
diff --git a/suivi/templates/suivi/menu_sujets.html b/suivi/templates/suivi/menu_sujets.html index 5eda2ae..136226c 100644 --- a/suivi/templates/suivi/menu_sujets.html +++ b/suivi/templates/suivi/menu_sujets.html @@ -1,9 +1,10 @@ -{% load bootstrap3 %}
  • +{% load bootstrap3 %} +
  • Liste des sujets {% bootstrap_icon "list" %}
    • {% if search_form %} -
    + {% bootstrap_form search_form show_label=False %} {% bootstrap_button 'Chercher' button_type='submit' %}
    diff --git a/website/templates/base.html b/website/templates/base.html index 844ea46..2a22d3d 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -3,9 +3,11 @@ {% block title %}La maraude{% endblock %} - {# Load Bootstrap CSS and JavaScript #}{% bootstrap_css %}{% bootstrap_javascript %} - {# Side Navbar from http://www.samrayner.com/bootstrap-side-navbar/inverse.html #} - {% if stylesheets %}{% for stylesheet in stylesheets %}{% endfor %}{% endif %} + {% bootstrap_css %}{% bootstrap_javascript %} + + + {% if stylesheets %}{% for stylesheet in stylesheets %} + {% endfor %}{% endif %}
    @@ -15,6 +17,7 @@

    {% block page_header %}{% endblock %}

    + {% bootstrap_messages %} {% block content %}{% endblock %}
    diff --git a/website/templates/base_site.html b/website/templates/base_site.html index 94557e7..9ec4093 100644 --- a/website/templates/base_site.html +++ b/website/templates/base_site.html @@ -1,10 +1,15 @@ {% extends "base.html" %} {% block title %}{{ page_title }}{% endblock %} -{% block page_header %}{{ page_header }} {{ page_header_small }}{% endblock %} +{% block page_header %} +{{ page_header }} +{{ page_header_small }} +{% endblock %} -{% block content %}{% include content_template %}{% endblock %} +{% block content %} + {% include content_template %} +{% endblock %}