From b4cc4f874917c98629e7ed645a7699b97927da71 Mon Sep 17 00:00:00 2001
From: "pmoreno.rodriguez" <pmoreno.rodriguez@outlook.com>
Date: Thu, 13 Jul 2023 21:50:36 +0200
Subject: [PATCH] twig code optimization

---
 templates/blog.html.twig                  |  6 ++--
 templates/default.html.twig               | 12 +-------
 templates/error.html.twig                 | 14 +++++++++
 templates/item.html.twig                  |  2 +-
 templates/modular.html.twig               | 12 +-------
 templates/offline.html.twig               | 16 ++++++++--
 templates/partials/base.html.twig         | 11 +++++++
 templates/partials/blog_item.html.twig    | 37 ++++++++++-------------
 templates/partials/header.html.twig       |  5 +--
 templates/partials/miniposts.html.twig    |  1 +
 templates/partials/owl-carousel.html.twig |  1 +
 templates/portfolio.html.twig             | 16 +++-------
 templates/simplesearch_results.html.twig  |  2 +-
 13 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/templates/blog.html.twig b/templates/blog.html.twig
index 10c935e..eef52b7 100755
--- a/templates/blog.html.twig
+++ b/templates/blog.html.twig
@@ -5,8 +5,6 @@
 {% set feed_url = base_url %}
 {% set show_breadcrumbs = header_var('show_breadcrumbs')|defined(true) %}
 {% set show_pagination = header_var('show_pagination')|defined(true) %}
-{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
-{% set title = page.title|raw %}
 
 {# Set page title by taxonomy #}
 {% if uri.param('category') %}
@@ -39,7 +37,7 @@
     </span>
     {% endif %}
     <div class="title">
-      <h2>{{ title }}</h2>
+      <h1 itemprop="headline">{{ title }}</h1>
       {% if listing_title %}
         <p>{{ listing_title|raw }}</p>
       {% endif %}
@@ -52,7 +50,7 @@
     {% endif %}
 </article>
   {% for child in collection %}
-    {% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
+    {% include 'partials/blog_item.html.twig' with {'page':child, 'title': child.title|raw, 'subtitle': child.header.subtitle|raw, 'listing': true, 'truncate':true} %}
   {% endfor %}
 
   {% if show_pagination and config.plugins.pagination.enabled and collection.params.pagination %}
diff --git a/templates/default.html.twig b/templates/default.html.twig
index a51221b..14be3cc 100755
--- a/templates/default.html.twig
+++ b/templates/default.html.twig
@@ -1,15 +1,5 @@
 {% extends 'partials/base.html.twig' %}
 
-{# Define if the primary image and the attributes of width and height are shown #}
-{% set show_image = header_var('show_pageimage')|defined(true) %}
-{% set image = page.media[page.header.primaryImage] ?: page.media.all|filter((v, k) => k != page.header.primaryImage and (v.type == 'image' or v.type == 'vector'))|first %}
-{% set img_width = header_var('image_width')|default(1038) %}
-{% set img_height = header_var('image_height')|default(437) %}
-
-{# Set title and subtitle #}
-{% set title = page.title|raw %}
-{% set subtitle = page.header.subtitle|raw %}
-
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}
 {% endblock %}
@@ -18,7 +8,7 @@
   <article class="post">
     <header>
       <div class="title">
-        <h2>{{ title }}</h2>
+        <h1>{{ title }}</h1>
         {% if subtitle %}
           <p>{{ subtitle }}</p>
         {% endif %}
diff --git a/templates/error.html.twig b/templates/error.html.twig
index 6a24692..7fa7ba4 100644
--- a/templates/error.html.twig
+++ b/templates/error.html.twig
@@ -1,5 +1,7 @@
 {% extends 'partials/base.html.twig' %}
 
+{% set sidebar = theme_var('sidebar')|defined(true)  %}
+
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}
 {% endblock %}
@@ -13,4 +15,16 @@
       </div>
     </header>
   </article>
+
+  {% if sidebar == false %}
+    <section id="footer" class="align-center">
+      {% include 'partials/footer.html.twig' %}
+    </section>
+  {% endif %}
 {% endblock %}
+
+{% block sidebar %}
+{% if sidebar == true %}
+    {% include 'partials/sidebar_left.html.twig' %}
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/item.html.twig b/templates/item.html.twig
index c3e0a6b..67166af 100755
--- a/templates/item.html.twig
+++ b/templates/item.html.twig
@@ -24,7 +24,7 @@
 		</div>
 	{% endif %}
 
-	{% include 'partials/blog_item.html.twig' with {'truncate':false} %}
+	{% include 'partials/blog_item.html.twig' with {'listing': false, 'truncate':false} %}
 
 	{% if show_sidebar == false %}
 		<section id="footer" class="align-center">
diff --git a/templates/modular.html.twig b/templates/modular.html.twig
index 61b29d0..5c50dfb 100755
--- a/templates/modular.html.twig
+++ b/templates/modular.html.twig
@@ -1,15 +1,5 @@
 {% extends 'partials/base.html.twig' %}
 
-{# Define if the primary image and the attributes of width and height are shown #}
-{% set show_image = header_var('show_pageimage')|defined(true) %}
-{% set image = page.media[page.header.primaryImage] ?: page.media.all|filter((v) => (v.type == 'image' or v.type == 'vector'))|first %}
-{% set img_width = header_var('image_width')|default(1038) %}
-{% set img_height = header_var('image_height')|default(437) %}
-
-{# Set title and subtitle #}
-{% set title = page.title|raw %}
-{% set subtitle = page.header.subtitle|raw %}
-
 {# Commented code for future improvements in modular menu #}
 
 {# {% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
@@ -25,7 +15,7 @@
   <article class="post">
     <header>
       <div class="title">
-        <h2>{{ title }}</h2>
+        <h1>{{ title }}</h1>
         {% if subtitle %}
           <p>{{ subtitle }}</p>
         {% endif %}
diff --git a/templates/offline.html.twig b/templates/offline.html.twig
index 9e2290f..25315f5 100755
--- a/templates/offline.html.twig
+++ b/templates/offline.html.twig
@@ -12,7 +12,17 @@
       </div>
     </header>
   </article>
-  <section id="footer" class="align-center">
-    {% include 'partials/footer.html.twig' %}
-  </section>
+
+  {% if sidebar == false %}
+    <section id="footer" class="align-center">
+      {% include 'partials/footer.html.twig' %}
+    </section>
+  {% endif %}
+  
 {% endblock %}
+
+{% block sidebar %}
+{% if sidebar == true %}
+    {% include 'partials/sidebar_left.html.twig' %}
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
index 4dc4f1a..4d3f344 100644
--- a/templates/partials/base.html.twig
+++ b/templates/partials/base.html.twig
@@ -1,3 +1,4 @@
+{# Define global variables #}
 {% set theme_config = attribute(config.themes, config.system.pages.theme) %}
 {% set compress = theme_var('production-mode') ? '.min.css' : '.css' %}
 {% set favicon = theme_config.favicon ? theme_config.favicon|first : { type:'image/png', path: url('theme://images/favicon.png') } %}
@@ -6,6 +7,16 @@
 {# Define if sidebar is shown in the page #}
 {% set show_sidebar = header_var('show_sidebar')|defined(false) %}
 
+{# Define if the primary image and the attributes of width and height are shown #}
+{% set show_image = header_var('show_pageimage')|defined(true) %}
+{% set image = page.media[page.header.primaryImage] ?: page.media.all|filter((v, k) => k != page.header.primaryImage and (v.type == 'image' or v.type == 'vector'))|first %}
+{% set img_width = header_var('image_width')|default(1038) %}
+{% set img_height = header_var('image_height')|default(437) %}
+
+{# Set title and subtitle #}
+{% set title = page.title|raw %}
+{% set subtitle = page.header.subtitle|raw %}
+
 <!DOCTYPE html>
 <html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
   <head>
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
index 778549b..b9ee893 100755
--- a/templates/partials/blog_item.html.twig
+++ b/templates/partials/blog_item.html.twig
@@ -1,41 +1,36 @@
+{# Set site language #}
 {% set lang = grav.language.getActive ?: grav.config.site.default_lang %}
-
-<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
-
-  {% if page.header.metadata.author %}
-    {% set author = page.header.metadata.author %}
-  {% elseif page.header.author %}
-    {% set author = page.header.author %}
-  {% else %}
-    {% set author = page.taxonomy.author[0] %}
-  {% endif %}
+{# For SEO purposes, we avoid displaying more than one H1 tag. #}
+{% set Htag = listing ? 'h2' : 'h1' %}
 
 {# Set avatar image and primary image #}
 {% set avatar = page.media[page.header.avatarImage].url|e  %}
 {% set image = page.media[page.header.primaryImage] ?: page.media.all|filter((v, k) => k != page.header.avatarImage and (v.type == 'image' or v.type == 'vector'))|first %}
 
-{# Define if the primary image and the attributes of width and height are shown #}
-{% set show_image = header_var('show_pageimage')|defined(true) %}
-{% set img_width = header_var('image_width')|default(1038) %}
-{% set img_height = header_var('image_height')|default(437) %}
+{# Set page author #}
+{% if page.header.metadata.author %}
+  {% set author = page.header.metadata.author %}
+{% elseif page.header.author %}
+  {% set author = page.header.author %}
+{% else %}
+  {% set author = page.taxonomy.author[0] %}
+{% endif %}
 
-{# Set title and subtitle #}
-{% set title = page.title|raw %}
-{% set subtitle = page.header.subtitle|raw %}
+<article class="post" itemprop="liveBlogUpdate" itemscope itemtype="http://schema.org/BlogPosting">
 
   <header>
     <div class="title">
       {% if page.header.link %}
-        <h2 itemprop="headline">
+        <{{ Htag }} itemprop="headline">
           {% if page.header.continue_link is not sameas(false) %}
             <a href="{{ page.url }}" aria-label="{{ title }}"></a>
           {% endif %}
           <a href="{{ page.header.link }}" aria-label="{{ title }}">{{ title }}</a>
-        </h2>
+        </{{ Htag }}>
       {% else %}
-        <h2 itemprop="headline">
+       <{{ Htag }} itemprop="headline">
           <a href="{{ page.url }}" aria-label="{{ title }}">{{ title }}</a>
-        </h2>
+        </{{ Htag }}>
       {% endif %}
       {% if subtitle %}
         <p itemprop="alternativeHeadline">{{ subtitle|raw }}</p>
diff --git a/templates/partials/header.html.twig b/templates/partials/header.html.twig
index 82b1007..9535e80 100755
--- a/templates/partials/header.html.twig
+++ b/templates/partials/header.html.twig
@@ -1,11 +1,12 @@
+{# Configuration of navbar buttons #}
 {% set icon_lang = theme_var('menu_langswitcher')|defined('false') %}
 {% set icon_search = theme_var('menu_search')|defined('false') %}
 {% set icon_login = theme_var('menu_login')|defined('false') %}
 
 <header id="header">
-  <h1 class="logo">
+  <div class="logo">
     <a href="{{ home_url }}">{{ site.title }}</a>
-  </h1>
+  </div>
   <nav class="dropdown">
     {% block header_navigation %}
       {% include 'partials/navigation.html.twig' %}
diff --git a/templates/partials/miniposts.html.twig b/templates/partials/miniposts.html.twig
index de3d897..5d5dcaa 100644
--- a/templates/partials/miniposts.html.twig
+++ b/templates/partials/miniposts.html.twig
@@ -1,3 +1,4 @@
+{# Configuring miniposts with variables defined in the theme #}
 {% set miniposts_category = theme_var('miniposts_category') %}
 {% set miniposts_number = config.theme.miniposts_number %}
 {% set lang = grav.language.getActive ?: grav.config.site.default_lang %}
diff --git a/templates/partials/owl-carousel.html.twig b/templates/partials/owl-carousel.html.twig
index 3d8a501..42b40ac 100755
--- a/templates/partials/owl-carousel.html.twig
+++ b/templates/partials/owl-carousel.html.twig
@@ -1,3 +1,4 @@
+{# OWL Carousel twig template for Future2021 theme #}
 {% block stylesheets %}
      <style>
          .wrapper-carousel-{{ owl_id }} {
diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig
index 6ed6567..8cabd46 100755
--- a/templates/portfolio.html.twig
+++ b/templates/portfolio.html.twig
@@ -1,15 +1,12 @@
 {% extends 'partials/base.html.twig' %}
 
-{# Define if the primary image and the attributes of width and height are shown #}
-{% set image = page.media[page.header.primaryImage] ?: page.media.all|filter((v) => (v.type == 'image' or v.type == 'vector'))|first %}
-{% set img_width = header_var('image_width')|default(1038) %}
-{% set img_height = header_var('image_height')|default(437) %}
-
-{# Set title and subtitle #}
-{% set title = page.title|raw %}
-{% set subtitle = page.header.subtitle|raw %}
 {% set columns = page.header.layout == 'standard' ? 'col-4 col-6-medium col-12-small' : 'col-6 col-12-small'  %}
 
+{# Set portfolio options #}
+{% set gallery = page.header.images %}
+{% set thumb_w = page.header.thumb_width|default(600) %}
+{% set thumb_h = page.header.thumb_height|default(450) %}
+
 {% block stylesheets %}
 	{{ parent() }}
 	{% do assets.addCss('theme://assets/css/glightbox.min.css') %}
@@ -21,9 +18,6 @@
 	{% endset %}
 {% do assets.addInlineCss(styling) %}
 {% endblock %}
-{% set gallery = page.header.images %}
-{% set thumb_w = page.header.thumb_width|default(600) %}
-{% set thumb_h = page.header.thumb_height|default(450) %}
 
 {% block menu %}
 	{% include 'partials/sidebar_right.html.twig' %}
diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig
index 048b791..0f4282c 100755
--- a/templates/simplesearch_results.html.twig
+++ b/templates/simplesearch_results.html.twig
@@ -1,6 +1,6 @@
 {% extends 'partials/base.html.twig' %}
 
-{% set sidebar = theme_var('sidebar')|defined(false)  %}
+{% set sidebar = theme_var('sidebar')|defined(true)  %}
 
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}