From b4ef4b8089677841970ab4aed805c045b6c4837d Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 1 Sep 2020 14:28:11 +0200 Subject: [PATCH] Use local javascript and css libs --- note_kfet/settings/base.py | 2 ++ note_kfet/templates/base.html | 20 +++++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 2aa303ed..230bf441 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -164,8 +164,10 @@ LANGUAGES = [ STATIC_URL = '/static/' # Add some custom statics from /note_kfet/static +# Because we are using Debian, also include /usr/share/javascript STATICFILES_DIRS = [ os.path.join(BASE_DIR, 'note_kfet/static'), + '/usr/share/javascript', ] # Collect statics to /static/ diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index df38eac9..13d0623f 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -24,24 +24,14 @@ SPDX-License-Identifier: GPL-3.0-or-later {# Bootstrap, Font Awesome and custom CSS #} - - - + + {# JQuery, Bootstrap and Turbolinks JavaScript #} - - - + + +