Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bryan BRANCOTTE
django-basetheme-bootstrap
Commits
f3cadc5e
Commit
f3cadc5e
authored
Oct 27, 2020
by
Bryan BRANCOTTE
Browse files
font awesome 5
parent
b8aed722
Pipeline
#40327
passed with stage
in 1 minute and 14 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
basetheme_bootstrap/templates/basetheme_bootstrap/base4.html
View file @
f3cadc5e
...
...
@@ -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"
/>
...
...
basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
View file @
f3cadc5e
...
...
@@ -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"
/>
...
...
basetheme_bootstrap/templates/basetheme_bootstrap/login_menu.html
View file @
f3cadc5e
{% 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=
"fa
s
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=
"fa
s
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>
...
...
setup.py
View file @
f3cadc5e
...
...
@@ -7,7 +7,7 @@ readme = open('README.rst').read()
setup
(
name
=
'django-basetheme-bootstrap'
,
version
=
'0.2.4
1
'
,
version
=
'0.2.4
2
'
,
description
=
'Django Basetheme Bootstrap'
,
long_description
=
readme
,
author
=
'Bryan Brancotte'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment