diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py index 330d8da..d621251 100644 --- a/maloja/jinjaenv/context.py +++ b/maloja/jinjaenv/context.py @@ -1,8 +1,8 @@ from .. import database_packed from . import filters +from .globalconf import malojaconfig from .. import database, database_packed, malojatime, utilities, malojauri -from doreah import settings from doreah.regular import repeatdaily import urllib @@ -30,7 +30,7 @@ def update_jinja_environment(): "malojatime": malojatime, "utilities": utilities, "mlj_uri": malojauri, - "settings": settings.get_settings, + "settings": malojaconfig, # external "urllib": urllib, "math":math, diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja index 2ea6362..c465aec 100644 --- a/maloja/web/jinja/abstracts/base.jinja +++ b/maloja/web/jinja/abstracts/base.jinja @@ -48,7 +48,7 @@ Get your own Maloja scrobble server on PyPI
- Maloja {% if settings("DEV_MODE") %}[Developer Mode]{% endif %} + Maloja {% if settings["DEV_MODE"] %}[Developer Mode]{% endif %}
diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja index d7dc648..c5b6a13 100644 --- a/maloja/web/jinja/charts_artists.jinja +++ b/maloja/web/jinja/charts_artists.jinja @@ -35,7 +35,7 @@ -{% if settings('CHARTS_DISPLAY_TILES') %} +{% if settings['CHARTS_DISPLAY_TILES'] %} {% include 'partials/charts_artists_tiles.jinja' %}

{% endif %} diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja index 31f7e09..e4779f7 100644 --- a/maloja/web/jinja/charts_tracks.jinja +++ b/maloja/web/jinja/charts_tracks.jinja @@ -37,7 +37,7 @@ -{% if settings('CHARTS_DISPLAY_TILES') %} +{% if settings['CHARTS_DISPLAY_TILES'] %} {% include 'partials/charts_tracks_tiles.jinja' %}

{% endif %} diff --git a/maloja/web/jinja/snippets/entityrow.jinja b/maloja/web/jinja/snippets/entityrow.jinja index 5d04899..fb2668f 100644 --- a/maloja/web/jinja/snippets/entityrow.jinja +++ b/maloja/web/jinja/snippets/entityrow.jinja @@ -10,7 +10,7 @@
{% if "artists" in entity %} - {% if settings('TRACK_SEARCH_PROVIDER') is not none %} + {% if settings['TRACK_SEARCH_PROVIDER'] %} {{ links.link_search(entity) }} {% endif %} diff --git a/maloja/web/jinja/snippets/links.jinja b/maloja/web/jinja/snippets/links.jinja index f765c1b..f66bd3b 100644 --- a/maloja/web/jinja/snippets/links.jinja +++ b/maloja/web/jinja/snippets/links.jinja @@ -62,7 +62,7 @@ {% macro link_search(entity) -%} {% set searchstr = (entity.artists + [entity.title]) | join(" ") | urlencode %} - {% set searchprovider = settings('TRACK_SEARCH_PROVIDER') | lower | replace(' ','') %} + {% set searchprovider = settings['TRACK_SEARCH_PROVIDER'] | lower | replace(' ','') %} {% set searchproviders = { "youtube":'https://www.youtube.com/results?search_query=', diff --git a/maloja/web/jinja/snippets/timeselection.jinja b/maloja/web/jinja/snippets/timeselection.jinja index 33ee6ba..99f1ef5 100644 --- a/maloja/web/jinja/snippets/timeselection.jinja +++ b/maloja/web/jinja/snippets/timeselection.jinja @@ -31,7 +31,7 @@ {% for r in xcurrent %} {% if r.range == limitkeys.timerange %} {{ r.localisation }} - {% elif r.heavy and settings('DISCOURAGE_CPU_HEAVY_STATS') %} + {% elif r.heavy and settings['DISCOURAGE_CPU_HEAVY_STATS'] %} {{ r.localisation }} {% else %} {{ r.localisation }} @@ -49,7 +49,7 @@ {# {% if all(r.keys[k] == allkeys[k] for k in r.keys) %} #} {% if r.replacekeys | map('compare_key_in_dicts',r.replacekeys,allkeys) | alltrue %} {{ r.localisation }} - {% elif r.heavy and settings('DISCOURAGE_CPU_HEAVY_STATS') %} + {% elif r.heavy and settings['DISCOURAGE_CPU_HEAVY_STATS'] %} {{ r.localisation }} {% else %} {{ r.localisation }} diff --git a/maloja/web/jinja/start.jinja b/maloja/web/jinja/start.jinja index edaee0b..0c0d112 100644 --- a/maloja/web/jinja/start.jinja +++ b/maloja/web/jinja/start.jinja @@ -4,9 +4,9 @@ {% block scripts %}