odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Fabien Meghazi 2012-08-01 15:19:52 +02:00
parent fbce1b1a1d
commit fb03a92729
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/web_kanban/static/src/css/kanban.css
View File

@ -40,6 +40,9 @@
.openerp .oe_kanban_view .oe_kanban_groups { .openerp .oe_kanban_view .oe_kanban_groups {
height: inherit; 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 { .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
display: inline-block; display: inline-block;
} }
@ -65,7 +68,7 @@
.openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group { .openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
padding: 0px; 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; background: #f0eeee;
border-left: 1px solid #f0f8f8; border-left: 1px solid #f0f8f8;
border-right: 1px solid #b9b9b9; border-right: 1px solid #b9b9b9;
@ -185,7 +188,7 @@
font-weight: bold; font-weight: bold;
margin: 2px 4px; 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; margin-bottom: 6px;
} }
.openerp .oe_kanban_view .oe_kanban_gravatar { .openerp .oe_kanban_view .oe_kanban_gravatar {
@ -236,13 +239,13 @@
clear: both; clear: both;
text-align: center; 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%; width: 100%;
} }
.openerp .oe_kanban_view .oe_kanban_ungrouped { .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column {
background: white; 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; float: left;
padding: 2px; padding: 2px;
box-sizing: border-box; box-sizing: border-box;

10
addons/web_kanban/static/src/css/kanban.sass
View File

@ -63,6 +63,8 @@
// KanbanGroups {{{ // KanbanGroups {{{
.oe_kanban_groups .oe_kanban_groups
height: inherit height: inherit
&.oe_kanban_ungrouped .oe_kanban_groups
width: 100%
.oe_kanban_header .oe_kanban_header
&:hover &:hover
.oe_dropdown_kanban .oe_dropdown_kanban
@ -86,7 +88,7 @@
.oe_kanban_group_header.oe_kanban_no_group .oe_kanban_group_header.oe_kanban_no_group
padding: 0px padding: 0px
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header &.oe_kanban_grouped .oe_kanban_column, .oe_kanban_group_header
background: #f0eeee background: #f0eeee
border-left: 1px solid #f0f8f8 border-left: 1px solid #f0f8f8
border-right: 1px solid #b9b9b9 border-right: 1px solid #b9b9b9
@ -187,7 +189,7 @@
.oe_kanban_title .oe_kanban_title
font-weight: bold font-weight: bold
margin: 2px 4px margin: 2px 4px
.oe_kanban_grouped .oe_kanban_record &.oe_kanban_grouped .oe_kanban_record
margin-bottom: 6px margin-bottom: 6px
.oe_kanban_gravatar .oe_kanban_gravatar
display: block display: block
@ -222,9 +224,9 @@
.oe_kanban_show_more .oe_kanban_show_more
clear: both clear: both
text-align: center text-align: center
.oe_kanban_grouped .oe_kanban_show_more .oe_button &.oe_kanban_grouped .oe_kanban_show_more .oe_button
width: 100% width: 100%
.oe_kanban_ungrouped &.oe_kanban_ungrouped .oe_kanban_column
background: white background: white
.oe_kanban_record .oe_kanban_record
float: left float: left

2
addons/web_kanban/static/src/js/kanban.js
View File

@ -173,6 +173,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
}, },
do_process_groups: function(groups) { do_process_groups: function(groups) {
var self = this; var self = this;
this.$element.remove('oe_kanban_ungrouped').addClass('oe_kanban_grouped');
this.add_group_mutex.exec(function() { this.add_group_mutex.exec(function() {
self.do_clear_groups(); self.do_clear_groups();
self.dataset.ids = []; self.dataset.ids = [];
@ -194,6 +195,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
}, },
do_process_dataset: function(dataset) { do_process_dataset: function(dataset) {
var self = this; var self = this;
this.$element.remove('oe_kanban_grouped').addClass('oe_kanban_ungrouped');
this.add_group_mutex.exec(function() { this.add_group_mutex.exec(function() {
var def = $.Deferred(); var def = $.Deferred();
self.do_clear_groups(); self.do_clear_groups();

2
addons/web_kanban/static/src/xml/web_kanban.xml
View File

@ -55,7 +55,7 @@
</td> </td>
</t> </t>
<t t-name="KanbanView.group_records_container"> <t t-name="KanbanView.group_records_container">
<td t-attf-class="oe_kanban_column #{widget.group ? 'oe_kanban_grouped' : 'oe_kanban_ungrouped'}"> <td class="oe_kanban_column">
<div class="oe_kanban_group_list_header"/> <div class="oe_kanban_group_list_header"/>
<div class="oe_kanban_show_more"> <div class="oe_kanban_show_more">
<button class="oe_button">Show more... (<span class="oe_kanban_remaining"></span> remaining)</button> <button class="oe_button">Show more... (<span class="oe_kanban_remaining"></span> remaining)</button>