diff --git a/aleksis/core/templates/core/base_print.html b/aleksis/core/templates/core/base_print.html index 428d28f2858406c771b635c20ff874bf5c9f9d5a..9b4c0e4ea32feb0cf3112df675e93e23385e6dc7 100644 --- a/aleksis/core/templates/core/base_print.html +++ b/aleksis/core/templates/core/base_print.html @@ -11,7 +11,7 @@ {% block no_browser_title %} {% block browser_title %}{% endblock %} — {% endblock %} - {{ config.SITE_TITLE }} + {{ SITE_PREFERENCES.general__title }} </title> {% include_css "material-design-icons" %} @@ -51,7 +51,7 @@ <div id="print-header" class="row"> <div class="col s6 logo"> {% static "img/aleksis-banner.svg" as aleksis_banner %} - <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" alt="Logo" + <img src="{% firstof SITE_PREFERENCES.theme__logo.url aleksis_banner %}" alt="Logo" id="print-logo"/> </div> <div class="col s6 right-align"> @@ -65,7 +65,7 @@ <footer> <div class="left"> - {{ request.site.preferences.school__name }} + {{ SITE_PREFERENCES.school__name }} </div> <div class="right"> diff --git a/aleksis/core/templates/core/index.html b/aleksis/core/templates/core/index.html index 4de8ddcf35ef9153d094798c5cc019aa1bb0f863..f91439ba86d8ea0738859e8ad60908d48ba05ab6 100644 --- a/aleksis/core/templates/core/index.html +++ b/aleksis/core/templates/core/index.html @@ -108,7 +108,7 @@ </div> {% endif %} - {% if user.person.preferences.general__automatically_update_dashboard and request.site.preferences.general__automatically_update_dashboard_site %} + {% if user.person.preferences.general__automatically_update_dashboard and SITE_PREFERENCES.general__automatically_update_dashboard_site %} <script type="text/javascript" src="{% static "js/include_ajax_live.js" %}"></script> {% endif %} {% endblock %} diff --git a/aleksis/core/templates/core/partials/meta.html b/aleksis/core/templates/core/partials/meta.html index 8fdbea9e15dd2c9520d8d6643ab251337da68609..cae0f93b801ab0157f61bbe319067ac49979002c 100644 --- a/aleksis/core/templates/core/partials/meta.html +++ b/aleksis/core/templates/core/partials/meta.html @@ -3,20 +3,20 @@ <meta charset="utf-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> -<meta name="description" content="{{ request.site.preferences.general__description }}"/> +<meta name="description" content="{{ SITE_PREFERENCES.general__description }}"/> <meta name="generator" content="AlekSIS School Information System"/> <meta name="theme-color" content="red"> <meta name="mobile-web-app-capable" content="yes"> -<meta name="apple-mobile-web-app-title" content="{{ request.site.preferences.general__title }}"> +<meta name="apple-mobile-web-app-title" content="{{ SITE_PREFERENCES.general__title }}"> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="default"> -<meta name="msapplication-navbutton-color" content="{{ request.site.preferences.theme__primary }}"> -<meta name="msapplication-TileColor" content="{{ request.site.preferences.theme__primary }}"> +<meta name="msapplication-navbutton-color" content="{{ SITE_PREFERENCES.theme__primary }}"> +<meta name="msapplication-TileColor" content="{{ SITE_PREFERENCES.theme__primary }}"> <meta name="msapplication-TileImage" content="{{ PWA_ICONS.microsoft.144.faviconImage.url }}"> -<meta name="application-name" content="{{ request.site.preferences.general__title }}"> +<meta name="application-name" content="{{ SITE_PREFERENCES.general__title }}"> <meta name="msapplication-starturl" content="/"> <meta name="msapplication-tap-highlight" content="no"> <meta name="browsermode" content="application"> diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py index 5871fd8dd7f568d463c8f672373fa60b708caddf..3dcebe4df7d97fa7fed8db4efda25362bee16210 100644 --- a/aleksis/core/util/core_helpers.py +++ b/aleksis/core/util/core_helpers.py @@ -213,6 +213,7 @@ def custom_information_processor(request: HttpRequest) -> dict: "ADMINS": settings.ADMINS, "PWA_ICONS": regrouped_pwa_icons, "SENTRY_ENABLED": settings.SENTRY_ENABLED, + "SITE_PREFERENCES": get_site_preferences(), } if settings.SENTRY_ENABLED: