diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
| commit | 2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch) | |
| tree | ff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/website_mail/static/src | |
| parent | 8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff) | |
| parent | 519594e9cab9a6362ef7c3e911605e4507a0a008 (diff) | |
[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
Diffstat (limited to 'addons/website_mail/static/src')
| -rw-r--r-- | addons/website_mail/static/src/js/follow.js | 16 | ||||
| -rw-r--r-- | addons/website_mail/static/src/xml/website_mail.xml | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js index 0f9c3a193d6..0893c998ff1 100644 --- a/addons/website_mail/static/src/js/follow.js +++ b/addons/website_mail/static/src/js/follow.js @@ -19,12 +19,12 @@ sAnimation.registry.follow = sAnimation.Class.extend({ self.is_user = data.is_user; self.email = data.email; self.toggle_subscription(data.is_follower, data.email); - self.$target.removeClass("hidden"); + self.$target.removeClass('d-none'); }); // not if editable mode to allow designer to edit if (!this.editableMode) { - $('.js_follow > .input-group-btn.hidden').removeClass("hidden"); + $('.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(); @@ -37,10 +37,10 @@ sAnimation.registry.follow = sAnimation.Class.extend({ var $email = this.$target.find(".js_follow_email"); if ($email.length && !$email.val().match(/.+@.+/)) { - this.$target.addClass('has-error'); + this.$target.addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid'); return false; } - this.$target.removeClass('has-error'); + this.$target.removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid'); var email = $email.length ? $email.val() : false; if (email || this.is_user) { @@ -60,12 +60,12 @@ sAnimation.registry.follow = sAnimation.Class.extend({ toggle_subscription: function (follow, email) { follow = follow || (!email && this.$target.attr('data-unsubscribe')); if (follow) { - this.$target.find(".js_follow_btn").addClass("hidden"); - this.$target.find(".js_unfollow_btn").removeClass("hidden"); + this.$target.find(".js_follow_btn").addClass('d-none'); + this.$target.find(".js_unfollow_btn").removeClass('d-none'); } else { - this.$target.find(".js_follow_btn").removeClass("hidden"); - this.$target.find(".js_unfollow_btn").addClass("hidden"); + this.$target.find(".js_follow_btn").removeClass('d-none'); + this.$target.find(".js_unfollow_btn").addClass('d-none'); } this.$target.find('input.js_follow_email') .val(email || "") diff --git a/addons/website_mail/static/src/xml/website_mail.xml b/addons/website_mail/static/src/xml/website_mail.xml index b80e2eb8af8..70f51435c3b 100644 --- a/addons/website_mail/static/src/xml/website_mail.xml +++ b/addons/website_mail/static/src/xml/website_mail.xml @@ -2,7 +2,7 @@ <t t-name="website_mail.publish_short"> <t t-if="is_publisher" t-ignore="true"> - <div t-attf-class="pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="res_id" t-att-data-object="res_model" t-att-data-controller="publish_controller"> + <div t-attf-class="float-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="res_id" t-att-data-object="res_model" t-att-data-controller="publish_controller"> <button class="btn btn-danger js_publish_btn">Unpublished</button> <button class="btn btn-success js_publish_btn">Published</button> </div> |