Skip to content

Commit 1c3a793

Browse files
author
Olexii Korshenko
committed
Merge remote-tracking branch 'tango/bug-fixing-round-4' into combined
2 parents 5e8d0fc + 3bf9677 commit 1c3a793

File tree

6 files changed

+34
-30
lines changed

6 files changed

+34
-30
lines changed

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
-->
77
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
88
<body>
9+
<remove name="legal"/>
910
<referenceContainer name="main.content">
1011
<block class="Magento\Backend\Block\Template" name="content" template="admin/login.phtml">
1112
<block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
55
*/
66
-->
7-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
7+
<page layout="admin-empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
88
<body>
9-
<remove name="left"/>
10-
<referenceBlock name="attribute_edit_content">
11-
<arguments>
12-
<argument name="template" xsi:type="string">Magento_Catalog::catalog/product/attribute/form.phtml</argument>
13-
</arguments>
14-
<container name="form" label="Form">
15-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main" as="main"/>
16-
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options" as="advanced-options"/>
17-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced" as="options"/>
18-
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels" as="labels"/>
19-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front" as="front-options"/>
20-
</container>
21-
</referenceBlock>
9+
<remove name="legal"/>
10+
<referenceContainer name="content">
11+
<block template="Magento_Catalog::catalog/product/attribute/form.phtml" class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit" name="attribute_edit_content">
12+
<container name="form" label="Form">
13+
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main" as="main"/>
14+
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options" as="advanced-options"/>
15+
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced" as="options"/>
16+
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels" as="labels"/>
17+
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front" as="front-options"/>
18+
</container>
19+
</block>
20+
<block class="Magento\Backend\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
21+
</referenceContainer>
2222
</body>
2323
</page>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@
44
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
55
*/
66
-->
7-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
8-
<body>
9-
<remove name="left"/>
10-
<referenceBlock name="attribute_edit_content">
11-
<arguments>
12-
<argument name="template" xsi:type="string">Magento_Catalog::catalog/product/attribute/form.phtml</argument>
13-
</arguments>
14-
<container name="form" label="Form">
15-
<block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\Edit\Tab\Variations\Main" as="main"/>
16-
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options" as="advanced-options"/>
17-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced" as="options"/>
18-
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels" as="labels"/>
19-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front" as="front-options"/>
20-
</container>
21-
</referenceBlock>
22-
</body>
7+
<page layout="admin-empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
8+
<update handle="catalog_product_attribute_edit_popup"/>
239
</page>

app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml renamed to app/code/Magento/GoogleOptimizer/view/adminhtml/layout/cms_page_edit.xml

File renamed without changes.

‎app/code/Magento/Theme/view/adminhtml/layouts.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
-->
77
<page_layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/View/PageLayout/etc/layouts.xsd">
8+
<layout id="admin-empty">
9+
<label translate="true">Admin empty</label>
10+
</layout>
811
<layout id="admin-1column">
912
<label translate="true">Admin 1column</label>
1013
</layout>

‎app/code/Magento/Theme/view/adminhtml/page_layout/admin-empty.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 Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
*/
6+
-->
7+
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd">
8+
<container name="root">
9+
<container name="page.formkey" as="page.formkey"/>
10+
<container name="page.js.translate" as="page.js.translate"/>
11+
<container name="content" as="content"/>
12+
<container name="js" as="js" label="JavaScript"/>
13+
</container>
14+
</layout>

0 commit comments

Comments
 (0)