Skip to content

Commit a252b0b

Browse files
CySSoOCySSoO
authored
Merge pull request #472 from TeamEver/codex/add-padding-and-margin-in-tpl-files
Ensure prettyblock spacing settings propagate
2 parents bfc0280 + 2335727 commit a252b0b

14 files changed

+249
-122
lines changed

‎src/Service/EverblockPrettyBlocks.php‎

Lines changed: 60 additions & 100 deletions
Large diffs are not rendered by default.

‎views/templates/hook/prettyblocks/_partials/spacing_style.tpl‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{* Generates inline spacing styles for blocks and repeater states *}
2+
{capture name='spacing_styles'}
3+
{if isset($spacing) && $spacing}
4+
{assign var='spacingMap' value=[
5+
'padding_left' => 'padding-left',
6+
'padding_right' => 'padding-right',
7+
'padding_top' => 'padding-top',
8+
'padding_bottom' => 'padding-bottom',
9+
'margin_left' => 'margin-left',
10+
'margin_right' => 'margin-right',
11+
'margin_top' => 'margin-top',
12+
'margin_bottom' => 'margin-bottom',
13+
]}
14+
{foreach from=$spacingMap key=spacingKey item=cssProperty}
15+
{if isset($spacing[$spacingKey]) && $spacing[$spacingKey]}
16+
{$cssProperty}:{$spacing[$spacingKey]|escape:'htmlall':'UTF-8'};
17+
{/if}
18+
{/foreach}
19+
{assign var='mobileSpacingMap' value=[
20+
'margin_left_mobile' => '--margin-left-mobile',
21+
'margin_right_mobile' => '--margin-right-mobile',
22+
'margin_top_mobile' => '--margin-top-mobile',
23+
'margin_bottom_mobile' => '--margin-bottom-mobile',
24+
]}
25+
{foreach from=$mobileSpacingMap key=spacingKey item=cssProperty}
26+
{if isset($spacing[$spacingKey]) && $spacing[$spacingKey]}
27+
{$cssProperty}:{$spacing[$spacingKey]|escape:'htmlall':'UTF-8'};
28+
{/if}
29+
{/foreach}
30+
{/if}
31+
{/capture}
32+
{$smarty.capture.spacing_styles|trim}

‎views/templates/hook/prettyblocks/prettyblock_brands.tpl‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_brands_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_brands_wrapper_style' value=$smarty.capture.prettyblock_brands_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_brands_wrapper_style} style="{$prettyblock_brands_wrapper_style}"{/if}>
2129
{assign var=brands value=[]}
2230
{if isset($block.states) && $block.states}
2331
{foreach from=$block.states item=state}

‎views/templates/hook/prettyblocks/prettyblock_card.tpl‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,27 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_card_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_card_wrapper_style' value=$smarty.capture.prettyblock_card_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_card_wrapper_style} style="{$prettyblock_card_wrapper_style}"{/if}>
2129
{if isset($block.states) && $block.states}
2230
<div class="{if $block.settings.center_cards}px-2 px-md-0 pb-2{else}overflow-auto px-2 px-md-0 pb-2{/if}">
2331
<div class="d-flex gap-3 pe-1{if $block.settings.center_cards} flex-wrap justify-content-center{else} flex-nowrap{/if}">
2432
{foreach from=$block.states item=state}
25-
<div class="flex-shrink-0 prettyblocks-card-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}" style="width:90%;max-width:90%;">
33+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$state assign='prettyblock_card_state_spacing_style'}
34+
{capture name='prettyblock_card_state_style'}
35+
width:90%;max-width:90%;
36+
{$prettyblock_card_state_spacing_style}
37+
{/capture}
38+
{assign var='prettyblock_card_state_style' value=$smarty.capture.prettyblock_card_state_style|trim}
39+
<div class="flex-shrink-0 prettyblocks-card-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}"{if $prettyblock_card_state_style} style="{$prettyblock_card_state_style}"{/if}>
2640
<div class="card h-100 mb-3 border border-light-subtle rounded-4 shadow-sm">
2741
<div class="card-body d-flex flex-column h-100 p-4">
2842
{if isset($state.image.url) && $state.image.url}

‎views/templates/hook/prettyblocks/prettyblock_contact.tpl‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_contact_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_contact_wrapper_style' value=$smarty.capture.prettyblock_contact_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_contact_wrapper_style} style="{$prettyblock_contact_wrapper_style}"{/if}>
2129
{if $block.settings.default.force_full_width}
2230
<div class="row gx-0 no-gutters">
2331
{elseif $block.settings.default.container}

‎views/templates/hook/prettyblocks/prettyblock_cover.tpl‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_cover_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_cover_wrapper_style' value=$smarty.capture.prettyblock_cover_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_cover_wrapper_style} style="{$prettyblock_cover_wrapper_style}"{/if}>
2129
{if $block.settings.default.force_full_width}
2230
<div class="row gx-0 no-gutters">
2331
{elseif $block.settings.default.container}
@@ -28,9 +36,13 @@
2836
{if $use_slider}
2937
<div class="ever-cover-carousel">
3038
{foreach from=$block.states item=state key=key}
39+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$state assign='prettyblock_cover_state_spacing_style'}
40+
{capture name='prettyblock_cover_state_style'}
41+
{$prettyblock_cover_state_spacing_style}
42+
{/capture}
43+
{assign var='prettyblock_cover_state_style' value=$smarty.capture.prettyblock_cover_state_style|trim}
3144
<div id="block-{$block.id_prettyblocks}-{$key}"
32-
class="prettyblock-cover-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}"
33-
{if $state.margin_left || $state.margin_right || $state.margin_top || $state.margin_bottom}style="{if $state.margin_left}margin-left:{$state.margin_left|escape:'htmlall'};{/if}{if $state.margin_right}margin-right:{$state.margin_right|escape:'htmlall'};{/if}{if $state.margin_top}margin-top:{$state.margin_top|escape:'htmlall'};{/if}{if $state.margin_bottom}margin-bottom:{$state.margin_bottom|escape:'htmlall'};{/if}"{/if}>
45+
class="prettyblock-cover-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}"{if $prettyblock_cover_state_style} style="{$prettyblock_cover_state_style}"{/if}>
3446
{if isset($state.background_image.url) && $state.background_image.url}
3547
<picture>
3648
{if isset($state.background_image_mobile.url) && $state.background_image_mobile.url}
@@ -82,9 +94,13 @@
8294
{/foreach}
8395
{else}
8496
{foreach from=$block.states item=state key=key}
97+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$state assign='prettyblock_cover_state_spacing_style'}
98+
{capture name='prettyblock_cover_state_style'}
99+
{$prettyblock_cover_state_spacing_style}
100+
{/capture}
101+
{assign var='prettyblock_cover_state_style' value=$smarty.capture.prettyblock_cover_state_style|trim}
85102
<div id="block-{$block.id_prettyblocks}-{$key}"
86-
class="prettyblock-cover-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}"
87-
{if $state.margin_left || $state.margin_right || $state.margin_top || $state.margin_bottom}style="{if $state.margin_left}margin-left:{$state.margin_left|escape:'htmlall'};{/if}{if $state.margin_right}margin-right:{$state.margin_right|escape:'htmlall'};{/if}{if $state.margin_top}margin-top:{$state.margin_top|escape:'htmlall'};{/if}{if $state.margin_bottom}margin-bottom:{$state.margin_bottom|escape:'htmlall'};{/if}"{/if}>
103+
class="prettyblock-cover-item{if $state.css_class} {$state.css_class|escape:'htmlall'}{/if}"{if $prettyblock_cover_state_style} style="{$prettyblock_cover_state_style}"{/if}>
88104
{if isset($state.background_image.url) && $state.background_image.url}
89105
<picture>
90106
{if isset($state.background_image_mobile.url) && $state.background_image_mobile.url}

‎views/templates/hook/prettyblocks/prettyblock_exit_intent.tpl‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_exit_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_exit_wrapper_style' value=$smarty.capture.prettyblock_exit_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_exit_wrapper_style} style="{$prettyblock_exit_wrapper_style}"{/if}>
2129
{foreach from=$block.states item=state key=key}
2230
<div class="modal fade ever-exit-intent-modal" id="everExitIntent-{$block.id_prettyblocks}-{$key}" tabindex="-1">
2331
<div class="modal-dialog">

‎views/templates/hook/prettyblocks/prettyblock_guided_selector.tpl‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_guided_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_guided_wrapper_style' value=$smarty.capture.prettyblock_guided_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_guided_wrapper_style} style="{$prettyblock_guided_wrapper_style}"{/if}>
2129
{if $block.settings.default.force_full_width}
2230
<div class="row gx-0 no-gutters">
2331
{elseif $block.settings.default.container}

‎views/templates/hook/prettyblocks/prettyblock_lookbook.tpl‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,25 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_lookbook_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{/capture}
23+
{assign var='prettyblock_lookbook_wrapper_style' value=$smarty.capture.prettyblock_lookbook_wrapper_style|trim}
1924

2025
{assign var=columns value=$block.settings.columns|default:'1'}
21-
<div class="prettyblock-lookbook columns-{$columns}{$prettyblock_visibility_class}">
26+
<div class="prettyblock-lookbook columns-{$columns}{$prettyblock_visibility_class}"{if $prettyblock_lookbook_wrapper_style} style="{$prettyblock_lookbook_wrapper_style}"{/if}>
2227
<div class="lookbook-item">
2328
{prettyblocks_zone zone_name="block-lookbook-{$block.id_prettyblocks}-before"}
2429
</div>
2530
<div class="lookbook-item">
26-
<div id="block-{$block.id_prettyblocks}" data-lookbook-url="{$link->getModuleLink('everblock', 'lookbook', ['token' => $static_token])|escape:'html':'UTF-8'}" class="{if $block.settings.default.force_full_width|default:false}container-fluid px-0 mx-0{elseif $block.settings.default.container|default:false}container{/if}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
31+
{capture name='prettyblock_lookbook_inner_style'}
32+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
33+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
34+
{/if}
35+
{/capture}
36+
{assign var='prettyblock_lookbook_inner_style' value=$smarty.capture.prettyblock_lookbook_inner_style|trim}
37+
<div id="block-{$block.id_prettyblocks}" data-lookbook-url="{$link->getModuleLink('everblock', 'lookbook', ['token' => $static_token])|escape:'html':'UTF-8'}" class="{if $block.settings.default.force_full_width|default:false}container-fluid px-0 mx-0{elseif $block.settings.default.container|default:false}container{/if}"{if $prettyblock_lookbook_inner_style} style="{$prettyblock_lookbook_inner_style}"{/if}>
2738
{if $block.settings.default.force_full_width|default:false}
2839
<div class="row gx-0 no-gutters">
2940
{elseif $block.settings.default.container|default:false}

‎views/templates/hook/prettyblocks/prettyblock_podcasts.tpl‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
1717
*}
1818
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/visibility_class.tpl'}
19+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$block.settings assign='prettyblock_spacing_style'}
20+
{capture name='prettyblock_podcasts_wrapper_style'}
21+
{$prettyblock_spacing_style}
22+
{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color}
23+
background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};
24+
{/if}
25+
{/capture}
26+
{assign var='prettyblock_podcasts_wrapper_style' value=$smarty.capture.prettyblock_podcasts_wrapper_style|trim}
1927

20-
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if isset($block.settings.default.bg_color) && $block.settings.default.bg_color} style="background-color:{$block.settings.default.bg_color|escape:'htmlall':'UTF-8'};"{/if}>
28+
<div id="block-{$block.id_prettyblocks}" class="{if $block.settings.default.force_full_width}container-fluid px-0 mx-0{elseif $block.settings.default.container}container{/if}{$prettyblock_visibility_class}"{if $prettyblock_podcasts_wrapper_style} style="{$prettyblock_podcasts_wrapper_style}"{/if}>
2129
{if $block.settings.default.force_full_width}
2230
<div class="row gx-0 no-gutters">
2331
{elseif $block.settings.default.container}
@@ -29,7 +37,12 @@
2937
{if isset($block.states) && $block.states}
3038
<div class="everblock-podcasts">
3139
{foreach from=$block.states item=state}
32-
<div class="podcast-item">
40+
{include file='module:everblock/views/templates/hook/prettyblocks/_partials/spacing_style.tpl' spacing=$state assign='prettyblock_podcast_state_spacing_style'}
41+
{capture name='prettyblock_podcast_state_style'}
42+
{$prettyblock_podcast_state_spacing_style}
43+
{/capture}
44+
{assign var='prettyblock_podcast_state_style' value=$smarty.capture.prettyblock_podcast_state_style|trim}
45+
<div class="podcast-item"{if $prettyblock_podcast_state_style} style="{$prettyblock_podcast_state_style}"{/if}>
3346
{if isset($state.cover_image.url) && $state.cover_image.url}
3447
<img src="{$state.cover_image.url|escape:'htmlall'}" alt="{$state.episode_title|escape:'htmlall'}" class="podcast-cover" loading="lazy" />
3548
{/if}

0 commit comments

Comments
 (0)