From a23009bcc8a7402492734f591ec1a8366b125666 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Wed, 18 Nov 2015 09:02:00 +0100 Subject: [PATCH] [FIX] mass_mailing: fix tooltip for "Select a theme" The popover in the mass mailing are not enabled, also the whole CSS of the website is not used (particularly, the popover CSS is not included). This commit replace the popover by a tooltip and enable tooltip on [data-toggle="tooltip"] elements. second half of: opw-656693 --- addons/mass_mailing/static/src/js/mass_mailing_editor.js | 1 + addons/mass_mailing/views/editor_field_html.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js index 97d77447300..d773a4fe54f 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -132,6 +132,7 @@ $.summernote.eventHandler.modules.popover.update = function ($popover, oStyle, i web_editor.Class.include({ start: function () { var self = this; + $('[data-toggle="tooltip"]').tooltip(); if (location.search.indexOf("enable_editor") !== -1) { this.on('rte:start', this, function () { $("#choose_template").off("click").on("click", _.bind(self.on_choose_template, self)); diff --git a/addons/mass_mailing/views/editor_field_html.xml b/addons/mass_mailing/views/editor_field_html.xml index 018333f50c6..11224aa4fbb 100644 --- a/addons/mass_mailing/views/editor_field_html.xml +++ b/addons/mass_mailing/views/editor_field_html.xml @@ -30,7 +30,7 @@