From 7c8526864e90cfa13a282221524fd57495b69482 Mon Sep 17 00:00:00 2001
From: "pmoreno.rodriguez"
 <60596353+pmoreno-rodriguez@users.noreply.github.com>
Date: Tue, 3 Jan 2023 20:17:24 +0100
Subject: [PATCH] Revert "Harmonize and modify twigs"

This reverts commit 9dc080bed82650c2f23403651af0f1d094fa30cd.
---
 templates/blog.html.twig               | 78 +++++++++++++-------------
 templates/default.html.twig            | 51 ++++++++---------
 templates/item.html.twig               | 46 ++++++++-------
 templates/partials/blog_item.html.twig |  1 -
 4 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/templates/blog.html.twig b/templates/blog.html.twig
index 12fc982..3c9743a 100644
--- a/templates/blog.html.twig
+++ b/templates/blog.html.twig
@@ -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 %}
-    {% 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 %}
+  {% 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 %}
-
-{% 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} %}
+  {% endblock %}
+  
+  {% block content %}
+    {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
+        {% include 'partials/breadcrumbs.html.twig' %}
     {% 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 %}
+    {% 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 ec3ecd3..ffdc1a6 100644
--- a/templates/default.html.twig
+++ b/templates/default.html.twig
@@ -1,33 +1,34 @@
 {% 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 %}
-    {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
-        {% include 'partials/breadcrumbs.html.twig' %}
-    {% endif %}
+  <article class="post">
+    <header>
+      <div class="title">
+      <h2>{{ page.header.title }}</h2>  
+      {% if page.header.subtitle %}
+        <p>{{ page.header.subtitle }}</p>
+      {% endif %}  
+      </div>
 
-<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>
+      </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> 
 {% endblock %}
+
+
+
diff --git a/templates/item.html.twig b/templates/item.html.twig
index dbe1a6a..baa5f01 100644
--- a/templates/item.html.twig
+++ b/templates/item.html.twig
@@ -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 %}
-
-{% block menu %}
-    {% include 'partials/sidebar_right.html.twig' %}
-{% endblock %}
-
-{% block content %}
-    {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
-        {% include 'partials/breadcrumbs.html.twig' %}
+    {% if base_url == '/' %}
+        {% set base_url = '' %}
     {% endif %}
 
-    {% include 'partials/blog_item.html.twig' with {'truncate':false} %}
+    {% if base_url == base_url_relative %}
+        {% set feed_url = base_url~'/'~page.parent.slug %}
+    {% endif  %}
+    
+    {% block menu %}
+        {% include 'partials/sidebar_right.html.twig' %}
+    {% endblock %}
 
-<section id="footer" class="align-center">
-    {% include 'partials/footer.html.twig' %}
-</section>
-{% endblock %}
+        {% 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 %}
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
index 8b851bb..5837448 100644
--- a/templates/partials/blog_item.html.twig
+++ b/templates/partials/blog_item.html.twig
@@ -37,7 +37,6 @@
 {% 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 %}
->>>>>>> parent of 9dc080b... Harmonize and modify twigs
 
 {% if page.header.blog_hide_body is not defined or not page.header.blog_hide_body %}
   <div itemprop="articleBody">