Merge pull request #25 from pikim/develop

Merge changes and fixes into develop

assets/css/misc.css

@@ -66,19 +66,27 @@
 .search-row {
   display: flex;
   align-items: top;
-  
 }
 .search-image img {
   overflow:hidden;
-  width: 100px;
-  height: 100px;
   object-fit: cover;
   object-position: 0 100%;
 }
+.search-image a {
+  border-bottom: none;
+}
 @media only all and (max-width: 47.938em) {
   .search-image img {display:none;}
 }
 .search-item {
   margin-left: 30px;
   margin-bottom: 50px;
+  border-bottom: solid 1px rgba(160, 160, 160, 0.3);
+  padding-bottom: 2em;
+}
+
+/* Styles modified from Breadcrumbs */
+
+#breadcrumbs {
+  padding-inline-start: 0rem;
 }

blueprints.yaml

@@ -34,9 +34,12 @@ form:
         type: bool
 
     header_section:
-      type: section
+      type: fieldset
-      title: FUTURE.ADMIN.THEME.HEADER_SECTION
+      collapsible: true
-      underline: true
+      collapsed: true
+      icon: header
+      title: FUTURE.ADMIN.THEME.HEADER
+      fields:
 
         favicon:
           type: file
@@ -74,12 +77,6 @@ form:
           label: FUTURE.ADMIN.THEME.SLOGAN
 
     blog_section:
-      type: columns
-      fields:
-        blog_fields:
-          type: column
-          fields:
-            blog:
       type: fieldset
       collapsible: true
       collapsed: true
@@ -90,10 +87,21 @@ form:
         blog_page:
           type: text
           label: FUTURE.ADMIN.THEME.BLOG_PAGE
-                  help: FUTURE.ADMIN.THEME.BLOG_PAGE_DESCRIPTION
+          help: FUTURE.ADMIN.THEME.BLOG_PAGE_HELP
           size: medium
           default: '/blog'
 
+        sidebar:
+          type: toggle
+          label: FUTURE.ADMIN.THEME.SIDEBAR
+          highlight: 1
+          default: 1
+          options:
+            1: PLUGIN_ADMIN.ENABLED
+            0: PLUGIN_ADMIN.DISABLED
+          validate:
+            type: bool
+
         miniposts:
           type: toggle
           label: FUTURE.ADMIN.THEME.MINIPOSTS
@@ -104,6 +112,7 @@ form:
             0: PLUGIN_ADMIN.DISABLED
           validate:
             type: bool
+
         miniposts_category:
           type: text
           markdown: true
@@ -122,18 +131,13 @@ form:
             max: 5
 
     footer_section:
-      type: columns
-      fields:
-        footer_fields:
-          type: column
-          fields:
-            footer:
       type: fieldset
       collapsible: true
       collapsed: true
       icon: list-alt
       title: FUTURE.ADMIN.THEME.FOOTER
       fields:
+
         footer.title:
           type: text
           label: FUTURE.ADMIN.THEME.FOOTER_TITLE
@@ -151,13 +155,15 @@ form:
         footer.button_url:
           type: text
           label: FUTURE.ADMIN.THEME.FOOTER_BUTTON_URL
-    social_icons:
+
+    social_icons_section:
       type: fieldset
       collapsible: true
       collapsed: true
       icon: share-alt
       title: FUTURE.ADMIN.THEME.FOOTER_SOCIALS_ICONS
       fields:
+
         social:
           name: social
           type: list
@@ -174,49 +180,50 @@ form:
             .icon:
               type: iconpicker
               label: FUTURE.ADMIN.THEME.FOOTER_SOCIALS_ICON_ICON
-    custommenu_options:
+
+    custommenu_options_section:
       type: fieldset
       collapsible: true
       collapsed: true
       icon: bars
-      title: 'Custom Menu Items'
+      title: FUTURE.ADMIN.THEME.CUSTOM_MENU_TITLE
       fields:
-        displaycustommenus.enabled:
+
+        custommenus.enabled:
           type: toggle
-          label: 'Display Custom Menu Items'
+          label: FUTURE.ADMIN.THEME.CUSTOM_MENU_ENABLE
-          help: 'Determines if any defined custom menu entries are displayed in the menubar.'
+          help: FUTURE.ADMIN.THEME.CUSTOM_MENU_ENABLE_HELP
           default: 0
           highlight: 1
           options:
-            '0': No
+            0: PLUGIN_ADMIN.DISABLED
-            '1': Yes
+            1: PLUGIN_ADMIN.ENABLED
           validate:
             type: bool
         custommenu:
           name: menu
           type: list
-          label: 'Custom Menu Items'
+          label: FUTURE.ADMIN.THEME.CUSTOM_MENU_TITLE
           fields:
             .text:
               type: text
-              label: Text
+              label: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TEXT
-              description: 'Text label for menu item.'
+              description: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TEXT_DESCRIPTION
             .icon:
               type: text
-              label: Icon
+              label: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_ICON
-              description: 'Font Awesome icon for menu item.'
+              description: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_ICON_DESCRIPTION
             .url:
               type: text
-              label: URL
+              label: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_URL
-              description: 'URL for menu item.'
+              description: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_URL_DESCRIPTION
             .target:
               type: select
-              label: Target
+              label: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TARGET
               default: _self
               size: medium
               options:
-                _blank: 'Open in a new window'
+                _blank: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TARGET_BLANK
-                _parent: 'Open in the parent frame'
+                _parent: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TARGET_PARENT
-                _top: 'Open in the full body of the window'
+                _self: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TARGET_SELF
-                _self: 'Open in the same frame as clicked'
+                _top: FUTURE.ADMIN.THEME.CUSTOM_MENU_ITEM_TARGET_TOP
-

languages.yaml

@@ -5,7 +5,7 @@ en:
         DROPDOWN_MENU: Dropdown menu
         PRODUCTION_MODE: Production Mode
         PRODUCTION_MODE_HELP: When enabled, Future will render with minified CSS
-        HEADER_SECTION: Header Section
+        HEADER: Header
         FAVICON: Choose your own favicon
         CUSTOM_LOGO: Custom Logo
         CUSTOM_LOGO_DESCRIPTION: Will be used instead of default logo `theme://images/grav-logo.svg`
@@ -13,8 +13,9 @@ en:
         SLOGAN: Slogan
         BLOG_DEFAULTS: Blog Defaults
         BLOG_PAGE: Blog Page
-        BLOG_PAGE_DESCRIPTION: The route to the blog page when working with blog sidebar
+        BLOG_PAGE_HELP: The route to the blog page when working with blog sidebar
-        MINIPOSTS: Enable Miniposts in Sidebar
+        SIDEBAR: Show sidebar on blog page
+        MINIPOSTS: Show miniposts in sidebar
         MINIPOSTS_NUMBER: Miniposts number to show
         MINIPOSTS_NUMBER_DESCRIPTION: Number of miniposts that will be showed in sidebar
         MINIPOSTS_CATEGORY: Miniposts category
@@ -29,6 +30,20 @@ en:
         FOOTER_SOCIALS_ICON_NAME: Social Name
         FOOTER_SOCIALS_ICON_URL: URL Link to Social
         FOOTER_SOCIALS_ICON_ICON: Icon to Social
+        CUSTOM_MENU_TITLE: 'Custom Menu Items'
+        CUSTOM_MENU_ENABLE: 'Display Custom Menu Items'
+        CUSTOM_MENU_ENABLE_HELP: 'Determines if any defined custom menu entries are displayed in the menubar.'
+        CUSTOM_MENU_ITEM_TEXT: 'Text'
+        CUSTOM_MENU_ITEM_TEXT_DESCRIPTION: 'Text label for menu item.'
+        CUSTOM_MENU_ITEM_ICON: 'Icon'
+        CUSTOM_MENU_ITEM_ICON_DESCRIPTION: 'Font Awesome icon for menu item.'
+        CUSTOM_MENU_ITEM_URL: 'URL'
+        CUSTOM_MENU_ITEM_URL_DESCRIPTION: 'URL for menu item.'
+        CUSTOM_MENU_ITEM_TARGET: 'Target'
+        CUSTOM_MENU_ITEM_TARGET_BLANK: 'Open in a new window'
+        CUSTOM_MENU_ITEM_TARGET_PARENT: 'Open in the parent frame'
+        CUSTOM_MENU_ITEM_TARGET_SELF: 'Open in the same frame as clicked'
+        CUSTOM_MENU_ITEM_TARGET_TOP: 'Open in the full body of the window'
       DEFAULT:
         PRIMARY_IMAGE: Primary image
       MODULAR:
@@ -52,7 +67,6 @@ en:
           FEATURES_BUTTON_URL: Button URL
           FEATURES_BUTTON_URL_TARGET: Open URL in a new window
 
-
       BLOG:
         BLOG_TAB: Blog Config
         BLOG_CONTENT_TITLE: Content Definition
@@ -94,6 +108,9 @@ en:
         PORTFOLIO_IMAGE_THUMB: Thumbnails
 
     BLOG:
+      LISTING_TITLE_CATEGORY: 'Posts in Category: '
+      LISTING_TITLE_TAG: 'Posts with Tag: '
+      LISTING_TITLE_AUTHOR: 'Posts written by Author: '
       ITEM:
         CONTINUE_READING: Continue reading...
         NEXT_POST: Next Post
@@ -120,12 +137,159 @@ en:
         HEADLINE: Archives
       SYNDICATE:
         HEADLINE: Syndicate
+
     LOGIN: Log in
     LATESTPOSTS: Latest posts
     FEATURED: Featured
-    PRIVACY: By using this form you agree to our
+    PRIVACY: By using this form you agree our terms
     FORM_SUMMARY: Here is the summary of what you wrote to us
 
+de:
+  FUTURE:
+    ADMIN:
+      THEME:
+        DROPDOWN_MENU: Dropdown-Menü
+        PRODUCTION_MODE: Produktionsmodus
+        PRODUCTION_MODE_HELP: Wenn aktiviert, wird Future mit minimiertem CSS geladen
+        HEADER: Kopfzeile
+        FAVICON: Wählen Sie Ihr eigenes Favicon
+        CUSTOM_LOGO: Benutzerdefiniertes Logo
+        CUSTOM_LOGO_DESCRIPTION: Dieses Logo wird anstelle des Standardlogos `theme://images/grav-logo.svg` verwendet
+        CUSTOM_LOGO_MOBILE: Benutzerdefiniertes Logo für Mobilgeräte
+        SLOGAN: Motto
+        BLOG_DEFAULTS: Blog-Optionen
+        BLOG_PAGE: Blog-Seite
+        BLOG_PAGE_HELP: Der Pfad zur Blog-Seite wenn die Blog-Seitenleiste aktiv ist
+        SIDEBAR: Seitenleiste auf der Blog-Seite zeigen
+        MINIPOSTS: Miniposts in der Seitenleiste zeigen
+        MINIPOSTS_NUMBER: Anzahl der anzuzeigenden Miniposts
+        MINIPOSTS_NUMBER_DESCRIPTION: Anzahl der in der Seitenleiste anzuzeigenden Miniposts
+        MINIPOSTS_CATEGORY: Kategorie für Miniposts
+        MINIPOSTS_CATEGORY_DESCRIPTION: Legen Sie einen Namen für die Miniposts-Kategorie fest.<br />`Sie müssen diesen Namen in Optionen->Taxonomie->Kategorie einfügen`
+        FOOTER: Fusszeile
+        FOOTER_TITLE: Fusszeilentitel
+        FOOTER_DESCRIPTION: Fusszeilentext
+        FOOTER_COPYRIGHT: Copyright-Text
+        FOOTER_BUTTON_TEXT: Schaltflächentext
+        FOOTER_BUTTON_URL: Schaltflächen-URL
+        FOOTER_SOCIALS_ICONS: Symbole für soziale Medien
+        FOOTER_SOCIALS_ICON_NAME: Name des sozialen Netzwerks
+        FOOTER_SOCIALS_ICON_URL: URL-Link zum sozialen Netzwerk
+        FOOTER_SOCIALS_ICON_ICON: Symbol des sozialen Netzwerks
+        CUSTOM_MENU_TITLE: 'Benutzerdefinierte Menüpunkte'
+        CUSTOM_MENU_ENABLE: 'Benutzerdefinierte Menüpunkte aktivieren'
+        CUSTOM_MENU_ENABLE_HELP: 'Legt fest, ob definierte benutzerdefinierte Menüeinträge in der Menüleiste angezeigt werden.'
+        CUSTOM_MENU_ITEM_TEXT: 'Text'
+        CUSTOM_MENU_ITEM_TEXT_DESCRIPTION: 'Textbeschriftung für Menüpunkt.'
+        CUSTOM_MENU_ITEM_ICON: 'Symbol'
+        CUSTOM_MENU_ITEM_ICON_DESCRIPTION: 'FontAwesome-Symbol für Menüelement.'
+        CUSTOM_MENU_ITEM_URL: 'URL'
+        CUSTOM_MENU_ITEM_URL_DESCRIPTION: 'URL für Menüpunkt.'
+        CUSTOM_MENU_ITEM_TARGET: 'Ziel'
+        CUSTOM_MENU_ITEM_TARGET_BLANK: 'In neuem Fenster öffnen'
+        CUSTOM_MENU_ITEM_TARGET_PARENT: 'In übergeordnetem Frame öffnen'
+        CUSTOM_MENU_ITEM_TARGET_SELF: 'In selbem Frame öffnen'
+        CUSTOM_MENU_ITEM_TARGET_TOP: 'In vollem Fensterkörper öffnen'
+      DEFAULT:
+        PRIMARY_IMAGE: Hauptbild
+      MODULAR:
+        BANNER:
+          BANNER_TAB: Banner
+          BANNER_SUBTITLE: Bildbeschriftung
+          BANNER_BUTTON_TEXT: Schaltflächentext
+          BANNER_BUTTON_URL: Schaltflächen-URL
+          BANNER_IMAGE: Bild
+          BANNER_IMAGE_DESCRIPTION: Wählen Sie ein Bild aus
+        FEATURES:
+          FEATURES_TAB: Funktionen
+          FEATURES_LAYOUT: Layout
+          FEATURES_LAYOUT_TWOCOLS: Mittel   = 2 / 1 Spalten
+          FEATURES_LAYOUT_THREECOLS: Standard  = 3 / 2 / 1 Spalten
+          FEATURES_HEADER: Funktionen
+          FEATURES_IMAGE: Bild
+          FEATURES_TITLE: Titel
+          FEATURES_TEXT: Text
+          FEATURES_BUTTON_TEXT: Schaltflächentext
+          FEATURES_BUTTON_URL: Schaltflächen-URL
+          FEATURES_BUTTON_URL_TARGET: Öffnen Sie die URL in einem neuen Fenster
+
+      BLOG:
+        BLOG_TAB: Blog-Einstellungen
+        BLOG_CONTENT_TITLE: Content Definition
+        BLOG_CONTENT_ITEMS: Artikel
+        BLOG_CONTENT_ITEMS_LIMIT: Maximale Artikel-Anzahl
+        BLOG_CONTENT_ITEMS_ORDER_BY: Sortieren nach
+        BLOG_CONTENT_ITEMS_ORDER_BY_DATE: Datum
+        BLOG_CONTENT_ITEMS_ORDER_BY_TITLE: Titel
+        BLOG_CONTENT_ITEMS_ORDER_BY_FOLDER: Verzeichnis
+        BLOG_CONTENT_ITEMS_ORDER_BY_DEFAULT: Standard
+        BLOG_CONTENT_ITEMS_ORDER_DIR: Reihenfolge
+        BLOG_CONTENT_ITEMS_ORDER_DIR_ASC: Aufsteigend
+        BLOG_CONTENT_ITEMS_ORDER_DIR_DESC: Absteigend
+        BLOG_CONTENT_ITEMS_PAGINATION: Seitennummerierung
+        BLOG_CONTENT_ITEMS_URL_TAXONOMY_FILTERS: Taxonomie filtern nach URL
+      ITEM:
+        ITEM_TAB: Blog-Artikel
+        ITEM_OPTIONS: Optionen
+        ITEM_SUMMARY: Artikelzusammenfassung
+        ITEM_SUMMARY_ENABLED: Zusammenfassung aktivieren
+        ITEM_SUMMARY_FORMAT: Zusammenfassungsformat
+        ITEM_SUMMARY_FORMAT_SHORT: Verwenden Sie das erste Vorkommen des Trennzeichens oder der Größe
+        ITEM_SUMMARY_FORMAT_LONG: Zusammenfassungsbegrenzer wird ignoriert
+        ITEM_SUMMARY_SIZE: Größe
+        ITEM_SUMMARY_DELIMITER: Zusammenfassungsbegrenzer
+        ITEM_ORDER: Minipost-Reihenfolge
+        ITEM_SUBTITLE: Untertitel
+        ITEM_AVATAR: Avatar-Bild
+      PORTFOLIO:
+        PORTFOLIO_TAB: Portfolio
+        PORTFOLIO_TITLE: Portfolio-Bild
+        PORTFOLIO_LAYOUT: Layout
+        PORTFOLIO_LAYOUT_TWOCOLS: Mittel   = 2 / 1 Spalten
+        PORTOFOLIO_LAYOUT_THREECOLS: Standard  = 3 / 2 / 1 Spalten
+        PORTFOLIO_IMAGES: Bilder
+        PORTFOLIO_IMAGE: Bild
+        PORTFOLIO_IMAGE_TITLE: Titel
+        PORTFOLIO_IMAGE_DESCRIPTION: Beschreibung
+        PORTFOLIO_IMAGE_THUMB: Miniaturansicht
+
+    BLOG:
+      LISTING_TITLE_CATEGORY: 'Beiträge in der Kategorie: '
+      LISTING_TITLE_TAG: 'Beiträge mit Tag: '
+      LISTING_TITLE_AUTHOR: 'Beiträge des Autors: '
+      ITEM:
+        CONTINUE_READING: Weiterlesen...
+        NEXT_POST: Nächster Eintrag
+        PREV_POST: Vorheriger Eintrag
+      PAGINATION:
+        PREVIOUS: Vorherige
+        NEXT: Nächste
+
+    SIDEBAR:
+      SIMPLE_SEARCH:
+        HEADLINE: Suche
+      RELATED_POSTS:
+        HEADLINE: Verwandte Einträge
+      RANDOM_ARTICLE:
+        HEADLINE: Zufälliger Artikel
+        FEELING_LUCKY: Ich habe Glück!
+      SOME_TEXT_WIDGET:
+        HEADLINE: Ein Text-Widget
+      TAGS:
+        HEADLINE: Schlagworte
+      POPULAR_TAGS:
+        HEADLINE: beliebte Schlagworte
+      ARCHIVES:
+        HEADLINE: Letzte Einträge
+      SYNDICATE:
+        HEADLINE: Verteilen
+
+    LOGIN: Einloggen
+    LATESTPOSTS: Letzte Beiträge
+    FEATURED: Hervorgehoben
+    PRIVACY: Durch die Nutzung dieses Formulars stimmen Sie unseren Bedingungen zu
+    FORM_SUMMARY: Hier ist die Zusammenfassung dessen, was Sie uns geschrieben haben
+
 es:
   FUTURE:
     ADMIN:
@@ -133,7 +297,7 @@ es:
         DROPDOWN_MENU: Menu Desplegable
         PRODUCTION_MODE: Modo Producción
         PRODUCTION_MODE_HELP: Si está activado, Future cargará con CSS minificado
-        HEADER_SECTION: Sección de encabezado
+        HEADER: Sección de encabezado
         FAVICON: Elige tu propio favicon
         CUSTOM_LOGO: Logo personalizado
         CUSTOM_LOGO_DESCRIPTION: Este logo se usará en lugar del log por defecto `theme://images/grav-logo.svg`
@@ -141,7 +305,7 @@ es:
         SLOGAN: Slogan
         BLOG_DEFAULTS: Opciones de Blog
         BLOG_PAGE: Página de Blog
-        BLOG_PAGE_DESCRIPTION: Ruta de la página de Blog cuando funciona con el blog de barra lateral
+        BLOG_PAGE_HELP: Ruta de la página de Blog cuando funciona con el blog de barra lateral
         MINIPOSTS: Activar Miniposts en la barra lateral
         MINIPOSTS_NUMBER: Número de miniposts a mostrar
         MINIPOSTS_NUMBER_DESCRIPTION: Número de miniposts que se mostrarán en la barra lateral
@@ -220,8 +384,10 @@ es:
         PORTFOLIO_IMAGE_DESCRIPTION: Descripción
         PORTFOLIO_IMAGE_THUMB: Miniatura
 
-             
     BLOG:
+      LISTING_TITLE_CATEGORY: 'Publicaciones en la categoría: '
+      LISTING_TITLE_TAG: 'Publicaciones con la etiqueta: '
+      LISTING_TITLE_AUTHOR: 'Publicaciones escritas por: '
       ITEM:
         CONTINUE_READING: Continuar leyendo...
         NEXT_POST: Siguiente Entrada
@@ -229,6 +395,7 @@ es:
       PAGINATION:
         PREVIOUS: Anterior
         NEXT: Siguiente
+
     SIDEBAR:
       SIMPLE_SEARCH:
         HEADLINE: Buscar
@@ -247,9 +414,9 @@ es:
         HEADLINE: Últimas entradas
       SYNDICATE:
         HEADLINE: Distribuir
+
     LOGIN: Iniciar sesión
     LATESTPOSTS: Últimos posts
     FEATURED: Destacados
     PRIVACY: Al usar este formulario estás de acuerdo con nuestra
-    FORM_SUMMARY: Aquí está el resumen de lo que nos escribió.
+    FORM_SUMMARY: Aquí está el resumen de lo que nos escribió
-

templates/blog.html.twig

@@ -1,4 +1,4 @@
-{% embed 'partials/base.html.twig' %}
+{% extends 'partials/base.html.twig' %}
 
 {% set collection = page.collection() %}
 {% set base_url = page.url %}
@@ -13,15 +13,18 @@
 {% else %}
   {% set show_pagination = true %}
 {% endif %}
+{% 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') %}
-	{% set page_title = theme_config.listing_title.taxonomy.category | default('Posts in Category: ') ~ uri.param('category') %}
+	{% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_CATEGORY'|t ~ uri.param('category') %}
 {% elseif uri.param('tag') %}
-	{% set page_title = theme_config.listing_title.taxonomy.tag | default('Posts with Tag: ') ~ uri.param('tag') %}
+	{% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_TAG'|t ~ uri.param('tag') %}
 {% elseif uri.param('author') %}
-	{% set page_title = theme_config.listing_title.taxonomy.author | default('Posts from Author: ') ~ uri.param('author') %}
+	{% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_AUTHOR'|t ~ uri.param('author') %}
 {% else %}
-	{% set page_title = theme_config.listing_title.blog | default('') %}
+    {% set listing_title = page.header.subtitle|raw %}
 {% endif %}
 
 {% if base_url == '/' %}
@@ -37,14 +40,26 @@
 {% endblock %}
 
 {% block content %}
+
+    <header>
+      <div class="title">
+        <h2>{{ title }}</h2>
+        {% if listing_title %}
+          <p>{{ listing_title|raw }}</p>
+        {% endif %}
+      </div>
+    </header>
+
+    {% if image %}
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+    {% endif %}
+
+    {{ page.content|raw }}
+  
   {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
     {% include 'partials/breadcrumbs.html.twig' %}
   {% endif %}
 
-    <h2>
-      {{page_title}}
-    </h2>
-    
   {% for child in collection %}
     {% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
   {% endfor %}
@@ -52,10 +67,16 @@
   {% 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 theme_config.sidebar == false %}
+    <section id="footer" class="align-center">
+      {% include 'partials/footer.html.twig' %}
+    </section>
+  {% endif %}
 {% endblock %}
 
 {% block sidebar %}
+  {% if theme_config.sidebar == true %}
     {% include 'partials/sidebar_left.html.twig' %}
+  {% endif %}
 {% endblock %}
-  
-{% endembed %}

templates/default.html.twig

@@ -1,5 +1,9 @@
 {% extends 'partials/base.html.twig' %}
 
+{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
+{% set title = page.title|raw %}
+{% set subtitle = page.header.subtitle|raw %}
+
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}
 {% endblock %}
@@ -8,27 +12,22 @@
   <article class="post">
     <header>
       <div class="title">
-      <h2>{{ page.header.title }}</h2>  
+        <h2>{{ title }}</h2>
-      {% if page.header.subtitle %}
+        {% if subtitle %}
-        <p>{{ page.header.subtitle }}</p>
+          <p>{{ subtitle }}</p>
         {% endif %}
       </div>
-
     </header>
-            {% if page.header.primaryImage %}
+
-                {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+    {% if image %}
-            {% else %}
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
-                {{ 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 %}
-
-
-

templates/form.html.twig

@@ -5,8 +5,7 @@
       <div class="title">
         <h2>{{ page.header.title }}</h2>
       </div>
-      <div class="meta">                            
+      <div class="meta"></div>
-      </div>
     </header>
     {{ content|raw }}
     {% include "forms/form.html.twig" %}

templates/formdata.html.twig

@@ -1,11 +1,16 @@
 {% extends 'partials/base.html.twig' %}
 {% block content %}
   <article class="post">
+    <header>
       <div class="title">
         <h2>{{ form.message }}</h2>
       </div>
       <div class="meta">
+        {% if config.plugins["translate-date"].enabled %}
+          <time class="published" datetime="{{ form.date|td(null, "Y-m-d") }}">{{ form.date|td(null, "M j, Y") }}</time>
+        {% else %}
           <time class="published" datetime="{{ form.date|date("Y-m-d") }}">{{ form.date|date("M j, Y") }}</time>
+        {% endif %}
       </div>
     </header>
     <p>{{'FUTURE.FORM_SUMMARY'|t}}</p>

templates/forms/data.html.twig

@@ -5,13 +5,11 @@
     {% set input = attribute(field, "input@") %}
 
     {% if input is null or input == true %}
-
       {% if form.value(scope ~ field.name) %}
         {% block field %}
           <div>
             {% block field_name %}
               <strong>{{ field.name|t|e }}</strong>:
-                           
             {% endblock %}
 
             {% block field_value %}
@@ -48,4 +46,3 @@
 {% import _self as macro %}
 
 {{ macro.render_field(form, form.fields, '') }}
-

templates/forms/fields/privacy/privacy.html.twig

@@ -35,5 +35,4 @@
       {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
     </label>
   </div>
-    
 {% endblock %}

templates/item.html.twig

@@ -1,4 +1,5 @@
-{% embed 'partials/base.html.twig' %}
+{% extends 'partials/base.html.twig' %}
+
 {% set base_url = page.parent.url %}
 {% set feed_url = base_url %}
 {% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog]) %}
@@ -16,7 +17,6 @@
 {% endblock %}
 
 {% block content %}
-        
   {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
     {% include 'partials/breadcrumbs.html.twig' %}
   {% endif %}
@@ -27,5 +27,3 @@
     {% include 'partials/footer.html.twig' %}
   </section>
 {% endblock %}
-
-{% endembed %}

templates/macros/topmenu.html.twig

@@ -5,8 +5,13 @@
     {% if p.children.visible.count > 0 %}
       <li class="{{ current_page }}">
         <a>
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+          {% if p.header.icon %}
-                    <span>{{ p.menu }}{% if p.routable ?? false %}&nbsp;<i class="fa fa-angle-down"></i>{% endif %}</span>
+            <i class="fa fa-{{ p.header.icon }}"></i>
+          {% endif %}
+          <span>{{ p.menu }}
+            {% if p.routable ?? false %}&nbsp;<i class="fa fa-angle-down"></i>
+            {% endif %}
+          </span>
         </a>
         <ul>
           {{ macros.nav_loop(p) }}
@@ -15,7 +20,9 @@
     {% else %}
       <li class="{{ current_page }}">
         <a href="{{ p.url }}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+          {% if p.header.icon %}
+            <i class="fa fa-{{ p.header.icon }}"></i>
+          {% endif %}
           <span>{{ p.menu }}</span>
         </a>
       </li>

templates/modular.html.twig

@@ -1,7 +1,15 @@
 {% extends 'partials/base.html.twig' %}
 
-{% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
+{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
-{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
+{% 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 %}
+{% macro pageLinkName(text) %}
+  {{ text|lower|replace({' ':'_'}) }}
+{% endmacro %} #}
 
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}
@@ -11,16 +19,19 @@
   <article class="post">
     <header>
       <div class="title">
-        <h2>{{ page.header.title }}</h2>    
+        <h2>{{ title }}</h2>
+        {% if subtitle %}
+          <p>{{ subtitle }}</p>
+        {% endif %}
       </div>
     </header>
 
-            {% if page.header.primaryImage %}
+    {% if image %}
-                {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, 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}}
+
     {% for module in page.collection() %}
       {{ module.content|raw }}
     {% endfor %}
@@ -28,7 +39,7 @@
 {% endblock %}
 
 {% block sidebar %}
+  {% if theme_config.sidebar == true %}
     {% include 'partials/sidebar_left.html.twig' %}
+  {% endif %}
 {% endblock %}
-
-

templates/modular/banner.html.twig

@@ -1,9 +1,13 @@
+{% set image = page.media[page.header.image] ?: page.media.images|first %}
+{% set title = page.title|raw %}
+{% set subtitle = page.header.subtitle|raw %}
+
 <section id="banner">
   <div class="content">
     <header>
-            <h2>{{ page.title}}</h2>
+      <h2>{{ title}}</h2>
-            {% if page.header.subtitle %}
+      {% if subtitle %}
-                <p>{{ page.header.subtitle }}</p>
+        <p>{{ subtitle }}</p>
       {% endif %}
     </header>
 
@@ -13,13 +17,9 @@
       <li><a href="{{page.header.buttonurl}}" class="button">{{page.header.buttontext}}</a></li>
     </ul>
   </div>
-    {% if page.header.image %}
+  {% if image %}
     <span class="image object fit">
-            {{page.media[page.header.image].loading('lazy').html('',page.title)|raw}}
+      {{image.loading('lazy').html(title,title)|raw}}
-        </span>
-    {% else %}
-        <span class="image object fit">
-            {{page.media[page.header.primaryImage].loading('lazy').html('',page.title)|raw}}
     </span>
   {% endif %}
 </section>

templates/modular/features.html.twig

@@ -1,30 +1,45 @@
+{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
+{% 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'  %}
 
 <section id="features">
   <header>
-    <h2>{{ page.title }}</h2>
+    <h2>{{ title }}</h2>
-    {% if page.header.subtitle %}
+    {% if subtitle %}
-        <p>{{ page.header.subtitle }}</p>
+      <p>{{ subtitle }}</p>
     {% endif %}
   </header>
-    {{ content|raw }}
+  
+  {% if image %}
+    {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+  {% endif %}
+
+  {{ page.content|raw }}
 
   <div class="row gtr-uniform">
     {% for feature in page.header.features %}
-   
       <div class="{{columns}}">
         <article class="box">
-            {% if feature.image %}<span class="image fit"><img src="{{page.media[feature.image].url}}" alt="{{feature.title}}" /></span>{% endif %}
+          {% if feature.image %}
+            <span class="image fit"><img src="{{page.media[feature.image].url}}" alt="{{feature.title}}"/></span>
+          {% endif %}
           <header>
-            {% if feature.title %}<h3>{{feature.title}}</h3>{% endif %}
+            {% if feature.title %}
-            {% if feature.text %}<p>{{feature.text|raw}}</p>{% endif %}
+              <h3>{{feature.title}}</h3>
-            {% if feature.buttonurl %}<p><a href="{{feature.buttonurl}}" class="button fit" target={% if feature.buttonurl_target %}"_blank"{% endif%}>{{feature.buttontext}}</a></p>{% endif %}
+            {% endif %}
+            {% if feature.text %}
+              <p>{{feature.text|raw}}</p>
+            {% endif %}
+            {% if feature.buttonurl %}
+              <p>
+                <a href="{{feature.buttonurl}}" class="button fit" target={% if feature.buttonurl_target %} "_blank" {% endif%}>{{feature.buttontext}}</a>
+              </p>
+            {% endif %}
           </header>
         </article>
       </div>
-    
     {% endfor %}
   </div>
-     
 </section>
 <br>

templates/partials/archives.html.twig

@@ -1,20 +1,22 @@
 <section>
   <ul class="posts">
     {% for p in page.find(theme_config.blog_page).children.order('date', 'desc').slice(0, 5) %}
-    
+    {% set image = p.media[p.header.primaryImage] ?: p.media.images|first %}
-    {% if p.header.primaryImage %} 
+    {% set title = p.title|raw %}
-      {% set bannerimage = p.media[p.header.primaryImage]%}
-   {% else %}
-      {% set bannerimage = p.media.images|first %}
-   {% endif %}
       <li>
         <article>
           <header>
-         <h3><a href="{{p.url}}">{{ p.title }}</a></h3>
+            <h3>
+              <a href="{{p.url}}">{{ title }}</a>
+            </h3>
+            {% if config.plugins["translate-date"].enabled %}
+              <time class="published" datetime="{{ p.date|td(null, "Y-m-d") }}">{{ p.date|td(null, "M j, Y") }}</time>
+            {% else %}
               <time class="published" datetime="{{ p.date|date("Y-m-d") }}">{{ p.date|date("M j, Y") }}</time>
+            {% endif %}
           </header>
           <a href="{{p.url}}" class="image">
-            {{ bannerimage.cropZoom(64,64).quality(60).loading('lazy').html('',p.title)|raw }}
+            {{ image.cropZoom(64,64).quality(60).loading('lazy').html(title,title)|raw }}
           </a>
         </article>
       </li>

templates/partials/base.html.twig

@@ -19,7 +19,8 @@
     {% block stylesheets %}
       {% do assets.addCss('theme://assets/css/main'~compress) %}
       {% do assets.addCss('theme://assets/css/fontawesome-all.min.css') %}
-			{% do assets.addCss('theme://assets/css/custom.css', 10) %}
+      {% do assets.addCss('theme://assets/css/misc.css') %}
+      {% do assets.addCss('theme://assets/css/custom.css', 5) %}
       {% if page.template() == 'portfolio' %}
         {% do assets.addCss('theme://assets/css/glightbox.min.css') %}
       {% endif %}
@@ -40,7 +41,8 @@
     {{ assets.js()|raw }}
 
   </head>
-	<body class="is-preload">
+  <body
+    class="is-preload">
     <!-- Wrapper -->
     <div id="wrapper">
 
@@ -61,7 +63,9 @@
 
       {% endblock %}
 
-		<a id="back-to-top" href="#"><i class="fa fa-chevron-up"></i></a>
+      <a id="back-to-top" href="#">
+        <i class="fa fa-chevron-up"></i>
+      </a>
 
       {% block bottom %}
         {{ assets.js('bottom')|raw }}

templates/partials/blog_item.html.twig

@@ -20,29 +20,37 @@
           <a href="{{ page.header.link }}">{{ page.title }}</a>
         </h2>
       {% else %}
-        <h2 itemprop="headline"><a href="{{ page.url }}">{{ page.title }}</a></h2>
+        <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">
+      {% if config.plugins["translate-date"].enabled %}
+        <time class="published" itemprop="datePublished" datetime="{{ page.date|td(null, "Y-m-d") }}">{{ page.date|td(null, "M j, Y") }}</time>
+      {% else %}
         <time class="published" itemprop="datePublished" datetime="{{ page.date|date("Y-m-d") }}">{{ page.date|date("M j, Y") }}</time>
+      {% endif %}
       {% if author %}
-            <span itemprop="author" itemscope itemtype="http://schema.org/Person">
+        <span itemprop="author" itemscope itemtype="http://schema.org/Person"/>
-            <a {% if page.taxonomy.author %} href="{{ base_url }}/author{{ config.system.param_sep }}{{ author }}" itemprop="url" {% endif %} class="author"><span class="name" rel="author">{{ author }}</span>{% if avatar %}<img src="{{ avatar }}" alt="{{ author }}" />{% endif %}</a>            
+        <a {% if page.taxonomy.author %}href="{{ base_url }}/author{{ config.system.param_sep }}{{ author }}" itemprop="url" {% endif %}class="author">
+          <span class="name" rel="author">{{ author }}</span>
+          {% if avatar %}<img src="{{ avatar }}" alt="{{ author }}" />{% endif %}
+        </a>
       {% endif %}
     </div>
   </header>
 
   {% if page.header.primaryImage %}
     <a href="{{ page.url }}">{{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}</a>
-    {% else %}
+  {% elseif page.media.images %}
     <a href="{{ page.url }}">{{ 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 %}
@@ -56,7 +64,6 @@
       {{ page.content|raw }}
       {% set show_prev_next = true %}
     {% endif %}
-
   </div>
 
   <footer>
@@ -69,25 +76,30 @@
 
       {% 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> 
+          <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>         
+          <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">
+      <li><a href="https://twitter.com/share" data-url="{{ page.url(true) }}" data-text="{{ page.title }}" class="icon brands fa-twitter"></a></li>
-            </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="http://www.facebook.com/sharer.php?u={{ page.url(true) }}" class="icon brands fa-facebook">
-            </a></li>
     </ul>
   </footer>
 </article>

templates/partials/footer.html.twig

@@ -1,4 +1,4 @@
 <ul class="icons">
   {% include 'partials/social.html.twig' %}
 </ul>
-<p class="copyright">&copy; {{ "now"|date("Y") }} {{ site.author.name }}. {{config.theme.footer.copyright_text|raw}}</a>.</p>
+<p class="copyright">&copy; {{ "now"|date("Y") }} {{ site.author.name }}. {{config.theme.footer.copyright_text|raw}}.</p>

templates/partials/header.html.twig

@@ -1,5 +1,7 @@
 <header id="header">
-	<h1 class="logo"><a href="{{ home_url }}">{{ site.title }}</a></h1>
+  <h1 class="logo">
+    <a href="{{ home_url }}">{{ site.title }}</a>
+  </h1>
   <nav class="dropdown">
     {% block header_navigation %}
       {% include 'partials/navigation.html.twig' %}

templates/partials/logo.html.twig

@@ -1,4 +1,4 @@
-{% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %}
+{% set logo = theme_var('custom_logo_mobile') ?: theme_var('custom_logo') %}
 <a href="{{ home_url }}" class="logo">
   {% if logo %}
     {% set logo_file = (logo|first).name %}

templates/partials/miniposts.html.twig

@@ -1,31 +1,38 @@
 {% set miniposts_category = theme_var('miniposts_category') %}
 {% set miniposts_number = config.theme.miniposts_number %}
+{% set lang = grav.language.getActive ?: grav.config.site.default_lang %}
 
 <section>
   <header class="">
     <h3>{{ 'FUTURE.FEATURED'|t }}</h3>
   </header>
   <div class="mini-posts">
-    
     {% for p in page.evaluate({'@taxonomy.category':miniposts_category}).order('header.order', 'asc').slice(0,miniposts_number) %}
+    {% set image = p.media[p.header.primaryImage] ?: p.media.images|first %}
+    {% set title = p.title|raw %}
       <article class="mini-post">
         <header>
-            <h3><a href="{{ p.url }}">{{ p.title }}</a></h3>
+          <h3>
-            <time class="published" datetime="{{p.date|date("Y-m-d")}}">{{ p.date|date("M j, Y")}}</time>
+            <a href="{{ p.url }}">{{ p.title }}</a>
-            <a href="{{ p.url }}" class="author"><img src="{{ p.media[p.header.avatarImage].url}}" alt="" /></a>
+          </h3>
-        </header>
+          {% if config.plugins["translate-date"].enabled %}
-        <a href="{{ p.url }}" class="image">
+            <time class="published" itemprop="datePublished" datetime="{{ page.date|td(null, "Y-m-d") }}">{{ page.date|td(null, "M j, Y") }}</time>
-            
+          {% elseif config.plugins["twig-extensions"].enabled %}
-            {% if p.header.primaryImage %}
+            <time class="published" itemprop="datePublished" datetime="{{ page.date|localizeddate('medium', 'none', lang) }}">{{ page.date|localizeddate('medium', 'none', lang) }}</time>
-            {{ p.media[p.header.primaryImage].cropZoom(1038,437).loading('lazy').html('',p.title)|raw}}
           {% else %}
-            {{p.media.images|first.cropZoom(1038,437).loading('lazy').html('',p.title)|raw}}
+            <time class="published" itemprop="datePublished" datetime="{{ page.date|date("Y-m-d") }}">{{ page.date|date("M j, Y") }}</time>
           {% endif %}
+        {% if avatar %}
+          <a href="{{ p.url }}" class="author"><img src="{{ p.media[p.header.avatarImage].url}}" alt=""/></a>
+        {% endif %}
+        </header>
+        {% if image %}
+        <a href="{{ p.url }}" class="image">
+            {{ image.cropZoom(1038,437).loading('lazy').html(title,title)|raw}}
         </a>
+        {% endif %}
       </article>
-    
     {% endfor %}
   </div>
 </section>
 <!-- End of featured Section -->
-

templates/partials/navigation.html.twig

@@ -3,7 +3,7 @@
 <ul>
   {{ macros.nav_loop(pages) }}
 
-    {% if theme_var('displaycustommenus.enabled') %}
+  {% if theme_var('custommenus.enabled') %}
     {% for mitem in theme_var('custommenu') %}
       <li>
         <a href="{{ mitem.url }}" target="{{ mitem.target }}">

templates/partials/pagination.html.twig

@@ -2,7 +2,6 @@
 {% set base_url = base_url|default(page.url) %}
 
 {% if pagination|length > 1 %}
-
   <ul class="actions pagination">
     {% if pagination.hasPrev %}
       {% set url =  (base_url ~ pagination.params ~ pagination.prevUrl)|replace({'//':'/'}) %}
@@ -12,7 +11,6 @@
     {% endif %}
 
     {% for paginate in pagination %}
-
       {% if paginate.isCurrent %}
         <li><span class="disabled button large">{{ paginate.number }}</span></li>
       {% elseif paginate.isInDelta %}
@@ -21,8 +19,8 @@
       {% elseif paginate.isDeltaBorder %}
         <li class="gap"><span>&hellip;</span></li>
       {% endif %}
-
     {% endfor %}
+
     {% if pagination.hasNext %}
       {% set url = (base_url ~ pagination.params ~ pagination.nextUrl)|replace({'//':'/'}) %}
       <li><a class="button large next" rel="next" href="{{ url }}">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</a></li>
@@ -30,5 +28,4 @@
       <li><span class="disabled button large">{{'FUTURE.BLOG.PAGINATION.NEXT'|t}}</span></li>
     {% endif %}
   </ul>
-
 {% endif %}

templates/partials/relatedpages.html.twig

@@ -3,7 +3,9 @@
     {% set related = grav['pages'].get(related_path) %}
     {% if related %}
       <li>
-                <a href="{{ related.url }}" title="{{ related.title }}">{{ related.title }}</a> {% if config.plugins.relatedpages.show_score %}<span class="score">( {{ score }} )</span>
+        <a href="{{ related.url }}" title="{{ related.title }}">{{ related.title }}</a>
+        {% if config.plugins.relatedpages.show_score %}
+          <span class="score">( {{ score }} )</span>
         {% endif %}
       </li>
     {% endif %}

templates/partials/sidebar_left.html.twig

@@ -4,7 +4,7 @@
     {% include 'partials/logo.html.twig' %}
     <header>
       <h2>{{ site.title|e('html') }}</h2>
-			<p>{{theme_config.slogan|raw}}</a></p>
+      <p>{{theme_config.slogan|raw}}</p>
     </header>
   </section>
   <!-- Mini Posts -->

templates/partials/sidebar_navigation.html.twig

@@ -5,8 +5,13 @@
       {% if p.children.visible.count > 0 %}
         <li class="{{ current_page }}">
           <a class="dropdown-btn">
-						{% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+            {% if p.header.icon %}
-						<span>{{ p.menu }}{% if p.routable ?? false %}&nbsp;<i class="fa fa-caret-down"></i>{% endif %}</span>
+              <i class="fa fa-{{ p.header.icon }}"></i>
+            {% endif %}
+            <span>{{ p.menu }}
+              {% if p.routable ?? false %}&nbsp;<i class="fa fa-caret-down"></i>
+              {% endif %}
+            </span>
           </a>
           <ul class="subitem_hide">
             {{ _self.loop(p) }}
@@ -15,7 +20,9 @@
       {% else %}
         <li class="{{ current_page }}">
           <a href="{{ p.url }}">
-						{% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+            {% if p.header.icon %}
+              <i class="fa fa-{{ p.header.icon }}"></i>
+            {% endif %}
             <span>{{ p.menu }}</span>
           </a>
         </li>
@@ -24,7 +31,7 @@
   {% endmacro %}
   <ul class="menulink">
     {{ _self.loop(pages) }}
-	    {% if theme_var('displaycustommenus.enabled') %}
+    {% if theme_var('custommenus.enabled') %}
       {% for mitem in theme_var('custommenu') %}
         <li>
           <a href="{{ mitem.url }}" target="{{ mitem.target }}">

templates/partials/sidebar_right.html.twig

@@ -1,16 +1,16 @@
 <section id="menu">
+  {% if config.plugins.simplesearch.enabled %}
     <!-- Search -->
     <section>
-		{% if config.plugins.simplesearch.enabled %}
       {% include 'partials/simplesearch_searchbox_sidebar.html.twig' %}
-		{% endif %}
     </section>
+  {% endif %}
   <!-- Links -->
   <section id="sidebarmenu">
     {% include 'partials/sidebar_navigation.html.twig' %}
   </section>
-	<!-- Actions -->
   {% if config.plugins.archives.enabled %}
+    <!-- Actions -->
     <section>
       <header>
         <h3>{{ 'FUTURE.SIDEBAR.ARCHIVES.HEADLINE'|t }}</h3>

templates/portfolio.html.twig

@@ -1,5 +1,7 @@
 {% extends 'partials/base.html.twig' %}
-
+{% set image = page.media[page.header.primaryImage] %}
+{% 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'  %}
 
 {% block menu %}
@@ -11,17 +13,18 @@
   <article class="post">
     <header>
       <div class="title">
-            <h2>{{ page.header.title }}</h2>
+        <h2>{{ title }}</h2>
-            {% if page.header.subtitle %}
+        {% if subtitle %}
-                <p>{{ page.header.subtitle }}</p>
+          <p>{{ subtitle }}</p>
         {% endif %}
       </div>
     </header>
-        {% if page.header.primaryImage %}
+    {% if image %}
-            {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
     {% endif %}
 
     {{ page.content|raw}}
+
     <!-- Portfolio -->
     {% block portfolio %}
       <section>
@@ -33,7 +36,6 @@
               </a>
             </div>
           {% endfor %}
-
         </div>
       </section>
     {% endblock %}

templates/simplesearch_results.html.twig

@@ -1,14 +1,13 @@
-{% extends 'partials/simplesearch_base.html.twig' %}
+{% extends 'partials/base.html.twig' %}
 
 {% block menu %}
   {% include 'partials/sidebar_right.html.twig' %}
 {% endblock %}
 
 {% block content %}
-<article class="post simplesearch">
+  <article class="simplesearch">
     <header>
       <div class="title">
-            
         {% block results %}
           <div class="content-padding simplesearch">
             <h1 class="search-header">{{ "PLUGIN_SIMPLESEARCH.SEARCH_RESULTS"|t }}</h1>
@@ -27,16 +26,22 @@
             </p>
           </div>
         {% endblock %}
-        
       </div>
-    
     </header>
     {% for page in search_results %}
       {% include 'partials/simplesearch_item.html.twig' with {'page':page} %}
     {% endfor %}
   </article>
 
+  {% if theme_config.sidebar == false %}
+    <section id="footer" class="align-center">
+      {% include 'partials/footer.html.twig' %}
+    </section>
+  {% endif %}
 {% endblock %}
+
 {% block sidebar %}
+  {% if theme_config.sidebar == true %}
     {% include 'partials/sidebar_left.html.twig' %}
+  {% endif %}
 {% endblock %}