odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap 

bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg
This commit is contained in:
Cedric Snauwaert 2014-04-17 11:05:15 +02:00
parent 6607cc3852
commit 19fac75f42
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/crm/static/src/js/crm_case_section.js
View File

@ -19,9 +19,7 @@ openerp.crm = function(openerp) {
dataset.read_slice(['id', 'name']).done(function(result) { dataset.read_slice(['id', 'name']).done(function(result) {
_.each(result, function(v, k) { _.each(result, function(v, k) {
// Set the proper value in the DOM // Set the proper value in the DOM
self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip();
offset: 10
});
}); });
}); });
}, },

3
addons/hr_attendance/static/src/js/attendance.js
View File

@ -25,7 +25,7 @@ openerp.hr_attendance = function (instance) {
this.$(".oe_attendance_signout").click(function() { this.$(".oe_attendance_signout").click(function() {
self.do_update_attendance(); self.do_update_attendance();
}); });
this.$el.tipsy({ this.$el.tooltip({
title: function() { title: function() {
var last_text = instance.web.format_value(self.last_sign, {type: "datetime"}); var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
var current_text = instance.web.format_value(new Date(), {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); return _.str.sprintf(_t("Click to Sign In at %s."), current_text);
} }
}, },
html: true,
}); });
return this.check_attendance(); return this.check_attendance();
}, },

2
addons/hr_attendance/static/src/xml/attendance.xml
View File

@ -1,6 +1,6 @@
<template> <template>
<t t-name="AttendanceSlider"> <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_signin"></div>
<div class="oe_attendance_signout"></div> <div class="oe_attendance_signout"></div>
</div> </div>

4
addons/project/static/src/js/project.js
View File

@ -19,9 +19,7 @@ openerp.project = function(openerp) {
dataset.read_slice(['id', 'name']).done(function(result) { dataset.read_slice(['id', 'name']).done(function(result) {
_.each(result, function(v, k) { _.each(result, function(v, k) {
// Set the proper value in the DOM // Set the proper value in the DOM
self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip();
offset: 10
});
}); });
}); });
}, },

2
addons/purchase/purchase_view.xml
View File

@ -191,7 +191,7 @@
</div> </div>
<group> <group>
<group> <group>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" domain="[('supplier','=',True)]"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1, 'default_supplier':1, 'default_customer':0}" domain="[('supplier','=',True)]"/>
<field name="partner_ref"/> <field name="partner_ref"/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/> <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/>
<field name="currency_id" groups="base.group_multi_currency"/> <field name="currency_id" groups="base.group_multi_currency"/>