Skip to content

Commit b0b5ed5

Browse files
author
Lukasz Borowiec
committed
#514: User sees content snapshot on Category page in Admin Panel #3 - Merged develop, added support for images preview
1 parent f4beaf8 commit b0b5ed5

File tree

16 files changed

+256
-150
lines changed

16 files changed

+256
-150
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,35 @@
4848
display: none !important;
4949
}
5050
}
51+
52+
//
53+
// Category Description
54+
// ---------------------------------------------
55+
56+
.catalog-category-edit {
57+
.admin__fieldset {
58+
> .admin__field {
59+
&[data-index="description"] {
60+
> .admin__field-label {
61+
text-align: left;
62+
63+
label {
64+
span {
65+
&:before {
66+
left: 0;
67+
}
68+
}
69+
}
70+
}
71+
72+
> .admin__field-control {
73+
float: right;
74+
75+
button.action-default {
76+
float: right;
77+
}
78+
}
79+
}
80+
}
81+
}
82+
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/config.js

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ define([
7979
initPageBuilder: function () {
8080
if (!this.isComponentInitialized()) {
8181
this.loading(true);
82-
this.pageBuilder = new PageBuilder(this.wysiwygConfigData(), this.initialValue);
82+
this.pageBuilder = new PageBuilder(
83+
this.wysiwygConfigData(),
84+
this.initialValue,
85+
Boolean(this.wysiwygConfigData()['pagebuilder_content_snapshot'])
86+
);
8387
events.trigger('pagebuilder:register', {
8488
ns: this.ns,
8589
instance: this.pageBuilder
@@ -97,8 +101,8 @@ define([
97101
this.visiblePageBuilder(true);
98102
}
99103

100-
if (this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
101-
this.pageBuilder.setContentSnapshotMode(true);
104+
if (!this.wysiwygConfigData()['pagebuilder_button'] ||
105+
this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
102106
this.visiblePageBuilder(true);
103107
}
104108
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.js

Lines changed: 14 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js

Lines changed: 21 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
<iframe frameborder="0" allowfullscreen attr="data.video.attributes" if="isHosted(data.video.attributes().src)"/>
1414
<video frameborder="0" controls attr="data.video.attributes()" ifnot="isHosted(data.video.attributes().src)" afterRender="onAfterRender"/>
1515
<i class="icon-pagebuilder-video pagebuilder-video-placeholder" ifnot="data.video.attributes().src"/>
16+
17+
<ifnot args="$parent.accessibility() && data.video.attributes().src">
18+
<div class="image-uploader-preview-information">
19+
<h4 class="title" translate="'Preview Mode'"></h4>
20+
<p class="description" translate="'If you want to upload an image, run the full-screen mode'"></p>
21+
</div>
22+
</ifnot>
1623
</div>
1724
</div>
1825
</div>

0 commit comments

Comments
 (0)