Skip to content

Commit e2695be

Browse files
glo24157glo24157
committed
Merge remote-tracking branch 'aj-prajapati/develop' into bt_community_ml_10may
2 parents 36c0f5d + b1d2e7b commit e2695be

File tree

9 files changed

+212
-1
lines changed

9 files changed

+212
-1
lines changed

‎app/code/Magento/PageBuilderImageAttribute/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Magento_PageBuilderImageAttribute module
2+

‎app/code/Magento/PageBuilderImageAttribute/Test/Mftf/Data/ImageData.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Image Width -->
12+
<entity name="PageBuilderImageWidthProperty" type="pagebuilder_width_property">
13+
<data key="name">Width</data>
14+
<data key="section">general</data>
15+
<data key="fieldName">image_attribute_width</data>
16+
<data key="value">123</data>
17+
</entity>
18+
<!-- Image Height -->
19+
<entity name="PageBuilderImageHeightProperty" type="pagebuilder_Height_property">
20+
<data key="name">Height</data>
21+
<data key="section">general</data>
22+
<data key="fieldName">image_attribute_height</data>
23+
<data key="value">123</data>
24+
</entity>
25+
<!-- Mobile Image Width -->
26+
<entity name="PageBuilderMobileImageWidthProperty" type="pagebuilder_mobile_width_property">
27+
<data key="name">Width</data>
28+
<data key="section">general</data>
29+
<data key="fieldName">mobile_image_attribute_width</data>
30+
<data key="value">123</data>
31+
</entity>
32+
<!-- Mobile Image Height -->
33+
<entity name="PageBuilderMobileImageHeightProperty" type="pagebuilder_mobile_Height_property">
34+
<data key="name">Height</data>
35+
<data key="section">general</data>
36+
<data key="fieldName">mobile_image_attribute_height</data>
37+
<data key="value">123</data>
38+
</entity>
39+
</entities>

‎app/code/Magento/PageBuilderImageAttribute/composer.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "magento/module-page-builder-image-attribute",
3+
"description": "Width & Height attribute - Pagebuilder image",
4+
"require": {
5+
"magento/framework": "*",
6+
"php": "~8.1.0||~8.2.0||~8.3.0"
7+
},
8+
"type": "magento2-module",
9+
"license": [
10+
"proprietary"
11+
],
12+
"autoload": {
13+
"files": [
14+
"registration.php"
15+
],
16+
"psr-4": {
17+
"Magento\\PageBuilderImageAttribute\\": ""
18+
}
19+
}
20+
}

‎app/code/Magento/PageBuilderImageAttribute/etc/module.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* Changes by: Ajay Prajapati
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9+
<module name="Magento_PageBuilderImageAttribute" setup_version="1.0.0">
10+
<sequence>
11+
<module name="Magento_PageBuilder" />
12+
</sequence>
13+
</module>
14+
</config>

‎app/code/Magento/PageBuilderImageAttribute/registration.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* Changes by: Ajay Prajapati
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
use Magento\Framework\Component\ComponentRegistrar;
10+
11+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PageBuilderImageAttribute', __DIR__);

‎app/code/Magento/PageBuilderImageAttribute/view/adminhtml/pagebuilder/content_type/image.xml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
9+
<type name="image"
10+
label="Image"
11+
component="Magento_PageBuilder/js/content-type"
12+
preview_component="Magento_PageBuilder/js/content-type/image/preview"
13+
form="pagebuilder_image_form"
14+
menu_section="media"
15+
icon="icon-pagebuilder-image"
16+
sortOrder="1"
17+
translate="label">
18+
<children default_policy="deny"/>
19+
<appearances>
20+
<appearance default="true"
21+
name="full-width"
22+
preview_template="Magento_PageBuilder/content-type/image/full-width/preview"
23+
master_template="Magento_PageBuilder/content-type/image/full-width/master"
24+
reader="Magento_PageBuilder/js/master-format/read/configurable">
25+
<elements>
26+
<element name="desktop_image">
27+
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
28+
<style name="border_color" source="border_color"/>
29+
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
30+
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
31+
<static_style source="max-width" value="100%"/>
32+
<static_style source="height" value="auto"/>
33+
<attribute name="image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
34+
<attribute name="alt" source="alt"/>
35+
<attribute name="title_attribute" source="title"/>
36+
<attribute name="image_attribute_width" source="width"/>
37+
<attribute name="image_attribute_height" source="height"/>
38+
</element>
39+
<element name="mobile_image">
40+
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
41+
<style name="border_color" source="border_color"/>
42+
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
43+
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
44+
<static_style source="max-width" value="100%"/>
45+
<static_style source="height" value="auto"/>
46+
<attribute name="mobile_image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
47+
<attribute name="alt" source="alt"/>
48+
<attribute name="title_attribute" source="title"/>
49+
<attribute name="mobile_image_attribute_width" source="width"/>
50+
<attribute name="mobile_image_attribute_height" source="height"/>
51+
</element>
52+
</elements>
53+
</appearance>
54+
</appearances>
55+
</type>
56+
</config>

‎app/code/Magento/PageBuilderImageAttribute/view/adminhtml/ui_component/pagebuilder_image_form.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" extends="pagebuilder_base_form">
9+
<fieldset name="general" sortOrder="20">
10+
<field name="image_attribute_width" formElement="input" sortOrder="10">
11+
<settings>
12+
<validation>
13+
<rule name="validate-digits" xsi:type="boolean">true</rule>
14+
</validation>
15+
<dataType>number</dataType>
16+
<label translate="true">Image Attribute Width</label>
17+
<addAfter translate="true">px</addAfter>
18+
<additionalClasses>
19+
<class name="admin__field-small">true</class>
20+
</additionalClasses>
21+
<dataScope>image_attribute_width</dataScope>
22+
</settings>
23+
</field>
24+
<field name="image_attribute_height" formElement="input" sortOrder="11">
25+
<settings>
26+
<validation>
27+
<rule name="validate-digits" xsi:type="boolean">true</rule>
28+
</validation>
29+
<dataType>number</dataType>
30+
<label translate="true">Image Attribute Height</label>
31+
<addAfter translate="true">px</addAfter>
32+
<additionalClasses>
33+
<class name="admin__field-small">true</class>
34+
</additionalClasses>
35+
<dataScope>image_attribute_height</dataScope>
36+
</settings>
37+
</field>
38+
<field name="mobile_image_attribute_width" formElement="input" sortOrder="12">
39+
<settings>
40+
<validation>
41+
<rule name="validate-digits" xsi:type="boolean">true</rule>
42+
</validation>
43+
<dataType>number</dataType>
44+
<label translate="true">Mobile Image Attribute Width</label>
45+
<addAfter translate="true">px</addAfter>
46+
<additionalClasses>
47+
<class name="admin__field-small">true</class>
48+
</additionalClasses>
49+
<dataScope>mobile_image_attribute_width</dataScope>
50+
</settings>
51+
</field>
52+
<field name="mobile_image_attribute_height" formElement="input" sortOrder="13">
53+
<settings>
54+
<validation>
55+
<rule name="validate-digits" xsi:type="boolean">true</rule>
56+
</validation>
57+
<dataType>number</dataType>
58+
<label translate="true">Mobile Image Attribute Height</label>
59+
<addAfter translate="true">px</addAfter>
60+
<additionalClasses>
61+
<class name="admin__field-small">true</class>
62+
</additionalClasses>
63+
<dataScope>mobile_image_attribute_height</dataScope>
64+
</settings>
65+
</field>
66+
</fieldset>
67+
</form>

‎app/code/Magento/_metapackage/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"magento/module-cms-page-builder-analytics": "*",
88
"magento/module-page-builder-admin-analytics": "*",
99
"magento/module-catalog-page-builder-analytics": "*",
10-
"magento/module-aws-s3-page-builder": "*"
10+
"magento/module-aws-s3-page-builder": "*",
11+
"magento/module-page-builder-image-attribute": "*"
1112
},
1213
"type": "metapackage"
1314
}

‎dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/composer_root_modules_pagebuilder.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ magento/module-page-builder-admin-analytics
44
magento/module-catalog-page-builder-analytics
55
magento/module-cms-page-builder-analytics
66
magento/module-aws-s3-page-builder
7+
magento/module-page-builder-image-attribute

0 commit comments

Comments
 (0)