From fc80dc43a69973ad7b8bf96222df70cd65a072c2 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 29 Jul 2019 12:10:13 +0200
Subject: [PATCH] Fixing extra_li_dropdown_right not shown when not
authenticated
---
basetheme_bootstrap/templates/basetheme_bootstrap/base.html | 2 +-
basetheme_bootstrap/templates/basetheme_bootstrap/base4.html | 2 +-
.../templates/basetheme_bootstrap/basePasteur.html | 2 +-
setup.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/base.html b/basetheme_bootstrap/templates/basetheme_bootstrap/base.html
index 88a46cf..2be1ec7 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/base.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/base.html
@@ -80,10 +80,10 @@
{% include_if_exists "nav_bar.html"|localize_template "basetheme_bootstrap/nav_bar.example.html" %}
</ul>
<ul class="nav navbar-nav navbar-right">
+ {% block extra_li_dropdown_right %}{% endblock %}
{%if not request.user.is_authenticated %}
<li class=""><a href="{% url 'basetheme_bootstrap:login'%}?next={{ request.path|urlencode }}">{% block sign_in_word %}{%trans "Login "%}{% endblock %}<i class="fa fa-sign-in"></i></a></li>
{%else%}
- {% block extra_li_dropdown_right %}{% endblock %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false"><i class="fa fa-user-circle-o"></i> <span class="caret"></span></a>
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
index 24934bf..73d43d3 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
@@ -38,10 +38,10 @@
{% include_if_exists "nav_bar.html"|localize_template "basetheme_bootstrap/nav_bar.example.html" %}
</ul>
<ul class="nav navbar-nav navbar-right">
+ {% block extra_li_dropdown_right %}{% endblock %}
{%if not request.user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{% url 'basetheme_bootstrap:login'%}?next={{ request.path|urlencode }}">{% block sign_in_word %}{%trans "Login "%}{% endblock %}<i class="fa fa-sign-in"></i></a></li>
{%else%}
- {% block extra_li_dropdown_right %}{% endblock %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"
href="#"
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
index 1cd12bf..5efa55a 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
@@ -38,10 +38,10 @@
{% include_if_exists "nav_bar.html"|localize_template "basetheme_bootstrap/nav_bar.example.html" %}
</ul>
<ul class="nav navbar-nav navbar-right">
+ {% block extra_li_dropdown_right %}{% endblock %}
{%if not request.user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{% url 'basetheme_bootstrap:login'%}?next={{ request.path|urlencode }}">{% block sign_in_word %}{%trans "Login "%}{% endblock %}<i class="fa fa-sign-in"></i></a></li>
{%else%}
- {% block extra_li_dropdown_right %}{% endblock %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"
href="#"
diff --git a/setup.py b/setup.py
index b0f7ab5..e3f70b9 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup(
name='django-basetheme-bootstrap',
- version='0.1.3',
+ version='0.1.4',
description='Django Basetheme Bootstrap',
long_description=readme,
author='Bryan Brancotte',
--
GitLab