makary/grav-theme-future2021
1
0
Fork 0
mirror of https://github.com/pmoreno-rodriguez/grav-theme-future2021.git synced 2025-06-07 20:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

twig code optimization

Browse source
This commit is contained in:
pmoreno.rodriguez 2023-07-13 21:50:36 +02:00
parent 3d1dc5918e
commit b4cc4f8749
13 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/blog.html.twig
View file

@ -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 %}

12
templates/default.html.twig
View file

@ -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 %}

14
templates/error.html.twig
View file

@ -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 %}

2
templates/item.html.twig
View file

@ -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">

12
templates/modular.html.twig
View file

@ -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 %}

10
templates/offline.html.twig
View file

@ -12,7 +12,17 @@
</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 %}

11
templates/partials/base.html.twig
View file

@ -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>

37
templates/partials/blog_item.html.twig
View file

@ -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>

5
templates/partials/header.html.twig
View file

@ -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' %}

1
templates/partials/miniposts.html.twig
View file

@ -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 %}

1
templates/partials/owl-carousel.html.twig
View file

@ -1,3 +1,4 @@
{# OWL Carousel twig template for Future2021 theme #}
{% block stylesheets %}
<style>
.wrapper-carousel-{{ owl_id }} {

16
templates/portfolio.html.twig
View file

@ -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' %}

2
templates/simplesearch_results.html.twig
View file

@ -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' %}