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

[Mahendra Barad(OpenERP)]

Hello,
[ADD]tooltip on kanban header and on priority and kanbanselection widget.
Thanks

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

4015. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]css for dialog wizard

4016. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]add Button label as field and set min-width for the kanban-header tooltip

4017. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]tooltip view on header

4018. By Mahendra Barad(OpenERP) on 2014-05-15

[Merge]with trunk

Unmerged revisions

4018. By Mahendra Barad(OpenERP) on 2014-05-15

[Merge]with trunk

4017. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]tooltip view on header

4016. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]add Button label as field and set min-width for the kanban-header tooltip

4015. By Mahendra Barad(OpenERP) on 2014-05-12

[IMP]css for dialog wizard

4014. By Mahendra Barad(OpenERP) on 2014-05-09

[IMP]fetch tooltip from stage model and display on widget field

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.css	2014-05-15 05:02:21 +0000
@@ -421,17 +421,17 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
-.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
+.openerp .oe_star_on, .openerp .oe_star_off {
   color: #cccccc;
   text-shadow: 0 0 2px black;
   vertical-align: top;
   position: relative;
   top: -8px;
 }
-.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover {
+.openerp .oe_star_on:hover, .openerp .oe_star_off:hover {
   text-decoration: none;
 }
-.openerp .oe_webclient .oe_star_on {
+.openerp .oe_star_on {
   color: gold;
 }
 .openerp p.oe_grey {

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.sass	2014-05-15 05:02:21 +0000
@@ -398,17 +398,16 @@
             font-weight: bold
             &:hover
                 text-decoration: underline
-    .oe_webclient
-        .oe_star_on, .oe_star_off
-            color: #cccccc
-            text-shadow: 0 0 2px black
-            vertical-align: top
-            position: relative
-            top: -8px
-        .oe_star_on:hover, .oe_star_off:hover
-            text-decoration: none
-        .oe_star_on
-            color: gold
+    .oe_star_on, .oe_star_off
+        color: #cccccc
+        text-shadow: 0 0 2px black
+        vertical-align: top
+        position: relative
+        top: -8px
+    .oe_star_on:hover, .oe_star_off:hover
+        text-decoration: none
+    .oe_star_on
+        color: gold
     p.oe_grey
         max-width: 650px
     .oe_grey

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-15 05:02:21 +0000
@@ -2392,6 +2392,17 @@
         this.states = self.prepare_dropdown_selection();;
         this.$el.html(QWeb.render("KanbanSelection", {'widget': self}));
         this.$el.find('.oe_legend').click(self.do_action.bind(self));
+
+        if (self.view.datarecord.stage_id) {
+            var stage_id = _.isArray(self.view.datarecord.stage_id) ? self.view.datarecord.stage_id[0] : self.view.datarecord.stage_id
+            return (new openerp.web.Model(self.view.fields.stage_id.field.relation)).query([])
+                .filter([["id", "=", stage_id]]).first().then(function(res) {
+                    var title = res['legend_'+self.get('value')]
+                    if (title) {
+                        self.$(".oe_kanban_status").attr("title", title)
+                    }
+             });
+        }
     },
     do_action: function(e) {
         var self = this;
@@ -2442,6 +2453,20 @@
         this.priorities = self.prepare_priority();
         this.$el.html(QWeb.render("Priority", {'widget': this}));
         this.$el.find('.oe_legend').click(self.do_action.bind(self));
+
+        if (self.view.datarecord.stage_id) {
+            var stage_id = _.isArray(self.view.datarecord.stage_id) ? self.view.datarecord.stage_id[0] : self.view.datarecord.stage_id
+            return (new openerp.web.Model(self.view.fields.stage_id.field.relation)).query([])
+                .filter([["id", "=", stage_id]]).first().then(function(res) {
+                    var li = self.$('li');
+                    for (i=1; i<=li.length; i++){
+                        var title = res['legend_star'+i]
+                        if (title) {
+                            self.$("ul").find("[data-value='" + i + "'] a").attr("title", title);
+                        }
+                    }
+             });
+        }
     },
     do_action: function(e) {
         var self = this;
@@ -6169,6 +6194,9 @@
         if (! this.node.attrs.nolabel) {
             options.text = this.string
         }
+        if(this.options.label_field){
+            options.text = this.view.datarecord[this.options.label_field]
+        }
         this.$el.html(QWeb.render("StatInfo", options));
     },
 

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2014-05-12 08:10:32 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2014-05-15 05:02:21 +0000
@@ -646,7 +646,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 +660,6 @@
             }
         });
         this.is_started = true;
-        var def_tooltip = this.fetch_tooltip();
-        return $.when(def_tooltip);
     },
     fetch_tooltip: function() {
         if (! this.group)
@@ -688,7 +689,7 @@
             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();
+                self.$(".oe_kanban_group_title_text").attr("title", self.tooltip.tooltip || self.title || "").tooltip();
             });
         }
     },
@@ -1272,7 +1273,7 @@
         var data = _.map(selection.slice(1), function(element, index) {
             var value = {
                 'value': element[0],
-                'name': element[1],
+                'name': self.parent.group.tooltip['legend_star'+element[0]] || element[1],
                 'click_value': element[0],
             }
             if (index == 0 && self.get('value') == element[0]) {
@@ -1310,11 +1311,12 @@
         this.parent = parent;
     },
     prepare_dropdown_selection: function() {
+        var self = this;
         var data = [];
         _.map(this.field.selection || [], function(res) {
             var value = {
                 'name': res[0],
-                'tooltip': res[1],
+                'tooltip': self.parent.group.tooltip['legend_'+res[0]] || res[1],
                 'state_name': res[1],
             }
             if (res[0] == 'normal') { value['state_class'] = 'oe_kanban_status'; }