From fb03a92729a44a7c0b1bebea6cefb81efa538810 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 1 Aug 2012 15:19:52 +0200 Subject: [PATCH] [CHG] Ungrouped kanban view does not expand under firefox, so set ungrouped kanban table's width to 100% bzr revid: fme@openerp.com-20120801131952-fvka1u152dtyuxz3 --- addons/web_kanban/static/src/css/kanban.css | 13 ++++++++----- addons/web_kanban/static/src/css/kanban.sass | 10 ++++++---- addons/web_kanban/static/src/js/kanban.js | 2 ++ addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 5830cb33e0f..745fdd1b883 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -40,6 +40,9 @@ .openerp .oe_kanban_view .oe_kanban_groups { height: inherit; } +.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_groups { + width: 100%; +} .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban { display: inline-block; } @@ -65,7 +68,7 @@ .openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group { padding: 0px; } -.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { +.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header { background: #f0eeee; border-left: 1px solid #f0f8f8; border-right: 1px solid #b9b9b9; @@ -185,7 +188,7 @@ font-weight: bold; margin: 2px 4px; } -.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_record { +.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_record { margin-bottom: 6px; } .openerp .oe_kanban_view .oe_kanban_gravatar { @@ -236,13 +239,13 @@ clear: both; text-align: center; } -.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button { +.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_show_more .oe_button { width: 100%; } -.openerp .oe_kanban_view .oe_kanban_ungrouped { +.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column { background: white; } -.openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record { +.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record { float: left; padding: 2px; box-sizing: border-box; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 44b3251c8fb..3864c5b5f0e 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -63,6 +63,8 @@ // KanbanGroups {{{ .oe_kanban_groups height: inherit + &.oe_kanban_ungrouped .oe_kanban_groups + width: 100% .oe_kanban_header &:hover .oe_dropdown_kanban @@ -86,7 +88,7 @@ .oe_kanban_group_header.oe_kanban_no_group padding: 0px - .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header + &.oe_kanban_grouped .oe_kanban_column, .oe_kanban_group_header background: #f0eeee border-left: 1px solid #f0f8f8 border-right: 1px solid #b9b9b9 @@ -187,7 +189,7 @@ .oe_kanban_title font-weight: bold margin: 2px 4px - .oe_kanban_grouped .oe_kanban_record + &.oe_kanban_grouped .oe_kanban_record margin-bottom: 6px .oe_kanban_gravatar display: block @@ -222,9 +224,9 @@ .oe_kanban_show_more clear: both text-align: center - .oe_kanban_grouped .oe_kanban_show_more .oe_button + &.oe_kanban_grouped .oe_kanban_show_more .oe_button width: 100% - .oe_kanban_ungrouped + &.oe_kanban_ungrouped .oe_kanban_column background: white .oe_kanban_record float: left diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 69e97384b03..4b6a4c9b158 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -173,6 +173,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, do_process_groups: function(groups) { var self = this; + this.$element.remove('oe_kanban_ungrouped').addClass('oe_kanban_grouped'); this.add_group_mutex.exec(function() { self.do_clear_groups(); self.dataset.ids = []; @@ -194,6 +195,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ }, do_process_dataset: function(dataset) { var self = this; + this.$element.remove('oe_kanban_grouped').addClass('oe_kanban_ungrouped'); this.add_group_mutex.exec(function() { var def = $.Deferred(); self.do_clear_groups(); diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 820189c7b27..a6284300a9b 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -55,7 +55,7 @@ - +