[IMP] *: uniformize modals buttons: remove 'oe_link' class and 'or' between buttons

14 files changed, 29 insertions, 44 deletions

diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 9c6aba96c0b..630474d5d07 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -18,8 +18,7 @@
                 <field name="journal_ids" required="0" invisible="1"/>
                 <footer>
                     <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
+                    <button string="Cancel" class="btn btn-default" special="cancel"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 0751ef30cb9..569a95b82ad 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -17,8 +17,7 @@
             </group>
             <footer>
                 <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                or 
-                <button string="Cancel" class="oe_link" special="cancel" />
+                <button string="Cancel" class="btn btn-default" special="cancel" />
             </footer>
         </form>
         </field>
diff --git a/addons/account/wizard/wizard_tax_adjustments_view.xml b/addons/account/wizard/wizard_tax_adjustments_view.xml
index 8a2b22e6544..3d4ed0a9e9a 100644
--- a/addons/account/wizard/wizard_tax_adjustments_view.xml
+++ b/addons/account/wizard/wizard_tax_adjustments_view.xml
@@ -27,8 +27,7 @@
             </group>
             <footer>
                 <button name="create_move" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
-                or 
-                <button string="Cancel" class="oe_link" special="cancel" />
+                <button string="Cancel" class="btn btn-default" special="cancel" />
             </footer>
         </form>
         </field>
diff --git a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
index 9b136b3a8dc..428ff9c2de3 100644
--- a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
+++ b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
@@ -13,8 +13,7 @@
                     </group>
                     <footer>
                         <button name="print_checks" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
+                        <button string="Cancel" class="btn btn-default" special="cancel"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/crm/wizard/base_partner_merge_views.xml b/addons/crm/wizard/base_partner_merge_views.xml
index 6c86442db32..0918d6ac3a4 100644
--- a/addons/crm/wizard/base_partner_merge_views.xml
+++ b/addons/crm/wizard/base_partner_merge_views.xml
@@ -92,12 +92,8 @@
                             type='object'
                             confirm="Are you sure to execute the list of automatic merges of your contacts ?"
                             attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
-                            <button special="cancel" string="Cancel" type="object" class="oe_link oe_inline"/>
-                        </span>
-                        <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
-                            <button special="cancel" string="Close" type="object" class="oe_link oe_inline"/>
-                        </span>
+                        <button special="cancel" string="Cancel" type="object" class="btn btn-default oe_inline" attrs="{'invisible': [('state', '=', 'finished')]}"/>
+                        <button special="cancel" string="Close" type="object" class="btn btn-default oe_inline" attrs="{'invisible': [('state', '!=', 'finished')]}"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_expense/wizard/hr_expense_refuse_reason.xml b/addons/hr_expense/wizard/hr_expense_refuse_reason.xml
index f73eca3dbdc..104165411e9 100644
--- a/addons/hr_expense/wizard/hr_expense_refuse_reason.xml
+++ b/addons/hr_expense/wizard/hr_expense_refuse_reason.xml
@@ -9,8 +9,7 @@
                 <field name="description"/>
                 <footer>
                     <button string='Refuse' name="expense_refuse_reason" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
+                    <button string="Cancel" class="btn btn-default" special="cancel"/>
                 </footer>
            </form>
         </field>
diff --git a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
index 44fc611ede0..dc571ac5323 100644
--- a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
+++ b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
@@ -13,8 +13,7 @@
             <footer>
                 <button string="Generate" name="generate_fec" type="object"
                     class="oe_highlight"/>
-                <button string="Cancel" special="cancel"
-                    class="oe_link"/>
+                <button string="Cancel" class="btn btn-default" special="cancel"/>
             </footer>
         </form>
     </field>
diff --git a/addons/lunch/wizard/lucky_order_view.xml b/addons/lunch/wizard/lucky_order_view.xml
index be432932343..f6ae254f8c6 100644
--- a/addons/lunch/wizard/lucky_order_view.xml
+++ b/addons/lunch/wizard/lucky_order_view.xml
@@ -14,8 +14,7 @@
                     </group>
                     <footer>
                         <button name="random_pick" string="I'm feeling lucky"  type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="btn btn-default" special="cancel" />
                     </footer>
                 </form>
               </field>
diff --git a/addons/web/static/src/xml/base_common.xml b/addons/web/static/src/xml/base_common.xml
index 2af69b61118..f5a4a44b857 100644
--- a/addons/web/static/src/xml/base_common.xml
+++ b/addons/web/static/src/xml/base_common.xml
@@ -17,7 +17,7 @@
 </div>
 
 <t t-name="WidgetButton">
-    <button type="button" t-attf-class="btn btn-sm #{widget.node.attrs.class or ''}"
+    <button type="button" t-attf-class="btn btn-sm #{widget.node.attrs.class or 'btn-default'}"
         t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus"
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 6fdc02eba2f..0a114af3c15 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
@@ -441,8 +441,8 @@
                                             </div>
                                         </div>
                                         <div class="modal-footer">
-                                            <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button> or
-                                            <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                            <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
+                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                         </div>
                                     </form>
                                 </div>
@@ -474,8 +474,8 @@
                                             </div>
                                         </div>
                                         <div class="modal-footer">
-                                            <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button> or
-                                            <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                            <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
+                                            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                         </div>
                                     </form>
                                 </div>
@@ -623,8 +623,8 @@
                                                         </div>
                                                     </div>
                                                     <div class="modal-footer">
-                                                        <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button> or
-                                                        <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                                        <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
+                                                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                                     </div>
                                                 </form>
                                             </div>
@@ -743,8 +743,8 @@
                                                         </div>
                                                     </div>
                                                     <div class="modal-footer">
-                                                        <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button> or
-                                                        <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                                        <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
+                                                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                                     </div>
                                                 </form>
                                             </div>
diff --git a/addons/website_event/views/website_event_templates.xml b/addons/website_event/views/website_event_templates.xml
index 918c59e3d1e..ccaaf5b00e7 100644
--- a/addons/website_event/views/website_event_templates.xml
+++ b/addons/website_event/views/website_event_templates.xml
@@ -498,8 +498,8 @@
                     </div>
                     <div class="modal-footer">
                         <div class="pull-left">
-                            <button type="submit" class="btn btn-primary">Continue</button> or
-                            <a class="js_goto_event" style="cursor: pointer;"> Cancel Registration</a>
+                            <button type="submit" class="btn btn-primary">Continue</button>
+                            <button type="button" class="btn btn-default js_goto_event" data-dismiss="modal">Cancel Registration</button>
                         </div>
                     </div>
                 </div>
diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml
index b4d8c720744..e7db7e3e187 100644
--- a/addons/website_gengo/static/src/xml/website.gengo.xml
+++ b/addons/website_gengo/static/src/xml/website.gengo.xml
@@ -45,8 +45,7 @@
                     </div>
                     <div>
                         <button type="button" data-action="activate" class="btn btn-primary">Ok</button>
-                        or
-                        <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
+                        <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button>
                     </div>
                 </div>
             </div>
@@ -74,8 +73,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" data-action="service_level" class="btn btn-primary">Post</button>
-                    or
-                    <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
+                    <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button>
                 </div>
             </div>
         </div>
@@ -152,8 +150,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" data-action="set_config" class="btn btn-primary">Submit</button>
-                    or
-                    <a data-action="discard" data-dismiss="modal" href="#">Close</a>
+                    <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index e65e39b2712..9da9d715c15 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -310,8 +310,8 @@
                             </div>
                             <div class="modal-footer">
                                 <div t-if="not acquirers">
-                                  <button type="submit" t-attf-class="btn btn-primary">Sign &amp; Confirm</button> or
-                                  <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                  <button type="submit" t-attf-class="btn btn-primary">Sign &amp; Confirm</button>
+                                  <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                                 </div>
                             </div>
                           </form>
@@ -387,8 +387,8 @@
                               <textarea rows="4" name="decline_message" placeholder="Your feedback....." class="form-control"/>
                             </div>
                             <div class="modal-footer">
-                                <button type="submit" t-att-id="quotation.id" class="btn btn-primary">Reject</button> or
-                                <button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
+                                <button type="submit" t-att-id="quotation.id" class="btn btn-primary">Reject</button>
+                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                             </div>
                           </form>
                         </div>
@@ -440,7 +440,7 @@
       <xpath expr="//a[@data-target='#modaldecline']" position="before">
           <a type="submit" href="#discussion">
               Ask Changes
-          </a> or
+          </a>
       </xpath>
       <xpath expr="//div[@id='quotation_toolbar']/a[@data-target='#modaldecline']" position="before">
           <a class="btn btn-info" type="submit" href="#discussion">
diff --git a/addons/website_slides/static/src/xml/website_slides.xml b/addons/website_slides/static/src/xml/website_slides.xml
index 270d3acb9c1..1944de0c9d8 100644
--- a/addons/website_slides/static/src/xml/website_slides.xml
+++ b/addons/website_slides/static/src/xml/website_slides.xml
@@ -68,8 +68,7 @@
                     <div 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>
-                        or
-                        <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
+                        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Discard</button>
                     </div>
                 </div>
             </div>