Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap into lp:openobject-addons

  1. trunk-tipsy-to-boostrap
  2. Merge into trunk
Proposed by Bhumi Thakkar (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap
Merge into: lp:openobject-addons
Diff against target: 90 lines (+13/-5)
6 files modified
crm/static/src/js/crm_case_section.js (+1/-1)
hr_attendance/static/src/js/attendance.js (+4/-1)
hr_attendance/static/src/xml/attendance.xml (+1/-1)
mail/static/src/js/mail.js (+2/-0)
process/static/src/js/process.js (+2/-0)
project/static/src/js/project.js (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+198204@code.launchpad.net

Description of the change

Hello,

  Added bootstrap tooltip and removed tipsy tooltip.

Thanks.

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap updated
9011. By Bhumi Thakkar (Open ERP)

[MERGE]With trunk.

9012. By Bhumi Thakkar (Open ERP)

[IMP]html true set in tooltip options.

9013. By Bhumi Thakkar (Open ERP)

[MERGE]With trunk.

9014. By Kunal Chavda

[MERGE]with latest.

9015. By Kunal Chavda

[IMP]modify for tipsy to tooltip.

9016. By Kunal Chavda

[MERGE]with latest.

Unmerged revisions

9016. By Kunal Chavda

[MERGE]with latest.

9015. By Kunal Chavda

[IMP]modify for tipsy to tooltip.

9014. By Kunal Chavda

[MERGE]with latest.

9013. By Bhumi Thakkar (Open ERP)

[MERGE]With trunk.

9012. By Bhumi Thakkar (Open ERP)

[IMP]html true set in tooltip options.

9011. By Bhumi Thakkar (Open ERP)

[MERGE]With trunk.

9010. By Bhumi Thakkar (Open ERP)

[MERGE]With Trunk.

9009. By Bhumi Thakkar (Open ERP)

[IMP]Add tooltip for mail.

9008. By Bhumi Thakkar (Open ERP)

[IMP]Add tooltip for procee view.

9007. By Bhumi Thakkar (Open ERP)

[IMP]Add attribute.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/static/src/js/crm_case_section.js'
2--- crm/static/src/js/crm_case_section.js 2013-11-01 09:02:22 +0000
3+++ crm/static/src/js/crm_case_section.js 2013-12-20 06:50:45 +0000
4@@ -19,7 +19,7 @@
5 dataset.read_slice(['id', 'name']).done(function(result) {
6 _.each(result, function(v, k) {
7 // Set the proper value in the DOM
8- self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
9+ self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip({
10 offset: 10
11 });
12 });
13
14=== modified file 'hr_attendance/static/src/js/attendance.js'
15--- hr_attendance/static/src/js/attendance.js 2012-12-14 15:52:25 +0000
16+++ hr_attendance/static/src/js/attendance.js 2013-12-20 06:50:45 +0000
17@@ -25,7 +25,8 @@
18 this.$(".oe_attendance_signout").click(function() {
19 self.do_update_attendance();
20 });
21- this.$el.tipsy({
22+ this.$el.attr('data-toggle', 'tooltip');
23+ this.$el.tooltip({
24 title: function() {
25 var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
26 var current_text = instance.web.format_value(new Date(), {type: "datetime"});
27@@ -37,6 +38,8 @@
28 }
29 },
30 html: true,
31+ container: 'body',
32+ placement: 'bottom',
33 });
34 return this.check_attendance();
35 },
36
37=== modified file 'hr_attendance/static/src/xml/attendance.xml'
38--- hr_attendance/static/src/xml/attendance.xml 2012-09-07 11:51:20 +0000
39+++ hr_attendance/static/src/xml/attendance.xml 2013-12-20 06:50:45 +0000
40@@ -1,6 +1,6 @@
41 <template>
42 <t t-name="AttendanceSlider">
43- <div class="oe_attendance_status oe_attendance_nosigned" data-tipsy="true">
44+ <div class="oe_attendance_status oe_attendance_nosigned" data-toggle="tooltip">
45 <div class="oe_attendance_signin"></div>
46 <div class="oe_attendance_signout"></div>
47 </div>
48
49=== modified file 'mail/static/src/js/mail.js'
50--- mail/static/src/js/mail.js 2013-12-18 15:57:15 +0000
51+++ mail/static/src/js/mail.js 2013-12-20 06:50:45 +0000
52@@ -964,6 +964,8 @@
53 * in the function. */
54 bind_events: function () {
55 var self = this;
56+ this.$el.find('[title]').attr('data-toggle', 'tooltip');
57+ this.$el.find('[title]').tooltip({placement: 'bottom', container: 'body', html: true})
58 // header icons bindings
59 this.$('.oe_read').on('click', this.on_message_read);
60 this.$('.oe_unread').on('click', this.on_message_unread);
61
62=== modified file 'process/static/src/js/process.js'
63--- process/static/src/js/process.js 2012-12-03 09:24:16 +0000
64+++ process/static/src/js/process.js 2013-12-20 06:50:45 +0000
65@@ -11,6 +11,8 @@
66 } else {
67 this.process_model = this.dataset.model;
68 }
69+ this.$el.find('.oe_process').attr('data-toggle', 'tooltip');
70+ this.$el.find('.oe_process').tooltip({placement: 'bottom', container: 'body', html: true});
71 this.$el.on('click', '.oe_process', function(ev) { self.initialize_process_view(ev);});
72 return _super;
73 },
74
75=== modified file 'project/static/src/js/project.js'
76--- project/static/src/js/project.js 2013-02-01 12:17:13 +0000
77+++ project/static/src/js/project.js 2013-12-20 06:50:45 +0000
78@@ -18,9 +18,10 @@
79 var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
80 dataset.read_slice(['id', 'name']).done(function(result) {
81 _.each(result, function(v, k) {
82+ self.$el.find('img[data-member_id=' + v.id + ']').attr('data-toggle', 'tooltip');
83 // Set the proper value in the DOM
84- self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
85- offset: 10
86+ self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip({
87+ offset: 10, placement: 'bottom', container: 'body', html: true
88 });
89 });
90 });

Subscribers

People subscribed via source and target branches

to all changes: