[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3

See sub-commits for details.

task-49280
Closes https://github.com/odoo/odoo/pull/25045

5 files changed, 34 insertions, 34 deletions

diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js
index b331ebf366c..e869f607d6e 100644
--- a/addons/website_slides/static/src/js/slides.js
+++ b/addons/website_slides/static/src/js/slides.js
@@ -130,7 +130,7 @@ var page_widgets = {};
             var input = this.$('input');
             var slide_id = this.$('button').data('slide-id');
             if(input.val() && input[0].checkValidity()){
-                this.$el.removeClass('has-error');
+                this.$el.removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid');
                 ajax.jsonRpc('/slides/slide/send_share_email', 'call', {
                     slide_id: slide_id,
                     email: input.val(),
@@ -138,7 +138,7 @@ var page_widgets = {};
                     self.$el.html($('<div class="alert alert-info" role="alert"><strong>Thank you!</strong> Mail has been sent.</div>'));
                 });
             }else{
-                this.$el.addClass('has-error');
+                this.$el.addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
                 input.focus();
             }
         },
diff --git a/addons/website_slides/static/src/js/slides_embed.js b/addons/website_slides/static/src/js/slides_embed.js
index d3d1321e6c8..617b0b900e8 100644
--- a/addons/website_slides/static/src/js/slides_embed.js
+++ b/addons/website_slides/static/src/js/slides_embed.js
@@ -184,7 +184,7 @@ $(document).ready(function () {
             var input = widget.find('input');
             var slide_id = widget.find('button').data('slide-id');
             if(input.val() && input[0].checkValidity()){
-                widget.removeClass('has-error');
+                widget.removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid');
                 $.ajax({
                     type: "POST",
                     dataType: 'json',
@@ -199,7 +199,7 @@ $(document).ready(function () {
                     }
                 });
             }else{
-                widget.addClass('has-error');
+                widget.addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
                 input.focus();
             }
         });
diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js
index b3953f12571..64202bba7bb 100644
--- a/addons/website_slides/static/src/js/slides_upload.js
+++ b/addons/website_slides/static/src/js/slides_upload.js
@@ -335,14 +335,14 @@ var SlideDialog = Widget.extend({
         return values;
     },
     validate: function () {
-        this.$('.form-group').removeClass('has-error');
+        this.$('.form-group').removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid');
         if (!this.$('#name').val()) {
-            this.$('#name').closest('.form-group').addClass('has-error');
+            this.$('#name').closest('.form-group').addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
             return false;
         }
         var url = this.$('#url').val() ? this.is_valid_url : false;
         if (!(this.file.name || url)) {
-            this.$('#url').closest('.form-group').addClass('has-error');
+            this.$('#url').closest('.form-group').addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
             return false;
         }
         return true;
diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss
index 2bc4681d451..10f50bef28b 100644
--- a/addons/website_slides/static/src/scss/website_slides.scss
+++ b/addons/website_slides/static/src/scss/website_slides.scss
@@ -1,14 +1,14 @@
 // FIXME may be useless (check initial code here: https://github.com/odoo/odoo/blob/51be5bbfb38db784cb3406877cc0e8806b1bf55a/addons/website_slides/static/src/less/website_slides.less#L1)
 $nav-tabs-border-color: #dddddd !default;
-$brand-info: #dddddd !default;
+$info: #dddddd !default;
 $body-bg: #FFFFFF !default;
-$brand-primary: #428bca !default;
-$link-color: $brand-primary !default;
+$primary: #428bca !default;
+$link-color: theme-color('primary') !default;
 $panel-footer-bg: #f5f5f5 !default;
 $nav-link-hover-bg: #FFFFFF !default;
 $navbar-default-link-color: #777 !default;
 $navbar-default-link-hover-color: #333 !default;
-$navbar-default-bg: #f8f8f8 !default;
+$light: #f8f8f8 !default;
 $MAX-Z-INDEX : 2147483647 !default;
 
 @mixin top-covered-image {
@@ -17,11 +17,11 @@ $MAX-Z-INDEX : 2147483647 !default;
 }
 
 .oe_slides_panel_footer {
-    background-color: $navbar-default-bg;
+    background-color: $light;
 }
 
 .oe_slides_panel_footer .fa, .oe_slide_js_embed_option_link{
-    color : $brand-primary;
+    color : theme-color('primary');
     cursor: pointer;
 }
 
@@ -185,7 +185,7 @@ textarea.o_slides_comment {
     .o_slide_navigation_buttons {
         margin-left: 15px;
         margin-right: -15px;
-        .col-xs-4 {
+        .col-4 {
             display: none;
         }
     }
diff --git a/addons/website_slides/static/src/xml/website_slides.xml b/addons/website_slides/static/src/xml/website_slides.xml
index 0df830eb5db..58618f2f48a 100644
--- a/addons/website_slides/static/src/xml/website_slides.xml
+++ b/addons/website_slides/static/src/xml/website_slides.xml
@@ -12,53 +12,53 @@
                         <h4><i class='fa fa-spinner fa-spin'></i> Uploading presentation...  </h4>
                     </div>
                     <main class="modal-body">
-                        <form class="clearfix form-horizontal">
-                            <div class="form-group">
-                                <div class="col-sm-4">
+                        <form class="clearfix">
+                            <div class="form-group row">
+                                <div class="col-md-4">
                                     <div class="img-thumbnail">
                                         <div class="o_slide_preview">
-                                            <img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-responsive"/>
+                                            <img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-fluid"/>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-8">
+                                <div class="col-md-8">
                                     <ul class="list-group">
                                         <li class="list-group-item active">
                                             <h5 class="list-group-item-heading">
-                                                <label for="upload" class="control-label">PDF or Image File</label>
+                                                <label for="upload" class="col-form-label">PDF or Image File</label>
                                             </h5>
                                             <input id="upload" name="file" class="form-control" accept="image/*,application/pdf" type="file"/>
                                         </li>
                                         <li class="list-group-item">
                                             <h5 class="list-group-item-heading">
-                                                <label for="url" class="control-label">Youtube or Google Doc URL</label>
+                                                <label for="url" class="col-form-label">Youtube or Google Doc URL</label>
                                             </h5>
                                             <input id="url" name="url" class="form-control" placeholder="Youtube Video URL"/>
                                         </li>
                                     </ul>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label for="name" class="control-label col-sm-2">Title</label>
-                                <div class="col-sm-10">
+                            <div class="form-group row">
+                                <label for="name" class="col-form-label col-md-2">Title</label>
+                                <div class="col-md-10">
                                     <input id="name" placeholder="Title" class="form-control" required="required"/>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label for="tag_ids" class="control-label col-sm-2">Tags</label>
-                                <div class="controls col-sm-10">
+                            <div class="form-group row">
+                                <label for="tag_ids" class="col-form-label col-md-2">Tags</label>
+                                <div class="controls col-md-10">
                                     <input id="tag_ids" type="hidden"/>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label for="category_id" class="control-label col-sm-2">Category</label>
-                                <div class="controls col-sm-10">
+                            <div class="form-group row">
+                                <label for="category_id" class="col-form-label col-md-2">Category</label>
+                                <div class="controls col-md-10">
                                     <input id="category_id" type="hidden"/>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label for="description" class="control-label col-sm-2">Description</label>
-                                <div class="controls col-sm-10">
+                            <div class="form-group row">
+                                <label for="description" class="col-form-label col-md-2">Description</label>
+                                <div class="controls col-md-10">
                                     <textarea id="description" rows="4" placeholder="Description" class="form-control"></textarea>
                                 </div>
                             </div>
@@ -68,7 +68,7 @@
                     <footer class="modal-footer">
                         <button type="button" data-loading-text="Loading..." class="btn btn-primary save">Save as Draft</button>
                         <button type="button" data-loading-text="Loading..." data-published="true" class="btn btn-primary save">Save and Publish</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Discard</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Discard</button>
                     </footer>
                 </div>
             </div>