Revert "Harmonize and modify twigs"

This reverts commit 9dc080bed8.
This commit is contained in:
pmoreno.rodriguez 2022-12-23 12:22:02 +01:00
parent ba71a6b92a
commit 19afc5c313
4 changed files with 166 additions and 153 deletions

View file

@ -1,51 +1,49 @@
{% extends 'partials/base.html.twig' %}
{% embed 'partials/base.html.twig' %}
{% set collection = page.collection() %}
{% set base_url = page.url %}
{% set feed_url = base_url %}
{% if page.header.show_breadcrumbs is defined %}
{% set collection = page.collection() %}
{% set base_url = page.url %}
{% set feed_url = base_url %}
{% if page.header.show_breadcrumbs is defined %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
{% else %}
{% else %}
{% set show_breadcrumbs = true %}
{% endif %}
{% if page.header.show_pagination is defined %}
{% endif %}
{% if page.header.show_pagination is defined %}
{% set show_pagination = page.header.show_pagination %}
{% else %}
{% else %}
{% set show_pagination = true %}
{% endif %}
{% endif %}
{% if base_url == '/' %}
{% if base_url == '/' %}
{% set base_url = '' %}
{% endif %}
{% endif %}
{% if base_url == base_url_relative %}
{% if base_url == base_url_relative %}
{% set feed_url = base_url~'/'~page.slug %}
{% endif %}
{% endif %}
{% block menu %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
{#
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
{% endif %}
#}
{% for child in collection %}
{% if child.header.hide is not defined or not child.header.hide %}
{% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
{% endif %}
{% endfor %}
{% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
{% include 'partials/pagination.html.twig' with {base_url: page.url, pagination: collection.params.pagination} %}
{% endif %}
{% endblock %}
{% block sidebar %}
{% include 'partials/sidebar_left.html.twig' %}
{% endblock %}
{% endembed %}
<section id="footer" class="align-center">
{% include 'partials/footer.html.twig' %}
</section>
{% endblock %}

View file

@ -1,21 +1,11 @@
{% extends 'partials/base.html.twig' %}
{% if page.header.show_breadcrumbs is defined %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
{% else %}
{% set show_breadcrumbs = true %}
{% endif %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
{% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
<article class="post">
<article class="post">
<header>
<div class="title">
<h2>{{ page.header.title }}</h2>
@ -23,11 +13,22 @@
<p>{{ page.header.subtitle }}</p>
{% endif %}
</div>
</header>
{{ page.content|raw }}
</article>
<section id="footer" class="align-center">
</header>
{% if page.header.primaryImage %}
{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
{% else %}
{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
{% endif %}
{{ page.content|raw}}
</article>
<section id="footer" class="align-center">
{% block footer %}
{% include 'partials/footer.html.twig' %}
</section>
{% endblock %}
</section>
{% endblock %}

View file

@ -1,23 +1,31 @@
{% extends 'partials/base.html.twig' %}
{% embed 'partials/base.html.twig' %}
{% set base_url = page.parent.url %}
{% set feed_url = base_url %}
{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog]) %}
{% if page.header.show_breadcrumbs is defined %}
{% set show_breadcrumbs = page.header.show_breadcrumbs %}
{% else %}
{% set show_breadcrumbs = true %}
{% endif %}
{% if base_url == '/' %}
{% set base_url = '' %}
{% endif %}
{% block menu %}
{% if base_url == base_url_relative %}
{% set feed_url = base_url~'/'~page.parent.slug %}
{% endif %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
{% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
{% include 'partials/breadcrumbs.html.twig' %}
{% endif %}
{% include 'partials/blog_item.html.twig' with {'truncate':false} %}
<section id="footer" class="align-center">
<section id="footer" class="align-center">
{% include 'partials/footer.html.twig' %}
</section>
{% endblock %}
</section>
{% endblock %}
{% endembed %}

View file

@ -1,12 +1,12 @@
<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
{% if page.header.author %}
{% if page.header.author %}
{% set author = page.header.author %}
{% else %}
{% else %}
{% set author = page.header.taxonomy.author[0] %}
{% endif %}
{% if author %}
{% endif %}
{% if author %}
{% set avatar = author|replace(' ', '-')|lower %}
{% endif %}
{% endif %}
<header>
<div class="title">
@ -25,21 +25,22 @@
{% endif %}
</div>
<div class="meta">
<time class="published" itemprop="datePublished" datetime="{{page.date|dateTranslate(grav.config.system.pages.dateformat.short)}}">{{ page.date|dateTranslate(grav.config.system.pages.dateformat.short)}}</time>
<time class="published" itemprop="datePublished" datetime="{{page.date|date("Y-m-d")}}">{{ page.date|date("M j, Y")}}</time>
{% if author %}
<a href="{{ base_url }}/author{{ config.system.param_sep }}{{ author }}" itemprop="keywords" class="author">{{ tag }}<span class="name" rel="author">{{ author }}</span>{% if page.header.avatarImage %}<img src="{{ page.media[page.header.avatarImage].url|e}}" alt="{{ author }}" />{% endif %}</a>
{% endif %}
</div>
</header>
{% if page.header.primaryImage %}
<a href="{{ page.url }}" class="image featured">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title)|raw }}</a>
{% elseif page.media.images %}
<a href="{{ page.url }}" class="image featured">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title)|raw }}</a>
{% endif %}
{% if page.header.primaryImage %}
<a href="{{ page.url }}" class="image featured">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
{% else %}
<a href="{{ page.url }}" class="image featured">{{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
{% endif %}
{% if page.header.blog_hide_body is not defined or not page.header.blog_hide_body %}
<div itemprop="articleBody">
{% if page.header.continue_link is sameas(false) %}
{{ page.content|raw }}
{% if not truncate %}
@ -53,8 +54,8 @@
{{ page.content|raw }}
{% set show_prev_next = true %}
{% endif %}
</div>
{% endif %}
<footer>
<ul class="actions">
@ -71,17 +72,22 @@
{% if not page.isFirst %}
<li><a class="button" href="{{ page.nextSibling.url }}">{{'FUTURE.BLOG.ITEM.NEXT_POST'|t}} <i class="fa fa-chevron-right"></i></a></li>
{% endif %}
{% endif %}
</ul>
{% endif %}
</ul>
<ul class="stats">
{% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %}
<li><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tag }}" itemprop="keywords">{{ tag }}</a></li>
{% endfor %}
{% endif %}
<li><a href="https://twitter.com/share" data-url="{{ page.url(true) }}" data-text="{{ page.title }}" class="icon brands fa-twitter"></a></li>
<li><a href="http://www.facebook.com/sharer.php?u={{ page.url(true) }}" class="icon brands fa-facebook"></a></li>
<li><a href="https://twitter.com/share" data-url="{{ page.url(true) }}" data-text="{{ page.title }}" class="icon brands fa-twitter">
</a></li>
<li><a href="http://www.facebook.com/sharer.php?u={{ page.url(true) }}" class="icon brands fa-facebook">
</a></li>
</ul>
</footer>
</footer>
</article>