diff --git a/templates/blog.html.twig b/templates/blog.html.twig old mode 100644 new mode 100755 index 841e09a..302641f --- a/templates/blog.html.twig +++ b/templates/blog.html.twig @@ -5,6 +5,7 @@ {% 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 %} @@ -59,7 +60,7 @@ {% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %} {% endif %} - {% if theme_config.sidebar == false %} + {% if show_sidebar == false %} @@ -67,7 +68,7 @@ {% endblock %} {% block sidebar %} - {% if theme_config.sidebar == true %} + {% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} {% endif %} {% endblock %} diff --git a/templates/default.html.twig b/templates/default.html.twig old mode 100644 new mode 100755 index c29ee79..7cbd75e --- a/templates/default.html.twig +++ b/templates/default.html.twig @@ -1,5 +1,5 @@ {% extends 'partials/base.html.twig' %} - +{% 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 %} {% set subtitle = page.header.subtitle|raw %} @@ -27,7 +27,15 @@ - + {% if show_sidebar == false %} + + {% endif %} +{% 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 old mode 100644 new mode 100755 index 45b5430..701f5c7 --- a/templates/item.html.twig +++ b/templates/item.html.twig @@ -3,6 +3,7 @@ {% set base_url = page.parent.url %} {% set feed_url = base_url %} {% set show_breadcrumbs = header_var('show_breadcrumbs')|defined(true) %} +{% set show_sidebar = header_var('show_sidebar')|defined(false) %} {% if base_url == '/' %} {% set base_url = '' %} @@ -24,8 +25,16 @@ {% endif %} {% include 'partials/blog_item.html.twig' with {'truncate':false} %} - - + + {% if show_sidebar == false %} + + {% endif %} +{% endblock %} + +{% block sidebar %} + {% if show_sidebar == true %} + {% include 'partials/sidebar_left.html.twig' %} + {% endif %} {% endblock %} diff --git a/templates/modular.html.twig b/templates/modular.html.twig old mode 100644 new mode 100755 index 09bd976..c639e0c --- a/templates/modular.html.twig +++ b/templates/modular.html.twig @@ -1,5 +1,5 @@ {% extends 'partials/base.html.twig' %} - +{% 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 %} {% set subtitle = page.header.subtitle|raw %} @@ -39,7 +39,7 @@ {% endblock %} {% block sidebar %} - {% if theme_config.sidebar == true %} + {% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} {% endif %} {% endblock %} diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig old mode 100644 new mode 100755 index acd5b9b..ce493d1 --- a/templates/portfolio.html.twig +++ b/templates/portfolio.html.twig @@ -1,4 +1,5 @@ {% extends 'partials/base.html.twig' %} +{% set show_sidebar = header_var('show_sidebar')|defined(false) %} {% set image = page.media[page.header.primaryImage] %} {% set title = page.title|raw %} {% set subtitle = page.header.subtitle|raw %} @@ -41,7 +42,15 @@ {% endblock %} - + {% if show_sidebar == false %} + + {% endif %} +{% endblock %} + +{% block sidebar %} + {% if show_sidebar == true %} + {% include 'partials/sidebar_left.html.twig' %} + {% endif %} {% endblock %} diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig old mode 100644 new mode 100755 index 2f20e11..b5c3837 --- a/templates/simplesearch_results.html.twig +++ b/templates/simplesearch_results.html.twig @@ -1,5 +1,7 @@ {% extends 'partials/base.html.twig' %} +{% set show_sidebar = theme_var('sidebar')|defined(false) %} + {% block menu %} {% include 'partials/sidebar_right.html.twig' %} {% endblock %} @@ -33,7 +35,7 @@ {% endfor %} - {% if theme_config.sidebar == false %} + {% if show_sidebar == false %} @@ -41,7 +43,7 @@ {% endblock %} {% block sidebar %} - {% if theme_config.sidebar == true %} + {% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} {% endif %} {% endblock %}