diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 4934979f65f..8eeca33934f 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -1076,7 +1076,8 @@ openerp.web._t = new openerp.web.TranslationDataBase().build_translation_functio openerp.web.qweb = new QWeb2.Engine(); openerp.web.qweb.debug = (window.location.search.indexOf('?debug') !== -1); openerp.web.qweb.default_dict = { - '_' : _ + '_' : _, + '_t' : openerp.web._t } openerp.web.qweb.format_text_node = function(s) { // Note that 'this' is the Qweb Node of the text diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index b4e0214265f..40731ea3821 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -159,10 +159,19 @@ width: 30px; height: 30px; border: 1px solid black; + text-align: center; + text-decoration: none; } .oe_kanban_color_picker a:hover { border-color: white; } +.oe_kanban_color_picker span { + border: none; + font-size: 120%; + font-weight: bold; + color: black; + line-height: 30px; +} .openerp .oe_kanban_left { float: left; } diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index a3755541548..d9f1a83c50e 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -26,10 +26,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ this.group_operators = ['avg', 'max', 'min', 'sum', 'count']; this.qweb = new QWeb2.Engine(); this.qweb.debug = openerp.connection.debug; - this.qweb.default_dict = { - '_' : _, - '_t' : _t - } + this.qweb.default_dict = _.clone(QWeb.default_dict); this.has_been_loaded = $.Deferred(); this.search_domain = this.search_context = this.search_group_by = null; this.currently_dragging = {}; diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 53aa6396e80..620d136b103 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -48,7 +48,9 @@