From 4c8eeb7f585cd471071dce0d47aa486bc6f668eb Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Thu, 3 Jan 2019 12:54:10 +0000
Subject: [PATCH] [FIX] website_*: set correct order on modal footer button

Modal primary button should be the one in the corner (left if buttons aligned
left, right if buttons aligned right) as in the Bootstrap doc.
More than a simple guideline, the user will intuitively click on the button in
the corner as it is supposed to be the primary one.

Plus some DOM fixes (o_technical_modal was missing, H2 was too big especially
since BS4)

Closes #29890
task-1922120
---
 addons/website/views/website_templates.xml    |  2 +-
 .../website_crm_partner_assign_templates.xml  | 12 +++++------
 .../website_event/views/event_templates.xml   |  6 ++----
 .../static/src/xml/website.gengo.xml          | 20 +++++++++----------
 .../static/src/xml/website_slides.xml         |  2 +-
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 2228d742c46..addf6b58344 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -991,8 +991,8 @@
                             </div>
                         </main>
                         <footer class="modal-footer">
-                            <input type="submit" value="Confirm" class="btn btn-primary"/>
                             <button type="button" class="btn" data-dismiss="modal" aria-label="Cancel">Cancel</button>
+                            <input type="submit" value="Confirm" class="btn btn-primary"/>
                         </footer>
                     </div>
                     </form>
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 08d218f1b02..f578142cd48 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
@@ -291,8 +291,8 @@
                             </div>
                         </main>
                         <footer class="modal-footer">
-                            <button t-attf-class="btn btn-primary new_opp_confirm">Confirm</button> or
-                            <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                            <button t-attf-class="btn btn-primary new_opp_confirm">Confirm</button>
                         </footer>
                     </form>
                 </div>
@@ -444,8 +444,8 @@
                                 </div>
                             </main>
                             <footer class="modal-footer">
-                                <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
                                 <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                                <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
                             </footer>
                         </form>
                     </div>
@@ -477,8 +477,8 @@
                                 </div>
                             </main>
                             <footer class="modal-footer">
-                                <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
                                 <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                                <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
                             </footer>
                         </form>
                     </div>
@@ -709,8 +709,8 @@
                                             </div>
                                         </main>
                                         <footer class="modal-footer">
-                                            <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
                                             <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                                            <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
                                         </footer>
                                     </form>
                                 </div>
@@ -789,8 +789,8 @@
                                             </div>
                                         </main>
                                         <footer class="modal-footer">
-                                            <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
                                             <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                                            <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
                                         </footer>
                                     </form>
                                 </div>
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index fc70e2ee4b0..0d8d28bc4be 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -546,10 +546,8 @@
                         </div>
                     </main>
                     <footer class="modal-footer">
-                        <div class="float-left">
-                            <button type="submit" class="btn btn-primary">Continue</button>
-                            <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel Registration</button>
-                        </div>
+                        <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary">Continue Registration</button>
                     </footer>
                 </div>
             </form>
diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml
index 4d43d5398f6..305c61e6888 100644
--- a/addons/website_gengo/static/src/xml/website.gengo.xml
+++ b/addons/website_gengo/static/src/xml/website.gengo.xml
@@ -11,7 +11,7 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <h2 class="modal-title">Translate this page</h2>
+                    <h4 class="modal-title">Translate this page</h4>
                     <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
@@ -54,11 +54,11 @@
 </t>
 
 <t t-name="website.GengoTranslatorPostDialog">
-    <div role="dialog" class="modal fade" tabindex="-1">
+    <div role="dialog" class="modal o_technical_modal fade" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <h2 class="modal-title">Select Gengo Translation Service Level</h2>
+                    <h4 class="modal-title">Select Gengo Translation Service Level</h4>
                     <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
@@ -81,17 +81,17 @@
 </t>
 
 <t t-name="website.GengoTranslatorStatisticDialog">
-    <div role="dialog" class="modal fade" tabindex="-1">
+    <div role="dialog" class="modal o_technical_modal fade" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <h2 class="modal-title">Translator statistics for this page</h2>
+                    <h5 class="modal-title">Translator statistics for this page</h5>
                     <button title="Close" aria-label="Close" type="button" class="close" data-dismiss="modal">×</button>
                 </header>
                 <main class="modal-body">
                     <b>
                         <div class="text-muted mb16"> <i class="fa fa-search-plus"></i> <t t-esc="widget.new_words"></t> new words found on this page.</div>
-                        <h4><i class="fa fa-tachometer"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="float-right" target="new">Gengo Dashboard</a></h4>
+                        <h5><i class="fa fa-tachometer"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="float-right" target="new">Gengo Dashboard</a></h5>
                         <hr class="mt8"/>
                         <div class="text-info mb8"> <i class="fa fa-align-left"></i> Words posted for translate <t t-esc="widget.total"></t></div>
                         <div class="text-warning mb8"> <i class="fa fa-cogs"></i> Words in progress <t t-esc="widget.inprogess"></t></div>
@@ -99,22 +99,22 @@
                     </b>
                 </main>
                 <footer class="modal-footer">
-                    <a data-action="discard" data-dismiss="modal" href="#">Close</a>
+                    <button type="button" class="btn btn-primary" data-action="discard" data-dismiss="modal">Close</button>
                 </footer>
             </div>
         </div>
     </div>
 </t>
 <t t-name="website.GengoApiConfigDialog">
-    <div role="dialog" class="modal fade" tabindex="-1">
+    <div role="dialog" class="modal o_technical_modal fade" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content">
                 <header class="modal-header">
-                    <h2 class="modal-title">Gengo API is not configured</h2>
+                    <h4 class="modal-title">Gengo API is not configured</h4>
                     <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>
+                    <b> <h4>Steps for configure Gengo </h4>
                         <div class="mb16"> 1. Go To your <b><a target="new" href="https://gengo.com/account/api_settings/">Gengo account</a></b> and generate API Keys.</div>
                         <div class="mb16"> 2. Then paste generated keys in given form</div>
                         <ul class="list-group">
diff --git a/addons/website_slides/static/src/xml/website_slides.xml b/addons/website_slides/static/src/xml/website_slides.xml
index d2e1f43c15b..5d9f8366a0c 100644
--- a/addons/website_slides/static/src/xml/website_slides.xml
+++ b/addons/website_slides/static/src/xml/website_slides.xml
@@ -66,9 +66,9 @@
                         </form>
                     </main>
                     <footer class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Discard</button>
                         <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-secondary" data-dismiss="modal">Discard</button>
                     </footer>
                 </div>
             </div>