Skip to content

Commit 89d14e2

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/develop' into PR
2 parents 5376a3e + 5481fac commit 89d14e2

File tree

412 files changed

+14975
-2737
lines changed

Some content is hidden

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

412 files changed

+14975
-2737
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ atlassian*
4646

4747
/var/*
4848
!/var/.htaccess
49-
/vendor
49+
/vendor/*
5050
!/vendor/.htaccess

‎ISSUE_TEMPLATE.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Steps to reproduce
2+
--
3+
1. Install Magento from `develop` branch.
4+
2. [Example] Add Configurable Product to the cart.
5+
3. ...
6+
7+
Expected result
8+
--
9+
1. [Example] Configurable product added to the shopping cart.
10+
2. ...
11+
12+
Actual result
13+
--
14+
1. [Example] Error message appears: "Cannot save quote".
15+
2. [Screenshot, logs]
16+
3. ...

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
4141
{
4242
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
4343
'Read Details'
44-
) . '</a>' : '';
44+
) . '</a> | ' : '';
4545

4646
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
4747
'*/*/markAsRead/',
4848
['_current' => true, 'id' => $row->getId()]
4949
) . '">' . __(
5050
'Mark as Read'
51-
) . '</a>' : '';
51+
) . '</a> | ' : '';
5252

5353
$encodedUrl = $this->_urlHelper->getEncodedUrl();
5454
return sprintf(

‎app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
allowtransparency="true"
3030
frameborder="0"
3131
name="iframeTransparent"
32-
style="display:none;width:100%;background-color:transparent">
32+
class="payment-method-iframe">
3333

3434
</iframe>
3535
<form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {

‎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/system/search.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<script data-template="search-suggest" type="text/x-magento-template">
2929
<ul class="search-global-menu">
3030
<li class="item">
31-
<a href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
31+
<a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
3232
</li>
3333
<li class="item">
34-
<a href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
34+
<a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
3535
</li>
3636
<li class="item">
37-
<a href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
37+
<a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
3838
</li>
3939
<li class="item">
40-
<a href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
40+
<a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
4141
</li>
4242
<% if (data.items.length) { %>
4343
<% _.each(data.items, function(value){ %>

‎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; ?>

0 commit comments

Comments
 (0)