makary/grav-theme-future2021
1
0
Fork 0
mirror of https://github.com/pmoreno-rodriguez/grav-theme-future2021.git synced 2025-06-07 20:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed show sidebar

Browse source
This commit is contained in:
Pedro Moreno 2023-03-05 22:10:02 +01:00
parent 3f745f7939
commit 6f51b6d636
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
templates/blog.html.twig
View file

@ -5,7 +5,6 @@
{% set feed_url = base_url %} {% set feed_url = base_url %}
{% set show_breadcrumbs = header_var('show_breadcrumbs')|defined(true) %} {% set show_breadcrumbs = header_var('show_breadcrumbs')|defined(true) %}
{% set show_pagination = header_var('show_pagination')|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 image = page.media[page.header.primaryImage] ?: page.media.images|first %}
{% set title = page.title|raw %} {% set title = page.title|raw %}
@ -68,5 +67,7 @@
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
{% if show_sidebar == true %}
{% include 'partials/sidebar_left.html.twig' %} {% include 'partials/sidebar_left.html.twig' %}
{% endif %}
{% endblock %} {% endblock %}

2
templates/item.html.twig
View file

@ -34,5 +34,7 @@
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
{% if show_sidebar == true %}
{% include 'partials/sidebar_left.html.twig' %} {% include 'partials/sidebar_left.html.twig' %}
{% endif %}
{% endblock %} {% endblock %}

7
templates/partials/base.html.twig
View file

@ -3,6 +3,9 @@
{% set favicon = theme_config.favicon ? theme_config.favicon|first : { type:'image/png', path: url('theme://images/favicon.png') } %} {% 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 %} {% 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) %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}"> <html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
<head> <head>
@ -54,9 +57,9 @@
<div id="main"> <div id="main">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% if show_sidebar == true %}
{% block sidebar %}{% endblock %} {% block sidebar %}{% endblock %}
{% endif %}
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}

7
templates/simplesearch_results.html.twig
View file

@ -1,6 +1,6 @@
{% extends 'partials/base.html.twig' %} {% extends 'partials/base.html.twig' %}
{% set show_sidebar = theme_var('sidebar')|defined(false) %} {% set sidebar = theme_var('sidebar')|defined(false) %}
{% block menu %} {% block menu %}
{% include 'partials/sidebar_right.html.twig' %} {% include 'partials/sidebar_right.html.twig' %}
@ -35,7 +35,7 @@
{% endfor %} {% endfor %}
</article> </article>
{% if show_sidebar == false %} {% if sidebar == false %}
<section id="footer" class="align-center"> <section id="footer" class="align-center">
{% include 'partials/footer.html.twig' %} {% include 'partials/footer.html.twig' %}
</section> </section>
@ -43,5 +43,8 @@
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
{% if sidebar == true %}
{% include 'partials/sidebar_left.html.twig' %} {% include 'partials/sidebar_left.html.twig' %}
{% endif %}
{% endblock %} {% endblock %}