Skip to content

Commit 204533b

Browse files
authored
Merge pull request #602 from yannicka/tpl-spacing
Templates: add some spacing
2 parents fdbfebb + 7f191e7 commit 204533b

Some content is hidden

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

56 files changed

+168
-25
lines changed

templates/_partials/footer.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
{hook h='displayFooter'}
1616
{/block}
1717
</div>
18+
1819
<div class="footer__main__bottom row">
1920
{block name='hook_footer_after'}
2021
{hook h='displayFooterAfter'}
2122
{/block}
2223
</div>
24+
2325
<p class="copyright">
2426
{block name='copyright_link'}
2527
<a href="https://www.prestashop-project.org/" target="_blank" rel="noopener noreferrer nofollow">

templates/_partials/head.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{block name='head_charset'}
66
<meta charset="utf-8">
77
{/block}
8+
89
{block name='head_ie_compatibility'}
910
<meta http-equiv="x-ua-compatible" content="ie=edge">
1011
{/block}
@@ -15,17 +16,22 @@
1516
{/block}
1617

1718
<title>{block name='head_seo_title'}{$page.meta.title}{/block}</title>
19+
1820
{block name='hook_after_title_tag'}
1921
{hook h='displayAfterTitleTag'}
2022
{/block}
23+
2124
<meta name="description" content="{block name='head_seo_description'}{$page.meta.description}{/block}">
2225
<meta name="keywords" content="{block name='head_seo_keywords'}{$page.meta.keywords}{/block}">
26+
2327
{if $page.meta.robots !== 'index'}
2428
<meta name="robots" content="{$page.meta.robots}">
2529
{/if}
30+
2631
{if $page.canonical}
2732
<link rel="canonical" href="{$page.canonical}">
2833
{/if}
34+
2935
{block name='head_hreflang'}
3036
{foreach from=$urls.alternative_langs item=pageUrl key=code}
3137
<link rel="alternate" href="{$pageUrl}" hreflang="{$code}">

templates/_partials/header.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<div class="{$headerTopName}__left col-md-5">
1919
{hook h='displayNav1'}
2020
</div>
21+
2122
<div class="{$headerTopName}__right col-md-7">
2223
{hook h='displayNav2'}
2324
</div>
@@ -80,5 +81,6 @@
8081
</div>
8182
</div>
8283
</div>
84+
8385
{hook h='displayNavFullWidth'}
8486
{/block}

templates/_partials/microdata/product-jsonld.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,27 @@
33
* file that was distributed with this source code.
44
*}
55
{assign var=hasAggregateRating value=false}
6+
67
{if !empty($product.productComments.averageRating) && !empty($product.productComments.nbComments)}
78
{assign var=hasAggregateRating value=true}
89
{assign var=ratingValue value=$product.productComments.averageRating}
910
{assign var=ratingReviewCount value=$product.productComments.nbComments}
1011
{/if}
12+
1113
{if !empty($ratings.avg) && !empty($nbComments)}
1214
{assign var=hasAggregateRating value=true}
1315
{assign var=ratingValue value=$ratings.avg}
1416
{assign var=ratingReviewCount value=$nbComments}
1517
{/if}
18+
1619
{assign var=hasWeight value=false}
20+
1721
{if isset($product.weight) && ($product.weight != 0)}
1822
{assign var=hasWeight value=true}
1923
{/if}
24+
2025
{assign var=hasOffers value=$product.show_price}
26+
2127
<script type="application/ld+json">
2228
{
2329
"@context": "https://schema.org/",

templates/catalog/_partials/facets.tpl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@
2626

2727
<section class="facet">
2828
<p class="h6 facet-title d-none d-sm-block d-md-block">{$facet.label}</p>
29+
2930
{assign var=_expand_id value=10|mt_rand:100000}
3031
{assign var=_collapse value=true}
32+
3133
{foreach from=$facet.filters item="filter"}
3234
{if $filter.active}{assign var=_collapse value=false}{/if}
3335
{/foreach}
3436

3537
<div class="title d-none d-sm-block d-md-none" data-target="#facet_{$_expand_id}" data-bs-toggle="collapse"{if !$_collapse} aria-expanded="true"{/if}>
3638
<p class="h6 facet-title">{$facet.label}</p>
39+
3740
<span>
3841
<span class="navbar-toggler collapse-icons">
3942
<i class="material-icons add">&#xE313;</i>
@@ -87,6 +90,7 @@
8790
rel="nofollow"
8891
>
8992
{$filter.label}
93+
9094
{if $filter.magnitude}
9195
<span class="magnitude">({$filter.magnitude})</span>
9296
{/if}
@@ -96,15 +100,14 @@
96100
{/foreach}
97101
</ul>
98102
{/block}
99-
100103
{else}
101-
102104
{block name='facet_item_dropdown'}
103105
<ul id="facet_{$_expand_id}" class="collapse{if !$_collapse} in{/if}">
104106
<li>
105107
<div class="facet-dropdown dropdown">
106108
<a class="select-title" rel="nofollow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
107109
{$active_found = false}
110+
108111
<span>
109112
{foreach from=$facet.filters item="filter"}
110113
{if $filter.active}
@@ -115,12 +118,15 @@
115118
{$active_found = true}
116119
{/if}
117120
{/foreach}
121+
118122
{if !$active_found}
119123
{l s='(no filter)' d='Shop.Theme.Global'}
120124
{/if}
121125
</span>
126+
122127
<i class="material-icons" aria-hidden="true">&#xE5C5;</i>
123128
</a>
129+
124130
<div class="dropdown-menu dropdown-menu-start">
125131
{foreach from=$facet.filters item="filter"}
126132
{if !$filter.active}
@@ -130,6 +136,7 @@
130136
class="dropdown-item select-list"
131137
>
132138
{$filter.label}
139+
133140
{if $filter.magnitude}
134141
({$filter.magnitude})
135142
{/if}

templates/catalog/_partials/miniatures/brand.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
<img src="{$brand.image}" alt="{$brand.name}" loading="lazy">
1010
</a>
1111
</div>
12+
1213
<div class="brand__infos">
1314
<p><a class="brand__link" href="{$brand.url}">{$brand.name}</a></p>
1415
{$brand.text nofilter}
1516
</div>
17+
1618
<div class="brand__products">
1719
<a class="btn" href="{$brand.url}">{$brand.nb_products}</a>
1820
</div>

templates/catalog/_partials/miniatures/product.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,9 @@
179179
{if $product.add_to_cart_url}
180180
<form action="{$urls.pages.cart}" method="post" class="d-flex flex-wrap flex-md-nowrap gap-3 align-items-center mt-3">
181181
<input type="hidden" value="{$product.id_product}" name="id_product">
182+
182183
<input type="hidden" name="token" value="{$static_token}" />
184+
183185
<div class="quantity-button js-quantity-button w-100 w-sm-auto">
184186
{include file='components/qty-input.tpl'
185187
attributes=[
@@ -190,6 +192,7 @@
190192
marginHelper="mb-0"
191193
}
192194
</div>
195+
193196
<button data-button-action="add-to-cart" class="btn btn-primary flex-grow-1 flex-md-grow-0">
194197
<i class="material-icons" aria-hidden="true">&#xe854;</i>
195198
<span class="visually-hidden">{l s='Add to cart' d='Shop.Theme.Actions'}</span>

templates/catalog/_partials/product-activation.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{foreach $page.admin_notifications as $notif}
99
<div>
1010
<i class="material-icons" aria-hidden="true">&#xE001;</i>
11+
1112
<p class="alert-text">{$notif.message}</p>
1213
</div>
1314
{/foreach}

templates/catalog/_partials/product-add-to-cart.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*}
55
<div class="product__add-to-cart product-add-to-cart js-product-add-to-cart">
66
{if !$configuration.is_catalog}
7-
87
<div class="mb-3">
98
{block name='product_availability'}
109
<span id="product-availability" class="product__availability js-product-availability d-flex align-items-center">
@@ -16,10 +15,12 @@
1615
{else}
1716
<i class="material-icons product-unavailable me-2">&#xE14B;</i>
1817
{/if}
18+
1919
{$product.availability_message}
2020
{/if}
2121
</span>
2222
{/block}
23+
2324
{block name='product_delivery_times'}
2425
{if $product.is_virtual == 0}
2526
{if $product.additional_delivery_times == 1}

templates/catalog/_partials/product-cover-thumbnails.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
2020
<span class="visually-hidden">Previous</span>
2121
</button>
22+
2223
<button class="carousel-control-next" type="button" data-bs-target="#product-images" data-bs-slide="next">
2324
<span class="carousel-control-next-icon" aria-hidden="true"></span>
2425
<span class="visually-hidden">Next</span>
@@ -70,6 +71,7 @@
7071
data-full-size-image-url="{$image.bySize.home_default.url}"
7172
>
7273
</picture>
74+
7375
<div class="product__images__modal-opener" data-bs-toggle="modal" data-bs-target="#product-modal">
7476
<i class="material-icons zoom-in">search</i>
7577
</div>

0 commit comments

Comments
 (0)