From 6f51b6d63691aad208a6f24225c13b98dc446d3a Mon Sep 17 00:00:00 2001 From: Pedro Moreno Date: Sun, 5 Mar 2023 22:10:02 +0100 Subject: [PATCH] Fixed show sidebar --- templates/blog.html.twig | 3 ++- templates/item.html.twig | 2 ++ templates/partials/base.html.twig | 7 +++++-- templates/simplesearch_results.html.twig | 7 +++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/templates/blog.html.twig b/templates/blog.html.twig index ee45fe5..10c935e 100755 --- a/templates/blog.html.twig +++ b/templates/blog.html.twig @@ -5,7 +5,6 @@ {% set feed_url = base_url %} {% set show_breadcrumbs = header_var('show_breadcrumbs')|defined(true) %} {% set show_pagination = header_var('show_pagination')|defined(true) %} -{% set show_sidebar = header_var('show_sidebar')|defined(false) %} {% set image = page.media[page.header.primaryImage] ?: page.media.images|first %} {% set title = page.title|raw %} @@ -68,5 +67,7 @@ {% endblock %} {% block sidebar %} +{% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} diff --git a/templates/item.html.twig b/templates/item.html.twig index a1b7162..c3e0a6b 100755 --- a/templates/item.html.twig +++ b/templates/item.html.twig @@ -34,5 +34,7 @@ {% endblock %} {% block sidebar %} +{% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index 61cdc6a..4dc4f1a 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -3,6 +3,9 @@ {% set favicon = theme_config.favicon ? theme_config.favicon|first : { type:'image/png', path: url('theme://images/favicon.png') } %} {% set new_base_url = base_url_absolute ~ theme_config.blog_page %} +{# Define if sidebar is shown in the page #} +{% set show_sidebar = header_var('show_sidebar')|defined(false) %} + @@ -54,9 +57,9 @@
{% block content %}{% endblock %}
- {% if show_sidebar == true %} + {% block sidebar %}{% endblock %} - {% endif %} + {% endblock %} {% endblock %} diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig index e6f3313..048b791 100755 --- a/templates/simplesearch_results.html.twig +++ b/templates/simplesearch_results.html.twig @@ -1,6 +1,6 @@ {% extends 'partials/base.html.twig' %} -{% set show_sidebar = theme_var('sidebar')|defined(false) %} +{% set sidebar = theme_var('sidebar')|defined(false) %} {% block menu %} {% include 'partials/sidebar_right.html.twig' %} @@ -35,7 +35,7 @@ {% endfor %} - {% if show_sidebar == false %} + {% if sidebar == false %} @@ -43,5 +43,8 @@ {% endblock %} {% block sidebar %} +{% if sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} +