Skip to content

Commit 5c5a934

Browse files
committed
MC-3880: Minimum Height & Vertical Alignment Is In Inconsistent Sections On Edit Panel for Each Content Type
- update map form fields - update translations - clean up code
1 parent 78d7469 commit 5c5a934

File tree

3 files changed

+43
-51
lines changed

3 files changed

+43
-51
lines changed

app/code/Magento/PageBuilder/i18n/en_US.csv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ City,City
162162
"Zip/Postal Code","Zip/Postal Code"
163163
Country,Country
164164
Comment,Comment
165-
"Map Settings","Map Settings"
166-
"Map Height","Map Height"
165+
"Height","Height"
167166
"Show Controls","Show Controls"
168167
Edit,Edit
169168
Label,Label

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

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,45 @@
3636
</item>
3737
</argument>
3838
</container>
39+
<fieldset name="appearance_fieldset" sortOrder="20" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
40+
<settings>
41+
<label translate="true">Appearance</label>
42+
<additionalClasses>
43+
<class name="admin__fieldset-visual-select-large">true</class>
44+
</additionalClasses>
45+
<collapsible>false</collapsible>
46+
<opened>true</opened>
47+
<imports>
48+
<link name="hideFieldset">${$.name}.appearance:options</link>
49+
<link name="hideLabel">${$.name}.appearance:options</link>
50+
</imports>
51+
</settings>
52+
<field name="appearance" formElement="select" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-visual-select">
53+
<argument name="data" xsi:type="array">
54+
<item name="config" xsi:type="array">
55+
<item name="default" xsi:type="string">default</item>
56+
</item>
57+
</argument>
58+
<settings>
59+
<additionalClasses>
60+
<class name="admin__field-wide">true</class>
61+
<class name="admin__field-visual-select-container">true</class>
62+
</additionalClasses>
63+
<dataType>text</dataType>
64+
<validation>
65+
<rule name="required-entry" xsi:type="boolean">true</rule>
66+
</validation>
67+
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
68+
</settings>
69+
<formElements>
70+
<select>
71+
<settings>
72+
<options class="AppearanceSourceMap" />
73+
</settings>
74+
</select>
75+
</formElements>
76+
</field>
77+
</fieldset>
3978
<fieldset name="general" sortOrder="20">
4079
<settings>
4180
<label/>
@@ -207,46 +246,7 @@
207246
</button>
208247
</container>
209248
</dynamicRows>
210-
</fieldset>
211-
<fieldset name="appearance_fieldset" sortOrder="30" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
212-
<settings>
213-
<label translate="true">Appearance</label>
214-
<additionalClasses>
215-
<class name="admin__fieldset-visual-select-large">true</class>
216-
</additionalClasses>
217-
<collapsible>false</collapsible>
218-
<opened>true</opened>
219-
<imports>
220-
<link name="hideFieldset">${$.name}.appearance:options</link>
221-
<link name="hideLabel">${$.name}.appearance:options</link>
222-
</imports>
223-
</settings>
224-
<field name="appearance" formElement="select" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-visual-select">
225-
<argument name="data" xsi:type="array">
226-
<item name="config" xsi:type="array">
227-
<item name="default" xsi:type="string">default</item>
228-
</item>
229-
</argument>
230-
<settings>
231-
<additionalClasses>
232-
<class name="admin__field-wide">true</class>
233-
<class name="admin__field-visual-select-container">true</class>
234-
</additionalClasses>
235-
<dataType>text</dataType>
236-
<validation>
237-
<rule name="required-entry" xsi:type="boolean">true</rule>
238-
</validation>
239-
<elementTmpl>Magento_PageBuilder/form/element/visual-select</elementTmpl>
240-
</settings>
241-
<formElements>
242-
<select>
243-
<settings>
244-
<options class="AppearanceSourceMap" />
245-
</settings>
246-
</select>
247-
</formElements>
248-
</field>
249-
<field name="height" sortOrder="20" formElement="input">
249+
<field name="height" sortOrder="30" formElement="input">
250250
<argument name="data" xsi:type="array">
251251
<item name="config" xsi:type="array">
252252
<item name="source" xsi:type="string">block</item>
@@ -266,14 +266,7 @@
266266
</validation>
267267
</settings>
268268
</field>
269-
</fieldset>
270-
<fieldset name="map_settings" sortOrder="40">
271-
<settings>
272-
<label translate="true">Map Settings</label>
273-
<collapsible>true</collapsible>
274-
<opened>true</opened>
275-
</settings>
276-
<field name="show_controls" sortOrder="20" formElement="checkbox">
269+
<field name="show_controls" sortOrder="40" formElement="checkbox">
277270
<argument name="data" xsi:type="array">
278271
<item name="config" xsi:type="array">
279272
<item name="default" xsi:type="string">true</item>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</fieldset>
7373
<fieldset name="general" sortOrder="20">
7474
<settings>
75-
<label />
75+
<label/>
7676
</settings>
7777
<field name="tab_name" sortOrder="10" formElement="input">
7878
<settings>

0 commit comments

Comments
 (0)