Skip to content

Commit a883d63

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8221: Reduced html content of image details templates #30076
- Merge Pull Request #30076 from sivaschenko/magento2:removed-excessive-html - Merged commits: 1. 5af6dbc
2 parents 57c527e + 5af6dbc commit a883d63

File tree

5 files changed

+39
-108
lines changed

5 files changed

+39
-108
lines changed

‎app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ use Magento\Framework\Escaper;
2222
title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
2323
}
2424
}">
25-
<div class="page-main-actions">
26-
<div class="page-actions">
27-
<div class="page-actions-inner">
28-
<div class="page-action-buttons" id="media-gallery-image-actions"
29-
data-bind="scope: 'mediaGalleryImageActions'">
30-
<!-- ko template: getTemplate() --><!-- /ko -->
31-
</div>
32-
</div>
33-
</div>
25+
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageActions'">
26+
<!-- ko template: getTemplate() --><!-- /ko -->
3427
</div>
3528
<div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
3629
<!-- ko template: getTemplate() --><!-- /ko -->
@@ -51,22 +44,10 @@ use Magento\Framework\Escaper;
5144
"modalSelector": ".media-gallery-image-details-modal",
5245
"modalWindowSelector": ".media-gallery-image-details",
5346
"mediaGridMessages": "media_gallery_listing.media_gallery_listing.messages"
54-
}
55-
}
56-
}
57-
},
58-
"#media-gallery-image-details-messages": {
59-
"Magento_Ui/js/core/app": {
60-
"components": {
47+
},
6148
"mediaGalleryImageDetailsMessages": {
6249
"component": "Magento_MediaGalleryUi/js/grid/messages"
63-
}
64-
}
65-
}
66-
},
67-
"#media-gallery-image-actions": {
68-
"Magento_Ui/js/core/app": {
69-
"components": {
50+
},
7051
"mediaGalleryImageActions": {
7152
"component": "Magento_MediaGalleryUi/js/image/image-actions",
7253
"modalSelector": ".media-gallery-image-details-modal",

‎app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,8 @@
1818
title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
1919
}
2020
}">
21-
<div class="page-main-actions">
22-
<div class="page-actions">
23-
<div class="page-actions-inner">
24-
<div class="page-action-buttons" id="media-gallery-image-actions"
25-
data-bind="scope: 'mediaGalleryImageActions'">
26-
<!-- ko template: getTemplate() --><!-- /ko -->
27-
</div>
28-
</div>
29-
</div>
21+
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageActions'">
22+
<!-- ko template: getTemplate() --><!-- /ko -->
3023
</div>
3124
<div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
3225
<!-- ko template: getTemplate() --><!-- /ko -->
@@ -47,29 +40,17 @@
4740
"modalSelector": ".media-gallery-image-details-modal",
4841
"modalWindowSelector": ".media-gallery-image-details",
4942
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
50-
}
51-
}
52-
}
53-
},
54-
"#media-gallery-image-details-messages": {
55-
"Magento_Ui/js/core/app": {
56-
"components": {
57-
"mediaGalleryImageDetailsMessages": {
58-
"component": "Magento_MediaGalleryUi/js/grid/messages"
59-
}
60-
}
61-
}
62-
},
63-
"#media-gallery-image-actions": {
64-
"Magento_Ui/js/core/app": {
65-
"components": {
43+
},
6644
"mediaGalleryImageActions": {
6745
"component": "Magento_MediaGalleryUi/js/image/image-actions",
6846
"modalSelector": ".media-gallery-image-details-modal",
6947
"modalWindowSelector": ".media-gallery-image-details",
7048
"mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
7149
"imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
7250
"actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>
51+
},
52+
"mediaGalleryImageDetailsMessages": {
53+
"component": "Magento_MediaGalleryUi/js/grid/messages"
7354
}
7455
}
7556
}

‎app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
2020
title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
2121
}
2222
}">
23-
<div class="page-main-actions">
24-
<div class="page-actions">
25-
<div class="page-actions-inner">
26-
<div class="page-action-buttons" id="media-gallery-edit-image-actions"
27-
data-bind="scope: 'mediaGalleryImageEditActions'">
28-
<!-- ko template: getTemplate() --><!-- /ko -->
29-
</div>
30-
</div>
31-
</div>
23+
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageEditActions'">
24+
<!-- ko template: getTemplate() --><!-- /ko -->
3225
</div>
3326
<div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
3427
<!-- ko template: getTemplate() --><!-- /ko -->
@@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
5043
"imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
5144
"saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
5245
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
53-
}
54-
}
55-
},
56-
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
57-
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
58-
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
59-
},
60-
"#media-gallery-image-edit-details-messages": {
61-
"Magento_Ui/js/core/app": {
62-
"components": {
46+
},
6347
"mediaGalleryEditDetailsMessages": {
6448
"component": "Magento_MediaGalleryUi/js/grid/messages"
65-
}
66-
}
67-
}
68-
},
69-
"#media-gallery-edit-image-actions": {
70-
"Magento_Ui/js/core/app": {
71-
"components": {
49+
},
7250
"mediaGalleryImageEditActions": {
7351
"component": "Magento_MediaGalleryUi/js/image/image-actions",
7452
"modalSelector": ".media-gallery-edit-image-details-modal",
@@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
9169
]
9270
}
9371
}
94-
}
72+
},
73+
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
74+
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
75+
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
9576
}
9677
}
9778
</script>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
2020
title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
2121
}
2222
}">
23-
<div class="page-main-actions">
24-
<div class="page-actions">
25-
<div class="page-actions-inner">
26-
<div class="page-action-buttons" id="media-gallery-edit-image-actions"
27-
data-bind="scope: 'mediaGalleryImageEditActions'">
28-
<!-- ko template: getTemplate() --><!-- /ko -->
29-
</div>
30-
</div>
31-
</div>
23+
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageEditActions'">
24+
<!-- ko template: getTemplate() --><!-- /ko -->
3225
</div>
3326
<div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
3427
<!-- ko template: getTemplate() --><!-- /ko -->
@@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
5043
"imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
5144
"saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
5245
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
53-
}
54-
}
55-
},
56-
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
57-
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
58-
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
59-
},
60-
"#media-gallery-image-edit-details-messages": {
61-
"Magento_Ui/js/core/app": {
62-
"components": {
46+
},
6347
"mediaGalleryEditDetailsMessages": {
6448
"component": "Magento_MediaGalleryUi/js/grid/messages"
65-
}
66-
}
67-
}
68-
},
69-
"#media-gallery-edit-image-actions": {
70-
"Magento_Ui/js/core/app": {
71-
"components": {
49+
},
7250
"mediaGalleryImageEditActions": {
7351
"component": "Magento_MediaGalleryUi/js/image/image-actions",
7452
"modalSelector": ".media-gallery-edit-image-details-modal",
@@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
9169
]
9270
}
9371
}
94-
}
72+
},
73+
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
74+
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
75+
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
9576
}
9677
}
9778
</script>

‎app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<each args="{ data: actionsList, as: 'action' }">
8-
<button type="button" click="$parent[action.handler].bind($parent)"
9-
attr="{class: action.classes, id: 'image-details-action-' + action.name, title: $t(action.title)}">
10-
<span translate="action.title"></span>
11-
</button>
12-
</each>
7+
<div class="page-actions">
8+
<div class="page-actions-inner">
9+
<div class="page-action-buttons">
10+
<each args="{ data: actionsList, as: 'action' }">
11+
<button type="button" click="$parent[action.handler].bind($parent)"
12+
attr="{class: action.classes, id: 'image-details-action-' + action.name, title: $t(action.title)}">
13+
<span translate="action.title"></span>
14+
</button>
15+
</each>
16+
</div>
17+
</div>
18+
</div>
19+

0 commit comments

Comments
 (0)