diff --git a/blueprints/default.yaml b/blueprints/default.yaml index 34bc6da..a5690b9 100755 --- a/blueprints/default.yaml +++ b/blueprints/default.yaml @@ -22,14 +22,47 @@ form: header.subtitle: type: text style: vertical + size: long label: FUTURE.ADMIN.ITEM.ITEM_SUBTITLE + image_section: + type: section + underline: true + title: FUTURE.ADMIN.DEFAULT.IMAGE_OPTIONS + header.show_pageimage: + type: toggle + style: vertical + label: FUTURE.ADMIN.DEFAULT.SHOW_PAGEIMAGE + help: FUTURE.ADMIN.DEFAULT.SHOW_PAGEIMAGE_HELP + default: 1 + highlight: 1 + options: + 1: PLUGIN_ADMIN.ENABLED + 0: PLUGIN_ADMIN.DISABLED + validate: + type: bool header.primaryImage: ordering@: header.subtitle style: vertical size: medium type: pagemediaselect - label: FUTURE.ADMIN.DEFAULT.PRIMARY_IMAGE + label: FUTURE.ADMIN.DEFAULT.PRIMARY_IMAGE.LABEL preview_images: true + header.image_width: + type: number + style: vertical + label: FUTURE.ADMIN.DEFAULT.PRIMARY_IMAGE.WIDTH + size: small + default: 1038 + header.image_height: + type: number + style: vertical + label: FUTURE.ADMIN.DEFAULT.PRIMARY_IMAGE.HEIGHT + size: small + default: 437 + content_section: + type: section + underline: true + title: FUTURE.ADMIN.DEFAULT.CONTENT options: fields: publishing: diff --git a/blueprints/modular/banner.yaml b/blueprints/modular/banner.yaml index b159b98..ad0a3fa 100644 --- a/blueprints/modular/banner.yaml +++ b/blueprints/modular/banner.yaml @@ -12,8 +12,16 @@ form: fields: header.content: fields: + image_section: + unset@: true header.primaryImage: unset@: true + header.show_pageimage: + unset@: true + header.image_width: + unset@: true + header.image_height: + unset@: true banner: type: tab title: FUTURE.ADMIN.MODULAR.BANNER.BANNER_TAB diff --git a/templates/default.html.twig b/templates/default.html.twig index 61b7e6d..a51221b 100755 --- a/templates/default.html.twig +++ b/templates/default.html.twig @@ -1,7 +1,12 @@ {% extends 'partials/base.html.twig' %} -{% set show_sidebar = header_var('show_sidebar')|defined(false) %} -{% set image = page.media[page.header.primaryImage] ? : page.media.images|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 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 %} @@ -13,24 +18,21 @@
-

- {{ title }} -

+

{{ title }}

{% if subtitle %} -

- {{ subtitle }} -

+

{{ subtitle }}

{% endif %}
- {% if image %} + {% if show_image and image %} - {{ image.cropZoom(1038, 437).loading('lazy').attribute('decoding','async').html(title, title)|raw }} + {{ image.cropZoom(img_width, img_height).loading('lazy').attribute('decoding','async').html(title, title)|raw }} - {% endif %} + {% endif %} {{ page.content|raw }} +
{% if show_sidebar == false %} @@ -41,5 +43,7 @@ {% endblock %} {% block sidebar %} +{% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} diff --git a/templates/modular.html.twig b/templates/modular.html.twig index bbf57d1..61b29d0 100755 --- a/templates/modular.html.twig +++ b/templates/modular.html.twig @@ -1,6 +1,12 @@ {% extends 'partials/base.html.twig' %} -{% set show_sidebar = header_var('show_sidebar')|defined(false) %} -{% set image = page.media[page.header.primaryImage] ?: page.media.images|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 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 %} @@ -26,9 +32,9 @@ - {% if image %} + {% if show_image and image %} - {{ image.cropZoom(1038,437).loading('lazy').attribute('decoding','async').html(title, title)|raw }} + {{ image.cropZoom(img_width,img_height).loading('lazy').attribute('decoding','async').html(title, title)|raw }} {% endif %} @@ -40,6 +46,10 @@ {% endblock %} + {% block sidebar %} +{% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} + diff --git a/templates/modular/features.html.twig b/templates/modular/features.html.twig index ce90182..9b3c6e3 100644 --- a/templates/modular/features.html.twig +++ b/templates/modular/features.html.twig @@ -1,6 +1,16 @@ -{% set image = page.media[page.header.primaryImage] ?: page.media.images|first %} +{# Define if sidebar is shown in the page #} +{% set show_image = header_var('show_pageimage')|defined(true) %} + +{# 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 for features page #} {% set columns = page.header.layout == 'standard' ? 'col-4 col-6-medium col-12-small' : 'col-6 col-12-small' %}
@@ -11,8 +21,8 @@ {% endif %} - {% if image %} - {{ image.cropZoom(1038,437).loading('lazy').attribute('decoding','async').html(title, title, 'image featured')|raw }} + {% if show_image and image %} + {{ image.cropZoom(img_width,img_height).loading('lazy').attribute('decoding','async').html(title, title, 'image featured')|raw }} {% endif %} {{ page.content|raw }} diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig index 164f17b..a356e24 100644 --- a/templates/partials/blog_item.html.twig +++ b/templates/partials/blog_item.html.twig @@ -10,9 +10,18 @@ {% set author = page.taxonomy.author[0] %} {% endif %} - {% set title = page.title|raw %} - {% 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 %} +{# 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 title and subtitle #} +{% set title = page.title|raw %} +{% set subtitle = page.header.subtitle|raw %}
@@ -28,8 +37,8 @@ {{ title }} {% endif %} - {% if page.header.subtitle %} -

{{ page.header.subtitle|raw }}

+ {% if subtitle %} +

{{ subtitle|raw }}

{% endif %}
@@ -49,9 +58,9 @@ {% endif %}
- {% if image %} + {% if show_image and image %} - {{ image.cropZoom(1038,437).loading('lazy').attribute('decoding','async').html(title, title)|raw }} + {{ image.cropZoom(img_width,img_height).loading('lazy').attribute('decoding','async').html(title, title)|raw }} {% endif %}
diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig index 220281b..63d993e 100755 --- a/templates/portfolio.html.twig +++ b/templates/portfolio.html.twig @@ -1,6 +1,11 @@ {% extends 'partials/base.html.twig' %} -{% set show_sidebar = header_var('show_sidebar')|defined(false) %} -{% set image = page.media[page.header.primaryImage] %} + +{# 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' %} @@ -9,9 +14,10 @@ {{ parent() }} {% do assets.addCss('theme://assets/css/glightbox.min.css') %} {% set styling %} - button.gclose.gbtn, button.gnext.gbtn, button.gprev.gbtn { - box-shadow: none !important; - } + button.gclose.gbtn, button.gnext.gbtn, button.gprev.gbtn { + box-shadow: none !important; + } + {% endset %} {% do assets.addInlineCss(styling) %} {% endblock %} @@ -28,19 +34,15 @@
-

- {{ title }} -

+

{{ title }}

{% if subtitle %} -

- {{ subtitle }} -

+

{{ subtitle }}

{% endif %}
- {% if image %} + {% if show_image and image %} - {{ image.cropZoom(1038,437).loading('lazy').attribute('decoding','async').html(title, title)|raw }} + {{ image.cropZoom(img_width,img_height).loading('lazy').attribute('decoding','async').html(title, title)|raw }} {% endif %} @@ -50,19 +52,19 @@ {% block portfolio %}
- {% for item in gallery %} - {% set item_image = page.media[item.image] %} + {% for item in gallery %} + {% set item_image = page.media[item.image] %} {% set item_title = item.title %} {% set item_desc = item.description %} {% set thumbnail = item_image.cropZoom(thumb_w, thumb_h).loading('lazy').attribute('decoding','async').attribute('itemprop','http://schema.org/image').html(item_title,item_title) %} - - {% endfor %} + + {% endfor %}
{% endblock %} @@ -76,7 +78,9 @@ {% endblock %} {% block sidebar %} +{% if show_sidebar == true %} {% include 'partials/sidebar_left.html.twig' %} +{% endif %} {% endblock %} {% block javascripts %}