summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/web_kanban/static/src/css/kanban.css7
-rw-r--r--addons/web_kanban/static/src/js/kanban.js8
-rw-r--r--addons/web_kanban/static/src/xml/web_kanban.xml2
3 files changed, 9 insertions, 8 deletions
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index dea09b75651..fe0dd75632f 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -9,8 +9,13 @@
.openerp .oe_kanban_view .oe_view_nocontent {
position: relative;
max-width: none;
+ z-index: 1;
+ width: 100%;
height: 100%;
}
+.openerp .oe_kanban_view.oe_kanban_grouped{
+ position: relative;
+}
.openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_content {
margin-left: 90px;
margin-top: 5px;
@@ -160,7 +165,7 @@
padding: 0px;
background: white;
}
-.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
+.openerp .oe_kanban_view .oe_kanban_column {
height: 100%;
}
.openerp .oe_kanban_view .oe_kanban_aggregates {
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index f600e20c03b..ca4bd4917bb 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -43,7 +43,6 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.currently_dragging = {};
this.limit = options.limit || 40;
this.add_group_mutex = new $.Mutex();
- this.last_position = 'static';
},
view_loading: function(r) {
return this.load_kanban(r);
@@ -496,16 +495,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
|| (!this.options.action.help && !this.options.action.get_empty_list_help)) {
return;
}
- this.last_position = this.$el.find('table:first').css("position");
- this.$el.find('table:first').css("position", "absolute");
- $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));
+ $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertBefore(this.$('table:first'));
this.$el.find('.oe_view_nocontent').click(function() {
self.$buttons.openerpBounce();
});
},
remove_no_result: function() {
- this.$el.find('table:first').css("position", this.last_position);
- this.$el.find('.oe_view_nocontent').remove();
+ this.$el.find('.oe_view_nocontent').remove();
},
/*
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 33e03baf5f9..8c145fea23f 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -102,7 +102,7 @@
</t>
</div>
<t t-name="KanbanView.nocontent">
- <div class="oe_view_nocontent">
+ <div class="oe_view_nocontent" style="position:absolute;">
<div class="oe_view_nocontent_bg"></div>
<div class="oe_view_nocontent_content">
<t t-raw="content"/>