From f3cadc5ef6d28f9e18c32d2b07aa517204947f70 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Tue, 27 Oct 2020 17:27:35 +0100
Subject: [PATCH] font awesome 5
---
.../templates/basetheme_bootstrap/base4.html | 2 +-
.../templates/basetheme_bootstrap/basePasteur.html | 2 +-
.../templates/basetheme_bootstrap/login_menu.html | 8 ++++----
setup.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
index 0a0b779..72e3d6a 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
@@ -15,7 +15,7 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.4.0/css/bootstrap4-toggle.min.css" rel="stylesheet">
- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" rel="stylesheet">
<link href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css" rel="stylesheet">
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.0.0/css/bootstrap-slider.min.css"/>
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
index a46a88a..c269c8d 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.4.0/css/bootstrap4-toggle.min.css" rel="stylesheet">
- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" rel="stylesheet">
<link href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css" rel="stylesheet">
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/10.0.0/css/bootstrap-slider.min.css"/>
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/login_menu.html b/basetheme_bootstrap/templates/basetheme_bootstrap/login_menu.html
index b2dc377..74aceb7 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/login_menu.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/login_menu.html
@@ -1,6 +1,6 @@
{% load i18n %}
{%if not request.user.is_authenticated %}
-<li class="nav-item {{li_additional_class}}"><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>
+<li class="nav-item {{li_additional_class}}"><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-alt"></i></a></li>
{%else%}
<li class="nav-item dropdown {{li_additional_class}}">
<a class="nav-link dropdown-toggle"
@@ -9,7 +9,7 @@
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
- ><i class="fa fa-user-circle-o"></i> <span class="caret"></span></a>
+ ><i class="fas fa-user-circle"></i> <span class="caret"></span></a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-user{{suffix_id}}">
{%if request.user.is_staff %}
{% block login_menu_staff_dropdown_items %}
@@ -18,8 +18,8 @@
<div class="dropdown-divider"></div>
{%endif%}
{% block login_menu_dropdown_items %}
- <a class="dropdown-item" href="{% url 'basetheme_bootstrap:account'%}"><i class="fa fa-user-circle-o"></i> {%trans "Account"%}</a>
- <a class="dropdown-item" href="{% url 'basetheme_bootstrap:logout'%}"><i class="fa fa-sign-out"></i> {%trans "Logout"%}</a>
+ <a class="dropdown-item" href="{% url 'basetheme_bootstrap:account'%}"><i class="fas fa-user-circle"></i> {%trans "Account"%}</a>
+ <a class="dropdown-item" href="{% url 'basetheme_bootstrap:logout'%}"><i class="fa fa-sign-out-alt"></i> {%trans "Logout"%}</a>
{% endblock %}
</div>
</li>
diff --git a/setup.py b/setup.py
index 62f8060..c3d140c 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup(
name='django-basetheme-bootstrap',
- version='0.2.41',
+ version='0.2.42',
description='Django Basetheme Bootstrap',
long_description=readme,
author='Bryan Brancotte',
--
GitLab