Skip to content

Commit c228706

Browse files
author
Viktor Paladiychuk
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-54836
2 parents d147b8a + 4d8ec01 commit c228706

File tree

59 files changed

+869
-504
lines changed

Some content is hidden

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

59 files changed

+869
-504
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="notifications">
11-
<block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/>
12-
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
13-
<block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
11+
<block class="Magento\AdminNotification\Block\System\Messages"
12+
name="system_messages"
13+
as="system_messages"
14+
before="-"
15+
template="Magento_AdminNotification::system/messages.phtml"/>
16+
<block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup"
17+
name="unread_system_messages"
18+
as="unread_system_messages"
19+
template="Magento_AdminNotification::system/messages/popup.phtml"/>
20+
<block class="Magento\AdminNotification\Block\Window"
21+
name="notification_window"
22+
as="notification_window"
23+
acl="Magento_AdminNotification::show_toolbar"
24+
template="notification/window.phtml"/>
1425
</referenceContainer>
1526
<referenceContainer name="header">
1627
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="toolbar_entry.phtml"/>

‎app/code/Magento/Braintree/view/adminhtml/layout/sales_order_create_index.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<argument name="template" xsi:type="string">Magento_Vault::form/vault.phtml</argument>
2020
</action>
2121
</referenceBlock>
22-
<referenceBlock name="content">
22+
<referenceBlock name="data">
2323
<block name="braintree_payment_script"
2424
as="braintree_payment_script"
25-
after="billing_method"
2625
template="Magento_Braintree::payment/script.phtml"
27-
class="Magento\Braintree\Block\Payment"/>
26+
class="Magento\Braintree\Block\Payment"
27+
after="billing_method"/>
2828
</referenceBlock>
2929
</body>
3030
</page>

‎app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</block>
3737
</referenceBlock>
3838
<referenceBlock name="product.info.form.options">
39-
<container name="bundle.product.options.wrapper" htmlTag="div" htmlClass="bundle-options-wrapper" after="product.info.form.options" />
39+
<container name="bundle.product.options.wrapper" htmlTag="div" htmlClass="bundle-options-wrapper"/>
4040
</referenceBlock>
4141
<move element="product.info.options.wrapper" destination="bundle.product.options.wrapper" before="-" />
4242
<move element="product.info.options.wrapper.bottom" destination="bundle.product.options.wrapper" after="product.info.options.wrapper" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<body>
1010
<referenceContainer name="content">
1111
<container name="adminhtml.catalog.product.set.edit.wrapper" htmlTag="div" htmlClass="admin__scope-old"><!-- @todo ui: remove arguments within .admin__scope-old -->
12-
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
12+
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main"
13+
name="adminhtml.catalog.product.set.edit"
14+
template="catalog/product/attribute/set/main.phtml"/>
1315
</container>
1416
</referenceContainer>
1517
</body>

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</referenceBlock>
3131
<referenceContainer name="content">
3232
<container name="product.info.main" htmlTag="div" htmlClass="product-info-main" before="-">
33-
<container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price" after="product.info.review">
33+
<container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price">
3434
<container name="product.info.stock.sku" label="Product auxiliary info" htmlTag="div" htmlClass="product-info-stock-sku">
3535
<container name="product.info.type" before="-"/>
3636
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type">
@@ -44,7 +44,7 @@
4444
</block>
4545
</container>
4646
<block class="Magento\Catalog\Block\Product\View" name="product.info.review" template="product/view/review.phtml" after="product.info.stock.sku" />
47-
<block class="Magento\Catalog\Pricing\Render" name="product.price.final" after="product.info.sku">
47+
<block class="Magento\Catalog\Pricing\Render" name="product.price.final">
4848
<arguments>
4949
<argument name="price_render" xsi:type="string">product.price.render.default</argument>
5050
<argument name="price_type_code" xsi:type="string">final_price</argument>
@@ -81,7 +81,7 @@
8181
</block>
8282
</block>
8383
<container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint">
84-
<container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links" after="product.info.overview">
84+
<container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links">
8585
<block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml">
8686
<block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare" after="view.addto.wishlist"
8787
template="Magento_Catalog::product/view/addto/compare.phtml" />

‎app/code/Magento/CatalogRule/view/adminhtml/layout/catalog_rule_promo_catalog_edit.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
1111
<referenceBlock name="catalog_rule_form">
1212
<block class="Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tab\Conditions" name="promo_catalog_edit_tab_conditions">
1313
<arguments>
14-
<argument name="config" xsi:type="array">
15-
<item name="label" xsi:type="string" translate="true">Conditions</item>
16-
<item name="collapsible" xsi:type="boolean">true</item>
17-
<item name="opened" xsi:type="boolean">false</item>
18-
<item name="sortOrder" xsi:type="number">20</item>
19-
<item name="canShow" xsi:type="boolean">true</item>
20-
<item name="componentType" xsi:type="string">fieldset</item>
21-
</argument>
22-
</arguments>
14+
<argument name="config" xsi:type="array">
15+
<item name="label" xsi:type="string" translate="true">Conditions</item>
16+
<item name="collapsible" xsi:type="boolean">true</item>
17+
<item name="opened" xsi:type="boolean">false</item>
18+
<item name="sortOrder" xsi:type="number">20</item>
19+
<item name="canShow" xsi:type="boolean">true</item>
20+
<item name="componentType" xsi:type="string">fieldset</item>
21+
</argument>
22+
</arguments>
2323
</block>
2424
</referenceBlock>
2525
<uiComponent name="catalog_rule_form"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
11-
<block class="Magento\Backend\Block\Template" name="adminhtml.catalog.product.set.edit.configurable" template="Magento_ConfigurableProduct::catalog/product/attribute/set/js.phtml" after="adminhtml.catalog.product.set.edit"/>
11+
<block class="Magento\Backend\Block\Template"
12+
name="adminhtml.catalog.product.set.edit.configurable"
13+
template="Magento_ConfigurableProduct::catalog/product/attribute/set/js.phtml"
14+
after="adminhtml.catalog.product.set.edit.wrapper"/>
1215
</referenceContainer>
1316
</body>
1417
</page>

‎app/code/Magento/Cookie/view/frontend/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="after.body.start">
11-
<block class="Magento\Cookie\Block\Html\Notices" name="cookie_notices" template="html/notices.phtml" after="global_notices" />
11+
<block class="Magento\Cookie\Block\Html\Notices" name="cookie_notices" template="html/notices.phtml"/>
1212
</referenceContainer>
1313
</body>
1414
</page>

‎app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</action>
1515
</referenceBlock>
1616
<referenceContainer name="content">
17-
<block class="Magento\Framework\View\Element\Template" name="customer_account_dashboard_top" as="top"/>
1817
<block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="account/dashboard/info.phtml" cacheable="false"/>
1918
<block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="account/dashboard/address.phtml" cacheable="false"/>
2019
</referenceContainer>

‎app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ define([
1717
$.widget('mage.passwordStrengthIndicator', {
1818
options: {
1919
cache: {},
20-
defaultClassName: 'password-strength-meter-',
2120
passwordSelector: '[type=password]',
2221
passwordStrengthMeterSelector: '[data-role=password-strength-meter]',
2322
passwordStrengthMeterLabelSelector: '[data-role=password-strength-meter-label]'
@@ -54,14 +53,15 @@ define([
5453
var password = this._getPassword(),
5554
isEmpty = password.length === 0,
5655
zxcvbnScore = zxcvbn(password).score,
57-
isValid = $.validator.validateSingleElement(this.options.cache.input),
58-
displayScore = zxcvbnScore || 1;
56+
displayScore,
57+
isValid;
5958

6059
// Display score is based on combination of whether password is empty, valid, and zxcvbn strength
6160
if (isEmpty) {
6261
displayScore = 0;
63-
} else if (!isValid) {
64-
displayScore = 1;
62+
} else {
63+
isValid = $.validator.validateSingleElement(this.options.cache.input);
64+
displayScore = isValid ? zxcvbnScore : 1;
6565
}
6666

6767
// Update label
@@ -75,27 +75,32 @@ define([
7575
*/
7676
_displayStrength: function (displayScore) {
7777
var strengthLabel = '',
78-
className = this._getClassName(displayScore);
78+
className = 'password-';
7979

8080
switch (displayScore) {
8181
case 0:
8282
strengthLabel = $t('No Password');
83+
className += 'none';
8384
break;
8485

8586
case 1:
8687
strengthLabel = $t('Weak');
88+
className += 'weak';
8789
break;
8890

8991
case 2:
9092
strengthLabel = $t('Medium');
93+
className += 'medium';
9194
break;
9295

9396
case 3:
9497
strengthLabel = $t('Strong');
98+
className += 'strong';
9599
break;
96100

97101
case 4:
98102
strengthLabel = $t('Very Strong');
103+
className += 'very-strong';
99104
break;
100105
}
101106

@@ -112,16 +117,6 @@ define([
112117
*/
113118
_getPassword: function () {
114119
return this.options.cache.input.val();
115-
},
116-
117-
/**
118-
* Get class name for score
119-
* @param {int} displayScore
120-
* @returns {String}
121-
* @private
122-
*/
123-
_getClassName: function (displayScore) {
124-
return this.options.defaultClassName + displayScore;
125120
}
126121
});
127122

0 commit comments

Comments
 (0)