Skip to content

Commit c944739

Browse files
authored
Merge pull request #52 from magento-obsessive-owls/MAGETWO-89880-slide-title
[CMS Team 1] Slide Title
2 parents b46ac70 + ff490de commit c944739

File tree

22 files changed

+107
-83
lines changed

22 files changed

+107
-83
lines changed

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,14 @@
7575
</select>
7676
</formElements>
7777
</field>
78-
<field name="title" sortOrder="20" formElement="input">
78+
<field name="slide_name" sortOrder="20" formElement="input">
7979
<settings>
80-
<label translate="true">Slide Title</label>
80+
<label translate="true">Slide Name</label>
8181
<validation>
8282
<rule name="validate-string" xsi:type="boolean">true</rule>
8383
</validation>
84+
<dataType>text</dataType>
85+
<dataScope>slide_name</dataScope>
8486
</settings>
8587
</field>
8688
<field name="min_height" sortOrder="30" formElement="input">

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

Lines changed: 20 additions & 5 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/slide/preview.js

Lines changed: 2 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/master-format/read/slide.js

Lines changed: 2 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/template/content-type/slide/collage-centered/preview.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
paddingLeft: 'calc(25% + ' + previewData.margins_and_padding().padding.left + 'px)',
1111
paddingRight: 'calc(25% + ' + previewData.margins_and_padding().padding.right + 'px)'}), event: { mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1212
<div class="pagebuilder-collage-overlay" data-bind="style: getOverlayColorStyle()">
13-
<!-- ko if: previewData.title() -->
14-
<h3 data-bind="text: previewData.title()"></h3>
15-
<!-- /ko -->
1613
<div data-bind="css: {'pagebuilder-empty-slide': isContentEmpty()}, html: getContentHtml()"></div>
1714
<!-- ko if: previewData.show_button() !== "never_show" -->
1815
<a type="button" class="pagebuilder-slide-button" data-bind="css: previewData.button_type(), attr: {'data-link-url': getHref()}, style: getButtonStyles()">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview pagebuilder-slide" data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }">
99
<div data-bind="style: Object.assign(previewStyle(), {paddingRight: 'calc(50% + ' + previewData.margins_and_padding().padding.right + 'px)'}), event: { mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1010
<div class="pagebuilder-collage-overlay" data-bind="style: getOverlayColorStyle()">
11-
<!-- ko if: previewData.title() -->
12-
<h3 data-bind="text: previewData.title()"></h3>
13-
<!-- /ko -->
1411
<div data-bind="css: {'pagebuilder-empty-slide': isContentEmpty()}, html: getContentHtml()"></div>
1512
<!-- ko if: previewData.show_button() !== "never_show" -->
1613
<a type="button" class="pagebuilder-slide-button" data-bind="css: previewData.button_type(), attr: {'data-link-url': getHref()}, style: getButtonStyles()">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview pagebuilder-slide" data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }">
99
<div data-bind="style: Object.assign(previewStyle(), {paddingLeft: 'calc(50% + ' + previewData.margins_and_padding().padding.left + 'px)'}), event: { mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1010
<div class="pagebuilder-collage-overlay" data-bind="style: getOverlayColorStyle()">
11-
<!-- ko if: previewData.title() -->
12-
<h3 data-bind="text: previewData.title()"></h3>
13-
<!-- /ko -->
1411
<div data-bind="css: {'pagebuilder-empty-slide': isContentEmpty()}, html: getContentHtml()"></div>
1512
<!-- ko if: previewData.show_button() !== "never_show" -->
1613
<a type="button" class="pagebuilder-slide-button" data-bind="css: previewData.button_type(), attr: {'data-link-url': getHref()}, style: getButtonStyles()">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-only" data-bind="style: getSlideStyles('mobileImage')">
1111
<div class="pagebuilder-overlay pagebuilder-poster-overlay" data-bind="attr: getOverlayAttributes(), style: getOverlayStyles()">
1212
<div class="pagebuilder-poster-content">
13-
<!-- ko if: getData().title -->
14-
<h3 data-bind="text: getData().title"></h3>
15-
<!-- /ko -->
1613
<div data-bind="html: getContentHtml()"></div>
1714
<!-- ko if: getData().show_button !== "never_show" -->
1815
<button type="button" class="pagebuilder-slide-button" data-bind="text: getData().button_text, style: getButtonStyle(), css: getData().button_type"></button>
@@ -23,9 +20,6 @@ <h3 data-bind="text: getData().title"></h3>
2320
<div class="pagebuilder-slide-wrapper" data-bind="style: getSlideStyles('image'), css: {'pagebuilder-mobile-hidden': getData().mobile_image}">
2421
<div class="pagebuilder-overlay pagebuilder-poster-overlay" data-bind="attr: getOverlayAttributes(), style: getOverlayStyles()">
2522
<div class="pagebuilder-poster-content">
26-
<!-- ko if: getData().title -->
27-
<h3 data-bind="text: getData().title"></h3>
28-
<!-- /ko -->
2923
<div data-bind="html: getContentHtml()"></div>
3024
<!-- ko if: getData().show_button !== "never_show" -->
3125
<button type="button" class="pagebuilder-slide-button" data-bind="text: getData().button_text, style: getButtonStyle(), css: getData().button_type"></button>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview pagebuilder-slide" data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }">
8+
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview pagebuilder-slide" data-bind="event: { mouseover: onMouseOver, mouseout: onMouseOut }, attr: {'data-slide-name': previewData.slide_name()}">
99
<div class="pagebuilder-slide-wrapper" data-bind="style: Object.assign(previewStyle(), getBackgroundStyles()), event: { mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1010
<div class="pagebuilder-poster-overlay" data-bind="style: getOverlayStyles()">
1111
<div class="pagebuilder-poster-content">
12-
<!-- ko if: previewData.title() -->
13-
<h3 data-bind="text: previewData.title()"></h3>
14-
<!-- /ko -->
1512
<div data-bind="html: getContentHtml(), css: {'pagebuilder-empty-slide': isContentEmpty()}"></div>
1613
<!-- ko if: previewData.show_button() !== "never_show" -->
1714
<a type="button" class="pagebuilder-slide-button" data-bind="css: previewData.button_type(), attr: {'data-link-url': getHref()}, style: getButtonStyles()">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<!-- ko template: getOptions().template --><!-- /ko -->
2020
<!-- /ko -->
2121
<a class="navigation-dot-anchor" href="#" data-bind="click: function () { $parent.navigateToSlide($index()); $parent.setFocusedSlide($index()); }"></a>
22-
<!-- ko if: preview.previewData.title() !== "" -->
23-
<span class="tooltip-content" role="tooltip" data-bind="text: preview.previewData.title()"></span>
22+
<!-- ko if: preview.previewData.slide_name() !== "" -->
23+
<span class="tooltip-content" role="tooltip" data-bind="text: preview.previewData.slide_name()"></span>
2424
<!-- /ko -->
2525
</div>
2626
</div>

0 commit comments

Comments
 (0)