8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 07:23:46 +00:00

Merge branch 'local-bootstrap' into 'dev'

Fix: Local bootstrap files

See merge request re2o/re2o!598
This commit is contained in:
klafyvel 2021-01-24 14:47:47 +01:00
commit 175a7e1baf

View file

@ -165,6 +165,8 @@ if "LOCAL_ROUTERS" in globals():
# django-bootstrap3 config # django-bootstrap3 config
BOOTSTRAP3 = { BOOTSTRAP3 = {
"css_url": "/javascript/bootstrap/css/bootstrap.min.css",
"javascript_url": "/javascript/bootstrap/js/bootstrap.min.js",
"jquery_url": "/javascript/jquery/jquery.min.js", "jquery_url": "/javascript/jquery/jquery.min.js",
"base_url": "/javascript/bootstrap/", "base_url": "/javascript/bootstrap/",
"include_jquery": True, "include_jquery": True,
@ -176,6 +178,7 @@ BOOTSTRAP_BASE_URL = "/javascript/bootstrap/"
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(BASE_DIR, "static").replace("\\", "/"), os.path.join(BASE_DIR, "static").replace("\\", "/"),
"/usr/share/fonts-font-awesome/", "/usr/share/fonts-font-awesome/",
"/usr/share/javascript/",
) )
# Directory where the static files served by the server are stored # Directory where the static files served by the server are stored
STATIC_ROOT = os.path.join(BASE_DIR, "static_files") STATIC_ROOT = os.path.join(BASE_DIR, "static_files")