From b437808f6696a8d202dac079fe8e40ade9779704 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Tue, 22 May 2018 12:07:42 +0200 Subject: [PATCH] [REF] *: BS4, adapt input-group structure The input-group-addon class has been replaced by a combination of the input-group-text and the input-group-append/prepend classes. The input-group-btn class is replaced by the input-group-append/prepend classes. --- addons/portal/views/portal_templates.xml | 4 +-- addons/survey/static/src/js/survey.js | 2 +- addons/web/static/src/xml/kanban.xml | 2 +- addons/web/views/webclient_templates.xml | 4 +-- addons/web_editor/static/src/xml/editor.xml | 16 ++++++--- .../static/src/xml/website.contentMenu.xml | 6 ++-- .../static/src/xml/website.pageProperties.xml | 12 ++++--- addons/website/static/src/xml/website.seo.xml | 4 +-- addons/website/views/website_templates.xml | 2 +- .../website_crm_partner_assign_templates.xml | 16 ++++++--- addons/website_mail/static/src/js/follow.js | 2 +- .../views/website_mail_templates.xml | 4 +-- .../src/js/website_mail_channel.snippet.js | 2 +- .../website_mail_channel/views/snippets.xml | 2 +- .../views/website_mail_channel_templates.xml | 8 ++--- .../static/src/js/website_mass_mailing.js | 4 +-- .../views/snippets_templates.xml | 6 ++-- .../views/website_quote_templates.xml | 24 +++++++------ .../static/src/js/website_sale.js | 2 +- .../static/src/js/website_sale_tour_buy.js | 2 +- addons/website_sale/views/templates.xml | 34 ++++++++++++------- .../views/website_sale_options_templates.xml | 16 +++++---- .../views/website_sale_stock_templates.xml | 9 ++--- .../website_slides/views/website_slides.xml | 4 +-- 24 files changed, 113 insertions(+), 74 deletions(-) diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index a8ba031c8a4..2e44d979783 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -217,7 +217,7 @@
-
+
@@ -231,7 +231,7 @@
- +
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js index 991a742e65d..eb8f451aa39 100644 --- a/addons/survey/static/src/js/survey.js +++ b/addons/survey/static/src/js/survey.js @@ -30,7 +30,7 @@ if(!the_form.length) { // Printing mode: will disable all the controls in the form if (_.isUndefined(submit_controller)) { - $(".js_surveyform .input-group-addon span.fa-calendar").css("pointer-events", "none"); + $(".js_surveyform .input-group-text span.fa-calendar").css("pointer-events", "none"); $('.js_surveyform :input').prop('disabled', true); print_mode = true; } diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml index 881babbda23..d3a6e8d7a3f 100644 --- a/addons/web/static/src/xml/kanban.xml +++ b/addons/web/static/src/xml/kanban.xml @@ -52,7 +52,7 @@
- +
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 805ef9ff3e9..e6b958e1a85 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -361,8 +361,8 @@
- - Select + + Select
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index 1b478a09d9c..187c880d3ae 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -388,7 +388,9 @@
-
%
+
+
%
+
@@ -397,7 +399,9 @@
-
%
+
+
%
+
@@ -410,7 +414,9 @@
-
%
+
+
%
+
@@ -419,7 +425,9 @@
-
%
+
+
%
+
diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index 9cabe61a861..1fdfd31fe7c 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -3,14 +3,16 @@
  • - +
    + +
    - +
    diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index dd6decda977..9680dac6d11 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -46,10 +46,10 @@
    - +
    - +
    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 968770545a7..fee450c06d9 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 @@ -668,7 +668,9 @@
    -
    +
    +
    +
    @@ -678,7 +680,9 @@
    -
    %
    +
    +
    %
    +
    @@ -706,7 +710,9 @@
    - +
    + +
    @@ -727,7 +733,9 @@
    - +
    + +
    diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js index 177c5d4768c..b46b9c500f7 100644 --- a/addons/website_mail/static/src/js/follow.js +++ b/addons/website_mail/static/src/js/follow.js @@ -24,7 +24,7 @@ sAnimation.registry.follow = sAnimation.Class.extend({ // not if editable mode to allow designer to edit if (!this.editableMode) { - $('.js_follow > .input-group-btn.d-none').removeClass('d-none'); + $('.js_follow > .input-group-append.d-none').removeClass('d-none'); this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) { event.preventDefault(); self._onClick(); diff --git a/addons/website_mail/views/website_mail_templates.xml b/addons/website_mail/views/website_mail_templates.xml index ddc881e012c..df768f003c5 100644 --- a/addons/website_mail/views/website_mail_templates.xml +++ b/addons/website_mail/views/website_mail_templates.xml @@ -10,10 +10,10 @@ class="js_follow_email form-control" placeholder="your email..." groups="base.group_public"/> - +
    - +
    diff --git a/addons/website_mail_channel/static/src/js/website_mail_channel.snippet.js b/addons/website_mail_channel/static/src/js/website_mail_channel.snippet.js index d176b1e981d..d5415ef5b83 100644 --- a/addons/website_mail_channel/static/src/js/website_mail_channel.snippet.js +++ b/addons/website_mail_channel/static/src/js/website_mail_channel.snippet.js @@ -30,7 +30,7 @@ sAnimation.registry.follow_alias = sAnimation.Class.extend({ // not if editable mode to allow designer to edit alert field if (!this.editableMode) { this.$('> .alert').addClass('d-none'); - this.$('> .input-group-btn.d-none').removeClass('d-none'); + this.$('> .input-group-append.d-none').removeClass('d-none'); this.$('.js_follow_btn, .js_unfollow_btn').on('click', function (event) { event.preventDefault(); self._onClick(); diff --git a/addons/website_mail_channel/views/snippets.xml b/addons/website_mail_channel/views/snippets.xml index bd4114dd826..6f0af554864 100644 --- a/addons/website_mail_channel/views/snippets.xml +++ b/addons/website_mail_channel/views/snippets.xml @@ -23,7 +23,7 @@ name="email" class="js_follow_email form-control" placeholder="your email..."/> - + diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml index 18976f29911..72ce7e54446 100644 --- a/addons/website_mail_channel/views/website_mail_channel_templates.xml +++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml @@ -60,12 +60,12 @@ name="email" class="js_follow_email form-control" placeholder="your email..."/> - +
    - - +
    +
    - +

    send mail - diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js index 352c486e536..517fe9b75c1 100644 --- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js +++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js @@ -31,7 +31,7 @@ sAnimation.registry.subscribe = sAnimation.Class.extend({ // not if editable mode to allow designer to edit alert field if (!this.editableMode) { $('.js_subscribe > .alert').addClass('d-none'); - $('.js_subscribe > .input-group-btn.d-none').removeClass('d-none'); + $('.js_subscribe > .input-group-append.d-none').removeClass('d-none'); this.$target.find('.js_subscribe_btn').on('click', function (event) { event.preventDefault(); self._onClick(); @@ -55,7 +55,7 @@ sAnimation.registry.subscribe = sAnimation.Class.extend({ 'email': $email.length ? $email.val() : false, }, }).then(function (subscribe) { - self.$target.find(".js_subscribe_email, .input-group-btn").addClass('d-none'); + self.$target.find(".js_subscribe_email, .input-group-append").addClass('d-none'); self.$target.find(".alert").removeClass('d-none'); self.$target.find('input.js_subscribe_email').attr("disabled", subscribe ? "disabled" : false); self.$target.attr("data-subscribe", subscribe ? 'on' : 'off'); diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml index 68f5a21d795..c5ba35728e7 100644 --- a/addons/website_mass_mailing/views/snippets_templates.xml +++ b/addons/website_mass_mailing/views/snippets_templates.xml @@ -19,7 +19,7 @@