Skip to content

Reduced html content of image details templates #30076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2020
Merged

Reduced html content of image details templates #30076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 4 additions & 23 deletions app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,8 @@ use Magento\Framework\Escaper;
title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
}
}">
<div class="page-main-actions">
<div class="page-actions">
<div class="page-actions-inner">
<div class="page-action-buttons" id="media-gallery-image-actions"
data-bind="scope: 'mediaGalleryImageActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
</div>
</div>
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -51,22 +44,10 @@ use Magento\Framework\Escaper;
"modalSelector": ".media-gallery-image-details-modal",
"modalWindowSelector": ".media-gallery-image-details",
"mediaGridMessages": "media_gallery_listing.media_gallery_listing.messages"
}
}
}
},
"#media-gallery-image-details-messages": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryImageDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
},
"#media-gallery-image-actions": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryImageActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-image-details-modal",
Expand Down
31 changes: 6 additions & 25 deletions app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@
title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
}
}">
<div class="page-main-actions">
<div class="page-actions">
<div class="page-actions-inner">
<div class="page-action-buttons" id="media-gallery-image-actions"
data-bind="scope: 'mediaGalleryImageActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
</div>
</div>
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -47,29 +40,17 @@
"modalSelector": ".media-gallery-image-details-modal",
"modalWindowSelector": ".media-gallery-image-details",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
}
}
}
},
"#media-gallery-image-details-messages": {
"Magento_Ui/js/core/app": {
"components": {
"mediaGalleryImageDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
},
"#media-gallery-image-actions": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryImageActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-image-details-modal",
"modalWindowSelector": ".media-gallery-image-details",
"mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
"imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
"actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>
},
"mediaGalleryImageDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
Expand Down
35 changes: 8 additions & 27 deletions app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
}
}">
<div class="page-main-actions">
<div class="page-actions">
<div class="page-actions-inner">
<div class="page-action-buttons" id="media-gallery-edit-image-actions"
data-bind="scope: 'mediaGalleryImageEditActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
</div>
</div>
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageEditActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
"imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
"saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
}
}
},
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
},
"#media-gallery-image-edit-details-messages": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryEditDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
},
"#media-gallery-edit-image-actions": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryImageEditActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-edit-image-details-modal",
Expand All @@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
]
}
}
}
},
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
}
}
</script>
35 changes: 8 additions & 27 deletions app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
}
}">
<div class="page-main-actions">
<div class="page-actions">
<div class="page-actions-inner">
<div class="page-action-buttons" id="media-gallery-edit-image-actions"
data-bind="scope: 'mediaGalleryImageEditActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
</div>
</div>
<div class="page-main-actions" data-bind="scope: 'mediaGalleryImageEditActions'">
<!-- ko template: getTemplate() --><!-- /ko -->
</div>
<div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
<!-- ko template: getTemplate() --><!-- /ko -->
Expand All @@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
"imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
"saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
}
}
},
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
},
"#media-gallery-image-edit-details-messages": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryEditDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
},
"#media-gallery-edit-image-actions": {
"Magento_Ui/js/core/app": {
"components": {
},
"mediaGalleryImageEditActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-edit-image-details-modal",
Expand All @@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
]
}
}
}
},
"Magento_MediaGalleryUi/js/validation/validate-image-title": {},
"Magento_MediaGalleryUi/js/validation/validate-image-description": {},
"Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
}
}
</script>
Expand Down
19 changes: 13 additions & 6 deletions app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@
* See COPYING.txt for license details.
*/
-->
<each args="{ data: actionsList, as: 'action' }">
<button type="button" click="$parent[action.handler].bind($parent)"
attr="{class: action.classes, id: 'image-details-action-' + action.name, title: $t(action.title)}">
<span translate="action.title"></span>
</button>
</each>
<div class="page-actions">
<div class="page-actions-inner">
<div class="page-action-buttons">
<each args="{ data: actionsList, as: 'action' }">
<button type="button" click="$parent[action.handler].bind($parent)"
attr="{class: action.classes, id: 'image-details-action-' + action.name, title: $t(action.title)}">
<span translate="action.title"></span>
</button>
</each>
</div>
</div>
</div>