Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-empty_kanban-pga into lp:openerp-web

  1. trunk-empty_kanban-pga
  2. Merge into trunk
Proposed by Richard Mathot (Odoo, formerly OpenERP)
Status: Merged
Merged at revision: 3973
Proposed branch: lp:~openerp-dev/openerp-web/trunk-empty_kanban-pga
Merge into: lp:openerp-web
Diff against target: 58 lines (+7/-7)
3 files modified
addons/web_kanban/static/src/css/kanban.css (+2/-0)
addons/web_kanban/static/src/js/kanban.js (+4/-6)
addons/web_kanban/static/src/xml/web_kanban.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-empty_kanban-pga
Reviewer Review Type Date Requested Status
Richard Mathot (Odoo, formerly OpenERP) (community) Approve
Review via email: mp+215402@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Richard Mathot (Odoo, formerly OpenERP) (rim-openerp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_kanban/static/src/css/kanban.css'
2--- addons/web_kanban/static/src/css/kanban.css 2014-01-27 17:24:14 +0000
3+++ addons/web_kanban/static/src/css/kanban.css 2014-04-11 13:11:23 +0000
4@@ -9,6 +9,8 @@
5 .openerp .oe_kanban_view .oe_view_nocontent {
6 position: relative;
7 max-width: none;
8+ z-index: 1;
9+ width: 100%;
10 height: 100%;
11 }
12 .openerp .oe_kanban_view .oe_view_nocontent .oe_view_nocontent_content {
13
14=== modified file 'addons/web_kanban/static/src/js/kanban.js'
15--- addons/web_kanban/static/src/js/kanban.js 2014-01-31 00:52:02 +0000
16+++ addons/web_kanban/static/src/js/kanban.js 2014-04-11 13:11:23 +0000
17@@ -43,7 +43,6 @@
18 this.currently_dragging = {};
19 this.limit = options.limit || 40;
20 this.add_group_mutex = new $.Mutex();
21- this.last_position = 'static';
22 },
23 view_loading: function(r) {
24 return this.load_kanban(r);
25@@ -496,16 +495,15 @@
26 || (!this.options.action.help && !this.options.action.get_empty_list_help)) {
27 return;
28 }
29- this.last_position = this.$el.find('table:first').css("position");
30- this.$el.find('table:first').css("position", "absolute");
31- $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));
32+ this.$el.css("position", "relative");
33+ $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertBefore(this.$('table:first'));
34 this.$el.find('.oe_view_nocontent').click(function() {
35 self.$buttons.openerpBounce();
36 });
37 },
38 remove_no_result: function() {
39- this.$el.find('table:first').css("position", this.last_position);
40- this.$el.find('.oe_view_nocontent').remove();
41+ this.$el.css("position", "");
42+ this.$el.find('.oe_view_nocontent').remove();
43 },
44
45 /*
46
47=== modified file 'addons/web_kanban/static/src/xml/web_kanban.xml'
48--- addons/web_kanban/static/src/xml/web_kanban.xml 2013-05-17 05:41:10 +0000
49+++ addons/web_kanban/static/src/xml/web_kanban.xml 2014-04-11 13:11:23 +0000
50@@ -102,7 +102,7 @@
51 </t>
52 </div>
53 <t t-name="KanbanView.nocontent">
54- <div class="oe_view_nocontent">
55+ <div class="oe_view_nocontent" style="position:absolute;">
56 <div class="oe_view_nocontent_bg"></div>
57 <div class="oe_view_nocontent_content">
58 <t t-raw="content"/>