From 7ab5663b8ae871ac29bfdcabde22e2f91866b14d Mon Sep 17 00:00:00 2001 From: Bryan Brancotte <bryan.brancotte@pasteur.fr> Date: Thu, 8 Oct 2020 16:36:44 +0200 Subject: [PATCH] put header and footer in block so they can be easily removed --- basetheme_bootstrap/templates/basetheme_bootstrap/base4.html | 5 +++++ .../templates/basetheme_bootstrap/basePasteur.html | 5 +++++ setup.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html index b362771..0a0b779 100644 --- a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html +++ b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html @@ -25,6 +25,7 @@ </head> <body class="d-flex flex-column h-100"> {% include_if_exists "fork_me.html"|localize_template "basetheme_bootstrap/fork_me.example.html" %} +{% block header %} <header> <!-- Fixed navbar --> <nav class="navbar navbar-expand-md fixed-top navbar-light bg-light"> @@ -50,6 +51,8 @@ </div> </nav> </header> +{% endblock header %} + <!-- Begin page content --> <main role="main" class="flex-shrink-0"> <div class="{% block container-class %}container mb-4{% endblock %}"> @@ -81,6 +84,7 @@ </div> </main> +{% block footer %} <footer class="footer mt-auto py-3"> <div class="container"> <span class="text-muted float-right"> @@ -88,6 +92,7 @@ </span> </div> </footer> +{% endblock footer %} </body> <script src="https://code.jquery.com/jquery-3.3.1.min.js" diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html index d369323..a46a88a 100644 --- a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html +++ b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html @@ -24,6 +24,7 @@ {% block extra_css %}{% endblock %} </head> <body class="d-flex flex-column h-100"> +{% block header %} {% include_if_exists "fork_me.html"|localize_template "basetheme_bootstrap/fork_me.example.html" %} <header class="main-header fixed-top"> <!-- Fixed navbar -->{% block before_nav_content %}{% endblock %} @@ -80,6 +81,8 @@ </div> </nav> </header> +{% endblock header %} + <!-- Begin page content --> <main role="main" class="flex-shrink-0"> <div class="{% block container-class %}container mb-4{% endblock %}"> @@ -113,6 +116,7 @@ </div> </div> </main> +{% block footer %} <footer class="footer mt-auto"> <div class="inner-wrap"> @@ -155,6 +159,7 @@ </div> </div> </footer> +{% endblock footer %} </body> <script src="https://code.jquery.com/jquery-3.3.1.min.js" diff --git a/setup.py b/setup.py index b036937..764c97b 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ readme = open('README.rst').read() setup( name='django-basetheme-bootstrap', - version='0.2.39', + version='0.2.40', description='Django Basetheme Bootstrap', long_description=readme, author='Bryan Brancotte', -- GitLab