From 0abda02684cd47aa3097e111d057534cec574307 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 20 Dec 2012 19:39:42 +0100 Subject: [PATCH] [UNCOMMIT] uncommit kanban fixed width as it's broken with a lot of column bzr revid: fp@tinyerp.com-20121220183942-wug9abfwdzbl8c9n --- addons/web_kanban/static/src/css/kanban.css | 3 --- addons/web_kanban/static/src/css/kanban.sass | 2 -- addons/web_kanban/static/src/js/kanban.js | 23 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 09f3d87d341..9026251acea 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -103,9 +103,6 @@ border-right: 1px solid #b9b9b9; } .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header { - width: 170px; -} -.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header.oe_kanban_group_folded { width: 1%; } .openerp .oe_kanban_view .oe_form .oe_kanban_column { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 4de65592813..d6734124def 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -128,8 +128,6 @@ border-right: 1px solid #b9b9b9 &.oe_kanban_grouped .oe_kanban_group_header - width: 170px - .oe_kanban_group_header.oe_kanban_group_folded width: 1% .oe_form diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 4fffdd0977a..0ff879d980b 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -322,6 +322,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, on_groups_started: function() { var self = this; + this.compute_groups_width(); if (this.group_by) { // Kanban cards drag'n'drop var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards'); @@ -419,6 +420,27 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }); } }, + compute_groups_width: function() { + var unfolded = 0; + var self = this; + _.each(this.groups, function(group) { + unfolded += group.state.folded ? 0 : 1; + group.$el.children(':first').css('width', ''); + }); + _.each(this.groups, function(group) { + if (!group.state.folded) { + if (182*unfolded>=self.$el.width()) { + group.$el.children(':first').css('width', "170px"); + } else if (262*unfolded