From 9dc080bed82650c2f23403651af0f1d094fa30cd Mon Sep 17 00:00:00 2001
From: pikim <pikim@web.de>
Date: Tue, 20 Dec 2022 00:17:26 +0100
Subject: [PATCH] Harmonize and modify twigs

---
 templates/blog.html.twig               |  88 +++++++--------
 templates/default.html.twig            |  51 +++++----
 templates/item.html.twig               |  46 ++++----
 templates/partials/blog_item.html.twig | 142 ++++++++++++-------------
 4 files changed, 157 insertions(+), 170 deletions(-)

diff --git a/templates/blog.html.twig b/templates/blog.html.twig
index 3c9743a..12fc982 100644
--- a/templates/blog.html.twig
+++ b/templates/blog.html.twig
@@ -1,49 +1,51 @@
-{% embed 'partials/base.html.twig' %}
+{% extends '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 %}
-      {% set show_breadcrumbs = true %}
-  {% endif %}
-  {% if page.header.show_pagination is defined %}
-      {% set show_pagination = page.header.show_pagination %}
-  {% else %}
-      {% set show_pagination = true %}
-  {% endif %}
+{% else %}
+    {% set show_breadcrumbs = true %}
+{% endif %}
+{% if page.header.show_pagination is defined %}
+    {% set show_pagination = page.header.show_pagination %}
+{% else %}
+    {% set show_pagination = true %}
+{% endif %}
 
-  {% if base_url == '/' %}
+{% if base_url == '/' %}
     {% set base_url = '' %}
+{% endif %}
+
+{% if base_url == base_url_relative %}
+    {% set feed_url = base_url~'/'~page.slug %}
+{% 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 %}
+{#
+  {% 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 %}
 
-  {% if base_url == base_url_relative %}
-    {% set feed_url = base_url~'/'~page.slug %}
-  {% 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 %}
-
-    {% for child in collection %}
-      {% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
-    {% 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 %}
diff --git a/templates/default.html.twig b/templates/default.html.twig
index ffdc1a6..ec3ecd3 100644
--- a/templates/default.html.twig
+++ b/templates/default.html.twig
@@ -1,34 +1,33 @@
 {% 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' %}
+    {% include 'partials/sidebar_right.html.twig' %}
 {% endblock %}
 
 {% block content %}
-  <article class="post">
-    <header>
-      <div class="title">
-      <h2>{{ page.header.title }}</h2>  
-      {% if page.header.subtitle %}
-        <p>{{ page.header.subtitle }}</p>
-      {% endif %}  
-      </div>
+    {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
+        {% include 'partials/breadcrumbs.html.twig' %}
+    {% endif %}
 
-      </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' %}
-      {% endblock %}
-  </section> 
+<article class="post">
+  <header>
+    <div class="title">
+      <h2>{{ page.header.title }}</h2>
+    {% if page.header.subtitle %}
+      <p>{{ page.header.subtitle }}</p>
+    {% endif %}
+    </div>
+  </header>
+    {{ page.content|raw }}
+</article>
+
+<section id="footer" class="align-center">
+    {% include 'partials/footer.html.twig' %}
+</section>
 {% endblock %}
-
-
-
diff --git a/templates/item.html.twig b/templates/item.html.twig
index baa5f01..dbe1a6a 100644
--- a/templates/item.html.twig
+++ b/templates/item.html.twig
@@ -1,31 +1,23 @@
-{% 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]) %}
+{% extends 'partials/base.html.twig' %}
 
-    {% if base_url == '/' %}
-        {% set base_url = '' %}
+{% 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 %}
 
-    {% if base_url == base_url_relative %}
-        {% set feed_url = base_url~'/'~page.parent.slug %}
-    {% endif  %}
-    
-    {% block menu %}
-        {% include 'partials/sidebar_right.html.twig' %}
-    {% endblock %}
+    {% include 'partials/blog_item.html.twig' with {'truncate':false} %}
 
-        {% 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">
-            {% include 'partials/footer.html.twig' %}
-        </section>
-        {% endblock %}
-
-{% endembed %}
+<section id="footer" class="align-center">
+    {% include 'partials/footer.html.twig' %}
+</section>
+{% endblock %}
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
index 38dd6e9..5837448 100644
--- a/templates/partials/blog_item.html.twig
+++ b/templates/partials/blog_item.html.twig
@@ -1,93 +1,87 @@
-<article class="post"  itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
-         {% if page.header.author %}
-         {% set author =  page.header.author %}
-         {% else %}
-         {% set author =  page.header.taxonomy.author[0] %}
-         {% endif %}
-         {% if author %}
-         {% set avatar = author|replace(' ', '-')|lower %}
-         {% endif %}
-    
-    <header>
+<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
+{% if page.header.author %}
+    {% set author = page.header.author %}
+{% else %}
+    {% set author = page.header.taxonomy.author[0] %}
+{% endif %}
+{% if author %}
+    {% set avatar = author|replace(' ', '-')|lower %}
+{% endif %}
+
+  <header>
     <div class="title">
-        {% if page.header.link %}
-            <h2 itemprop="headline">
-                {% if page.header.continue_link is not sameas(false) %}
-                    <a href="{{ page.url }}"></a>
-                {% endif %}
-                <a href="{{ page.header.link }}">{{ page.title }}</a>
-            </h2>
-            {% else %}
-            <h2 itemprop="headline"><a href="{{ page.url }}">{{ page.title }}</a></h2>
-        {% endif %}
-        {% if page.header.subtitle %}
-        <p itemprop="alternativeHeadline">{{ page.header.subtitle|raw }}</p>
+      {% if page.header.link %}
+      <h2 itemprop="headline">
+        {% if page.header.continue_link is not sameas(false) %}
+        <a href="{{ page.url }}"></a>
         {% endif %}
+        <a href="{{ page.header.link }}">{{ page.title }}</a>
+      </h2>
+      {% else %}
+      <h2 itemprop="headline"><a href="{{ page.url }}">{{ page.title }}</a></h2>
+      {% endif %}
+      {% if page.header.subtitle %}
+      <p itemprop="alternativeHeadline">{{ page.header.subtitle|raw }}</p>
+      {% endif %}
     </div>
     <div class="meta">
-        <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 %}
+      <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>
+      {% 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>
+  </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, '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.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>
+{% 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, 'image featured')|raw }}</a>
+{% endif %}
 
-         
-    <div itemprop="articleBody">
- 
-    {% if page.header.continue_link is sameas(false) %}
-        {{ page.content|raw }}
-        {% if not truncate %}
-        {% set show_prev_next = true %}
-        {% endif %}
-    {% elseif truncate and page.summary != page.content %}
-        {{ page.summary|raw }}
-    {% elseif truncate %}
-        {{ page.content|truncate(550)|raw }}
-    {% else %}
-        {{ page.content|raw }}
-        {% set show_prev_next = true %}
-    {% 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 %}
+          {% set show_prev_next = true %}
+      {% endif %}
+  {% elseif truncate and page.summary != page.content %}
+      {{ page.summary|raw }}
+  {% elseif truncate %}
+      {{ page.content|truncate(550)|raw }}
+  {% else %}
+      {{ page.content|raw }}
+      {% set show_prev_next = true %}
+  {% endif %}
+  </div>
+{% endif %}
 
-   </div>
-
-    <footer>
+  <footer>
     <ul class="actions">
     {% if truncate and page.summary != page.content %}
-        <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
+      <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
     {% elseif truncate %}
-        <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
+      <li><a href="{{ page.url }}" class="button">{{'FUTURE.BLOG.ITEM.CONTINUE_READING'|t}}</a></li>
     {% endif %}
 
     {% if show_prev_next %}
-           {% if not page.isLast %}
-                <li><a class="button" href="{{ page.prevSibling.url }}"><i class="fa fa-chevron-left"></i> {{'FUTURE.BLOG.ITEM.PREV_POST'|t}}</a></li> 
-            {% endif %}
-           {% 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 %}
-            
+      {% if not page.isLast %}
+      <li><a class="button" href="{{ page.prevSibling.url }}"><i class="fa fa-chevron-left"></i> {{'FUTURE.BLOG.ITEM.PREV_POST'|t}}</a></li>
+      {% endif %}
+    {% 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>
+
     <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>
+    {% 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>
     </ul>
-</footer>
-
-
+  </footer>
 </article>