Skip to content

Commit 7a9add8

Browse files
committed
Merge branch '5.9' into 6.x
# Conflicts: # CHANGELOG-WIP.md # src/config/app.php # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map # src/web/assets/cp/dist/css/cp.css # src/web/assets/cp/dist/css/cp.css.map # src/web/assets/garnish/dist/garnish.js # src/web/assets/garnish/dist/garnish.js.map # src/web/assets/matrix/dist/MatrixInput.js.map # src/web/assets/routes/dist/routes.js # src/web/assets/routes/dist/routes.js.map # src/web/assets/tablesettings/dist/TableFieldSettings.js.map # yii2-adapter/legacy/controllers/ElementsController.php # yii2-adapter/legacy/web/assets/dashboard/dist/Dashboard.js # yii2-adapter/legacy/web/assets/dashboard/dist/Dashboard.js.map
2 parents c651019 + c305c0e commit 7a9add8

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
- Fixed a bug where font icons weren’t hidden from screen readers. ([#18078](https://github.com/craftcms/cms/pull/18078))
6+
7+
## 5.8.20 - 2025-11-18
8+
59
- Plugin licenses are now assigned immediately when installed via the `plugin/install` command. ([#17871](https://github.com/craftcms/cms/issues/17871))
610
- Improved drag-n-drop performance. ([#18019](https://github.com/craftcms/cms/pull/18019))
711
- Fixed a bug where assets with disallowed file extensions could still be uploaded to the system’s temp directory. ([#18015](https://github.com/craftcms/cms/issues/18015))
@@ -12,6 +16,7 @@
1216
- Fixed a bug where component select inputs could show a “Choose” button even if disabled. ([#18032](https://github.com/craftcms/cms/issues/18032))
1317
- Fixed a bug where plugin licenses in the project config could be discarded when plugins were installed. ([#18042](https://github.com/craftcms/cms/pull/18042))
1418
- Fixed a bug where logging in with a passkey wasn’t possible in some environments. ([#18048](https://github.com/craftcms/cms/pull/18048))
19+
- Fixed a bug where elements weren’t selectable within element select modals when searching, if the Structure view mode had been selected. ([#18051](https://github.com/craftcms/cms/issues/18051))
1520

1621
## 5.8.19 - 2025-10-28
1722

resources/templates/_components/fieldtypes/Matrix/settings.twig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,31 +211,39 @@
211211
<img class="mb-xs" src="{{ baseIconsUrl }}/cards.svg" width="80" height="60" alt="">
212212
{{ input('radio', 'viewMode', 'cards', {
213213
checked: field.viewMode == 'cards',
214+
class: 'fieldtoggle',
214215
disabled: readOnly,
216+
data: {'target-prefix': 'view-mode--'},
215217
}) }}
216218
{{ 'Cards'|t('app') }}
217219
</label>
218220
<label class="nowrap">
219221
<img class="mb-xs" src="{{ baseIconsUrl }}/cards-grid.svg" width="80" height="60" alt="">
220222
{{ input('radio', 'viewMode', 'cards-grid', {
221223
checked: field.viewMode == 'cards-grid',
224+
class: 'fieldtoggle',
222225
disabled: readOnly,
226+
data: {'target-prefix': 'view-mode--'},
223227
}) }}
224228
{{ 'Card grid'|t('app') }}
225229
</label>
226230
<label class="nowrap">
227231
<img class="mb-xs" src="{{ baseIconsUrl }}/blocks.svg" width="80" height="60" alt="">
228232
{{ input('radio', 'viewMode', 'blocks', {
229233
checked: field.viewMode == 'blocks',
234+
class: 'fieldtoggle',
230235
disabled: readOnly,
236+
data: {'target-prefix': 'view-mode--'},
231237
}) }}
232238
{{ 'Blocks'|t('app') }}
233239
</label>
234240
<label class="nowrap">
235241
<img class="mb-xs" src="{{ baseIconsUrl }}/index.svg" width="80" height="60" alt="">
236242
{{ input('radio', 'viewMode', 'index', {
237243
checked: field.viewMode == 'index',
244+
class: 'fieldtoggle',
238245
disabled: readOnly,
246+
data: {'target-prefix': 'view-mode--'},
239247
}) }}
240248
{{ 'Index'|t('app') }}
241249
</label>
@@ -338,10 +346,8 @@
338346

339347
{% if readOnly %}
340348
config['disabled'] = true;
341-
{% else %}
342-
config['sortable'] = true;
343349
{% endif %}
344350

345-
Craft.ui.createCheckboxSelect(config).appendTo($defaultColumnsContainer);
351+
Craft.ui.createSortableCheckboxSelect(config).appendTo($defaultColumnsContainer);
346352
})();
347353
{% endjs %}

resources/templates/settings/sites/index.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
{% endif %}
7474
{% if canSort %}
7575
<td class="thin"></td>
76+
<td class="thin"></td>
7677
{% endif %}
7778
{% if multiple %}
7879
<td class="thin"></td>
@@ -95,6 +96,7 @@
9596
{% endif %}
9697
{% if canSort %}
9798
<td class="thin"><a class="move icon" title="{{ 'Reorder'|t('app') }}" aria-label="{{ 'Reorder'|t('app') }}" role="button"></a></td>
99+
<td class="thin actions-container"></td>
98100
{% endif %}
99101
{% if multiple %}
100102
<td class="thin"><a class="delete icon{% if site.primary %} disabled{% endif %}" title="{{ 'Delete'|t('app') }}" aria-label="{{ 'Delete'|t('app') }}" role="button"></a></td>

yii2-adapter/legacy/controllers/ElementsController.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -980,9 +980,6 @@ private function _additionalButtons(
980980
? Html::beginTag('button', [
981981
'type' => 'button',
982982
'class' => ['preview-btn', 'btn'],
983-
'aria' => [
984-
'label' => t('Preview'),
985-
],
986983
]) .
987984
Html::tag('span', t('Preview'), ['class' => 'label']) .
988985
Html::endTag('button')

yii2-adapter/legacy/web/assets/dashboard/src/Dashboard.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ import './dashboard.scss';
687687
'<td class="widgetmanagerhud-col-move thin"><a class="move icon" title="' +
688688
Craft.t('app', 'Reorder') +
689689
'" role="button"></a></td>' +
690+
'<td class="widgetmanagerhud-col-actions thin actions-container"></td>' +
690691
'<td class="thin"><a class="delete icon" tabindex="0" type="button" title="' +
691692
Craft.t('app', 'Delete') +
692693
'" role="button" aria-label="' +

0 commit comments

Comments
 (0)