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

[Bhumi Thakkar (Open ERP)]

Hello,

  Added bootstrap tooltip and removed tipsy tooltip.

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap]

9011. By Bhumi Thakkar (Open ERP) on 2013-12-11

[MERGE]With trunk.

9012. By Bhumi Thakkar (Open ERP) on 2013-12-12

[IMP]html true set in tooltip options.

9013. By Bhumi Thakkar (Open ERP) on 2013-12-12

[MERGE]With trunk.

9014. By Kunal Chavda on 2013-12-18

[MERGE]with latest.

9015. By Kunal Chavda on 2013-12-20

[IMP]modify for tipsy to tooltip.

9016. By Kunal Chavda on 2013-12-20

[MERGE]with latest.

Unmerged revisions

9016. By Kunal Chavda on 2013-12-20

[MERGE]with latest.

9015. By Kunal Chavda on 2013-12-20

[IMP]modify for tipsy to tooltip.

9014. By Kunal Chavda on 2013-12-18

[MERGE]with latest.

9013. By Bhumi Thakkar (Open ERP) on 2013-12-12

[MERGE]With trunk.

9012. By Bhumi Thakkar (Open ERP) on 2013-12-12

[IMP]html true set in tooltip options.

9011. By Bhumi Thakkar (Open ERP) on 2013-12-11

[MERGE]With trunk.

9010. By Bhumi Thakkar (Open ERP) on 2013-12-06

[MERGE]With Trunk.

9009. By Bhumi Thakkar (Open ERP) on 2013-12-05

[IMP]Add tooltip for mail.

9008. By Bhumi Thakkar (Open ERP) on 2013-12-05

[IMP]Add tooltip for procee view.

9007. By Bhumi Thakkar (Open ERP) on 2013-12-05

[IMP]Add attribute.

=== modified file 'crm/static/src/js/crm_case_section.js'
--- crm/static/src/js/crm_case_section.js	2013-11-01 09:02:22 +0000
+++ crm/static/src/js/crm_case_section.js	2013-12-20 06:50:45 +0000
@@ -19,7 +19,7 @@
             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({
+                    self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tooltip({
                         offset: 10
                     });
                 });
 
=== modified file 'hr_attendance/static/src/js/attendance.js'
--- hr_attendance/static/src/js/attendance.js	2012-12-14 15:52:25 +0000
+++ hr_attendance/static/src/js/attendance.js	2013-12-20 06:50:45 +0000
@@ -25,7 +25,8 @@
             this.$(".oe_attendance_signout").click(function() {
                 self.do_update_attendance();
             });
-            this.$el.tipsy({
+            this.$el.attr('data-toggle', 'tooltip');
+            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"});
@@ -37,6 +38,8 @@
                     }
                 },
                 html: true,
+                container: 'body',
+                placement: 'bottom',
             });
             return this.check_attendance();
         },
 
=== modified file 'hr_attendance/static/src/xml/attendance.xml'
--- hr_attendance/static/src/xml/attendance.xml	2012-09-07 11:51:20 +0000
+++ hr_attendance/static/src/xml/attendance.xml	2013-12-20 06:50:45 +0000
@@ -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>
 
=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2013-12-18 15:57:15 +0000
+++ mail/static/src/js/mail.js	2013-12-20 06:50:45 +0000
@@ -964,6 +964,8 @@
          * in the function. */
         bind_events: function () {
             var self = this;
+            this.$el.find('[title]').attr('data-toggle', 'tooltip');
+            this.$el.find('[title]').tooltip({placement: 'bottom', container: 'body', html: true})
             // header icons bindings
             this.$('.oe_read').on('click', this.on_message_read);
             this.$('.oe_unread').on('click', this.on_message_unread);
 
=== modified file 'process/static/src/js/process.js'
--- process/static/src/js/process.js	2012-12-03 09:24:16 +0000
+++ process/static/src/js/process.js	2013-12-20 06:50:45 +0000
@@ -11,6 +11,8 @@
         } else {
             this.process_model = this.dataset.model;
         }
+        this.$el.find('.oe_process').attr('data-toggle', 'tooltip');
+        this.$el.find('.oe_process').tooltip({placement: 'bottom', container: 'body', html: true});
         this.$el.on('click', '.oe_process', function(ev) { self.initialize_process_view(ev);});
         return _super;
     },
 
=== modified file 'project/static/src/js/project.js'
--- project/static/src/js/project.js	2013-02-01 12:17:13 +0000
+++ project/static/src/js/project.js	2013-12-20 06:50:45 +0000
@@ -18,9 +18,10 @@
             var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
             dataset.read_slice(['id', 'name']).done(function(result) {
                 _.each(result, function(v, k) {
+                    self.$el.find('img[data-member_id=' + v.id + ']').attr('data-toggle', 'tooltip');
                     // 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({
+                        offset: 10, placement: 'bottom', container: 'body', html: true
                     });
                 });
             });