diff --git a/chat/templates/chat/fullscreen.html b/chat/templates/chat/fullscreen.html
index 20d2f21..e82a4e8 100644
--- a/chat/templates/chat/fullscreen.html
+++ b/chat/templates/chat/fullscreen.html
@@ -15,11 +15,16 @@
- {# Bootstrap + Font Awesome CSS #}
- {% stylesheet 'bootstrap_fontawesome' %}
+ {# Bootstrap CSS #}
+
+ {# Fontawesome CSS #}
+
+
+ {# bootstrap-select CSS #}
+
{# Bootstrap JavaScript #}
- {% javascript 'bootstrap' %}
+
{# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
diff --git a/chat/templates/chat/login.html b/chat/templates/chat/login.html
index a77738b..377fee7 100644
--- a/chat/templates/chat/login.html
+++ b/chat/templates/chat/login.html
@@ -16,10 +16,13 @@
{# Bootstrap CSS #}
- {% stylesheet 'bootstrap_fontawesome' %}
+
+ {# Fontawesome CSS #}
+
+
{# Bootstrap JavaScript #}
- {% javascript 'bootstrap' %}
+
{# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
diff --git a/tfjm/settings.py b/tfjm/settings.py
index 7eac8d8..ec01e98 100644
--- a/tfjm/settings.py
+++ b/tfjm/settings.py
@@ -206,25 +206,6 @@ STATICFILES_FINDERS = (
PIPELINE = {
'DISABLE_WRAPPER': True,
'JAVASCRIPT': {
- 'bootstrap': {
- 'source_filenames': {
- 'bootstrap/js/bootstrap.bundle.min.js',
- },
- 'output_filename': 'tfjm/js/bootstrap.bundle.min.js',
- },
- 'jquery': {
- 'source_filenames': {
- 'jquery/jquery.min.js',
- },
- 'output_filename': 'tfjm/js/jquery.min.js',
- },
- 'bootstrap_select': {
- 'source_filenames': {
- 'bootstrap-select/js/bootstrap-select.min.js',
- 'bootstrap-select/js/defaults-fr_FR.min.js',
- },
- 'output_filename': 'tfjm/js/bootstrap-select-jquery.min.js',
- },
'main': {
'source_filenames': (
'tfjm/js/main.js',
@@ -251,17 +232,6 @@ PIPELINE = {
'output_filename': 'tfjm/js/draw.min.js',
},
},
- 'STYLESHEETS': {
- 'bootstrap_fontawesome': {
- 'source_filenames': (
- 'bootstrap/css/bootstrap.min.css',
- 'fontawesome/css/all.css',
- 'fontawesome/css/v4-shims.css',
- 'bootstrap-select/css/bootstrap-select.min.css',
- ),
- 'output_filename': 'tfjm/css/bootstrap_fontawesome.min.css',
- }
- },
}
MEDIA_URL = '/media/'
diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html
index 4a392c5..cb90406 100644
--- a/tfjm/templates/base.html
+++ b/tfjm/templates/base.html
@@ -20,13 +20,18 @@
{# Bootstrap CSS #}
- {% stylesheet 'bootstrap_fontawesome' %}
+
+ {# Fontawesome CSS #}
+
+
+ {# bootstrap-select CSS #}
+
{# Bootstrap JavaScript #}
- {% javascript 'bootstrap' %}
+
{# bootstrap-select for beautiful selects and JQuery dependency #}
- {% javascript 'jquery' %}
- {% javascript 'bootstrap_select' %}
+
+
{# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
{% if form.media %}