From 6171d1d2e1f0c77900c10a290483c08fb73b5ccf Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 26 Apr 2022 19:43:35 +0200 Subject: [PATCH] Restored custom CSS file functionality, fix GH-135 --- maloja/jinjaenv/context.py | 2 ++ maloja/pkg_global/conf.py | 3 +++ maloja/web/jinja/abstracts/base.jinja | 3 +++ 3 files changed, 8 insertions(+) diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py index 55e2f4e..908634a 100644 --- a/maloja/jinjaenv/context.py +++ b/maloja/jinjaenv/context.py @@ -1,5 +1,6 @@ from . import filters from ..pkg_global.conf import malojaconfig +from ..pkg_global import conf from .. import database, malojatime, images, malojauri, thirdparty, __pkginfo__ from ..database import jinjaview @@ -32,6 +33,7 @@ def update_jinja_environment(): "mlj_uri": malojauri, "settings": malojaconfig, "thirdparty": thirdparty, + "conf":conf, "pkginfo": __pkginfo__, # external "urllib": urllib, diff --git a/maloja/pkg_global/conf.py b/maloja/pkg_global/conf.py index bbe1e7c..0e951e2 100644 --- a/maloja/pkg_global/conf.py +++ b/maloja/pkg_global/conf.py @@ -326,6 +326,9 @@ config( +custom_css_files = [f for f in os.listdir(data_dir['css']()) if f.lower().endswith('.css')] + + # what the fuck did i just write # this spaghetti file is proudly sponsored by the rice crackers i'm eating at the diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja index 1c6da0d..9c9849a 100644 --- a/maloja/web/jinja/abstracts/base.jinja +++ b/maloja/web/jinja/abstracts/base.jinja @@ -14,6 +14,9 @@ + {% for cssf in conf.custom_css_files %} + + {% endfor %}