Skip to content

Commit 7b3b87d

Browse files
committed
Resolved Conflicts from sizes.html
2 parents efa1b2f + c61c922 commit 7b3b87d

File tree

2 files changed

+9
-6
lines changed
  • app/code/Magento

2 files changed

+9
-6
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ $numColumns = count($block->getColumns());
102102
selected="selected"<?php endif; ?>>200
103103
</option>
104104
</select>
105-
<label for="<?= $block->escapeHtml($block->getHtmlId())
106-
?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
105+
<label for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
107106
class="admin__control-support-text"><?= $block->escapeHtml(__('per page')) ?></label>
108107

109108
<div class="admin__data-grid-pager">

app/code/Magento/Ui/view/base/web/templates/grid/paging/sizes.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77

88
<div class="selectmenu" collapsible="">
99
<div class="selectmenu-value" openCollapsible="">
10-
<input type="text" aria-label="selectmenu-listing-paging-sizes" ko-value="_value" attr="id: index" autoselect/>
10+
<input type="text" ko-value="_value" attr="id: index" autoselect aria-labelledby="per-page-text"/>
1111
</div>
12-
<button class="selectmenu-toggle" type="button" css="_active: $collapsible.opened" toggleCollapsible>
13-
<span translate="'Select'"></span>
12+
<button class="selectmenu-toggle"
13+
type="button"
14+
css="_active: $collapsible.opened"
15+
toggleCollapsible
16+
aria-labelledby="per-page-text select-button-text">
17+
<span id="select-button-text" translate="'Select'"></span>
1418
</button>
1519
<div class="selectmenu-items" css="_active: $collapsible.opened" outerClick="discardAll.bind($data)">
1620
<ul>
@@ -58,4 +62,4 @@
5862
</ul>
5963
</div>
6064
</div>
61-
<label class="admin__control-support-text" translate="'per page'" attr="for: index"></label>
65+
<label class="admin__control-support-text" translate="'per page'" attr="for: index" id="per-page-text"></label>

0 commit comments

Comments
 (0)