Skip to content

Commit d73fe8d

Browse files
ENGCOM-6117: Resolve "Collapse All | Expand All" in Media Gallery has wrong Cursor Icon issue25108 #25109
2 parents c8e691d + 3315e9a commit d73fe8d

File tree

2 files changed

+42
-15
lines changed

2 files changed

+42
-15
lines changed

app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images;
79

810
/**
@@ -45,40 +47,60 @@ protected function _construct()
4547
$this->buttonList->remove('edit');
4648
$this->buttonList->add(
4749
'cancel',
48-
['class' => 'cancel action-quaternary', 'label' => __('Cancel'), 'type' => 'button',
49-
'onclick' => 'MediabrowserUtility.closeDialog();'],
50+
[
51+
'class' => 'cancel action-quaternary',
52+
'label' => __('Cancel'),
53+
'type' => 'button',
54+
'onclick' => 'MediabrowserUtility.closeDialog();'
55+
],
5056
0,
5157
0,
5258
'header'
5359
);
5460

5561
$this->buttonList->add(
5662
'delete_folder',
57-
['class' => 'delete no-display action-quaternary', 'label' => __('Delete Folder'), 'type' => 'button'],
63+
[
64+
'class' => 'delete no-display action-quaternary',
65+
'label' => __('Delete Folder'),
66+
'type' => 'button'
67+
],
5868
0,
5969
0,
6070
'header'
6171
);
6272

6373
$this->buttonList->add(
6474
'delete_files',
65-
['class' => 'delete no-display action-quaternary', 'label' => __('Delete Selected'), 'type' => 'button'],
75+
[
76+
'class' => 'delete no-display action-quaternary',
77+
'label' => __('Delete Selected'),
78+
'type' => 'button'
79+
],
6680
0,
6781
0,
6882
'header'
6983
);
7084

7185
$this->buttonList->add(
7286
'new_folder',
73-
['class' => 'save', 'label' => __('Create Folder'), 'type' => 'button'],
87+
[
88+
'class' => 'save new_folder',
89+
'label' => __('Create Folder'),
90+
'type' => 'button'
91+
],
7492
0,
7593
0,
7694
'header'
7795
);
7896

7997
$this->buttonList->add(
8098
'insert_files',
81-
['class' => 'save no-display action-primary', 'label' => __('Add Selected'), 'type' => 'button'],
99+
[
100+
'class' => 'save no-display action-primary',
101+
'label' => __('Add Selected'),
102+
'type' => 'button'
103+
],
82104
0,
83105
0,
84106
'header'
@@ -92,9 +114,7 @@ protected function _construct()
92114
*/
93115
public function getContentsUrl()
94116
{
95-
return $this->getUrl('cms/*/contents', [
96-
'type' => $this->getRequest()->getParam('type'),
97-
]);
117+
return $this->getUrl('cms/*/contents', ['type' => $this->getRequest()->getParam('type')]);
98118
}
99119

100120
/**

app/code/Magento/Cms/view/adminhtml/web/css/source/_module.less

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
* See COPYING.txt for license details.
44
*/
55
.modal-slide {
6-
.media-gallery-modal {
7-
.page-main-actions {
8-
margin-bottom: 3rem;
6+
.media-gallery-modal {
7+
.page-main-actions {
8+
margin-bottom: 3rem;
9+
}
10+
11+
.new_folder {
12+
margin-right: 10px;
13+
}
914
}
15+
}
1016

11-
#new_folder {
12-
margin-right: 10px;
17+
.tree-actions {
18+
a {
19+
cursor: pointer;
1320
}
14-
}
1521
}
22+

0 commit comments

Comments
 (0)