Merge branch 'ME-MAGETWO-QA' into 'master3'

ME-MAGETWO-QA

Edit warning failed image upload style

See merge request !151

Author: Dmitry Kologrivov

app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

@@ -403,7 +403,7 @@ require([
                             errorsMessage.push(tmpError.message);
                         }
 
-                        return 'Video cannot be shown due to the following reason: ' + $.unique(errorsMessage).join(', ');
+                        return 'Video cant be shown due to the following reason: ' + $.unique(errorsMessage).join(', ');
                     };
 
                     if (data.error && data.error.code === 400) {

app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js

@@ -4,14 +4,13 @@
  */
 define([
     'jquery',
-    'Magento_Ui/js/modal/alert',
     'jquery/ui',
     'Magento_Ui/js/modal/modal',
     'mage/translate',
     'mage/backend/tree-suggest',
     'mage/backend/validation',
     'Magento_ProductVideo/js/get-video-information'
-], function ($, alert) {
+], function ($) {
     'use strict';
 
     $.widget('mage.createVideoPlayer', {
@@ -527,10 +526,13 @@ define([
         _onImageLoaded: function (result, file, oldFile, callback) {
             var data = JSON.parse(result);
 
+            if ($('#video_url').parent().find('.image-upload-error').length > 0) {
+                $('.image-upload-error').remove();
+            }
+
             if (data.errorcode || data.error) {
-                alert({
-                    content: data.error
-                });
+                $('#video_url').parent().append('<div class="image-upload-error">' +
+                '<div class="image-upload-error-cross"></div><span>' + data.error + '</span></div>');
 
                 return;
             }

app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less

@@ -234,3 +234,34 @@
 .image.base-image:hover .image-label {
     display: none;
 }
+
+.image-upload-error {
+    background: #F9E1E1;
+    color: @color-gray19;
+    font-size: 12px;
+    font-weight: 400;
+    padding: 7px 7px 7px 35px;
+    position: relative;
+    .image-upload-error-cross {
+        position: absolute;
+        left: 8px;
+        top: 9px;
+        width: 20px;
+        height: 20px;
+        &:before,
+        &:after {
+            position: absolute;
+            left: 8px;
+            content: ' ';
+            height: 20px;
+            width: 4px;
+            background-color: @color-red9;
+        }
+        &:before {
+            transform: rotate(45deg);
+        }
+        &:after {
+            transform: rotate(-45deg);
+        }
+    }
+}