Skip to content

Commit 5d33762

Browse files
SharakPLSharakPL
authored
Merge pull request #584 from SharakPL/fix-blockwishlist
Fix missing add to wishlist button and modals backdrop
2 parents 2262c67 + d602e92 commit 5d33762

File tree

7 files changed

+48
-101
lines changed

7 files changed

+48
-101
lines changed

‎modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
>
1010
<div
1111
class="wishlist-modal modal fade"
12-
{literal}
13-
:class="{show: !isHidden}"
14-
{/literal}
12+
:class="{ldelim}show: !isHidden{rdelim}"
1513
tabindex="-1"
1614
role="dialog"
1715
aria-modal="true"
@@ -26,8 +24,7 @@
2624
@click="toggleModal"
2725
data-dismiss="modal"
2826
aria-label="{l s='Close' d='Modules.Blockwishlist.Shop'}"
29-
>
30-
</button>
27+
></button>
3128
</div>
3229

3330
<div class="modal-body">
@@ -39,8 +36,7 @@
3936
url="{$url}"
4037
add-url="{$addUrl}"
4138
empty-text="{l s='No list found.' d='Modules.Blockwishlist.Shop'}"
42-
>
43-
</choose-list>
39+
></choose-list>
4440
</div>
4541

4642
<div class="modal-footer">
@@ -52,11 +48,8 @@
5248
</div>
5349
</div>
5450

55-
<div
51+
<div
5652
class="modal-backdrop fade"
57-
{literal}
58-
:class="{in: !isHidden}"
59-
{/literal}
60-
>
61-
</div>
53+
:class="{ldelim}show: !isHidden{rdelim}"
54+
></div>
6255
</div>

‎modules/blockwishlist/views/templates/components/modals/create.tpl‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
>
1616
<div
1717
class="wishlist-modal modal fade"
18-
{literal}
19-
:class="{show: !isHidden}"
20-
{/literal}
18+
:class="{ldelim}show: !isHidden{rdelim}"
2119
tabindex="-1"
2220
role="dialog"
2321
aria-modal="true"
@@ -32,8 +30,7 @@
3230
@click="toggleModal"
3331
data-dismiss="modal"
3432
aria-label="Close"
35-
>
36-
</button>
33+
></button>
3734
</div>
3835
<div class="modal-body">
3936
<div class="form-group form-group-lg">
@@ -53,27 +50,20 @@
5350
class="modal-cancel btn btn-secondary"
5451
data-dismiss="modal"
5552
@click="toggleModal"
56-
>
57-
((cancelText))
58-
</button>
53+
>((cancelText))</button>
5954

6055
<button
6156
type="button"
6257
class="btn btn-primary"
6358
@click="createWishlist"
64-
>
65-
((createText))
66-
</button>
59+
>((createText))</button>
6760
</div>
6861
</div>
6962
</div>
7063
</div>
7164

72-
<div
65+
<div
7366
class="modal-backdrop fade"
74-
{literal}
75-
:class="{in: !isHidden}"
76-
{/literal}
77-
>
78-
</div>
67+
:class="{ldelim}show: !isHidden{rdelim}"
68+
></div>
7969
</div>

‎modules/blockwishlist/views/templates/components/modals/delete.tpl‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
>
2121
<div
2222
class="wishlist-modal modal fade"
23-
{literal}
24-
:class="{show: !isHidden}"
25-
{/literal}
23+
:class="{ldelim}show: !isHidden{rdelim}"
2624
tabindex="-1"
2725
role="dialog"
2826
aria-modal="true"
@@ -37,39 +35,31 @@
3735
@click="toggleModal"
3836
data-dismiss="modal"
3937
aria-label="Close"
40-
>
41-
</button>
38+
></button>
4239
</div>
4340
<div class="modal-body" v-if="productId">
44-
<p class="modal-text">((confirmMessage))</p>
41+
<p class="modal-text">((confirmMessage))</p>
4542
</div>
4643
<div class="modal-footer">
4744
<button
4845
type="button"
4946
class="modal-cancel btn btn-secondary"
5047
data-dismiss="modal"
5148
@click="toggleModal"
52-
>
53-
((cancelText))
54-
</button>
49+
>((cancelText))</button>
5550

5651
<button
5752
type="button"
5853
class="btn btn-primary"
5954
@click="deleteWishlist"
60-
>
61-
((modalDeleteText))
62-
</button>
55+
>((modalDeleteText))</button>
6356
</div>
6457
</div>
6558
</div>
6659
</div>
6760

68-
<div
61+
<div
6962
class="modal-backdrop fade"
70-
{literal}
71-
:class="{in: !isHidden}"
72-
{/literal}
73-
>
74-
</div>
63+
:class="{ldelim}show: !isHidden{rdelim}"
64+
></div>
7565
</div>

‎modules/blockwishlist/views/templates/components/modals/login.tpl‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
>
1111
<div
1212
class="wishlist-modal modal fade"
13-
{literal}
14-
:class="{show: !isHidden}"
15-
{/literal}
13+
:class="{ldelim}show: !isHidden{rdelim}"
1614
tabindex="-1"
1715
role="dialog"
1816
aria-modal="true"
@@ -27,8 +25,7 @@
2725
@click="toggleModal"
2826
data-dismiss="modal"
2927
aria-label="Close"
30-
>
31-
</button>
28+
></button>
3229
</div>
3330
<div class="modal-body">
3431
<p class="modal-text">{l s='You need to be logged in to save products in your wishlist.' d='Modules.Blockwishlist.Shop'}</p>
@@ -39,26 +36,19 @@
3936
class="modal-cancel btn btn-secondary"
4037
data-dismiss="modal"
4138
@click="toggleModal"
42-
>
43-
((cancelText))
44-
</button>
39+
>((cancelText))</button>
4540

4641
<a
4742
class="btn btn-primary"
4843
:href="prestashop.urls.pages.authentication"
49-
>
50-
((loginText))
51-
</a>
44+
>((loginText))</a>
5245
</div>
5346
</div>
5447
</div>
5548
</div>
5649

5750
<div
5851
class="modal-backdrop fade"
59-
{literal}
60-
:class="{in: !isHidden}"
61-
{/literal}
62-
>
63-
</div>
52+
:class="{ldelim}show: !isHidden{rdelim}"
53+
></div>
6454
</div>

‎modules/blockwishlist/views/templates/components/modals/rename.tpl‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
>
1515
<div
1616
class="wishlist-modal modal fade"
17-
{literal}
18-
:class="{show: !isHidden}"
19-
{/literal}
17+
:class="{ldelim}show: !isHidden{rdelim}"
2018
tabindex="-1"
2119
role="dialog"
2220
aria-modal="true"
@@ -31,8 +29,7 @@
3129
@click="toggleModal"
3230
data-dismiss="modal"
3331
aria-label="Close"
34-
>
35-
</button>
32+
></button>
3633
</div>
3734
<div class="modal-body">
3835
<div class="form-group form-group-lg">
@@ -51,26 +48,19 @@
5148
class="modal-cancel btn btn-secondary"
5249
data-dismiss="modal"
5350
@click="toggleModal"
54-
>
55-
((cancelText))
56-
</button>
51+
>((cancelText))</button>
5752
<button
5853
type="button"
5954
class="btn btn-primary"
6055
@click="renameWishlist"
61-
>
62-
((renameText))
63-
</button>
56+
>((renameText))</button>
6457
</div>
6558
</div>
6659
</div>
6760
</div>
6861

69-
<div
62+
<div
7063
class="modal-backdrop fade"
71-
{literal}
72-
:class="{in: !isHidden}"
73-
{/literal}
74-
>
75-
</div>
64+
:class="{ldelim}show: !isHidden{rdelim}"
65+
></div>
7666
</div>

‎modules/blockwishlist/views/templates/components/modals/share.tpl‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
>
1515
<div
1616
class="wishlist-modal modal fade"
17-
{literal}
18-
:class="{show: !isHidden}"
19-
{/literal}
17+
:class="{ldelim}show: !isHidden{rdelim}"
2018
tabindex="-1"
2119
role="dialog"
2220
aria-modal="true"
@@ -31,8 +29,7 @@
3129
@click="toggleModal"
3230
data-dismiss="modal"
3331
aria-label="Close"
34-
>
35-
</button>
32+
></button>
3633
</div>
3734
<div class="modal-body">
3835
<div class="form-group form-group-lg">
@@ -52,27 +49,20 @@
5249
class="modal-cancel btn btn-secondary"
5350
data-dismiss="modal"
5451
@click="toggleModal"
55-
>
56-
((cancelText))
57-
</button>
52+
>((cancelText))</button>
5853

5954
<button
6055
type="button"
6156
class="btn btn-primary"
6257
@click="copyLink"
63-
>
64-
(( actionText ))
65-
</button>
58+
>(( actionText ))</button>
6659
</div>
6760
</div>
6861
</div>
6962
</div>
7063

71-
<div
64+
<div
7265
class="modal-backdrop fade"
73-
{literal}
74-
:class="{in: !isHidden}"
75-
{/literal}
76-
>
77-
</div>
66+
:class="{ldelim}show: !isHidden{rdelim}"
67+
></div>
7868
</div>

‎templates/catalog/_partials/miniatures/product.tpl‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
{$componentName = 'product-miniature'}
66

77
{block name='product_miniature_item'}
8-
<article class="{$componentName} js-{$componentName} thumbnail-container {if !empty($productClasses)} {$productClasses}{/if}" data-id-product="{$product.id_product}" data-id-product-attribute="{$product.id_product_attribute}">
8+
<article
9+
class="{$componentName} js-{$componentName}{if !empty($productClasses)} {$productClasses}{/if}"
10+
data-id-product="{$product.id_product}"
11+
data-id-product-attribute="{$product.id_product_attribute}"
12+
>
913
<div class="card">
1014
<a href="{$product.url}" class="{$componentName}__link">
1115
{include file='catalog/_partials/product-flags.tpl'}
1216

1317
{block name='product_miniature_image'}
14-
<div class="{$componentName}__image-container">
18+
<div class="{$componentName}__image-container thumbnail-container">
1519
{if $product.cover}
1620
<picture>
1721
{if isset($product.cover.bySize.default_md.sources.avif)}
@@ -102,7 +106,7 @@
102106

103107
{block name='quick_view_touch'}
104108
<button class="{$componentName}__quickview_touch btn js-quickview" data-link-action="quickview">
105-
<i class="material-icons">&#xE417;</i>
109+
<i class="material-icons">&#xE417;</i>
106110
</button>
107111
{/block}
108112
</div>

0 commit comments

Comments
 (0)