From 19fac75f4217df06b9af390f2605fbca95feb6e6 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 17 Apr 2014 11:05:15 +0200 Subject: [PATCH] [FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg --- addons/crm/static/src/js/crm_case_section.js | 4 +--- addons/hr_attendance/static/src/js/attendance.js | 3 +-- addons/hr_attendance/static/src/xml/attendance.xml | 2 +- addons/project/static/src/js/project.js | 4 +--- addons/purchase/purchase_view.xml | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js index 02f42288880..a7bf7c280da 100644 --- a/addons/crm/static/src/js/crm_case_section.js +++ b/addons/crm/static/src/js/crm_case_section.js @@ -19,9 +19,7 @@ openerp.crm = function(openerp) { dataset.read_slice(['id', 'name']).done(function(result) { _.each(result, function(v, k) { // Set the proper value in the DOM - self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ - offset: 10 - }); + self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip(); }); }); }, diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js index c2750a920a4..143e3dd163d 100644 --- a/addons/hr_attendance/static/src/js/attendance.js +++ b/addons/hr_attendance/static/src/js/attendance.js @@ -25,7 +25,7 @@ openerp.hr_attendance = function (instance) { this.$(".oe_attendance_signout").click(function() { self.do_update_attendance(); }); - this.$el.tipsy({ + this.$el.tooltip({ title: function() { var last_text = instance.web.format_value(self.last_sign, {type: "datetime"}); var current_text = instance.web.format_value(new Date(), {type: "datetime"}); @@ -36,7 +36,6 @@ openerp.hr_attendance = function (instance) { return _.str.sprintf(_t("Click to Sign In at %s."), current_text); } }, - html: true, }); return this.check_attendance(); }, diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml index 3fd9bcf2798..2e71e1195aa 100644 --- a/addons/hr_attendance/static/src/xml/attendance.xml +++ b/addons/hr_attendance/static/src/xml/attendance.xml @@ -1,6 +1,6 @@