Skip to content

Commit 1e5fa8f

Browse files
author
Serhii Balko
committed
MC-41138: W3C validator reports duplicate ID on Listing Page and Search Result Page
1 parent 1fa7fb1 commit 1e5fa8f

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ $_helper = $block->getData('outputHelper');
153153
<?php endforeach; ?>
154154
</ol>
155155
</div>
156-
<?= $block->getToolbarHtml() ?>
156+
<?= $block->getChildBlock('toolbar')->setIsBottom(true)->toHtml() ?>
157157
<script type="text/x-magento-init">
158158
{
159159
"[data-role=tocart-form], .form.map.checkout": {

app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,23 @@
1010
*
1111
* @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
1212
*/
13-
14-
// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
15-
// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
1613
?>
1714
<?php if ($block->getCollection()->getSize()) :?>
1815
<?php $widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getWidgetOptionsJson());
1916
$widgetOptions = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['productListToolbarForm']);
2017
?>
2118
<div class="toolbar toolbar-products" data-mage-init='{"productListToolbarForm":<?= /* @noEscape */ $widgetOptions ?>}'>
22-
<?php if ($block->isExpanded()) :?>
23-
<?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
24-
<?php endif; ?>
25-
26-
<?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
27-
28-
<?= $block->getPagerHtml() ?>
29-
30-
<?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
31-
32-
<?php if ($block->isExpanded()) :?>
33-
<?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
34-
<?php endif; ?>
19+
<?php if ($block->getIsBottom()): ?>
20+
<?= $block->getPagerHtml() ?>
21+
<?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
22+
<?php else: ?>
23+
<?php if ($block->isExpanded()): ?>
24+
<?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
25+
<?php endif ?>
26+
<?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
27+
<?php if ($block->isExpanded()): ?>
28+
<?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
29+
<?php endif ?>
30+
<?php endif ?>
3531
</div>
3632
<?php endif ?>

0 commit comments

Comments
 (0)