Skip to content

Commit 9c0d20d

Browse files
shiftedrealityshiftedreality
committed
Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-49681
2 parents ff8fda8 + fa74f85 commit 9c0d20d

File tree

173 files changed

+10440
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+10440
-521
lines changed

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -100,43 +100,6 @@
100100
<label>Design</label>
101101
<tab>general</tab>
102102
<resource>Magento_Config::config_design</resource>
103-
<group id="theme" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
104-
<label>Design Theme</label>
105-
<field id="theme_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
106-
<label>Design Theme</label>
107-
<source_model>Magento\Framework\View\Design\Theme\Label::getLabelsCollectionForSystemConfiguration</source_model>
108-
<backend_model>Magento\Theme\Model\Design\Backend\Theme</backend_model>
109-
<comment><![CDATA[If no value is specified, the system default will be used. The system default may be modified by third party extensions.]]></comment>
110-
</field>
111-
<field id="ua_regexp" translate="label comment tooltip" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0">
112-
<label>User-Agent Exceptions</label>
113-
<frontend_model>Magento\Config\Block\System\Config\Form\Field\Regexceptions</frontend_model>
114-
<backend_model>Magento\Theme\Model\Design\Backend\Exceptions</backend_model>
115-
<comment>
116-
<![CDATA[Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered. Examples:<br /><span style="font-family:monospace">Firefox<br />/^mozilla/i</span>]]>
117-
</comment>
118-
<tooltip>Find a string in client user-agent header and switch to specific design theme for that browser.</tooltip>
119-
</field>
120-
</group>
121-
<group id="pagination" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="1" showInStore="1">
122-
<label>Pagination</label>
123-
<field id="pagination_frame" translate="label comment" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
124-
<label>Pagination Frame</label>
125-
<comment>How many links to display at once.</comment>
126-
</field>
127-
<field id="pagination_frame_skip" translate="label comment" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
128-
<label>Pagination Frame Skip</label>
129-
<comment>If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.</comment>
130-
</field>
131-
<field id="anchor_text_for_previous" translate="label comment" type="text" sortOrder="9" showInDefault="1" showInWebsite="1" showInStore="1">
132-
<label>Anchor Text for Previous</label>
133-
<comment>Alternative text for previous link in pagination menu. If empty, default arrow image will used.</comment>
134-
</field>
135-
<field id="anchor_text_for_next" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
136-
<label>Anchor Text for Next</label>
137-
<comment>Alternative text for next link in pagination menu. If empty, default arrow image will used.</comment>
138-
</field>
139-
</group>
140103
</section>
141104
<section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
142105
<label>Developer</label>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,37 @@
181181
</argument>
182182
</arguments>
183183
</type>
184+
<type name="Magento\Theme\Model\Design\Config\MetadataProvider">
185+
<arguments>
186+
<argument name="metadata" xsi:type="array">
187+
<item name="theme_theme_id" xsi:type="array">
188+
<item name="path" xsi:type="string">design/theme/theme_id</item>
189+
<item name="fieldset" xsi:type="string">theme</item>
190+
<item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Theme</item>
191+
<item name="use_in_grid" xsi:type="boolean">true</item>
192+
</item>
193+
<item name="theme_ua_regexp" xsi:type="array">
194+
<item name="path" xsi:type="string">design/theme/ua_regexp</item>
195+
<item name="fieldset" xsi:type="string">desing_rule</item>
196+
<item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Exceptions</item>
197+
</item>
198+
<item name="pagination_pagination_frame" xsi:type="array">
199+
<item name="path" xsi:type="string">design/pagination/pagination_frame</item>
200+
<item name="fieldset" xsi:type="string">other_settings/pagination</item>
201+
</item>
202+
<item name="pagination_pagination_frame_skip" xsi:type="array">
203+
<item name="path" xsi:type="string">design/pagination/pagination_frame_skip</item>
204+
<item name="fieldset" xsi:type="string">other_settings/pagination</item>
205+
</item>
206+
<item name="pagination_anchor_text_for_previous" xsi:type="array">
207+
<item name="path" xsi:type="string">design/pagination/anchor_text_for_previous</item>
208+
<item name="fieldset" xsi:type="string">other_settings/pagination</item>
209+
</item>
210+
<item name="pagination_anchor_text_for_next" xsi:type="array">
211+
<item name="path" xsi:type="string">design/pagination/anchor_text_for_next</item>
212+
<item name="fieldset" xsi:type="string">other_settings/pagination</item>
213+
</item>
214+
</argument>
215+
</arguments>
216+
</type>
184217
</config>

‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,16 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
3131
<div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
3232
<?php if ($elementBeforeLabel): ?>
3333
<?php echo $element->getElementHtml() ?>
34-
<?php echo $element->getLabelHtml() ?>
34+
<?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
3535
<?php /* @escapeNotVerified */ echo $note ?>
3636
<?php else: ?>
37-
<?php echo $element->getLabelHtml() ?>
37+
<?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
3838
<div class="admin__field-control control">
3939
<?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
4040
<?php echo $block->getHintHtml() ?>
4141
<?php /* @escapeNotVerified */ echo $note ?>
4242
</div>
4343
<?php endif; ?>
44-
<?php if ($element->getScopeLabel()): ?>
45-
<div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo $element->getScopeLabel()?>">
46-
</div>
47-
<?php endif;?>
4844
</div>
4945
<?php endif; ?>
5046
<?php endif; ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,15 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
3333
<div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
3434
<?php if ($elementBeforeLabel): ?>
3535
<?php echo $element->getElementHtml() ?>
36-
<?php echo $element->getLabelHtml() ?>
36+
<?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
3737
<?php /* @escapeNotVerified */ echo $note ?>
3838
<?php else: ?>
39-
<?php echo $element->getLabelHtml() ?>
39+
<?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
4040
<div class="admin__field-control control">
4141
<?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
4242
<?php /* @escapeNotVerified */ echo $note ?>
4343
</div>
4444
<?php endif; ?>
45-
<?php if ($element->getScopeLabel()): ?>
46-
<div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo $element->getScopeLabel()?>">
47-
</div>
48-
<?php endif;?>
4945
</div>
5046
<?php endif; ?>
5147
<?php endif; ?>

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<fieldset name="theme">
10+
<argument name="data" xsi:type="array">
11+
<item name="config" xsi:type="array">
12+
<item name="label" xsi:type="string" translate="true">Default Theme</item>
13+
<item name="sortOrder" xsi:type="number">10</item>
14+
</item>
15+
</argument>
16+
<field name="theme_theme_id">
17+
<argument name="data" xsi:type="array">
18+
<item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
19+
<item name="config" xsi:type="array">
20+
<item name="label" xsi:type="string" translate="true">Applied Theme</item>
21+
<item name="dataType" xsi:type="string">text</item>
22+
<item name="formElement" xsi:type="string">select</item>
23+
<item name="dataScope" xsi:type="string">theme_theme_id</item>
24+
<item name="sortOrder" xsi:type="number">10</item>
25+
<item name="notice" xsi:type="string" translate="true">If no value is specified, the system default is used. The system default may be modified by third party extensions.</item>
26+
</item>
27+
</argument>
28+
</field>
29+
</fieldset>
30+
<fieldset name="desing_rule">
31+
<argument name="data" xsi:type="array">
32+
<item name="config" xsi:type="array">
33+
<item name="label" xsi:type="string" translate="true">Design Rule</item>
34+
<item name="sortOrder" xsi:type="number">20</item>
35+
</item>
36+
</argument>
37+
<container name="theme_ua_regexp">
38+
<argument name="data" xsi:type="array">
39+
<item name="config" xsi:type="array">
40+
<item name="component" xsi:type="string">Magento_Ui/js/dynamic-rows/dynamic-rows</item>
41+
<item name="template" xsi:type="string">Magento_Backend/dynamic-rows/grid</item>
42+
<item name="fallbackResetTpl" xsi:type="string">Magento_Backend/form/element/helper/fallback-reset-link</item>
43+
<item name="componentType" xsi:type="string">dynamicRows</item>
44+
<item name="recordTemplate" xsi:type="string">record</item>
45+
<item name="deleteButtonLabel" xsi:type="string">Remove</item>
46+
<item name="addButtonLabel" xsi:type="string">Add New User Agent Rule</item>
47+
<item name="deleteProperty" xsi:type="boolean">false</item>
48+
<item name="dndConfig" xsi:type="array">
49+
<item name="enabled" xsi:type="boolean">false</item>
50+
</item>
51+
</item>
52+
</argument>
53+
<container name="record">
54+
<argument name="data" xsi:type="array">
55+
<item name="config" xsi:type="array">
56+
<item name="label" xsi:type="string" translate="true">User Agent Rules</item>
57+
<item name="component" xsi:type="string" translate="true">Magento_Ui/js/dynamic-rows/record</item>
58+
<item name="isTemplate" xsi:type="boolean">true</item>
59+
<item name="is_collection" xsi:type="boolean">true</item>
60+
<item name="showFallbackReset" xsi:type="boolean">false</item>
61+
</item>
62+
</argument>
63+
<field name="search_string">
64+
<argument name="data" xsi:type="array">
65+
<item name="config" xsi:type="array">
66+
<item name="formElement" xsi:type="string">input</item>
67+
<item name="dataType" xsi:type="string">text</item>
68+
<item name="dataScope" xsi:type="string">search</item>
69+
<item name="fit" xsi:type="boolean">false</item>
70+
<item name="label" xsi:type="string">Search String</item>
71+
<item name="showFallbackReset" xsi:type="boolean">false</item>
72+
</item>
73+
</argument>
74+
</field>
75+
<field name="theme">
76+
<argument name="data" xsi:type="array">
77+
<item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
78+
<item name="config" xsi:type="array">
79+
<item name="formElement" xsi:type="string">select</item>
80+
<item name="dataType" xsi:type="string">text</item>
81+
<item name="dataScope" xsi:type="string">value</item>
82+
<item name="fit" xsi:type="boolean">false</item>
83+
<item name="label" xsi:type="string">Theme Name</item>
84+
<item name="showFallbackReset" xsi:type="boolean">false</item>
85+
</item>
86+
</argument>
87+
</field>
88+
<actionDelete>
89+
<argument name="data" xsi:type="array">
90+
<item name="config" xsi:type="array">
91+
<item name="componentType" xsi:type="string">actionDelete</item>
92+
<item name="dataType" xsi:type="string">text</item>
93+
<item name="fit" xsi:type="boolean">false</item>
94+
<item name="label" xsi:type="string">Actions</item>
95+
<item name="sortOrder" xsi:type="string">50</item>
96+
<item name="additionalClasses" xsi:type="string">data-grid-actions-cell</item>
97+
<item name="template" xsi:type="string">Magento_Backend/dynamic-rows/cells/action-delete</item>
98+
</item>
99+
</argument>
100+
</actionDelete>
101+
</container>
102+
</container>
103+
</fieldset>
104+
<fieldset name="other_settings">
105+
<fieldset name="pagination">
106+
<argument name="data" xsi:type="array">
107+
<item name="config" xsi:type="array">
108+
<item name="label" xsi:type="string" translate="true">Pagination</item>
109+
<item name="collapsible" xsi:type="boolean">true</item>
110+
<item name="level" xsi:type="number">1</item>
111+
</item>
112+
</argument>
113+
<field name="pagination_pagination_frame">
114+
<argument name="data" xsi:type="array">
115+
<item name="config" xsi:type="array">
116+
<item name="label" xsi:type="string" translate="true">Pagination Frame</item>
117+
<item name="dataType" xsi:type="string">number</item>
118+
<item name="formElement" xsi:type="string">input</item>
119+
<item name="dataScope" xsi:type="string">pagination_pagination_frame</item>
120+
<item name="validation" xsi:type="array">
121+
<item name="validate-digits" xsi:type="boolean">true</item>
122+
</item>
123+
<item name="notice" xsi:type="string" translate="true">How many links to display at once.</item>
124+
</item>
125+
</argument>
126+
</field>
127+
<field name="pagination_pagination_frame_skip">
128+
<argument name="data" xsi:type="array">
129+
<item name="config" xsi:type="array">
130+
<item name="label" xsi:type="string" translate="true">Pagination Frame Skip</item>
131+
<item name="dataType" xsi:type="string">number</item>
132+
<item name="formElement" xsi:type="string">input</item>
133+
<item name="dataScope" xsi:type="string">pagination_pagination_frame_skip</item>
134+
<item name="validation" xsi:type="array">
135+
<item name="validate-digits" xsi:type="boolean">true</item>
136+
</item>
137+
<item name="notice" xsi:type="string" translate="true">If current frame position does not cover utmost pages, it renders the link to current position plus/minus this value.</item>
138+
</item>
139+
</argument>
140+
</field>
141+
<field name="pagination_anchor_text_for_previous">
142+
<argument name="data" xsi:type="array">
143+
<item name="config" xsi:type="array">
144+
<item name="label" xsi:type="string" translate="true">Anchor Text for Previous</item>
145+
<item name="dataType" xsi:type="string">text</item>
146+
<item name="formElement" xsi:type="string">input</item>
147+
<item name="dataScope" xsi:type="string">pagination_anchor_text_for_previous</item>
148+
<item name="notice" xsi:type="string" translate="true">Alternative text for the previous pages link in the pagination menu. If empty, the default arrow image is used.</item>
149+
<item name="validation" xsi:type="array">
150+
<item name="validate-no-html-tags" xsi:type="boolean">true</item>
151+
</item>
152+
</item>
153+
</argument>
154+
</field>
155+
<field name="pagination_anchor_text_for_next">
156+
<argument name="data" xsi:type="array">
157+
<item name="config" xsi:type="array">
158+
<item name="label" xsi:type="string" translate="true">Anchor Text for Next</item>
159+
<item name="dataType" xsi:type="string">text</item>
160+
<item name="formElement" xsi:type="string">input</item>
161+
<item name="dataScope" xsi:type="string">pagination_anchor_text_for_next</item>
162+
<item name="notice" xsi:type="string" translate="true">Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used.</item>
163+
<item name="validation" xsi:type="array">
164+
<item name="validate-no-html-tags" xsi:type="boolean">true</item>
165+
</item>
166+
</item>
167+
</argument>
168+
</field>
169+
</fieldset>
170+
</fieldset>
171+
</form>

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<columns name="design_config_columns">
10+
<column name="theme_theme_id">
11+
<argument name="data" xsi:type="array">
12+
<item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
13+
<item name="config" xsi:type="array">
14+
<item name="filter" xsi:type="string">select</item>
15+
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
16+
<item name="dataType" xsi:type="string">select</item>
17+
<item name="label" xsi:type="string" translate="true">Theme Name</item>
18+
<item name="sortOrder" xsi:type="number">40</item>
19+
</item>
20+
</argument>
21+
</column>
22+
</columns>
23+
</listing>

0 commit comments

Comments
 (0)