[FIX] *: BS4, restore modal headers

Close icon should now be put after the modal title in the DOM.
Completes commit https://github.com/odoo/odoo/commit/d9801c1abe06b4c20702c0e94c56eea6a3ed8327

19 files changed, 29 insertions, 29 deletions

diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index 543f2b5a9f7..289a1d75486 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -125,8 +125,8 @@
                 <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
                             <h3 class="mt0 ml16 mb0">History</h3>
+                            <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
                         </div>
                         <div class="modal-body">
                             <t t-call="portal.message_thread">
diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml
index 3e0b4c2729a..88c5b228100 100644
--- a/addons/account_payment/views/account_portal_templates.xml
+++ b/addons/account_payment/views/account_portal_templates.xml
@@ -41,8 +41,8 @@
                 <div class="modal-dialog modal-content">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
                             <h3 class="modal-title">Pay with</h3>
+                            <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
                         </div>
                         <div class="modal-footer">
                             <div t-if="pms or s2s_acquirers or form_acquirers" id="payment_method" class="text-left col-md-13">
diff --git a/addons/payment_stripe/static/src/xml/stripe_templates.xml b/addons/payment_stripe/static/src/xml/stripe_templates.xml
index e9d96af9263..fd47d911cc9 100644
--- a/addons/payment_stripe/static/src/xml/stripe_templates.xml
+++ b/addons/payment_stripe/static/src/xml/stripe_templates.xml
@@ -5,8 +5,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                     <h4 class="modal-title">Error</h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                 </header>
                 <main class="modal-body">
                     <t t-esc="msg"></t>
diff --git a/addons/stock/static/src/xml/stock_traceability_report_backend.xml b/addons/stock/static/src/xml/stock_traceability_report_backend.xml
index 1c60cd85b23..e2aa016b5e6 100644
--- a/addons/stock/static/src/xml/stock_traceability_report_backend.xml
+++ b/addons/stock/static/src/xml/stock_traceability_report_backend.xml
@@ -10,8 +10,8 @@
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     <h3 class="modal-title">Error</h3>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                 </header>
                 <main class="modal-body">
                     <p id='insert_error' class='text-center'></p>
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 23b27336629..bd9657f79c8 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -212,8 +212,8 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                         <h4 class="modal-title">A problem has occured</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                     </header>
                     <main class="modal-body"><p>Something went wrong while contacting survey server. <strong class="text-danger">Your answers have probably not been recorded.</strong> Try refreshing.</p></main>
                     <footer class="modal-footer"><button type="button" class="btn btn-primary" data-dismiss="modal">Close</button></footer>
diff --git a/addons/theme_bootswatch/views/theme_bootswatch_templates.xml b/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
index 21dc869e441..f0da5e7e2d9 100644
--- a/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
+++ b/addons/theme_bootswatch/views/theme_bootswatch_templates.xml
@@ -7,8 +7,8 @@
                 <div class="modal-content">
                     <div class="loading_backdrop"></div>
                         <header class="modal-header">
-                            <button type="button" class="close">×</button>
                             <h4 class="modal-title">Customize your theme</h4>
+                            <button type="button" class="close">×</button>
                         </header>
                         <main class="modal-body">
                             <div class="row">
diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js
index 2c856d4b152..bf72f9f945f 100644
--- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js
+++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js
@@ -99,8 +99,8 @@ define([
                  '<div class="modal-content">' +
                    (title ?
                    '<header class="modal-header">' +
-                     '<button type="button" class="close" aria-hidden="true" tabindex="-1">&times;</button>' +
                      '<h4 class="modal-title">' + title + '</h4>' +
+                     '<button type="button" class="close" aria-hidden="true" tabindex="-1">&times;</button>' +
                    '</header>' : ''
                    ) +
                    '<main class="modal-body">' + body + '</main>' +
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 7bac85692e2..57146f5be37 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -121,8 +121,8 @@
             <div class="modal-dialog select-image">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <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"/>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index e391fcfd5f8..5f85f6d5d09 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -5,8 +5,8 @@
                 <div class="modal-dialog">
                 <div class="modal-content">
                     <header class="modal-header" t-if="window_title">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     </header>
                     <main class="modal-body">
                         <form role="form" t-att-id="id">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d8cd83e37fa..310be357b8a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -727,8 +727,8 @@
                     <form role="form">
                     <div class="modal-content">
                         <header class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                             <h3 class="modal-title">Reset templates</h3>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         </header>
                         <main class="modal-body">
                             <div class="form-group row mb0">
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index f52c8ce99bf..623419e8dbd 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -119,8 +119,8 @@
               <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h4 class="modal-title">World Map</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     </header>
                     <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
                     style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
@@ -272,8 +272,8 @@
                     <form method="POST" class="modal-content js_website_submit_form new_opp_form">
                         <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                         <header class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             <h4 class="modal-title">New Opportunity</h4>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                         </header>
                         <main class="modal-body" id="new-opp-dialog">
                             <div class="form-group">
@@ -431,8 +431,8 @@
                             <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                             <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
                             <header class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                 <h4 class="modal-title">Lead Feedback</h4>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             </header>
                             <main class="modal-body" id="sign-dialog">
                                 <div class="form-group">
@@ -460,8 +460,8 @@
                             <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                             <input type="hidden" name="lead_id" class="assign_lead_id" t-att-value="lead.id"/>
                             <header class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                 <h4 class="modal-title">Lead Feedback</h4>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             </header>
                             <main class="modal-body" id="sign-dialog">
                                 <div class="form-group">
@@ -545,8 +545,8 @@
                                         <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                                         <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
                                         <header class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                             <h4 class="modal-title">Edit Contact</h4>
+                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                         </header>
                                         <main class="modal-body" id="sign-dialog">
                                             <t t-if="opportunity.partner_name">
@@ -660,8 +660,8 @@
                                         <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                                         <input type="hidden" name="opportunity_id" class="opportunity_id" t-att-value="opportunity.id"/>
                                         <header class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                             <h4 class="modal-title">Edit Opportunity</h4>
+                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                                         </header>
                                         <main class="modal-body" id="sign-dialog">
                                             <div class="form-group">
diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml
index e2ee949ef54..d27dc19b146 100644
--- a/addons/website_customer/views/website_customer_templates.xml
+++ b/addons/website_customer/views/website_customer_templates.xml
@@ -69,8 +69,8 @@
               <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h4 class="modal-title">World Map</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     </header>
                     <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
                     style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index e454e13c2d6..9578d66115d 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -524,8 +524,8 @@
                 <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">x</button>
                         <h4 class="modal-title" id="myModalLabel"><strong>Attendees</strong></h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">x</button>
                     </header>
                     <main class="modal-body">
                         <div class="container">
diff --git a/addons/website_forum/static/src/xml/website_forum_share_templates.xml b/addons/website_forum/static/src/xml/website_forum_share_templates.xml
index 29d88594b4b..8cd8a27117e 100644
--- a/addons/website_forum/static/src/xml/website_forum_share_templates.xml
+++ b/addons/website_forum/static/src/xml/website_forum_share_templates.xml
@@ -3,10 +3,10 @@
         <div role="dialog" class="modal fade" id="oe_social_share_modal">
             <div class="modal-dialog modal-content">
                 <header class="modal-header alert alert-info mb0" role="status">
+                    <h4 class="modal-title">Thanks for posting!</h4>
                     <button type="button" class="close" data-dismiss="modal">
                         <span role="img" aria-label="Close">x</span>
                     </button>
-                    <h4 class="modal-title">Thanks for posting!</h4>
                 </header>
                 <main class="modal-body">
                     <t t-if="target_type == 'question'" t-call="website_forum.social_message_question"/>
diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml
index 5efaf47c31a..4d43d5398f6 100644
--- a/addons/website_gengo/static/src/xml/website.gengo.xml
+++ b/addons/website_gengo/static/src/xml/website.gengo.xml
@@ -11,8 +11,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                     <h2 class="modal-title">Translate this page</h2>
+                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
                     <section>
@@ -58,8 +58,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                     <h2 class="modal-title">Select Gengo Translation Service Level</h2>
+                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
                     <section>
@@ -85,8 +85,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                     <h2 class="modal-title">Translator statistics for this page</h2>
+                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
                     <b>
@@ -110,8 +110,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                     <h2 class="modal-title">Gengo API is not configured</h2>
+                    <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
                     <b> <h3>Steps for configure Gengo </h3>
diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml
index 7493434af6b..5883be37029 100644
--- a/addons/website_membership/views/website_membership_templates.xml
+++ b/addons/website_membership/views/website_membership_templates.xml
@@ -104,8 +104,8 @@
               <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h4 class="modal-title">World Map</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     </header>
                     <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
                     style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index e22f12639db..26dc036962a 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -358,8 +358,8 @@
                            <form id="accept" method="POST" t-att-data-order-id="quotation.id" t-att-data-token="quotation.access_token" class="js_accept_json modal-content js_website_submit_form">
                             <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                             <header class="modal-header">
-                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                               <h4 class="modal-title">Validate Order</h4>
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             </header>
                             <main class="modal-body" id="sign-dialog">
                                 <p>
@@ -381,8 +381,8 @@
 
                         <div class="modal-dialog modal-content" t-if="not (quotation.has_to_be_signed() and not quotation.signature) and (quotation.has_to_be_paid() or need_payment)">
                           <header class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             <h4 class="modal-title">Validate Order</h4>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                           </header>
                           <main class="modal-body" id="sign-dialog">
                             <p>
@@ -414,8 +414,8 @@
                           <form id="decline" method="POST" t-attf-action="/quote/#{quotation.id}/#{quotation.access_token}/decline" class="modal-content">
                             <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                             <header class="modal-header">
-                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                               <h4 class="modal-title">Reject This Quote</h4>
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">&amp;times;</button>
                             </header>
                             <main class="modal-body">
                               <p>
diff --git a/addons/website_sale_options/views/website_sale_options_templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml
index e33e1e5b489..5a4c06bdce7 100644
--- a/addons/website_sale_options/views/website_sale_options_templates.xml
+++ b/addons/website_sale_options/views/website_sale_options_templates.xml
@@ -30,8 +30,8 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <header class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">x</button>
         <h4 class="modal-title" id="myModalLabel">Add to Cart</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">x</button>
       </header>
       <main class="modal-body">
         <table class="table table-striped table-sm">
diff --git a/addons/website_slides/static/src/xml/website_slides.xml b/addons/website_slides/static/src/xml/website_slides.xml
index 58618f2f48a..5aa9cf49d13 100644
--- a/addons/website_slides/static/src/xml/website_slides.xml
+++ b/addons/website_slides/static/src/xml/website_slides.xml
@@ -5,8 +5,8 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <header class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h3 class="modal-title">Upload Presentation</h3>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                     </header>
                     <div class="oe_slides_upload_loading text-center" style="display:none" aria-hidden="true" role="status">
                         <h4><i class='fa fa-spinner fa-spin'></i> Uploading presentation...  </h4>