Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit d042792

Browse files
doboothdobooth
authored
Merge branch 'master' into static-files-fall-back-docs-clarification-2609
2 parents 1a9aa48 + 2a2bafc commit d042792

File tree

8 files changed

+70
-5
lines changed

8 files changed

+70
-5
lines changed

‎src/common/images/widget/dropdown-widget-result.jpg‎

-35.1 KB
Binary file not shown.

‎src/common/images/widget/dropdown-widget-result.png‎

28.6 KB
Loading

‎src/guides/v2.3/frontend-dev-guide/layouts/layout-extend.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ To add an extending [page configuration]({{ page.baseurl }}/frontend-dev-guide/l
2020
|--<layout2>.xml
2121
```
2222
23-
For example, to customize the layout defined in `<Magento_Catalog_module_dir>/view/frontend/layout/catalog_product_view.xml`, you need to add a layout file with the same name in your custom theme, such as: `<theme_dir>/Magento_Catalog/layout/catalog_product_view.xml`
23+
For example, to customize the layout defined in `<Magento_Catalog_module_dir>/view/frontend/layout/catalog_product_view.xml`, you need to add a layout file with the same name in your custom theme, such as: `<theme_dir>/Magento_Catalog/layout/catalog_product_view.xml`. Then do your customizations on the layout xml.
24+
25+
**Example:**
26+
27+
```xml
28+
<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
29+
<body>
30+
<move element="product.info.stock.sku" destination="product.info.price" after="product.price.final"/>
31+
</body>
32+
</page>
33+
```
2434

2535
To add an extending [page layout]({{ page.baseurl }}/frontend-dev-guide/layouts/layout-types.html#layout-types-page) file:
2636

@@ -33,6 +43,19 @@ To add an extending [page layout]({{ page.baseurl }}/frontend-dev-guide/layouts/
3343
|--<layout2>.xml
3444
```
3545
46+
For example, to customize the page layout defined in `<Magento_Theme_module_dir>/view/frontend/page_layout/1column.xml`, you need to add a page layout file with the same name in your custom theme, such as: `<theme_dir>/Magento_Theme/page_layout/1column.xml`. Then do your customizations on the page layout xml.
47+
48+
**Example:**
49+
50+
```xml
51+
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
52+
<update handle="empty"/>
53+
<referenceContainer name="page.wrapper">
54+
<container name="page.top.after" label="After Page Top" after="page.top"/>
55+
</referenceContainer>
56+
</layout>
57+
```
58+
3659
## Processing extending layouts
3760

3861
Magento merges layout files as follows:

‎src/guides/v2.3/frontend-dev-guide/layouts/product-layouts.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ Layout file | Description
5252
`checkout_cart_configure_type_configurable.xml` | Layout from this file is applied to `configurable` product only
5353
`checkout_cart_configure_type_downloadable.xml` | Layout from this file is applied to `downloadable` product only
5454
`checkout_cart_configure_type_simple.xml` | Layout from this file is applied to `simple` product only
55+
`checkout_cart_configure_id_{id}.xml` | Layout from this file is applied to the specific product by `Entity ID` value. E.g. `checkout_cart_configure_id_45.xml`
56+
`checkout_cart_configure_sku_{sku}.xml` | Layout from this file is applied to the specific product by `SKU` value. E.g. `checkout_cart_configure_sku_24-WG080.xml`
5557
`checkout_cart_item_renderers.xml` | Layout from this file is applied to renderer's cart page items
5658

5759
## Wishlist item configure page
@@ -64,5 +66,7 @@ Layout file | Description
6466
`wishlist_index_configure_type_downloadable.xml` | Layout from this file is applied to `downloadable` product only
6567
`wishlist_index_configure_type_grouped.xml` | Layout from this file is applied to `grouped` product only
6668
`wishlist_index_configure_type_simple.xml` | Layout from this file is applied to `simple` product only
69+
`wishlist_index_configure_id_{id}.xml` | Layout from this file is applied to the specific product by `Entity ID` value. E.g. `wishlist_index_configure_id_45.xml`
70+
`wishlist_index_configure_sku_{sku}.xml` | Layout from this file is applied to the specific product by `SKU` value. E.g. `wishlist_index_configure_sku_24-WG080.xml`
6771

6872
For setting a custom layout on specific category, product, and CMS pages, see [Common layout customization tasks]({{ page.baseurl }}/frontend-dev-guide/layouts/xml-manage.html#create-cms-pageproductcategory-specific-selectable-layouts).

‎src/guides/v2.3/javascript-dev-guide/widgets/widget_dropdown.md‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Because the dropdown widget is not formatted by default, use [LESS mixin `.lib-d
9797
}
9898
```
9999

100+
If there is a need to customize the button and arrow, the [Magento UI Library](https://magento-devdocs.github.io/magento2-ui-library/dropdowns.html) provides the ability to do this with ready-made Less mixins.
101+
100102
[LESS mixin `.lib-dropdown()`]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/web/css/source/lib/_dropdowns.less
101103

102104
## Initialize the dropdown widget {#dropdown_init}
@@ -175,8 +177,35 @@ Given class is added to the widget element when the menu is visible.
175177

176178
**Default value**: `active`
177179

180+
## Code sample
181+
182+
The following example shows how to initialize the dropdown widget.
183+
184+
```html
185+
<div class="customer-welcome">
186+
<button
187+
data-mage-init='{"dropdown":{}}'
188+
data-toggle="dropdown"
189+
class="action"
190+
data-action="customer-menu-toggle">
191+
<span><?= $block->escapeHtml(__('Dropdown open button')) ?></span>
192+
</button>
193+
<ul data-target="dropdown" class="dropdown-options">
194+
<li>
195+
<span class="item"><?= $block->escapeHtml(__('Item 1')) ?></span>
196+
</li>
197+
<li>
198+
<span class="item"><a href="#"><?= $block->escapeHtml(__('Item 2 with link')) ?></a></span>
199+
</li>
200+
<li>
201+
<span class="item"><?= $block->escapeHtml(__('Item 3')) ?></span>
202+
</li>
203+
</ul>
204+
</div>
205+
```
206+
178207
## Result
179208

180209
The result is a custom select dropdown with custom content as options.
181210

182-
![Dropdown Widget]({{ site.baseurl }}/common/images/widget/dropdown-widget-result.jpg)
211+
![Dropdown Widget]({{ site.baseurl }}/common/images/widget/dropdown-widget-result.png)

‎src/guides/v2.3/ui_comp_guide/components/ui-htmlcontent.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ Template `Vendor/Module/view/adminhtml/templates/template.phtml`:
7272

7373
```php
7474
<?php
75-
/** @var Magento\Backend\Block\Template $block */
75+
/** @var \Magento\Framework\Escaper $escaper */
7676
?>
7777

7878
<div>
79-
<b><?= $block->escapeHtml(__('Custom template.')); ?></b>
79+
<b><?= $escaper->escapeHtml(__('Custom template.')); ?></b>
8080
</div>
8181
```
8282

‎src/quality-patches/release-notes.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,21 @@ The [Magento Quality Patches](https://github.com/magento/quality-patches) packag
1919
See [Apply patches]({{ site.baseurl }}/guides/v2.4/comp-mgr/patching/mqp.html) for instructions on applying patches to your Magento projects.
2020
See [Patches available in MQP tool](https://support.magento.com/hc/en-us/sections/360010506631-Patches-available-in-MQP-tool-) for additional patch details.
2121

22+
## v1.0.16
23+
24+
- **MDVA-33453** _(for Magento `>=2.3.6 <2.4.3`)_—Fixes the issue where Page Builder Products content type preview breaks if matching products have different prices for each website.
25+
- **MDVA-32634** _(for Magento `^2.3.1`)_—Fixes the issue when url_path of the category assigned to all store remains unchanged after moving the category in the hierarchy.
26+
- **MDVA-33344** _(for Magento `^2.3.0`)_—Fixes the issue where hard coded rma_item entity default attribute set ID is used instead of the value from the database.
27+
- **MDVA-34192** _(for Magento `>=2.3.4 <2.4.3`)_—Fixes the issue where it is impossible to modify/specify customer date of birth using dd/mm/yyyy format.
28+
- **MDVA-34847** _(for Magento `^2.3.0`)_—Fixes store IDs type conversion to integer for SQL condition in Admin collections for Admin User with custom permissions.
29+
- **MDVA-34886** _(for Magento `^2.3.2`)_—Fixes the issue where search does not return results if 'weight' product attribute is configured as searchable.
30+
2231
## v1.0.15
2332

2433
- **MDVA-33559** _(for Magento `>=2.3.0 <2.4.3`)_—Fixes the issue of PayPal Payflow Pro payment failing with redirect parameter list format error.
2534
- **MDVA-34023** _(for Magento `>=2.3.0 <2.4.3`)_—Fixes the issue where the error "No such entity with addressId" displays randomly on visitors' browsers.
2635
- **MDVA-32759** _(for Magento `>=2.3.1 <2.4.3` with B2B extension)_—Fixes the issue where Shared Catalogs are deleting existing tier pricing.
27-
- **MDVA-33482** _(for Magento `>=2.3.5 <2.3.7 || >=2.4.0 <2.4.3`)_—Fixes the issue where generating a Credit Memo against a partial invoice results in tax for the total order instead of tax for that partial invoice.
36+
- **MDVA-33482** _(for Magento `^2.3.5`)_—Fixes the issue where generating a Credit Memo against a partial invoice results in tax for the total order instead of tax for that partial invoice.
2837
- **MDVA-33393** _(for Magento `>=2.3.0 <2.4.2`)_—Fixes the error "Provided countryId does not exist".
2938
- **MDVA-33632** _(for Magento `>=2.3.0 <2.3.7`)_—Provides a fix where the exception message "This product is out of stock" is now displayed to admin user when trying to re-order an out of stock product.
3039
- **MDVA-34469** _(for Magento `>=2.4.1 <2.4.2`)_—Fixes the issue where GraphQL mutations on a customer's cart fail when using multiple store views.

‎src/upgrade-compatibility-tool/img/audience-uct-v3.png‎

-3.18 KB
Loading

0 commit comments

Comments
 (0)