Merge remote-tracking branch 'remotes/api/MAGETWO-52993-Github#2958-Image-Media-Uploader' into pull-request

Author: Cari Spruiell

app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml

@@ -20,6 +20,7 @@
                 <div class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></div>
             </div>
         </div>
+        <div id="error-message" data-action="show-error"></div>
         <div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></div>
         <div id="contents"></div>
     </div>

app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

@@ -69,10 +69,16 @@ require([
         },
         done: function (e, data) {
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
+            var tempErrorMessage = document.createElement("div");
             $(progressSelector).css('width', '100%');
+            $('[data-action="show-error"]').children(".message").remove();
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = data.result.error;
+
+                $('[data-action="show-error"]').append(tempErrorMessage);
                 $(progressSelector).removeClass('upload-progress').addClass('upload-failure');
             }
         },