From e970f998e4e8e927412301fc24c206b35b98f7c1 Mon Sep 17 00:00:00 2001 From: pikim Date: Thu, 19 Jan 2023 23:01:41 +0100 Subject: [PATCH] Autoformatted some twigs --- templates/form.html.twig | 9 +- templates/formdata.html.twig | 32 +++--- templates/forms/data.html.twig | 81 +++++++------- templates/partials/archives.html.twig | 45 ++++---- templates/partials/base.html.twig | 149 +++++++++++++------------ templates/partials/blog_item.html.twig | 140 ++++++++++++----------- 6 files changed, 234 insertions(+), 222 deletions(-) diff --git a/templates/form.html.twig b/templates/form.html.twig index 02fb8bd..a1b1ef2 100644 --- a/templates/form.html.twig +++ b/templates/form.html.twig @@ -2,12 +2,11 @@ {% block content %}
-
-

{{ page.header.title }}

-
-
+
+

{{ page.header.title }}

-
+
+ {{ content|raw }} {% include "forms/form.html.twig" %}
diff --git a/templates/formdata.html.twig b/templates/formdata.html.twig index 425fe4f..2a07d31 100644 --- a/templates/formdata.html.twig +++ b/templates/formdata.html.twig @@ -1,22 +1,22 @@ {% extends 'partials/base.html.twig' %} {% block content %} -
+
-
-

{{ form.message }}

-
-
- {% if plugin.translate_date.enabled %} - - {% else %} - - {% endif %} -
-
-

{{'FUTURE.FORM_SUMMARY'|t}}

+
+

{{ form.message }}

+
+
+ {% if plugin.translate_date.enabled %} + + {% else %} + + {% 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' %} + + {% 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/partials/archives.html.twig b/templates/partials/archives.html.twig index c6084de..8d9896b 100644 --- a/templates/partials/archives.html.twig +++ b/templates/partials/archives.html.twig @@ -1,27 +1,28 @@
-
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index 30191be..d0ff451 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -5,84 +5,91 @@ - - {% block head deferred %} - {% if page.title %}{{ page.title|e('html') }} | {% endif %}{{ site.title|e('html') }} - - - - {% include 'partials/metadata.html.twig' %} - - - {% endblock head %} + + {% block head deferred %} + + {% if page.title %} + {{ page.title|e('html') }} + {% endif %} + {{ site.title|e('html') }} + + + + {% include 'partials/metadata.html.twig' %} + + + {% endblock head %} - {% 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/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 %} - {% endblock %} - {{ assets.css()|raw }} - - {% 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 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/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 %} + {% endblock %} + {{ assets.css()|raw }} - - - -
+ {% 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 %} +
+ diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig index 1b9930a..61ddef4 100644 --- a/templates/partials/blog_item.html.twig +++ b/templates/partials/blog_item.html.twig @@ -1,98 +1,106 @@ -
- - {% if page.header.metadata.author %} - {% set author = page.header.metadata.author %} - {% elseif page.header.author %} - {% set author = page.header.author %} - {% else %} - {% set author = page.header.taxonomy.author[0] %} - {% endif %} - - {% if 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.header.taxonomy.author[0] %} + {% endif %} + + {% if author %} {% set avatar = author|replace(' ', '-')|lower %} - {% endif %} - -
+ {% endif %} + +
- {% if page.header.link %} + {% if page.header.link %}

- {% if page.header.continue_link is not sameas(false) %} - - {% endif %} - {{ page.title }} + {% if page.header.continue_link is not sameas(false) %} + + {% endif %} + {{ page.title }}

- {% else %} -

{{ page.title }}

- {% endif %} - {% if page.header.subtitle %} + {% else %} +

+ {{ page.title }} +

+ {% endif %} + {% if page.header.subtitle %}

{{ page.header.subtitle|raw }}

- {% endif %} + {% endif %}
- {% if plugin.translate_date.enabled %} - - {% else %} - - {% endif %} - {% if author %} - {{ tag }}{% if page.header.avatarImage %}{{ author }}{% endif %} - {% endif %} + {% if plugin.translate_date.enabled %} + + {% else %} + + {% endif %} + {% if author %} + {{ tag }} + {% if page.header.avatarImage %}{{ author }} + {% endif %} + + {% 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.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 %} +
-
- -