python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved bootstrap_messages on base template

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-25 10:44:56 +02:00
parent 06cf6c3d35
commit 6bdde54ed2
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
suivi/templates/suivi/index.html
View File

@@ -1,4 +1,3 @@
{% load bootstrap3 %}{% bootstrap_messages %}
<div class="col-md-6">
{% include "suivi/signalement_form.html" with form=signalement_form %}
</div>

5
suivi/templates/suivi/menu_sujets.html
View File

@@ -1,9 +1,10 @@
{% load bootstrap3 %}<li class="app-menu">
{% load bootstrap3 %}
<li class="app-menu">
<a href="{% url 'sujets:liste' %}">Liste des sujets
<span class="pull-right">{% bootstrap_icon "list" %}</span></a>
</li>
{% if search_form %}
<form class="navbar-form app-menu" method="POST" action="search/">
<form class="nav navbar-form app-menu text-center" method="POST" action="search/">
{% bootstrap_form search_form show_label=False %}
{% bootstrap_button 'Chercher' button_type='submit' %}
</form>

9
website/templates/base.html
View File

@@ -3,9 +3,11 @@
<html lang="fr">
<head>
<title>{% block title %}La maraude{% endblock %}</title>
{# Load Bootstrap CSS and JavaScript #}{% bootstrap_css %}{% bootstrap_javascript %}
{# Side Navbar from http://www.samrayner.com/bootstrap-side-navbar/inverse.html #}<link href="/static/bootstrap/navbar-fixed-side.css" rel="stylesheet" />
{% if stylesheets %}{% for stylesheet in stylesheets %}<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %}
{% bootstrap_css %}{% bootstrap_javascript %}
<!-- Side Navbar from http://www.samrayner.com/bootstrap-side-navbar/inverse.html -->
<link href="/static/bootstrap/navbar-fixed-side.css" rel="stylesheet" />
{% if stylesheets %}{% for stylesheet in stylesheets %}
<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %}
</head>
<body>
<div class="container-fluid">
@@ -15,6 +17,7 @@
</div>
<div class="col-sm-8 col-md-8 col-lg-10">
<h1 class="page-header">{% block page_header %}{% endblock %}</h1>
{% bootstrap_messages %}
{% block content %}{% endblock %}
</div>
</div>

9
website/templates/base_site.html
View File

@@ -1,10 +1,15 @@
{% extends "base.html" %}
{% block title %}{{ page_title }}{% endblock %}
{% block page_header %}<span style="color:#980300;">{{ page_header }}</span> <small>{{ page_header_small }}</small>{% endblock %}
{% block page_header %}
<span style="color:#980300;">{{ page_header }}</span>
<small>{{ page_header_small }}</small>
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}
{% block content %}
{% include content_template %}
{% endblock %}