From ce381c30cc5308e7a228d8048a49e543ff6779dc Mon Sep 17 00:00:00 2001 From: Daniel Ramsay Date: Mon, 11 Oct 2021 12:38:16 +0100 Subject: [PATCH] use existing site_theme config openrightsgroup/blocked-org-uk#410 --- BlockedFrontend/default_settings.py | 2 -- BlockedFrontend/templates/blocked-uk/BasicPage.page.html | 2 +- .../templates/theme/{eu.theme.html => blocked-eu.theme.html} | 0 .../templates/theme/{uk.theme.html => blocked-uk.theme.html} | 0 4 files changed, 1 insertion(+), 3 deletions(-) rename BlockedFrontend/templates/theme/{eu.theme.html => blocked-eu.theme.html} (100%) rename BlockedFrontend/templates/theme/{uk.theme.html => blocked-uk.theme.html} (100%) diff --git a/BlockedFrontend/default_settings.py b/BlockedFrontend/default_settings.py index 11c6884..52d52a3 100644 --- a/BlockedFrontend/default_settings.py +++ b/BlockedFrontend/default_settings.py @@ -26,8 +26,6 @@ UPDATE_PASSWORD = None -THEME = 'uk' - REMOTE_TYPE = "modx" REMOTE_SRC = None REMOTE_AUTH = None diff --git a/BlockedFrontend/templates/blocked-uk/BasicPage.page.html b/BlockedFrontend/templates/blocked-uk/BasicPage.page.html index d0e9bfe..bfd9f2c 100644 --- a/BlockedFrontend/templates/blocked-uk/BasicPage.page.html +++ b/BlockedFrontend/templates/blocked-uk/BasicPage.page.html @@ -1,6 +1,6 @@ {%import "chunks.part.html" as chunks %} {%import "remotecontent.part.html" as rmt %} -{%import "theme/" ~ config.THEME ~ ".theme.html" as theme %} +{%import "theme/" ~ config.SITE_THEME ~ ".theme.html" as theme %} {# Behaviour variables: diff --git a/BlockedFrontend/templates/theme/eu.theme.html b/BlockedFrontend/templates/theme/blocked-eu.theme.html similarity index 100% rename from BlockedFrontend/templates/theme/eu.theme.html rename to BlockedFrontend/templates/theme/blocked-eu.theme.html diff --git a/BlockedFrontend/templates/theme/uk.theme.html b/BlockedFrontend/templates/theme/blocked-uk.theme.html similarity index 100% rename from BlockedFrontend/templates/theme/uk.theme.html rename to BlockedFrontend/templates/theme/blocked-uk.theme.html