Skip to content

Removed code redundancy for module frontend layouts. #30644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 19, 2025
Merged

Removed code redundancy for module frontend layouts. #30644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e200706
Removed code redundancy to theme layouts for Magento_Msrp, Magento_Lo…
pratiksangani Oct 24, 2020
ce36413
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Foxtrot Apr 1, 2021
ad68e64
Merge remote-tracking branch 'magneto/2.4-develop' into hacktoberfest…
Nov 4, 2022
b2518be
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Echo Mar 20, 2024
9bad282
Svc failure fix
engcom-Echo Mar 22, 2024
42d33a4
Fix SVC failure
engcom-Echo Mar 22, 2024
bc93cda
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Echo Mar 26, 2024
ad25d5b
svc fix
engcom-November Jun 18, 2024
94d5b7e
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-November Jun 18, 2024
e6f4149
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-November Jun 20, 2024
5511677
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-November Jun 21, 2024
ccff588
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Charlie Jun 28, 2024
fbef74b
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Dash May 8, 2025
3220c78
Merge branch '2.4-develop' into hacktoberfest_PR_4
engcom-Dash May 9, 2025
6c86e3b
Fixed Copyright static failures
engcom-Dash May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2020 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="customer_form_register">
<container name="fieldset.create.info.additional" as="fieldset_create_info_additional"/>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Msrp/view/base/layout/cms_index_index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="msrp_popup"/>
<body/>
</page>
</page>
6 changes: 3 additions & 3 deletions app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="msrp_popup"/>
<body/>
</page>
6 changes: 3 additions & 3 deletions app/code/Magento/Newsletter/view/frontend/layout/customer_account_create.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="customer_form_register">
<block name="customer.form.register.newsletter" template="Magento_Newsletter::form/register/newsletter.phtml"/>
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sitemap/view/frontend/layout/robots_index_index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2017 Adobe
* All Rights Reserved.
*/
-->
<page layout="robots" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="root">
<block class="Magento\Sitemap\Block\Robots" name="sitemapRobotsLinks"/>
Expand Down