+
+
{{ page.header.title }}
-
+
+
{{ content|raw }}
{% include "forms/form.html.twig" %}
diff --git a/templates/formdata.html.twig b/templates/formdata.html.twig
index bff3f77..85027b5 100644
--- a/templates/formdata.html.twig
+++ b/templates/formdata.html.twig
@@ -1,17 +1,22 @@
{% extends 'partials/base.html.twig' %}
{% block content %}
-
-
-
{{ form.message }}
-
-
- {{ form.date|date("M j, Y")}}
-
-
- {{'FUTURE.FORM_SUMMARY'|t}}
+
+
+
+
{{ form.message }}
+
+
+ {% if config.plugins["translate-date"].enabled %}
+ {{ form.date|td(null, "M j, Y") }}
+ {% else %}
+ {{ form.date|date("M j, Y") }}
+ {% endif %}
+
+
+ {{'FUTURE.FORM_SUMMARY'|t}}
- {{ content|raw }}
+ {{ content|raw }}
- {% include "forms/data.html.twig" %}
-
+ {% include "forms/data.html.twig" %}
+
{% endblock %}
diff --git a/templates/forms/data.html.twig b/templates/forms/data.html.twig
index f8a2756..afcb705 100644
--- a/templates/forms/data.html.twig
+++ b/templates/forms/data.html.twig
@@ -1,51 +1,48 @@
{% macro render_field(form, fields, scope) %}
- {% import _self as self %}
+ {% import _self as self %}
- {% for index, field in fields %}
- {% set input = attribute(field, "input@") %}
+ {% for index, field in fields %}
+ {% set input = attribute(field, "input@") %}
- {% if input is null or input == true %}
+ {% if input is null or input == true %}
+ {% if form.value(scope ~ field.name) %}
+ {% block field %}
+
+ {% block field_name %}
+
{{ field.name|t|e }} :
+ {% endblock %}
- {% if form.value(scope ~ field.name) %}
- {% block field %}
-
- {% block field_name %}
-
{{ field.name|t|e }} :
-
- {% endblock %}
-
- {% block field_value %}
- {% if field.type == 'checkboxes' %}
-
- {% set use_keys = field.use is defined and field.use == 'keys' %}
- {% for key,value in form.value(scope ~ field.name) %}
- {% set index = (use_keys ? key : value) %}
- {{ field.options[index]|e }}
- {% endfor %}
-
- {% elseif field.type == 'checkbox' %}
- {{ (form.value(scope ~ field.name) == 1) ? "GRAV.YES"|t|e : "GRAV.NO"|t|e }}
- {% elseif field.type == 'privacy' %}
- {{ (form.value(scope ~ field.name) == 1) ? "Acepta la Política de Privacidad, Si"|t|e : "GRAV.NO"|t|e }}
- {% elseif field.type == 'select' %}
- {{ field.options[form.value(scope ~ field.name)]|e }}
- {% else %}
- {{ string(form.value(scope ~ field.name))|nl2br }}
- {% endif %}
- {% endblock %}
-
- {% endblock %}
- {% endif %}
- {% else %}
- {% if field.fields %}
- {% set new_scope = field.nest_id ? scope ~ field.name ~ '.' : scope %}
- {{ self.render_field(form, field.fields, new_scope) }}
- {% endif %}
- {% endif %}
- {% endfor %}
+ {% block field_value %}
+ {% if field.type == 'checkboxes' %}
+
+ {% set use_keys = field.use is defined and field.use == 'keys' %}
+ {% for key,value in form.value(scope ~ field.name) %}
+ {% set index = (use_keys ? key : value) %}
+ {{ field.options[index]|e }}
+ {% endfor %}
+
+ {% elseif field.type == 'checkbox' %}
+ {{ (form.value(scope ~ field.name) == 1) ? "GRAV.YES"|t|e : "GRAV.NO"|t|e }}
+ {% elseif field.type == 'privacy' %}
+ {{ (form.value(scope ~ field.name) == 1) ? "Acepta la Política de Privacidad, Si"|t|e : "GRAV.NO"|t|e }}
+ {% elseif field.type == 'select' %}
+ {{ field.options[form.value(scope ~ field.name)]|e }}
+ {% else %}
+ {{ string(form.value(scope ~ field.name))|nl2br }}
+ {% endif %}
+ {% endblock %}
+
+ {% endblock %}
+ {% endif %}
+ {% else %}
+ {% if field.fields %}
+ {% set new_scope = field.nest_id ? scope ~ field.name ~ '.' : scope %}
+ {{ self.render_field(form, field.fields, new_scope) }}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
{% endmacro %}
{% import _self as macro %}
{{ macro.render_field(form, form.fields, '') }}
-
diff --git a/templates/forms/fields/privacy/privacy.html.twig b/templates/forms/fields/privacy/privacy.html.twig
index 1227b4c..1b6c651 100644
--- a/templates/forms/fields/privacy/privacy.html.twig
+++ b/templates/forms/fields/privacy/privacy.html.twig
@@ -4,36 +4,35 @@
{% endblock %}
{% block input %}
- {% set id = field.id|default(field.name) ~ '-' ~ key %}
-
-
-
+
{% endblock %}
diff --git a/templates/item.html.twig b/templates/item.html.twig
index baa5f01..adb706b 100644
--- a/templates/item.html.twig
+++ b/templates/item.html.twig
@@ -1,31 +1,29 @@
-{% 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 = '' %}
- {% endif %}
+{% set base_url = page.parent.url %}
+{% set feed_url = base_url %}
+{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog]) %}
- {% if base_url == base_url_relative %}
- {% set feed_url = base_url~'/'~page.parent.slug %}
- {% endif %}
-
- {% block menu %}
- {% include 'partials/sidebar_right.html.twig' %}
- {% endblock %}
+{% if base_url == '/' %}
+ {% set base_url = '' %}
+{% endif %}
- {% 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 %}
- {% include 'partials/blog_item.html.twig' with {'truncate':false} %}
+{% block menu %}
+ {% include 'partials/sidebar_right.html.twig' %}
+{% endblock %}
-
- {% endblock %}
+{% block content %}
+ {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
+ {% include 'partials/breadcrumbs.html.twig' %}
+ {% endif %}
-{% endembed %}
+ {% include 'partials/blog_item.html.twig' with {'truncate':false} %}
+
+
+{% endblock %}
diff --git a/templates/macros/topmenu.html.twig b/templates/macros/topmenu.html.twig
index ae0954b..80258a0 100644
--- a/templates/macros/topmenu.html.twig
+++ b/templates/macros/topmenu.html.twig
@@ -1,24 +1,31 @@
{% macro nav_loop(page) %}
-{% import _self as macros %}
+ {% import _self as macros %}
{% for p in page.children.visible %}
- {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
- {% if p.children.visible.count > 0 %}
-
-
- {% if p.header.icon %}{% endif %}
- {{ p.menu }}{% if p.routable ?? false %}
-
-
- {{ macros.nav_loop(p) }}
-
-
- {% else %}
-
-
- {% if p.header.icon %}{% endif %}
- {{ p.menu }}
-
-
- {% endif %}
- {% endfor %}
-{% endmacro %}
\ No newline at end of file
+ {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
+ {% if p.children.visible.count > 0 %}
+
+
+ {% if p.header.icon %}
+
+ {% endif %}
+ {{ p.menu }}
+ {% if p.routable ?? false %}
+
+
+ {{ macros.nav_loop(p) }}
+
+
+ {% else %}
+
+
+ {% if p.header.icon %}
+
+ {% endif %}
+ {{ p.menu }}
+
+
+ {% endif %}
+ {% endfor %}
+{% endmacro %}
diff --git a/templates/modular.html.twig b/templates/modular.html.twig
index 01e929c..09bd976 100644
--- a/templates/modular.html.twig
+++ b/templates/modular.html.twig
@@ -1,34 +1,45 @@
{% extends 'partials/base.html.twig' %}
-{% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
-{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
+{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %}
+{% 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' %}
{% endblock %}
{% block content %}
-
-
+
+
+
+
{{ title }}
+ {% if subtitle %}
+
{{ subtitle }}
+ {% endif %}
+
- {% 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}}
- {% for module in page.collection() %}
- {{ module.content|raw }}
- {% endfor %}
-
+ {% if image %}
+ {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+ {% endif %}
+
+ {{ page.content|raw}}
+
+ {% for module in page.collection() %}
+ {{ module.content|raw }}
+ {% endfor %}
+
{% endblock %}
{% block sidebar %}
- {% include 'partials/sidebar_left.html.twig' %}
+ {% if theme_config.sidebar == true %}
+ {% include 'partials/sidebar_left.html.twig' %}
+ {% endif %}
{% endblock %}
-
-
diff --git a/templates/modular/banner.html.twig b/templates/modular/banner.html.twig
index 355cb12..cc69055 100644
--- a/templates/modular/banner.html.twig
+++ b/templates/modular/banner.html.twig
@@ -1,25 +1,25 @@
-
-
-
+{% set image = page.media[page.header.image] ?: page.media.images|first %}
+{% set title = page.title|raw %}
+{% set subtitle = page.header.subtitle|raw %}
- {{page.content|raw}}
-
-
-
- {{page.media[page.header.image].loading('lazy').html('',page.title)|raw}}
-
- {% else %}
-
- {{page.media[page.header.primaryImage].loading('lazy').html('',page.title)|raw}}
-
- {% endif %}
+
+
+
+ {{ title}}
+ {% if subtitle %}
+ {{ subtitle }}
+ {% endif %}
+
+
+ {{page.content|raw}}
+
+
+
+ {{image.loading('lazy').html(title,title)|raw}}
+
+ {% endif %}
diff --git a/templates/modular/contact.html.twig b/templates/modular/contact.html.twig
index 88fd263..f169487 100644
--- a/templates/modular/contact.html.twig
+++ b/templates/modular/contact.html.twig
@@ -1,5 +1,5 @@
-
+
+ {% if image %}
+ {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+ {% endif %}
-
+
-
-
-
Error {{ page.header.http_response_code }}
-
{{ page.content|raw }}
-
+
+
Error {{ page.header.http_response_code }}
+
{{ page.content|raw }}
+
-
-
+
+
{% endblock %}
diff --git a/templates/partials/archives.html.twig b/templates/partials/archives.html.twig
index a4ca12c..99a3215 100644
--- a/templates/partials/archives.html.twig
+++ b/templates/partials/archives.html.twig
@@ -1,23 +1,25 @@
-
+
{% for p in page.find(theme_config.blog_page).children.order('date', 'desc').slice(0, 5) %}
-
- {% if p.header.primaryImage %}
- {% set bannerimage = p.media[p.header.primaryImage]%}
- {% else %}
- {% set bannerimage = p.media.images|first %}
- {% endif %}
-
+ {% set image = p.media[p.header.primaryImage] ?: p.media.images|first %}
+ {% set title = p.title|raw %}
+
-
-
- {{ p.date|date("M j, Y")}}
-
-
- {{ bannerimage.cropZoom(64,64).quality(60).loading('lazy').html('',p.title)|raw }}
-
-
-
- {% endfor %}
-
+
+
+ {% if config.plugins["translate-date"].enabled %}
+ {{ p.date|td(null, "M j, Y") }}
+ {% else %}
+ {{ p.date|date("M j, Y") }}
+ {% endif %}
+
+
+ {{ image.cropZoom(64,64).quality(60).loading('lazy').html(title,title)|raw }}
+
+
+
+ {% endfor %}
+
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
index a31908f..f857aaa 100644
--- a/templates/partials/base.html.twig
+++ b/templates/partials/base.html.twig
@@ -5,83 +5,87 @@
-
- {% block head deferred %}
- {% if page.title %}{{ page.title|e('html') }} | {% endif %}{{ site.title|e('html') }}
- {% if page.title %}{{ page.title|e('html') }} | {% endif %}{{ site.title|e('html') }}
+
+ {% block javascripts %}
+ {% do assets.add('jquery',101) %}
+ {% do assets.addJs('theme://assets/js/browser.min.js', {group:'bottom'}) %}
+ {% do assets.addJs('theme://assets/js/breakpoints.min.js', {group:'bottom'}) %}
+ {% do assets.addJs('theme://assets/js/util.js', {group:'bottom'}) %}
+ {% do assets.addJs('theme://assets/js/main.js', {group:'bottom'}) %}
+ {% do assets.addJs('theme://assets/js/custom.js', {group:'bottom'}) %}
+ {% if page.template() == 'portfolio' %}
+ {% do assets.addJs('theme://assets/js/glightbox.min.js', {group:'bottom'}) %}
+ {% endif %}
+ {% endblock %}
+ {{ assets.js()|raw }}
- {% block header %}
- {% include 'partials/header.html.twig' %}
+
+
+
+
+
+ {% block header %}
+ {% include 'partials/header.html.twig' %}
+ {% endblock %}
+
+ {% block body %}
+
+ {% block menu %}{% endblock %}
+
+ {% block main %}
+
+ {% block content %}{% endblock %}
+
+ {% block sidebar %}{% endblock %}
{% endblock %}
- {% block body %}
-
- {% block menu %}{% endblock %}
-
- {% block main %}
-
- {% block content %}{% endblock %}
-
- {% block sidebar %}{% endblock %}
- {% endblock %}
-
- {% endblock %}
+ {% endblock %}
-
+
+
- {% block bottom %}
- {{ assets.js('bottom')|raw }}
- {% if page.template() == 'portfolio' %}
-
- {% endif %}
- {% endblock %}
-
-
+ {% block bottom %}
+ {{ assets.js('bottom')|raw }}
+ {% if page.template() == 'portfolio' %}
+
+ {% endif %}
+ {% endblock %}
+
-
- {% 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 avatar = page.media[page.header.avatarImage].url|e %}
-
-
+
+
+ {% 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 avatar = page.media[page.header.avatarImage].url|e %}
+
+
- {% if page.header.link %}
+ {% if page.header.link %}
- {% if page.header.continue_link is not sameas(false) %}
- {{ page.title }}
+ {% if page.header.continue_link is not sameas(false) %}
+ {{ page.title }}
- {% else %}
-
- {% endif %}
- {% if page.header.subtitle %}
+ {% else %}
+
+ {% endif %}
+ {% if page.header.subtitle %}
{{ page.header.subtitle|raw }}
- {% endif %}
+ {% endif %}
+
- {% 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 %}
+ {% if page.header.primaryImage %}
+ {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+ {% elseif page.media.images %}
+ {{ page.media.images|first.cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+ {% endif %}
-
-
+
{% if page.header.continue_link is sameas(false) %}
- {{ page.content|raw }}
- {% if not truncate %}
+ {{ page.content|raw }}
+ {% if not truncate %}
{% set show_prev_next = true %}
- {% endif %}
+ {% endif %}
{% elseif truncate and page.summary != page.content %}
- {{ page.summary|raw }}
+ {{ page.summary|raw }}
{% elseif truncate %}
- {{ page.content|truncate(550)|raw }}
+ {{ page.content|truncate(550)|raw }}
{% else %}
- {{ page.content|raw }}
- {% set show_prev_next = true %}
+ {{ page.content|raw }}
+ {% set show_prev_next = true %}
{% endif %}
+
-
+
-
- {% if page.taxonomy.tag %}
+ {% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %}
- {{ tag }} {{ tag }}
-
-
-
+
diff --git a/templates/partials/footer.html.twig b/templates/partials/footer.html.twig
index af096cd..e9c579c 100644
--- a/templates/partials/footer.html.twig
+++ b/templates/partials/footer.html.twig
@@ -1,4 +1,4 @@
- {% include 'partials/social.html.twig' %}
+ {% include 'partials/social.html.twig' %}
-© {{ "now"|date("Y") }} {{ site.author.name }}. {{config.theme.footer.copyright_text|raw}}.
+© {{ "now"|date("Y") }} {{ site.author.name }}. {{config.theme.footer.copyright_text|raw}}.
diff --git a/templates/partials/header.html.twig b/templates/partials/header.html.twig
index 7cc8e62..ba73542 100644
--- a/templates/partials/header.html.twig
+++ b/templates/partials/header.html.twig
@@ -1,23 +1,25 @@
\ No newline at end of file
+
+
+ {% block header_navigation %}
+ {% include 'partials/navigation.html.twig' %}
+ {% endblock %}
+
+
+ {% block header_extra %}
+
+ {% if config.plugins.langswitcher.enabled %}
+ {% include 'partials/langswitcher.html.twig' %}
+ {% endif %}
+ {% if config.plugins.simplesearch.enabled %}
+ {% include 'partials/simplesearch_searchbox.html.twig' %}
+ {% endif %}
+
+
+ {% endblock %}
+
+
diff --git a/templates/partials/langswitcher.html.twig b/templates/partials/langswitcher.html.twig
index 0cd0f7c..d2e1518 100644
--- a/templates/partials/langswitcher.html.twig
+++ b/templates/partials/langswitcher.html.twig
@@ -1,31 +1,31 @@
-{% set display_format = display_format ?? config.get('plugins.langswitcher.language_display', 'long') %}
-{% for language in langswitcher.languages %}
+ {% set display_format = display_format ?? config.get('plugins.langswitcher.language_display', 'long') %}
+ {% for language in langswitcher.languages %}
{% set show_language = true %}
{% if language == langswitcher.current %}
- {% set lang_url = page.url %}
- {% set active_class = ' active' %}
+ {% set lang_url = page.url %}
+ {% set active_class = ' active' %}
{% else %}
- {% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
- {% set lang_url = base_lang_url ~ langswitcher.page_route ~ page.urlExtension %}
- {% set untranslated_pages_behavior = grav.config.plugins.langswitcher.untranslated_pages_behavior %}
- {% if untranslated_pages_behavior != 'none' %}
- {% set translated_page = langswitcher.translated_pages[language] %}
- {% if (not translated_page) or (not translated_page.published) %}
- {% if untranslated_pages_behavior == 'redirect' %}
- {% set lang_url = base_lang_url ~ '/' %}
- {% elseif untranslated_pages_behavior == 'hide' %}
- {% set show_language = false %}
- {% endif %}
- {% endif %}
+ {% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
+ {% set lang_url = base_lang_url ~ langswitcher.page_route ~ page.urlExtension %}
+ {% set untranslated_pages_behavior = grav.config.plugins.langswitcher.untranslated_pages_behavior %}
+ {% if untranslated_pages_behavior != 'none' %}
+ {% set translated_page = langswitcher.translated_pages[language] %}
+ {% if (not translated_page) or (not translated_page.published) %}
+ {% if untranslated_pages_behavior == 'redirect' %}
+ {% set lang_url = base_lang_url ~ '/' %}
+ {% elseif untranslated_pages_behavior == 'hide' %}
+ {% set show_language = false %}
+ {% endif %}
{% endif %}
- {% set active_class = '' %}
+ {% endif %}
+ {% set active_class = '' %}
{% endif %}
{% if show_language %}
- {% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %}
+ {% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %}
{% endif %}
-{% endfor %}
+ {% endfor %}
diff --git a/templates/partials/logo.html.twig b/templates/partials/logo.html.twig
index c220b1c..e788f2c 100644
--- a/templates/partials/logo.html.twig
+++ b/templates/partials/logo.html.twig
@@ -1,9 +1,9 @@
-{% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %}
+{% set logo = theme_var('custom_logo_mobile') ?: theme_var('custom_logo') %}
-{% if logo %}
- {% set logo_file = (logo|first).name %}
-
\ No newline at end of file
+ {% if logo %}
+ {% set logo_file = (logo|first).name %}
+
-
+
{{ 'FUTURE.FEATURED'|t }}
-
-
-
+
+
{% 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 %}
+
-
- {{ p.date|date("M j, Y")}}
- {{ page.date|td(null, "M j, Y") }}
+ {% elseif config.plugins["twig-extensions"].enabled %}
+ {{ page.date|localizeddate('medium', 'none', lang) }}
+ {% else %}
+ {{ page.date|date("M j, Y") }}
+ {% endif %}
+ {% if avatar %}
+
+ {% if image %}
-
- {% if p.header.primaryImage %}
- {{ 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}}
- {% endif %}
+ {{ image.cropZoom(1038,437).loading('lazy').html(title,title)|raw}}
-
-
+ {% endif %}
+
{% endfor %}
-
+
-
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
index 8243663..4308b93 100644
--- a/templates/partials/navigation.html.twig
+++ b/templates/partials/navigation.html.twig
@@ -1,18 +1,18 @@
{% import 'macros/topmenu.html.twig' as macros %}
diff --git a/templates/partials/pagination.html.twig b/templates/partials/pagination.html.twig
index 5b6d1f5..1ce44c9 100644
--- a/templates/partials/pagination.html.twig
+++ b/templates/partials/pagination.html.twig
@@ -2,33 +2,30 @@
{% set base_url = base_url|default(page.url) %}
{% if pagination|length > 1 %}
-
-
{% endif %}
diff --git a/templates/partials/relatedpages.html.twig b/templates/partials/relatedpages.html.twig
index 07cb74a..5a1cc38 100644
--- a/templates/partials/relatedpages.html.twig
+++ b/templates/partials/relatedpages.html.twig
@@ -1,11 +1,13 @@
- {% for related_path, score in related_pages %}
- {% set related = grav['pages'].get(related_path) %}
- {% if related %}
-
- {{ related.title }} {% if config.plugins.relatedpages.show_score %}( {{ score }} )
- {% endif %}
-
+ {% for related_path, score in related_pages %}
+ {% set related = grav['pages'].get(related_path) %}
+ {% if related %}
+
+ {{ related.title }}
+ {% if config.plugins.relatedpages.show_score %}
+ ( {{ score }} )
{% endif %}
- {% endfor %}
-
\ No newline at end of file
+
+ {% endif %}
+ {% endfor %}
+
diff --git a/templates/partials/sidebar_left.html.twig b/templates/partials/sidebar_left.html.twig
index dbb7ec6..5cd473b 100644
--- a/templates/partials/sidebar_left.html.twig
+++ b/templates/partials/sidebar_left.html.twig
@@ -1,32 +1,32 @@
\ No newline at end of file
+
+
+ {% include 'partials/logo.html.twig' %}
+
+
+
+ {% if theme_config.miniposts == true %}
+ {% block miniposts %}
+ {% include 'partials/miniposts.html.twig' %}
+ {% endblock %}
+ {% endif %}
+
+ {% if theme_config.footer.title or theme_config.footer.description %}
+
+ {{theme_config.footer.title}}
+ {{theme_config.footer.description}}
+
+
+ {% endif %}
+
+
+
diff --git a/templates/partials/sidebar_navigation.html.twig b/templates/partials/sidebar_navigation.html.twig
index 538208f..1bf6c17 100644
--- a/templates/partials/sidebar_navigation.html.twig
+++ b/templates/partials/sidebar_navigation.html.twig
@@ -1,40 +1,47 @@
-{% block menu_navigation %}
- {% macro loop(page) %}
- {% for p in page.children.visible %}
- {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
- {% if p.children.visible.count > 0 %}
-
-
- {% if p.header.icon %}{% endif %}
- {{ p.menu }}{% if p.routable ?? false %}
-
-
-
- {% else %}
-
-
- {% if p.header.icon %}{% endif %}
- {{ p.menu }}
-
-
- {% endif %}
- {% endfor %}
- {% endmacro %}
-
-{% endblock %}
\ No newline at end of file
+{% block menu_navigation %}
+ {% macro loop(page) %}
+ {% for p in page.children.visible %}
+ {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
+ {% if p.children.visible.count > 0 %}
+
+
+ {% if p.header.icon %}
+
+ {% endif %}
+ {{ p.menu }}
+ {% if p.routable ?? false %}
+
+
+
+ {% else %}
+
+
+ {% if p.header.icon %}
+
+ {% endif %}
+ {{ p.menu }}
+
+
+ {% endif %}
+ {% endfor %}
+ {% endmacro %}
+
+{% endblock %}
diff --git a/templates/partials/sidebar_right.html.twig b/templates/partials/sidebar_right.html.twig
index 61f6c6e..ceea146 100644
--- a/templates/partials/sidebar_right.html.twig
+++ b/templates/partials/sidebar_right.html.twig
@@ -1,57 +1,57 @@
\ No newline at end of file
+ {% if p.routable == false and p.children.count > 0 %}
+ $(".subitem_hide").hide(); // this hides the list initially
+ $(".dropdown-btn").click(function () {
+ $(this).next(".subitem_hide").slideToggle();
+ });
+ {% else %}
+ $(".subitem").attr("style", "display:block"); // this shows the list if it is routable
+ $(".dropdown-btn").click(function () {
+ $(this).next(".subitem_hide").slideToggle();
+ });
+ {% endif %}
+
diff --git a/templates/partials/simplesearch_searchbox.html.twig b/templates/partials/simplesearch_searchbox.html.twig
index 7bb47b7..52bccfe 100644
--- a/templates/partials/simplesearch_searchbox.html.twig
+++ b/templates/partials/simplesearch_searchbox.html.twig
@@ -1,25 +1,25 @@
{% set min_chars = config.get('plugins.simplesearch.min_query_length', 3) %}
- {{"PLUGIN_SIMPLESEARCH.SEARCH_PLACEHOLDER"|t}}
-
+ {{"PLUGIN_SIMPLESEARCH.SEARCH_PLACEHOLDER"|t}}
+
\ No newline at end of file
diff --git a/templates/partials/simplesearch_searchbox_results.html.twig b/templates/partials/simplesearch_searchbox_results.html.twig
index 7fb0ecd..bc30b17 100644
--- a/templates/partials/simplesearch_searchbox_results.html.twig
+++ b/templates/partials/simplesearch_searchbox_results.html.twig
@@ -1,24 +1,24 @@
{% set min_chars = config.get('plugins.simplesearch.min_query_length', 3) %}
diff --git a/templates/partials/simplesearch_searchbox_sidebar.html.twig b/templates/partials/simplesearch_searchbox_sidebar.html.twig
index ba93861..073bd2a 100644
--- a/templates/partials/simplesearch_searchbox_sidebar.html.twig
+++ b/templates/partials/simplesearch_searchbox_sidebar.html.twig
@@ -1,22 +1,22 @@
{% set min_chars = config.get('plugins.simplesearch.min_query_length', 3) %}
diff --git a/templates/partials/social.html.twig b/templates/partials/social.html.twig
index 4f516f3..d0a298b 100644
--- a/templates/partials/social.html.twig
+++ b/templates/partials/social.html.twig
@@ -1,3 +1,3 @@
{% for item in theme_config.social %}
-
{{item.name}}
+
{{item.name}}
{% endfor %}
\ No newline at end of file
diff --git a/templates/partials/taxonomylist.html.twig b/templates/partials/taxonomylist.html.twig
index 1519e31..af9b08e 100644
--- a/templates/partials/taxonomylist.html.twig
+++ b/templates/partials/taxonomylist.html.twig
@@ -3,10 +3,10 @@
{% if taxlist %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig
index 43ed5ec..acd5b9b 100644
--- a/templates/portfolio.html.twig
+++ b/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 %}
@@ -8,38 +10,38 @@
{% block content %}
-
-
- {% if page.header.primaryImage %}
- {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+
+
+ {% if image %}
+ {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
+ {% endif %}
+
+ {{ page.content|raw}}
+
- {% block portfolio %}
-
+ {% block portfolio %}
+
- {% for item in page.header.images %}
+ {% for item in page.header.images %}
- {% endfor %}
-
+ {% endfor %}
+
{% endblock %}
-
+
-
+
{% endblock %}
diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig
index 12dc73d..2f20e11 100644
--- a/templates/simplesearch_results.html.twig
+++ b/templates/simplesearch_results.html.twig
@@ -1,42 +1,47 @@
-{% extends 'partials/simplesearch_base.html.twig' %}
+{% extends 'partials/base.html.twig' %}
{% block menu %}
{% include 'partials/sidebar_right.html.twig' %}
{% endblock %}
{% block content %}
-
+
 }}){kind=logo}
-{% else %}
- {% include('@images/grav-logo.svg') %}
-{% endif %}
-
\ No newline at end of file
+ {% if logo %}
+ {% set logo_file = (logo|first).name %}
+  }}){kind=logo}
+ {% else %}
+ {% include('@images/grav-logo.svg') %}
+ {% endif %}
+
diff --git a/templates/partials/metadata.html.twig b/templates/partials/metadata.html.twig
index 2f08a0e..59deee3 100644
--- a/templates/partials/metadata.html.twig
+++ b/templates/partials/metadata.html.twig
@@ -1,3 +1,3 @@
{% for meta in page.metadata %}
-
+
{% endfor %}
diff --git a/templates/partials/miniposts.html.twig b/templates/partials/miniposts.html.twig
index 6fd99a7..6a18f91 100644
--- a/templates/partials/miniposts.html.twig
+++ b/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 %}