Skip to content

Commit 9d07c3c

Browse files
jissereitsmajissereitsma
committed
Move layout that is duplicate to Mage-OS Alpine to separate handles
1 parent f2f40f5 commit 9d07c3c

4 files changed

Lines changed: 47 additions & 32 deletions

File tree

‎view/base/layout/loki_alpinejs.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0"?>
2+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
4+
<body>
5+
<referenceBlock name="loki.script">
6+
<block name="loki.alpinejs" template="Loki_Base::script/alpine-csp.phtml"/>
7+
</referenceBlock>
8+
</body>
9+
</page>

‎view/base/layout/loki_base.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
44
<body>
5-
<!--
6-
<referenceContainer name="page.messages">
7-
<block
8-
name="loki.messages"
9-
template="Loki_Base::component/messages.phtml"
10-
before="-">
11-
</block>
12-
</referenceContainer>
13-
-->
14-
155
<referenceContainer name="before.body.end">
166
<container name="loki.dynamic-script">
177
<block name="loki.dynamic-script.variables" template="Loki_Base::script/variables.phtml">
@@ -27,10 +17,6 @@
2717
class="Loki\Base\Block\LokiScript"
2818
template="Loki_Base::script/script-container.phtml">
2919

30-
<!--
31-
<block name="loki.alpinejs" template="Loki_Base::script/alpine-csp.phtml"/>
32-
-->
33-
3420
<block name="loki.script.cookies" template="Loki_Base::script/cookies.phtml">
3521
<arguments>
3622
<argument name="cookie_config" xsi:type="object">Loki\Base\ViewModel\CookieConfig</argument>
@@ -42,16 +28,6 @@
4228
name="loki.script.store"
4329
class="Loki\Base\Block\LokiScript"
4430
template="Loki_Base::script/script-container.phtml">
45-
46-
<!--
47-
<block name="loki.script.store.local-storage" template="Loki_Base::script/store/localstorage-store.phtml">
48-
<arguments>
49-
<argument name="section_config" xsi:type="object">Loki\Base\ViewModel\SectionConfig</argument>
50-
</arguments>
51-
</block>
52-
53-
<block name="loki.script.store.messages" template="Loki_Base::script/store/message-store.phtml"/>
54-
-->
5531
</block>
5632

5733
<block
@@ -78,14 +54,6 @@
7854
name="loki.script.component"
7955
class="Loki\Base\Block\LokiScript"
8056
template="Loki_Base::script/script-container.phtml">
81-
82-
<!--
83-
<block name="loki.component.messages" template="Loki_Base::script/component/message-component.phtml">
84-
<arguments>
85-
<argument name="config" xsi:type="object">Loki\Base\Config\Config</argument>
86-
</arguments>
87-
</block>
88-
-->
8957
</block>
9058
</referenceContainer>
9159
</body>

‎view/base/layout/loki_localstorage.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0"?>
2+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
4+
<body>
5+
<referenceBlock name="loki.script.store">
6+
<block name="loki.script.store.local-storage" template="Loki_Base::script/store/localstorage-store.phtml">
7+
<arguments>
8+
<argument name="section_config" xsi:type="object">Loki\Base\ViewModel\SectionConfig</argument>
9+
</arguments>
10+
</block>
11+
</referenceBlock>
12+
</body>
13+
</page>

‎view/base/layout/loki_messages.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
4+
<body>
5+
<referenceContainer name="page.messages">
6+
<block
7+
name="loki.messages"
8+
template="Loki_Base::component/messages.phtml"
9+
before="-">
10+
</block>
11+
</referenceContainer>
12+
13+
<referenceBlock name="loki.script.store">
14+
<block name="loki.script.store.messages" template="Loki_Base::script/store/message-store.phtml"/>
15+
</referenceBlock>
16+
17+
<referenceBlock name="loki.script.component">
18+
<block name="loki.component.messages" template="Loki_Base::script/component/message-component.phtml">
19+
<arguments>
20+
<argument name="config" xsi:type="object">Loki\Base\Config\Config</argument>
21+
</arguments>
22+
</block>
23+
</referenceBlock>
24+
</body>
25+
</page>

0 commit comments

Comments
 (0)