[REF] web_editor, web_unsplash: review load more feature

* Simplify the code
* Make the feature mork without unsplash
* Handle corner cases

task-1896705

4 files changed, 179 insertions, 270 deletions

diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index daa5e868afd..194b7e15d4d 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -110,7 +110,7 @@ var AltDialog = Dialog.extend({
 var MediaWidget = Widget.extend({
     xmlDependencies: ['/web_editor/static/src/xml/editor.xml'],
     events: {
-        'input input#icon-search': '_onSearchInput',
+        'input input.o_we_search': '_onSearchInput',
     },
 
     /**
@@ -120,7 +120,7 @@ var MediaWidget = Widget.extend({
         this._super.apply(this, arguments);
         this.media = media;
         this.$media = $(media);
-        this._onSearchInput = _.debounce(this._onSearchInput, 250);
+        this._onSearchInput = _.debounce(this._onSearchInput, 500);
     },
 
     //--------------------------------------------------------------------------
@@ -137,17 +137,6 @@ var MediaWidget = Widget.extend({
         this._clear();
     },
     /**
-     * @todo comment
-     */
-    getControlPanelConfig: function () {
-        return {
-            searchEnabled: true,
-            pagerEnabled: true,
-            pagerLeftEnabled: false,
-            pagerRightEnabled: false,
-        };
-    },
-    /**
      * @abstract
      * @param {string} needle
      * @returns {Deferred}
@@ -185,6 +174,7 @@ var MediaWidget = Widget.extend({
      */
     _onSearchInput: function (ev) {
         this.search($(ev.currentTarget).val() || '');
+        this.hasSearched = true;
     },
 });
 
@@ -198,11 +188,11 @@ var ImageWidget = MediaWidget.extend({
         'click .o_upload_media_button_no_optimization': '_onUploadButtonNoOptimizationClick',
         'change input[type=file]': '_onImageSelection',
         'click .o_upload_media_url_button': '_onUploadURLButtonClick',
-        'input input.url': '_onChangeInputURL',
+        'input input.o_we_url_input': '_onURLInputChange',
         'click .existing-attachments [data-src]': '_onImageClick',
         'dblclick .existing-attachments [data-src]': '_onImageDblClick',
         'click .o_existing_attachment_remove': '_onRemoveClick',
-        'click .o_load_more': '_onLoadMore',
+        'click .o_load_more': '_onLoadMoreClick',
     }),
 
     IMAGES_PER_ROW: 6,
@@ -214,7 +204,8 @@ var ImageWidget = MediaWidget.extend({
     init: function (parent, media, options) {
         this._super.apply(this, arguments);
 
-        this.IMAGES_DISPLAYED_TOTAL = this.IMAGES_PER_ROW * this.IMAGES_ROWS;
+        this.imagesRows = this.IMAGES_ROWS;
+        this.IMAGES_DISPLAYED_TOTAL = this.IMAGES_PER_ROW * this.imagesRows;
 
         this.options = options;
         this.accept = options.accept || (options.document ? '*/*' : 'image/*');
@@ -251,7 +242,7 @@ var ImageWidget = MediaWidget.extend({
         var def = this._super.apply(this, arguments);
         var self = this;
 
-        this._renderImages();
+        this._renderImages(true);
 
         var o = {
             url: null,
@@ -354,7 +345,7 @@ var ImageWidget = MediaWidget.extend({
     search: function (needle, noRender) {
         var self = this;
         if (!noRender) {
-            this.$('input.url').val('').trigger('input').trigger('change');
+            this.$('input.o_we_url_input').val('').trigger('input').trigger('change');
         }
         // TODO: Expand this for adding SVG
         var domain = this.domain.concat(['|', ['mimetype', '=', false], ['mimetype', this.options.document ? 'not in' : 'in', ['image/gif', 'image/jpe', 'image/jpeg', 'image/jpg', 'image/gif', 'image/png']]]);
@@ -403,6 +394,7 @@ var ImageWidget = MediaWidget.extend({
             });
             if (!noRender) {
                 self._renderImages();
+                self._adaptLoadMore();
             }
         });
     },
@@ -412,6 +404,14 @@ var ImageWidget = MediaWidget.extend({
     //--------------------------------------------------------------------------
 
     /**
+     * @private
+     */
+    _adaptLoadMore: function () {
+        var noMoreImgToLoad = this.IMAGES_DISPLAYED_TOTAL >= this.records.length;
+        this.$('.o_load_more').toggleClass('d-none', noMoreImgToLoad);
+        this.$('.o_load_done_msg').toggleClass('d-none', !noMoreImgToLoad);
+    },
+    /**
      * @override
      */
     _clear: function () {
@@ -435,30 +435,37 @@ var ImageWidget = MediaWidget.extend({
     /**
      * @private
      */
-    _renderImages: function () {
+    _loadMoreImages: function (forceSearch) {
+        this.imagesRows += 2;
+        this.IMAGES_DISPLAYED_TOTAL = this.imagesRows * this.IMAGES_PER_ROW;
+        if (!forceSearch) {
+            this._renderImages();
+            this._adaptLoadMore();
+        } else {
+            this.search(this.$('.o_we_search').val() || '');
+        }
+    },
+    /**
+     * @private
+     */
+    _renderImages: function (withEffect) {
         var self = this;
         var rows = _(this.records).chain()
             .slice(0, this.IMAGES_DISPLAYED_TOTAL)
             .groupBy(function (a, index) { return Math.floor(index / self.IMAGES_PER_ROW); })
             .values()
             .value();
-        var noMoreImgToLoad = this.IMAGES_DISPLAYED_TOTAL >= this.records.length;
 
-        this.$('.o_load_more').toggleClass('d-none', noMoreImgToLoad);
-        this.$('.o_load_done_msg').toggleClass('d-none', !noMoreImgToLoad);
         this.$('.form-text').empty();
 
-        //Rendering menu & content for 'Image' or 'Document' tab
-        var templateMenu = 'web_editor.dialog.files.submenu';
-        var templateContent = 'web_editor.dialog.files.existing.content';
-        this.$('.o_submenu').replaceWith(QWeb.render(templateMenu, {
-            accept: this.accept,
-            isDocument: this.options.document,
-        }));
-        this.$('.existing-attachments').replaceWith(QWeb.render(templateContent, {
-            rows: rows,
-            isDocument: this.options.document,
-        }));
+        // Render menu & content
+        this.$('.existing-attachments').replaceWith(
+            QWeb.render('web_editor.dialog.files.existing.content', {
+                rows: rows,
+                isDocument: this.options.document,
+                withEffect: withEffect,
+            })
+        );
 
         var $divs = this.$('.o_image');
         var imageDefs = _.map($divs, function (el) {
@@ -474,11 +481,13 @@ var ImageWidget = MediaWidget.extend({
                 return def;
             }
         });
-        $.when.apply($, imageDefs).then(function () {
-            _.delay(function () {
-                $divs.removeClass('o_image_loading');
-            }, 400);
-        });
+        if (withEffect) {
+            $.when.apply($, imageDefs).then(function () {
+                _.delay(function () {
+                    $divs.removeClass('o_image_loading');
+                }, 400);
+            });
+        }
         this._highlightSelectedImages();
     },
     /**
@@ -547,17 +556,10 @@ var ImageWidget = MediaWidget.extend({
             }
         });
         this.$el.submit();
-        // Emptying file inputs
+
+        // Empty file input
         this.$('.o_file_input').val('');
     },
-    /**
-     * @private
-     */
-    _loadMoreImages: function () {
-        this.IMAGES_ROWS += 2;
-        this.IMAGES_DISPLAYED_TOTAL = this.IMAGES_ROWS * this.IMAGES_PER_ROW;
-        this._renderImages();
-    },
 
     //--------------------------------------------------------------------------
     // Handlers
@@ -596,8 +598,7 @@ var ImageWidget = MediaWidget.extend({
      */
     _onRemoveClick: function (ev) {
         var self = this;
-        var message = _t("Are you sure you want to delete this file ?");
-        DialogBase.confirm(this, message, {
+        DialogBase.confirm(this, _t("Are you sure you want to delete this file ?"), {
             confirm_callback: function () {
                 var $helpBlock = this.$('.form-text').empty();
                 var $a = $(ev.currentTarget);
@@ -616,7 +617,7 @@ var ImageWidget = MediaWidget.extend({
                         return;
                     }
                     $helpBlock.replaceWith(QWeb.render('web_editor.dialog.image.existing.error', {
-                        views: prevented[id]
+                        views: prevented[id],
                     }));
                 });
             }
@@ -625,33 +626,29 @@ var ImageWidget = MediaWidget.extend({
     /**
      * @private
      */
-    _onChangeInputURL: function (ev) {
+    _onURLInputChange: function (ev) {
         var $input = $(ev.currentTarget);
-        var $button = $input.next('.input-group-append').children();
+        var $button = this.$('.o_upload_media_url_button');
+        var $success = this.$('.o_we_url_success');
+        var $warning = this.$('.o_we_url_warning');
+        var $error = this.$('.o_we_url_error');
+
         var inputValue = $input.val();
         var emptyValue = (inputValue === '');
-        var $warning = this.$('.warning-url');
-        var $success = this.$('.success-url');
-        var $error = this.$('.error-url');
-        var $btn = this.$('.o_upload_media_url_button');
-        var regex = /^(?:https?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/;
-        var isURL = regex.test(inputValue);
-        var showWarningOrError = (inputValue.length !== 0 ? isURL : !isURL);
 
-        $button.toggleClass('btn-secondary', emptyValue).toggleClass('btn-primary', !emptyValue)
-               .prop('disabled', emptyValue);
+        var isURL = /^.+\..+$/.test(inputValue); // TODO improve
+        var isImage = _.any(['.gif', '.jpe', '.jpg', '.png'], function (format) {
+            return inputValue.endsWith(format);
+        });
 
+        $button.toggleClass('btn-secondary', emptyValue).toggleClass('btn-primary', !emptyValue)
+               .prop('disabled', !isURL);
         if (!this.options.document) {
-            _.each(['.gif', '.jpe', '.jpg', '.png'], function (format) {
-                var endsWith = inputValue.endsWith(format);
-                $button.text(endsWith ? _t("Add image") : _t("Add as document"));
-            });
-        } else {
-            $btn.prop('disabled', !isURL);
+            $button.text((isURL && !isImage) ? _t("Add as document") : _t("Add image"));
         }
         $success.toggleClass('d-none', !isURL);
-        $warning.toggleClass('d-none', showWarningOrError);
-        $error.toggleClass('d-none', showWarningOrError);
+        $warning.toggleClass('d-none', !isURL || this.options.document || isImage);
+        $error.toggleClass('d-none', emptyValue || isURL);
     },
     /**
      * @private
@@ -675,9 +672,17 @@ var ImageWidget = MediaWidget.extend({
     /**
      * @private
      */
-    _onLoadMore: function () {
+    _onLoadMoreClick: function () {
         this._loadMoreImages();
     },
+    /**
+     * @override
+     */
+    _onSearchInput: function () {
+        this.imagesRows = this.IMAGES_ROWS;
+        this.IMAGES_DISPLAYED_TOTAL = this.IMAGES_PER_ROW * this.imagesRows;
+        this._super.apply(this, arguments);
+    },
 });
 
 /**
@@ -728,14 +733,6 @@ var IconWidget = MediaWidget.extend({
     /**
      * @override
      */
-    getControlPanelConfig: function () {
-        return _.extend(this._super.apply(this, arguments), {
-            pagerEnabled: false,
-        });
-    },
-    /**
-     * @override
-     */
     save: function () {
         var style = this.$media.attr('style') || '';
         var iconFont = this._getFont(this.selectedIcon) || {base: 'fa', font: ''};
@@ -849,11 +846,11 @@ var IconWidget = MediaWidget.extend({
  */
 var VideoWidget = MediaWidget.extend({
     template: 'web_editor.dialog.video',
-    events: {
+    events: _.extend({}, MediaWidget.prototype.events || {}, {
         'change .o_video_dialog_options input': '_onUpdateVideoOption',
         'input textarea#o_video_text': '_onVideoCodeInput',
         'change textarea#o_video_text': '_onVideoCodeChange',
-    },
+    }),
 
     /**
      * @constructor
@@ -894,15 +891,6 @@ var VideoWidget = MediaWidget.extend({
     /**
      * @override
      */
-    getControlPanelConfig: function () {
-        return _.extend(this._super.apply(this, arguments), {
-            searchEnabled: false,
-            pagerEnabled: false,
-        });
-    },
-    /**
-     * @override
-     */
     save: function () {
         this._updateVideo();
         if (this.$('.o_video_dialog_iframe').is('iframe')) {
@@ -1075,7 +1063,6 @@ var VideoWidget = MediaWidget.extend({
 
         // Hide the entire options box if no options are available
         $optBox.toggleClass('d-none', $optBox.find('div:not(.d-none)').length === 0);
-        $('.option_title').toggleClass('d-none');
 
         if (query.type === 'yt') {
             // Youtube only: If 'hide controls' is checked, hide 'fullscreen'
diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss
index 805ac4a35b6..ad9da79f788 100644
--- a/addons/web_editor/static/src/scss/web_editor.ui.scss
+++ b/addons/web_editor/static/src/scss/web_editor.ui.scss
@@ -1291,29 +1291,8 @@ body .modal {
         max-width: 80%;
 
         .modal-body {
-            .nav-tabs .active > a[href="#editor-media-icon"] {
-                background-color: white;
-            }
-
-            li.search {
-                .form-group {
-                    position: relative;
-                    margin: 0 10px 0 0;
-                    > input {
-                        padding-right: 30px;
-                    }
-                    > span {
-                        @include o-position-absolute(7px, 7px);
-                        font-size: 1.3em;
-                    }
-                }
-            }
-
-            .card {
-                border-color: gray('200');
-                border-top-width: 0;
-                border-top-left-radius: 0;
-                border-top-right-radius: 0;
+            .tab-pane {
+                min-height: 300px;
             }
 
             .o_existing_attachment_cell {
@@ -1357,8 +1336,6 @@ body .modal {
                 }
             }
             .font-icons-icons {
-                padding: 20px 0;
-
                 > span {
                     text-align: center;
                     font-size: 22px;
@@ -1377,34 +1354,14 @@ body .modal {
             }
 
             #editor-media-image, #editor-media-document {
-                .card {
-                    label {
-                        margin: auto 10px;
-                    }
-
-                    .btn-group {
-                        margin-right: 10px;
-                    }
-                }
-                .o_size_fa_icon {
-                    font-size: 1.4rem;
-                }
-                .o_size_dropdown_item {
-                    font-size: 0.9rem;
+                .o_we_url_input {
+                    width: 300px;
                 }
             }
 
             // VIDEO TAB
-            #editor-media-video .o_video_dialog_container {
-                padding: 0;
-                display: flex;
-                flex-flow: row wrap;
-
+            #editor-media-video {
                 .o_video_dialog_form {
-                    flex: 1 1 auto;
-                    min-width: 0;
-                    padding: 20px;
-
                     #o_video_form_group {
                         position: relative;
                         width: 100%;
@@ -1416,17 +1373,17 @@ body .modal {
                             overflow-y: scroll;
                         }
 
-                        > .o_validate_feedback {
+                        .o_validate_feedback {
                             @include o-position-absolute(auto, 10px, 10px);
 
                             > .fa {
                                 display: none;
                             }
                         }
-                        &.o_has_error > .o_validate_feedback > .fa-exclamation-triangle {
+                        &.o_has_error .o_validate_feedback > .fa-exclamation-triangle {
                             display: block;
                         }
-                        &.o_has_success > .o_validate_feedback > .fa-check {
+                        &.o_has_success .o_validate_feedback > .fa-check {
                             display: block;
                         }
                     }
@@ -1434,12 +1391,8 @@ body .modal {
 
                 #video-preview {
                     position: relative;
-                    flex: 1 0 50%;
-                    display: flex;
-                    flex-flow: column nowrap;
-                    justify-content: center;
 
-                    @include o-we-preview-box(0 19px);
+                    @include o-we-preview-box();
                     border: none;
 
                     .media_iframe_video {
@@ -1504,6 +1457,7 @@ body .modal {
 
         .o_bg_img_opt_cover_edition {
             @include o-we-preview-box;
+            padding: 0 25px 25px 25px;
 
             h6 {
                 color: white;
diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index 9bb6b705c8d..e556d6e5e4e 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -45,8 +45,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default;
 // ============    'Preview' component Mixins    ===============
 // Create a "preview" work-area to edit/customize specific elements
 
-@mixin o-we-preview-box($padding: 0px 25px 25px 25px, $color-text: white) {
-    padding: $padding;
+@mixin o-we-preview-box($color-text: white) {
     border-top: 1px solid black;
     border-bottom: 1px solid white;
     background-image: linear-gradient(-150deg, $o-we-color-dark, $o-we-color-darker);
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 0fc6434f0aa..5fcfac2f4aa 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -66,12 +66,21 @@
             <div role="tabpanel" class="tab-pane fade" id="editor-media-video"/>
         </div>
     </div>
+    <t t-name="web_editor.dialog.media.search">
+        <div class="input-group ml-auto">
+            <input type="text" class="form-control o_we_search" t-att-placeholder="searchPlaceholder.trim()"/>
+            <div class="input-group-append">
+                <div class="input-group-text o_we_search_icon">
+                    <i class="fa fa-search" title="Search" role="img" aria-label="Search"/>
+                </div>
+            </div>
+        </div>
+    </t>
 
     <!-- Image choosing part of the Media Dialog -->
     <t t-name="web_editor.dialog.image">
         <t t-set="iframeName" t-value="_.uniqueId('fileframe-')"/>
-        <form class="form-inline"
-            method="POST"
+        <form method="POST"
             action="/web_editor/attachment/add"
             enctype="multipart/form-data"
             t-att-target="iframeName">
@@ -79,108 +88,71 @@
             <input type="hidden" name="filters" t-att-value="widget.firstFilters.join('_')"/>
             <input t-if="widget.options.res_id" type="hidden" name="res_id" t-att-value="widget.options.res_id"/>
             <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
-            <div class="mt-4 w-100">
-                <div class="mb-4">
-                    <div class="o_submenu"></div>
-                </div>
-                <div class="form-text"/>
-                <div class="existing-attachments">
-                    <t t-call="web_editor.dialog.image.existing"/>
-                </div>
-                <div class="mt-4 text-center o_load_elements mx-auto">
-                    <button class="btn btn-primary o_load_more" type="button">Load more...</button>
-                    <div class="mt-4 o_load_done_msg d-none">
-                        <span><i>All attachments have been loaded</i></span>
-                    </div>
+            <t t-call="web_editor.dialog.files.submenu">
+                <t t-set="isDocument" t-value="widget.options.document"/>
+                <t t-set="accept" t-value="widget.accept"/>
+            </t>
+            <div class="form-text"/>
+            <div class="existing-attachments"/>
+            <div class="mt-4 text-center mx-auto">
+                <button class="btn btn-primary o_load_more" type="button">Load more...</button>
+                <div class="mt-4 o_load_done_msg d-none">
+                    <span><i>All attachments have been loaded</i></span>
                 </div>
             </div>
             <iframe class="o_file_upload_iframe d-none" t-att-name="iframeName"/>
         </form>
     </t>
     <t t-name="web_editor.dialog.files.submenu">
-        <div class="o_submenu">
-            <div class="row">
-                <div class="col-sm">
-                    <div class="form-inline row no-gutters">
-                        <input type="file" class="d-none o_file_input" name="upload" t-att-accept="accept" multiple="multiple"/>
-                        <input type="hidden" name="disable_optimization" value=""/>
-                        <div class="btn-group o_btn_group_image">
-                            <button class="btn btn-primary o_upload_media_button" type="button">
-                                <t t-if="isDocument">Upload a document</t>
-                                <t t-else="">Upload an image</t>
-                            </button>
-                            <t t-if="!isDocument">
-                                <button class="btn btn-primary dropdown-toggle dropdown-toggle-split o_media_optimization" data-toggle="dropdown" type="button">
-                                    <span class="sr-only">Alternate Upload</span>
-                                </button>
-                                <div class="dropdown-menu" role="menu">
-                                    <a role="menuitem" class="dropdown-item o_upload_media_button_no_optimization">Upload image without optimization</a>
-                                </div>
-                            </t>
-                        </div>
-                        <div class="input-group col-8 ml-2">
-                            <input type="text" class="form-control url col-7" name="url" t-attf-placeholder="https://www.odoo.com/#{isDocument ? 'mydocument' : 'logo.png'}"/>
-                            <div class="input-group-append ml-2">
-                                <button type="button" class="btn btn-sm btn-secondary o_upload_media_url_button" disabled="disabled">
-                                    <t t-if="isDocument">Add document</t>
-                                    <t t-else="">Add image</t>
-                                </button>
-                            </div>
-                            <div class="ml-2 o_size_fa_icon">
-                                <span class="success-url text-success d-none fa fa-check" title="The URL seems valid"/>
-                                <t t-if="isDocument">
-                                    <span class="error-url text-danger d-none fa fa-times" title="This URL does not seem to work"/>
-                                </t>
-                                <t t-else="">
-                                    <span class="warning-url text-warning d-none fa fa-warning" title="The URL provided does not contain any image. It will be added in the document section."/>
-                                </t>
-                            </div>
-                        </div>
+        <div class="form-inline align-items-center py-4">
+            <input type="file" class="d-none o_file_input" name="upload" t-att-accept="accept" multiple="multiple"/>
+            <input type="hidden" name="disable_optimization" value=""/>
+
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary o_upload_media_button">
+                    <t t-if="isDocument">Upload a document</t>
+                    <t t-else="">Upload an image</t>
+                </button>
+                <t t-if="!isDocument">
+                    <button class="btn btn-primary dropdown-toggle dropdown-toggle-split o_media_optimization" data-toggle="dropdown" type="button">
+                        <span class="sr-only">Alternate Upload</span>
+                    </button>
+                    <div class="dropdown-menu" role="menu">
+                        <button type="button" role="menuitem" class="dropdown-item o_upload_media_button_no_optimization">Upload image without optimization</button>
                     </div>
-                </div>
-                <div class="col-sm text-right">
-                    <ul class="list-unstyled row">
-                        <li class="nav-item ml-auto col-6 search">
-                            <div class="form-group o_search_div">
-                                <t t-set="searchPlaceholder">
-                                    <t t-if="isDocument">Search a document</t>
-                                    <t t-else="">Search an image</t>
-                                </t>
-                                <input class="form-control w-100" id="icon-search" type="search" t-att-placeholder="searchPlaceholder.trim()"/>
-                                <span class="fa fa-search" title="Search" role="img" aria-label="Search"/>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+                </t>
             </div>
-        </div>
-    </t>
-    <t t-name="web_editor.dialog.image.existing">
-        <div role="dialog" class="modal" tabindex="-1">
-            <div class="modal-dialog select-image">
-                <div class="modal-content">
-                    <header class="modal-header">
-                        <h3 class="modal-title">Select a Picture</h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
-                    </header>
-                    <main class="modal-body o_has_error">
-                        <div class="existing-attachments"/>
-                        <div class="form-text"/>
-                    </main>
-                    <footer class="modal-footer">
-                        <button data-dismiss="modal" type="button" aria-label="Discard">Discard</button>
-                    </footer>
+
+            <div class="input-group align-items-center ml-2">
+                <input type="text" class="form-control o_we_url_input" name="url" t-attf-placeholder="https://www.odoo.com/#{isDocument ? 'mydocument' : 'logo.png'}"/>
+                <div class="input-group-append align-items-center">
+                    <button type="button" class="btn btn-secondary o_upload_media_url_button" disabled="disabled">
+                        <t t-if="isDocument">Add document</t>
+                        <t t-else="">Add image</t>
+                    </button>
+                    <div class="ml-2">
+                        <span class="o_we_url_success text-success d-none fa fa-lg fa-check" title="The URL seems valid"/>
+                        <span class="o_we_url_warning text-warning d-none fa fa-lg fa-warning" title="The URL does not contain any image. The file will be added in the document section."/>
+                        <span class="o_we_url_error text-danger d-none fa fa-lg fa-times" title="The URL does not seem to work"/>
+                    </div>
                 </div>
             </div>
+
+            <t t-call="web_editor.dialog.media.search">
+                <t t-set="searchPlaceholder">
+                    <t t-if="isDocument">Search a document</t>
+                    <t t-else="">Search an image</t>
+                </t>
+            </t>
         </div>
     </t>
     <t t-name="web_editor.dialog.files.existing.content">
         <div class="existing-attachments">
-            <div class="row mt16 ml-auto" t-as="row" t-foreach="rows">
-                <div class="col-2 o_existing_attachment_cell" t-as="attachment" t-foreach="row">
+            <div t-foreach="rows" t-as="row" class="row mt-2">
+                <div t-foreach="row" t-as="attachment" class="col-2 o_existing_attachment_cell">
                     <i t-if="attachment.res_model === 'ir.ui.view'" class="fa fa-trash o_existing_attachment_remove" title="This file is a public view attachment" role="img" aria-label="This file is a public view attachment" t-att-data-id="attachment.id"/>
                     <i t-else="" class="fa fa-trash o_existing_attachment_remove" title="This file is attached to the current record" role="img" aria-label="This file is attached to the current record" t-att-data-id="attachment.id"/>
-                    <div class="o_attachment_border" t-att-style="attachment.res_model === 'ir.ui.view' ? null : 'border: 1px solid #5cb85c;'"><div t-att-data-src="attachment.src" t-att-data-url="attachment.url" role="img" t-att-aria-label="attachment.name" t-att-title="attachment.name" t-att-data-id="attachment.id" t-att-data-mimetype="attachment.mimetype" class="o_image o_image_loading"/></div>
+                    <div class="o_attachment_border" t-att-style="attachment.res_model === 'ir.ui.view' ? null : 'border: 1px solid #5cb85c;'"><div t-att-data-src="attachment.src" t-att-data-url="attachment.url" role="img" t-att-aria-label="attachment.name" t-att-title="attachment.name" t-att-data-id="attachment.id" t-att-data-mimetype="attachment.mimetype" t-attf-class="o_image #{withEffect ? 'o_image_loading' : ''}"/></div>
                     <t t-if="isDocument">
                         <small class="o_file_name"><t t-esc="attachment.name"/></small>
                     </t>
@@ -204,14 +176,11 @@
 
     <!-- Icon choosing part of the Media Dialog -->
     <t t-name="web_editor.dialog.font-icons">
-        <form action="#" class="mt-2">
-            <div class="d-flex flex-row-reverse">
-                <li class="nav-item search list-unstyled col-3 p-2">
-                    <div class="form-group">
-                        <input class="form-control" id="icon-search" type="search" placeholder="Search a pictogram"/>
-                        <span class="fa fa-search" title="Search" role="img" aria-label="Search"/>
-                    </div>
-                </li>
+        <form action="#">
+            <div class="form-inline align-items-center py-4">
+                <t t-call="web_editor.dialog.media.search">
+                    <t t-set="searchPlaceholder">Search a pictogram</t>
+                </t>
             </div>
             <div class="font-icons-icons">
                 <t t-call="web_editor.dialog.font-icons.icons">
@@ -232,57 +201,57 @@
     </t>
 
     <!-- Video choosing part of the Media Dialog -->
-    <div t-name="web_editor.dialog.video" class="o_video_dialog_container mt-4">
-        <form action="#" class="form-inline w-100">
-            <div class="o_video_dialog_form">
+    <t t-name="web_editor.dialog.video">
+        <form action="#" class="row">
+            <div class="col mt-4 o_video_dialog_form">
                 <div class="form-group mb-2" id="o_video_form_group">
-                    <label>Video code </label>
-                    <small class="ml-1 form-text text-muted"> (URL or Embed)</small>
-                    <label class="ml-2 col-form-label o_validate_feedback position-static" for="o_video_text">
-                        <i class="fa fa-check text-success" role="img" aria-label="Checked" title="Checked"/>
-                        <i class="fa fa-exclamation-triangle text-danger" role="img" aria-label="Attention" title="Attention"/>
+                    <label class="col-form-label" for="o_video_text">
+                        Video code <small>(URL or Embed)</small>
+                        <div class="o_validate_feedback">
+                            <i class="fa fa-check text-success" role="img" aria-label="Checked" title="Checked"/>
+                            <i class="fa fa-exclamation-triangle text-danger" role="img" aria-label="Attention" title="Attention"/>
+                        </div>
                     </label>
-                    <textarea class="form-control url" id="o_video_text" placeholder="Copy-paste your URL or embed code here"/>
+                    <textarea class="form-control" id="o_video_text" placeholder="Copy-paste your URL or embed code here"/>
                 </div>
                 <div class="text-right">
                     <small class="text-muted">Accepts <b><i>Youtube</i></b>, <b><i>Instagram</i></b>, <b><i>Vine.co</i></b>, <b><i>Vimeo</i></b>, <b><i>Dailymotion</i></b> and <b><i>Youku</i></b> videos</small>
                 </div>
                 <div class="o_video_dialog_options d-none mt-4">
-                    <div class="option_title mb-2 d-flex">
-                        <label>Options</label>
-                    </div>
-                    <div class="o_yt_option o_vim_option o_dm_option d-flex">
+                    <div class="o_yt_option o_vim_option o_dm_option">
                         <label class="o_switch mb0"><input id="o_video_autoplay" type="checkbox"/><span/>Autoplay</label>
                     </div>
-                    <div class="o_yt_option o_vim_option d-flex">
+                    <div class="o_yt_option o_vim_option">
                         <label class="o_switch mb0"><input id="o_video_loop" type="checkbox"/><span/>Loop</label>
                     </div>
-                    <div class="o_yt_option o_dm_option d-flex">
+                    <div class="o_yt_option o_dm_option">
                         <label class="o_switch mb0"><input id="o_video_hide_controls" type="checkbox"/><span/>Hide player controls</label>
                     </div>
-                    <div class="o_yt_option d-flex">
+                    <div class="o_yt_option">
                         <label class="o_switch mb0"><input id="o_video_hide_fullscreen" type="checkbox"/><span/>Hide fullscreen button</label>
                     </div>
-                    <div class="o_yt_option d-flex">
+                    <div class="o_yt_option">
                         <label class="o_switch mb0"><input id="o_video_hide_yt_logo" type="checkbox"/><span/>Hide Youtube logo</label>
                     </div>
-                    <div class="o_dm_option d-flex">
+                    <div class="o_dm_option">
                         <label class="o_switch mb0"><input id="o_video_hide_dm_logo" type="checkbox"/><span/>Hide Dailymotion logo</label>
                     </div>
-                    <div class="o_dm_option d-flex">
+                    <div class="o_dm_option">
                         <label class="o_switch mb0"><input id="o_video_hide_dm_share" type="checkbox"/><span/>Hide sharing button</label>
                     </div>
                 </div>
             </div>
-            <div id="video-preview">
-                <div class="o_video_dialog_preview_text small mt16 mb8 d-none">Preview</div>
-                <div class="media_iframe_video">
-                    <div class="media_iframe_video_size"/>
-                    <iframe class="o_video_dialog_iframe" allowfullscreen="allowfullscreen" frameborder="0" src=""/>
+            <div class="col-md-6">
+                <div id="video-preview" class="p-3">
+                    <div class="o_video_dialog_preview_text small mb-2 d-none">Preview</div>
+                    <div class="media_iframe_video">
+                        <div class="media_iframe_video_size"/>
+                        <iframe class="o_video_dialog_iframe" allowfullscreen="allowfullscreen" frameborder="0" src=""/>
+                    </div>
                 </div>
             </div>
         </form>
-    </div>
+    </t>
 
     <!-- Link Dialog (allows to choose a style and content for a link on the page) -->
     <div t-name="web_editor.dialog.link" class="o_link_dialog">
@@ -354,7 +323,7 @@
                 <div class="form-group text-center">
                     <label>Preview</label>
                     <div style="overflow: auto; max-width: 100%; max-height: 200px;">
-                        <a href="#" type="button" id="link-preview" aria-label="Preview" title="Preview"/>
+                        <a href="#" id="link-preview" aria-label="Preview" title="Preview"/>
                     </div>
                 </div>
             </div>