From e29cd46960a3b0bbe57a720e3d7013d59a1ef1f2 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 4 Feb 2016 18:13:28 +0100 Subject: [PATCH] Set a globally available `theme_config` var and use it Fixes issues with dropdown in child themes, as deliver was explicitly referenced when checking the config. --- templates/modular.html.twig | 2 +- templates/modular/contact.html.twig | 2 +- templates/modular_alt.html.twig | 2 +- templates/partials/base.html.twig | 1 + templates/partials/navigation.html.twig | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/modular.html.twig b/templates/modular.html.twig index 066036d..387a691 100644 --- a/templates/modular.html.twig +++ b/templates/modular.html.twig @@ -51,7 +51,7 @@ {% endmacro %} - {% if config.themes.deliver.dropdown.enabled %} + {% if theme_config.dropdown.enabled %} {{ _self.loop(pages) }} {% else %} {% for page in pages.children %} diff --git a/templates/modular/contact.html.twig b/templates/modular/contact.html.twig index 26e03dd..c5cc084 100644 --- a/templates/modular/contact.html.twig +++ b/templates/modular/contact.html.twig @@ -2,7 +2,7 @@
{% if config.plugins.simple_form.enabled %} - {% set simple_form_config = page.header.simple_form ?: config.themes.deliver.simple_form %} + {% set simple_form_config = page.header.simple_form ?: theme_config.simple_form %} {{ simple_form(simple_form_config) }} {% endif %}
diff --git a/templates/modular_alt.html.twig b/templates/modular_alt.html.twig index 9bedbe1..dd3a985 100644 --- a/templates/modular_alt.html.twig +++ b/templates/modular_alt.html.twig @@ -46,7 +46,7 @@ {% endif %} {% endfor %} {% endmacro %} - {% if config.themes.deliver.dropdown.enabled %} + {% if theme_config.dropdown.enabled %} {{ _self.loop(pages) }} {% else %} {% for page in pages.children %} diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index 7257193..67a8be0 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -1,3 +1,4 @@ +{% set theme_config = attribute(config.themes, config.system.pages.theme) %} diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig index ada98b3..475957d 100644 --- a/templates/partials/navigation.html.twig +++ b/templates/partials/navigation.html.twig @@ -18,7 +18,7 @@ {% endmacro %}