diff options
| author | chm@openerp.com <> | 2014-04-23 17:48:52 +0200 |
|---|---|---|
| committer | chm@openerp.com <> | 2014-04-23 17:48:52 +0200 |
| commit | ee7ff4bd07d8d84ed2ebb0e2e3f5eb437f158e5b (patch) | |
| tree | 25577845139d390f9bf27e0237d18842aeace02b /addons/hr_attendance/static/src | |
| parent | b1bc68d8eb374f30173e03e8048d1c3588a00d4b (diff) | |
| parent | 1657ffb8e7d95ef5f94e59121737abb068371b66 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
Diffstat (limited to 'addons/hr_attendance/static/src')
| -rw-r--r-- | addons/hr_attendance/static/src/js/attendance.js | 3 | ||||
| -rw-r--r-- | addons/hr_attendance/static/src/xml/attendance.xml | 2 |
2 files changed, 2 insertions, 3 deletions
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 @@ <template> <t t-name="AttendanceSlider"> - <div class="oe_attendance_status oe_attendance_nosigned" data-tipsy="true"> + <div class="oe_attendance_status oe_attendance_nosigned" data-toggle="tooltip"> <div class="oe_attendance_signin"></div> <div class="oe_attendance_signout"></div> </div> |