Skip to content

Commit 747e7c0

Browse files
HlavtoxHlavtox
authored
Merge pull request #424 from PrestaShop/develop
Merge develop on master
2 parents 4f50b19 + 5b759ec commit 747e7c0

File tree

133 files changed

+2276
-849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+2276
-849
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Hummingbird theme
22

3-
This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `1.7.8.x` branch of PrestaShop to make sure this theme is compatible with the latest `1.7` version.
3+
This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.0.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.x` version.
44

55
[Read more](https://build.prestashop.com/news/new-theme-announce/) about this theme on the blog.
66

‎config/theme.yml

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author:
88

99
meta:
1010
compatibility:
11-
from: 1.7.0.0
11+
from: 8.0.0
1212
to: ~
1313

1414
available_layouts:
@@ -85,7 +85,7 @@ global_settings:
8585
- ps_linklist
8686
- ps_customeraccountlinks
8787
- ps_contactinfo
88-
- ~
88+
- blockwishlist
8989
displayLeftColumn:
9090
- ps_categorytree
9191
- ps_facetedsearch
@@ -135,6 +135,43 @@ global_settings:
135135
width: 170
136136
height: 115
137137
scope: [stores]
138+
default_xs:
139+
width: 120
140+
height: 120
141+
scope: [products, manufacturers, suppliers, categories]
142+
default_s:
143+
width: 160
144+
height: 160
145+
scope: [categories, products]
146+
default_m:
147+
width: 200
148+
height: 200
149+
scope: [stores, manufacturers, suppliers, products]
150+
default_md:
151+
width: 320
152+
height: 320
153+
scope: [categories, products]
154+
default_xl:
155+
width: 400
156+
height: 400
157+
scope: [stores, products]
158+
product_main:
159+
width: 720
160+
height: 720
161+
scope: [products]
162+
category_cover:
163+
width: 1000
164+
height: 200
165+
scope: [categories]
166+
product_main_2x:
167+
width: 1440
168+
height: 1440
169+
scope: [products]
170+
category_cover_2x:
171+
width: 2000
172+
height: 400
173+
scope: [categories]
174+
138175

139176
theme_settings:
140177
rtl_generation: false
@@ -145,3 +182,5 @@ theme_settings:
145182
new-products: layout-left-column
146183
prices-drop: layout-left-column
147184
contact: layout-left-column
185+
manufacturer: layout-left-column
186+
supplier: layout-left-column

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{**
2+
* For the full copyright and license information, please view the LICENSE
3+
* file that was distributed with this source code.
4+
*}
5+
6+
<div
7+
class="wishlist-add-to"
8+
data-url="{$url}"
9+
>
10+
<div
11+
class="wishlist-modal modal fade"
12+
{literal}
13+
:class="{show: !isHidden}"
14+
{/literal}
15+
tabindex="-1"
16+
role="dialog"
17+
aria-modal="true"
18+
>
19+
<div class="modal-dialog modal-dialog-centered" role="document">
20+
<div class="modal-content">
21+
<div class="modal-header px-3">
22+
<h5 class="modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</h5>
23+
<button
24+
type="button"
25+
class="btn-close"
26+
@click="toggleModal"
27+
data-dismiss="modal"
28+
aria-label="{l s='Close' d='Modules.Blockwishlist.Shop'}"
29+
>
30+
</button>
31+
</div>
32+
33+
<div class="modal-body">
34+
<choose-list
35+
@hide="toggleModal"
36+
:product-id="productId"
37+
:product-attribute-id="productAttributeId"
38+
:quantity="quantity"
39+
url="{$url}"
40+
add-url="{$addUrl}"
41+
empty-text="{l s='No list found.' d='Modules.Blockwishlist.Shop'}"
42+
>
43+
</choose-list>
44+
</div>
45+
46+
<div class="modal-footer">
47+
<a @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
48+
<i class="material-icons text-primary">add_circle_outline</i> {$newWishlistCTA}
49+
</a>
50+
</div>
51+
</div>
52+
</div>
53+
</div>
54+
55+
<div
56+
class="modal-backdrop fade"
57+
{literal}
58+
:class="{in: !isHidden}"
59+
{/literal}
60+
>
61+
</div>
62+
</div>

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{**
2+
* For the full copyright and license information, please view the LICENSE
3+
* file that was distributed with this source code.
4+
*}
5+
6+
<div
7+
class="wishlist-create"
8+
data-url="{$url}"
9+
data-title="{l s='Create wishlist' d='Modules.Blockwishlist.Shop'}"
10+
data-label="{l s='Wishlist name' d='Modules.Blockwishlist.Shop'}"
11+
data-placeholder="{l s='Add name' d='Modules.Blockwishlist.Shop'}"
12+
data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
13+
data-create-text="{l s='Create wishlist' d='Modules.Blockwishlist.Shop'}"
14+
data-length-text="{l s='List title is too short' d='Modules.Blockwishlist.Shop'}"
15+
>
16+
<div
17+
class="wishlist-modal modal fade"
18+
{literal}
19+
:class="{show: !isHidden}"
20+
{/literal}
21+
tabindex="-1"
22+
role="dialog"
23+
aria-modal="true"
24+
>
25+
<div class="modal-dialog modal-dialog-centered" role="document">
26+
<div class="modal-content">
27+
<div class="modal-header px-3">
28+
<h5 class="modal-title">((title))</h5>
29+
<button
30+
type="button"
31+
class="btn-close"
32+
@click="toggleModal"
33+
data-dismiss="modal"
34+
aria-label="Close"
35+
>
36+
</button>
37+
</div>
38+
<div class="modal-body">
39+
<div class="form-group form-group-lg">
40+
<label class="form-label" for="input2">((label))</label>
41+
<input
42+
type="text"
43+
class="form-control form-control-lg"
44+
v-model="value"
45+
id="input2"
46+
:placeholder="placeholder"
47+
>
48+
</div>
49+
</div>
50+
<div class="modal-footer">
51+
<button
52+
type="button"
53+
class="modal-cancel btn btn-secondary"
54+
data-dismiss="modal"
55+
@click="toggleModal"
56+
>
57+
((cancelText))
58+
</button>
59+
60+
<button
61+
type="button"
62+
class="btn btn-primary"
63+
@click="createWishlist"
64+
>
65+
((createText))
66+
</button>
67+
</div>
68+
</div>
69+
</div>
70+
</div>
71+
72+
<div
73+
class="modal-backdrop fade"
74+
{literal}
75+
:class="{in: !isHidden}"
76+
{/literal}
77+
>
78+
</div>
79+
</div>

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

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{**
2+
* For the full copyright and license information, please view the LICENSE
3+
* file that was distributed with this source code.
4+
*}
5+
6+
<div
7+
class="wishlist-delete"
8+
{if isset($listUrl)}
9+
data-delete-list-url="{$listUrl}"
10+
{/if}
11+
{if isset($deleteProductUrl)}
12+
data-delete-product-url="{$deleteProductUrl}"
13+
{/if}
14+
data-title="{l s='Remove product from wishlist' d='Modules.Blockwishlist.Shop'}"
15+
data-title-list="{l s='Delete wishlist' d='Modules.Blockwishlist.Shop'}"
16+
data-placeholder='{l s='The product will be removed from "%nameofthewishlist%".' d='Modules.Blockwishlist.Shop'}'
17+
data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
18+
data-delete-text="{l s='Remove' d='Modules.Blockwishlist.Shop'}"
19+
data-delete-text-list="{l s='Delete' d='Modules.Blockwishlist.Shop'}"
20+
>
21+
<div
22+
class="wishlist-modal modal fade"
23+
{literal}
24+
:class="{show: !isHidden}"
25+
{/literal}
26+
tabindex="-1"
27+
role="dialog"
28+
aria-modal="true"
29+
>
30+
<div class="modal-dialog modal-dialog-centered" role="document">
31+
<div class="modal-content">
32+
<div class="modal-header px-3">
33+
<h5 class="modal-title">((modalTitle))</h5>
34+
<button
35+
type="button"
36+
class="btn-close"
37+
@click="toggleModal"
38+
data-dismiss="modal"
39+
aria-label="Close"
40+
>
41+
</button>
42+
</div>
43+
<div class="modal-body" v-if="productId">
44+
<p class="modal-text">((confirmMessage))</p>
45+
</div>
46+
<div class="modal-footer">
47+
<button
48+
type="button"
49+
class="modal-cancel btn btn-secondary"
50+
data-dismiss="modal"
51+
@click="toggleModal"
52+
>
53+
((cancelText))
54+
</button>
55+
56+
<button
57+
type="button"
58+
class="btn btn-primary"
59+
@click="deleteWishlist"
60+
>
61+
((modalDeleteText))
62+
</button>
63+
</div>
64+
</div>
65+
</div>
66+
</div>
67+
68+
<div
69+
class="modal-backdrop fade"
70+
{literal}
71+
:class="{in: !isHidden}"
72+
{/literal}
73+
>
74+
</div>
75+
</div>

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{**
2+
* For the full copyright and license information, please view the LICENSE
3+
* file that was distributed with this source code.
4+
*}
5+
6+
<div
7+
class="wishlist-login"
8+
data-login-text="{l s='Sign in' d='Modules.Blockwishlist.Shop'}"
9+
data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
10+
>
11+
<div
12+
class="wishlist-modal modal fade"
13+
{literal}
14+
:class="{show: !isHidden}"
15+
{/literal}
16+
tabindex="-1"
17+
role="dialog"
18+
aria-modal="true"
19+
>
20+
<div class="modal-dialog modal-dialog-centered" role="document">
21+
<div class="modal-content">
22+
<div class="modal-header px-3">
23+
<h5 class="modal-title">{l s='Sign in' d='Modules.Blockwishlist.Shop'}</h5>
24+
<button
25+
type="button"
26+
class="btn-close"
27+
@click="toggleModal"
28+
data-dismiss="modal"
29+
aria-label="Close"
30+
>
31+
</button>
32+
</div>
33+
<div class="modal-body">
34+
<p class="modal-text">{l s='You need to be logged in to save products in your wishlist.' d='Modules.Blockwishlist.Shop'}</p>
35+
</div>
36+
<div class="modal-footer">
37+
<button
38+
type="button"
39+
class="modal-cancel btn btn-secondary"
40+
data-dismiss="modal"
41+
@click="toggleModal"
42+
>
43+
((cancelText))
44+
</button>
45+
46+
<a
47+
class="btn btn-primary"
48+
:href="prestashop.urls.pages.authentication"
49+
>
50+
((loginText))
51+
</a>
52+
</div>
53+
</div>
54+
</div>
55+
</div>
56+
57+
<div
58+
class="modal-backdrop fade"
59+
{literal}
60+
:class="{in: !isHidden}"
61+
{/literal}
62+
>
63+
</div>
64+
</div>

0 commit comments

Comments
 (0)