Merge lp:~openerp-dev/openerp-web/trunk-customizetooltips-kanban-rga into lp:openerp-web

[Ravi Gadhia (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-customizetooltips-kanban-rga]

3828. By Mahendra Barad(OpenERP) on 2013-10-29

[Merge]Merge with trunk

3829. By Mahendra Barad(OpenERP) on 2013-11-11

[Merge]Merge with trunk

3830. By RGA(OpenERP) on 2013-11-15

Merge with trunk

3831. By RGA(OpenERP) on 2013-11-15

[MERGE] code refector

3832. By Mahendra Barad(OpenERP) on 2013-12-05

[Merge]merge with trunk

3833. By RGA(OpenERP) on 2013-12-05

[IMP] remove adition field addons get_tooltips should return all required field value

3834. By RGA(OpenERP) on 2013-12-06

[IMP] unescape html when list view row render

3835. By Mahendra Barad(OpenERP) on 2013-12-06

[REV]revert last revision

3836. By Mahendra Barad(OpenERP) on 2013-12-23

[Merge]merge with trunk

3837. By Mahendra Barad(OpenERP) on 2013-12-23

[IMP]improved css

3838. By Mahendra Barad(OpenERP) on 2013-12-27

[Merge]merge with trunk

3839. By Mahendra Barad(OpenERP) on 2014-01-03

[Merge]Merge with trunk

3840. By Mahendra Barad(OpenERP) on 2014-01-21

[Merge]merge with trunk

3841. By Mahendra Barad(OpenERP) on 2014-01-28

[Merge]Merge with trunk

3842. By Mahendra Barad(OpenERP) on 2014-02-10

[MErge]Merge with trunk

3843. By Mahendra Barad(OpenERP) on 2014-02-17

[Merge]Merge with trunk

3844. By Mahendra Barad(OpenERP) on 2014-02-21

[Merge] with trunk

3845. By Mahendra Barad(OpenERP) on 2014-02-25

[Merge]with trunk

3846. By Mahendra Barad(OpenERP) on 2014-02-28

[Merge]with trunk

3847. By Mahendra Barad(OpenERP) on 2014-03-05

[IMP]improve the code

3848. By Chirag Dodiya(OpenERP) on 2014-03-18

[MRG]Merge with lp:openerp-web

3849. By Mahendra Barad(OpenERP) on 2014-03-27

[Merge]with trunk

3850. By Mahendra Barad(OpenERP) on 2014-04-08

[Merge]with trunk

3851. By Mahendra Barad(OpenERP) on 2014-04-11

[Merge]with trunk

3852. By Mahendra Barad(OpenERP) on 2014-04-14

[Merge]with trunk

3853. By Mahendra Barad(OpenERP) on 2014-04-28

[Merge]with trunk

3854. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]resolve conflict

3855. By Mahendra Barad(OpenERP) on 2014-05-06

[Merge]with trunk

Unmerged revisions

3855. By Mahendra Barad(OpenERP) on 2014-05-06

[Merge]with trunk

3854. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]resolve conflict

3853. By Mahendra Barad(OpenERP) on 2014-04-28

[Merge]with trunk

3852. By Mahendra Barad(OpenERP) on 2014-04-14

[Merge]with trunk

3851. By Mahendra Barad(OpenERP) on 2014-04-11

[Merge]with trunk

3850. By Mahendra Barad(OpenERP) on 2014-04-08

[Merge]with trunk

3849. By Mahendra Barad(OpenERP) on 2014-03-27

[Merge]with trunk

3848. By Chirag Dodiya(OpenERP) on 2014-03-18

[MRG]Merge with lp:openerp-web

3847. By Mahendra Barad(OpenERP) on 2014-03-05

[IMP]improve the code

3846. By Mahendra Barad(OpenERP) on 2014-02-28

[Merge]with trunk

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/css/base.css	2014-05-06 09:05:53 +0000
@@ -3378,3 +3378,16 @@
   background-color: black;
   opacity: 0.6;
 }
+.fa-star {
+  font-size: 15px;
+  padding-top: 9px;
+}
+
+.fa-star-tooltip {
+  padding-top: 1px;
+}
+
+.oe_star_on {
+  color: gold;
+}
+

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/css/base.sass	2014-05-06 09:05:53 +0000
@@ -2681,6 +2681,14 @@
             overflow: hidden !important
 // }}}
 
+.fa-star
+    font-size: 15px
+    padding-top: 9px
+.fa-star-tooltip
+    padding-top: 1px
+.oe_star_on
+    color: #FFD700
+// End hack }}}
 // End of customize
 
 // Customize bootstrap3 for tooltip

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2014-04-23 07:38:40 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2014-05-06 09:05:53 +0000
@@ -562,6 +562,7 @@
         this.dataset = dataset;
         this.dataset_offset = 0;
         this.aggregates = {};
+        this.legend = {};
         this.value = this.title = null;
         if (this.group) {
             this.value = group.get('value');
@@ -646,7 +647,10 @@
         }
         this.$el.data('widget', this);
         this.$records.data('widget', this);
-        this.$has_been_started.resolve();
+        var def_tooltip = this.fetch_tooltip();
+        $.when(def_tooltip).done(function (){
+            self.$has_been_started.resolve();
+        });
         var add_btn = this.$el.find('.oe_kanban_add');
         add_btn.tooltip({delay: { show: 500, hide:1000 }});
         this.$records.find(".oe_kanban_column_cards").click(function (ev) {
@@ -657,8 +661,6 @@
             }
         });
         this.is_started = true;
-        var def_tooltip = this.fetch_tooltip();
-        return $.when(def_tooltip);
     },
     fetch_tooltip: function() {
         if (! this.group)
@@ -682,13 +684,13 @@
         var options = instance.web.py_eval(field_desc.attrs.options || '{}')
         if (! options.tooltip_on_group_by)
             return;
-
         var self = this;
         if (this.value) {
             return (new instance.web.Model(field.relation)).query([options.tooltip_on_group_by])
-                    .filter([["id", "=", this.value]]).first().then(function(res) {
-                self.tooltip = res[options.tooltip_on_group_by];
-                self.$(".oe_kanban_group_title_text").attr("title", self.tooltip || self.title || "").tooltip();
+                .filter([["id", "=", this.value]]).first().then(function(res) {
+                    self.legend = res[options.tooltip_on_group_by];
+                    var title = self.legend.tooltip || self.title || ""
+                    self.$(".oe_kanban_group_title_text").attr("title", title).tooltip({html: true,className: 'oe_tooltip oe_tooltip_message'});
             });
         }
     },