Skip to content

Commit d030b6a

Browse files
author
Erik Hansen
committed
MAGETWO-37672: Responsive Email Foundation
- Moved configuration/system XML to appropriate files in Email module
1 parent 6e3f2a9 commit d030b6a

File tree

4 files changed

+47
-34
lines changed

4 files changed

+47
-34
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -137,34 +137,6 @@
137137
<comment>Alternative text for next link in pagination menu. If empty, default arrow image will used.</comment>
138138
</field>
139139
</group>
140-
<group id="email" translate="label" type="text" sortOrder="510" showInDefault="1" showInWebsite="1" showInStore="1">
141-
<label>Emails</label>
142-
<field id="logo" translate="label" type="image" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
143-
<label>Logo Image</label>
144-
<comment>Allowed file types: jpg, jpeg, gif, png. To optimize logo for high-resolution displays, upload an image that is 2x normal size and then specify 1x dimensions in width/height fields below.</comment>
145-
<backend_model>Magento\Config\Model\Config\Backend\Email\Logo</backend_model>
146-
<base_url type="media" scope_info="1">email/logo</base_url>
147-
</field>
148-
<field id="logo_alt" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
149-
<label>Logo Image Alt</label>
150-
</field>
151-
<field id="logo_width" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
152-
<label>Logo Width</label>
153-
<comment>Only necessary if image has been uploaded above. Enter number of pixels, without appending "px".</comment>
154-
</field>
155-
<field id="logo_height" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
156-
<label>Logo Height</label>
157-
<comment>Only necessary if image has been uploaded above. Enter number of pixels, without appending "px".</comment>
158-
</field>
159-
<field id="header_template" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
160-
<label>Header Template</label>
161-
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
162-
</field>
163-
<field id="footer_template" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
164-
<label>Footer Template</label>
165-
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
166-
</field>
167-
</group>
168140
</section>
169141
<section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
170142
<label>Developer</label>

‎app/code/Magento/Backend/etc/config.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
99
<default>
10-
<design>
11-
<email>
12-
<header_template>design_email_header_template</header_template>
13-
<footer_template>design_email_footer_template</footer_template>
14-
</email>
15-
</design>
1610
<dev>
1711
<template>
1812
<minify_html>0</minify_html>

‎app/code/Magento/Email/etc/adminhtml/system.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. 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="../../../Config/etc/system_file.xsd">
9+
<system>
10+
<section id="design">
11+
<group id="email" translate="label" type="text" sortOrder="510" showInDefault="1" showInWebsite="1" showInStore="1">
12+
<label>Emails</label>
13+
<field id="logo" translate="label" type="image" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
14+
<label>Logo Image</label>
15+
<comment>Allowed file types: jpg, jpeg, gif, png. To optimize logo for high-resolution displays, upload an image that is 2x normal size and then specify 1x dimensions in width/height fields below.</comment>
16+
<backend_model>Magento\Config\Model\Config\Backend\Email\Logo</backend_model>
17+
<base_url type="media" scope_info="1">email/logo</base_url>
18+
</field>
19+
<field id="logo_alt" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
20+
<label>Logo Image Alt</label>
21+
</field>
22+
<field id="logo_width" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
23+
<label>Logo Width</label>
24+
<comment>Only necessary if image has been uploaded above. Enter number of pixels, without appending "px".</comment>
25+
</field>
26+
<field id="logo_height" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
27+
<label>Logo Height</label>
28+
<comment>Only necessary if image has been uploaded above. Enter number of pixels, without appending "px".</comment>
29+
</field>
30+
<field id="header_template" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
31+
<label>Header Template</label>
32+
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
33+
</field>
34+
<field id="footer_template" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
35+
<label>Footer Template</label>
36+
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
37+
</field>
38+
</group>
39+
</section>
40+
</system>
41+
</config>

‎app/code/Magento/Email/etc/config.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
99
<default>
10+
<design>
11+
<email>
12+
<header_template>design_email_header_template</header_template>
13+
<footer_template>design_email_footer_template</footer_template>
14+
</email>
15+
</design>
1016
<system>
1117
<media_storage_configuration>
1218
<allowed_resources>

0 commit comments

Comments
 (0)