Merge branch 'develop' into product-video-PR3

Author: Igor Miniailo

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -120,11 +120,8 @@ public function getSystemMessageDialogJson()
         return $this->jsonHelper->jsonEncode(
             [
                 'systemMessageDialog' => [
-                    'autoOpen' => false,
-                    'width' => '75%',
-                    'modal' => true,
-                    'minHeight' => '0',
-                    'dialogClass' => 'ui-dialog-active ui-popup-message',
+                    'buttons' => [],
+                    'modalClass' => 'ui-dialog-active ui-popup-message modal-system-messages',
                     'ajaxUrl' => $this->_getMessagesUrl()
                 ],
             ]

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -9,8 +9,8 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div style="display:none" id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
-    <ul class="message-system-list">
+<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+    <ul class="message-system-list messages">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
                 <?php /* @escapeNotVerified */ echo $message->getText();?>
@@ -22,29 +22,17 @@
 <script>
 require([
     "jquery",
-    "jquery/ui"
+    "Magento_Ui/js/modal/modal"
 ], function($){
-
-    $(function() {
-        $("#system_messages_list").dialog({
-            autoOpen: true,
-            resizable: false,
-            width: '75%',
-            modal: true,
-            minHeight: '0',
-            dialogClass: 'ui-popup-message',
-            position: {
-                my: 'left+12.5% top',
-                at: 'center top',
-                of: 'body'
-            },
-            open: function() {
-                $(this).closest('.ui-dialog').addClass('ui-dialog-active');
-
-                var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 10;
-                $(this).closest('.ui-dialog').css('margin-top', topMargin);
-            }
+    if (this.modal) {
+        this.modal.html($('[data-role="system_messages_list"]').html());
+    } else {
+        this.modal = $('[data-role="system_messages_list"]').modal({
+            modalClass: 'modal-system-messages ui-popup-message',
+            type: 'popup',
+            buttons: []
         });
-    });
+    }
+    this.modal.modal('openModal');
 });
 </script>

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -5,12 +5,14 @@
 define([
     'jquery',
     'mage/template',
-    'jquery/ui'
+    'jquery/ui',
+    'Magento_Ui/js/modal/modal'
 ], function ($, mageTemplate) {
     'use strict';
 
-    $.widget('mage.systemMessageDialog', $.ui.dialog, {
+    $.widget('mage.systemMessageDialog', $.mage.modal, {
         options: {
+            modalClass: 'modal-system-messages',
             systemMessageTemplate:
                 '<% _.each(data.items, function(item) { %>' +
                     '<li class="message message-warning <% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
@@ -19,8 +21,14 @@ define([
                 '<% }); %>'
         },
 
-        open: function (severity) {
+        _create: function() {
+            this.options.title = $('#message-system-all').attr('title');
+            this._super();
+        },
+
+        openModal: function (severity) {
             var superMethod = $.proxy(this._super, this);
+            //this.modal.options
 
             $.ajax({
                 url: this.options.ajaxUrl,
@@ -47,16 +55,19 @@ define([
             }, this));
 
             return this;
+        },
+        closeModal: function () {
+            this._super();
         }
     });
 
     $(document).ready(function () {
         $('#system_messages .message-system-short .error').on('click', function () {
-            $('#message-system-all').systemMessageDialog('open', 1);
+            $('#message-system-all').systemMessageDialog('openModal', 1);
         });
 
         $('#system_messages .message-system-short .warning').on('click', function () {
-            $('#message-system-all').systemMessageDialog('open', 2);
+            $('#message-system-all').systemMessageDialog('openModal', 2);
         });
     });
 

app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml

@@ -5,7 +5,6 @@
  */
 
 // @codingStandardsIgnoreFile
-
 /**
  * @var \Magento\Authorizenet\Block\Transparent\Iframe $block
  * @see \Magento\Authorizenet\Block\Transparent\Iframe
@@ -24,10 +23,12 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         src="<?php /* @noEscape */ echo $block->getViewFileUrl('blank.html'); ?>">
 </iframe>
 <!-- IFRAME for request to Authorize.net -->
-<iframe id="directpost-iframe" allowtransparency="true" frameborder="0"  name="iframeDirectPost" style="display:none;width:100%;background-color:transparent"
+<iframe id="directpost-iframe" allowtransparency="true" frameborder="0"  name="iframeDirectPost"
+        style="display:none;width:100%;background-color:transparent"
         src="<?php /* @noEscape */ echo $block->getViewFileUrl('blank.html'); ?>">
 </iframe>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display:none;">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+          style="display:none;">
     <div class="admin__field _required">
         <label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="admin__field-label">
             <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
@@ -81,11 +82,11 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                             <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
                         <?php echo $block->escapeHtml($v); ?>
                     </option>
-                <?php endforeach ?>
+                <?php endforeach; ?>
             </select>
         </div>
     </div>
-    <?php if ($_form->hasVerification()): ?>
+    <?php if ($block->hasVerification()): ?>
     <div class="admin__field _required">
         <label for="<?php /* @noEscape */ echo $code; ?>_cc_cid">
             <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
@@ -123,7 +124,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
             '<?php /* @noEscape */ echo $controller; ?>',
             '<?php /* @noEscape */ echo $orderUrl; ?>',
             '<?php echo $block->escapeUrl($method->getCgiUrl()); ?>',
-            '<?php /* @noEscape */ echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>');
+            '<?php /* @noEscape */ echo $block->getUrl('*/*/save', [
+                '_secure' => $block->getRequest()->isSecure()
+            ]);?>');
 
         <?php if (!$block->isAjaxRequest()): ?>
             });

app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

@@ -50,9 +50,8 @@ define(
             placeOrder: function () {
                 var self = this;
 
-                fullScreenLoader.startLoader();
-
                 if (this.validateHandler() && additionalValidators.validate()) {
+                    fullScreenLoader.startLoader();
                     this.isPlaceOrderActionAllowed(false);
                     $.when(setPaymentInformationAction(this.messageContainer, {
                         'method': self.getCode()

app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml

@@ -10,7 +10,10 @@
 
 <?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
 <script>
-require(['prototype'], function(){
+require([
+    'Magento_Ui/js/modal/alert',
+    'prototype'
+], function(alert){
 
 window.changeDiagramsPeriod = function(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
@@ -25,7 +28,9 @@ window.changeDiagramsPeriod = function(periodObj) {
                 if (transport.responseText.isJSON()) {
                     var response = transport.responseText.evalJSON()
                     if (response.error) {
-                        alert(response.message);
+                        alert({
+                            content: response.message
+                        });
                     }
                     if(response.ajaxExpired && response.ajaxRedirect) {
                         setLocation(response.ajaxRedirect);
@@ -47,9 +52,11 @@ window.changeDiagramsPeriod = function(periodObj) {
             tabContentElementId = 'dashboard_diagram_totals';
             try {
                 if (transport.responseText.isJSON()) {
-                    var response = transport.responseText.evalJSON()
+                    var response = transport.responseText.evalJSON();
                     if (response.error) {
-                        alert(response.message);
+                        alert({
+                            content: response.message
+                        });
                     }
                     if(response.ajaxExpired && response.ajaxRedirect) {
                         setLocation(response.ajaxRedirect);

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -31,9 +31,10 @@
 require([
     "jquery",
     'mage/template',
+    'Magento_Ui/js/modal/alert',
     "mage/translate",
     "jquery/file-uploader"
-], function ($, mageTemplate) {
+], function ($, mageTemplate, alert) {
 
     $('#fileupload').fileupload({
         dataType: 'json',
@@ -75,7 +76,9 @@ require([
                 $('#' + data.fileId)
                     .delay(2000)
                     .hide('highlight');
-                alert($.mage.__('We don\'t recognize or support this file extension type.'));
+                alert({
+                   content: $.mage.__('We don\'t recognize or support this file extension type.')
+                });
             }
             $('#' + data.fileId).remove();
         },

app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml

@@ -11,16 +11,21 @@
     <label class="label" for="footer_interface_locale"><span><?php /* @escapeNotVerified */ echo __('Interface Locale'); ?></span></label>
     <?php /* @escapeNotVerified */ echo $block->getLocaleSelect(); ?>
     <script>
-        (function () {
-            'use strict';
+        require([
+                'mage/validation/url'
+            ],
+            function (urlValidator) {
+                'use strict';
 
-            var elem = document.getElementById('footer_interface_locale');
+                var elem = document.getElementById('footer_interface_locale');
 
-            function onChange() {
-                window.location.href = '<?php /* @escapeNotVerified */ echo $block->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php /* @escapeNotVerified */ echo $block->getUrlForReferer() ?>';
-            }
+                function onChange() {
+                    urlValidator.redirect('<?php /* @escapeNotVerified */ echo $block->getChangeLocaleUrl() ?>locale/' +
+                    elem.value +
+                    '/<?php /* @escapeNotVerified */ echo $block->getUrlForReferer() ?>');
+                }
 
-            elem.addEventListener('change', onChange);
-        })();
+                elem.addEventListener('change', onChange);
+            });
     </script>
 </div>

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -130,7 +130,10 @@
 </div>
 
 <script>
-require(['jquery'], function(jQuery){
+require([
+    'jquery',
+    'Magento_Ui/js/modal/confirm'
+], function(jQuery, confirm){
 
     (function($) {
         var $storesList = $('[data-role=stores-list]');
@@ -171,11 +174,19 @@ require(['jquery'], function(jQuery){
         } else {
 
             <?php if ($block->getUseConfirm()): ?>
-            if (confirm("<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
-                reload();
-            } else {
-                obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
-            }
+
+            confirm({
+                content:  "<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>",
+                actions: {
+                    confirm: function() {
+                        reload();
+                    },
+                    cancel: function() {
+                        obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
+                    }
+                }
+            });
+
             <?php else: ?>
                 reload();
             <?php endif; ?>

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

@@ -38,7 +38,7 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
             <div class="admin__field-control control">
-                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
                 <?php /* @escapeNotVerified */ echo $note ?>
             </div>
         <?php endif; ?>