Merge lp:~openerp-dev/openerp-web/7.0-kanban-size-chm into lp:openerp-web/7.0

Proposed by Christophe Matthieu (OpenERP)
Status: Rejected
Rejected by: Antony Lesuisse (OpenERP)
Proposed branch: lp:~openerp-dev/openerp-web/7.0-kanban-size-chm
Merge into: lp:openerp-web/7.0
Diff against target: 103 lines (+34/-2)
3 files modified
addons/web_kanban/static/src/css/kanban.css (+0/-1)
addons/web_kanban/static/src/css/kanban.sass (+0/-1)
addons/web_kanban/static/src/js/kanban.js (+34/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-kanban-size-chm
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+141761@code.launchpad.net
To post a comment you must log in.
3681. By Nicolas Vanhoren (OpenERP)

[FIX] css problem in list view: list arrow appearing when we sort could appear on the text

3682. By Fabien (Open ERP)

[IMP] kanban column width

3683. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

3684. By Christophe Matthieu (OpenERP)

[FIX] py.js: add the name of value to display error when debugging.

3685. By Christophe Matthieu (OpenERP)

[MERGE] trunk-bug-1095257-vja: In IE9,create database page should display in center.

3686. By Fabien (Open ERP)

[FIX] kanban width improvement

3687. By Fabien (Open ERP)

[IMP] french translation

3688. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

3689. By Fabien Meghazi (OpenERP)

[FIX] Kanban view produce multiple result set on multiple concurrent searches

3690. By Christophe Matthieu (OpenERP)

[IMP] menu css, don't display active color and need action hover the content document

3691. By Fabien Meghazi (OpenERP)

[FIX] Empty binary fields does not hide filename placeholder

3692. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

3693. By Nicolas Vanhoren (OpenERP)

[FIX] problem when multiple instances of the web client run in tabs and we disconnect from one tab, now displays a better error message

3694. By Christophe Matthieu (OpenERP)

[FIX] kanban view: css change for title elipsis

3695. By Christophe Matthieu (OpenERP)

[IMP] kanban view: auto size column

Unmerged revisions

3695. By Christophe Matthieu (OpenERP)

[IMP] kanban view: auto size column

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2013-01-09 09:44:51 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2013-01-09 09:51:20 +0000
@@ -84,7 +84,6 @@
84 color: #333333;84 color: #333333;
85 text-shadow: 0 1px 0 white;85 text-shadow: 0 1px 0 white;
86 margin-right: 30px;86 margin-right: 30px;
87 width: 200px;
88}87}
89.openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_title_text {88.openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_title_text {
90 margin-right: 4px;89 margin-right: 4px;
9190
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2013-01-09 09:44:51 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2013-01-09 09:51:20 +0000
@@ -112,7 +112,6 @@
112 color: #333333112 color: #333333
113 text-shadow: 0 1px 0 white113 text-shadow: 0 1px 0 white
114 margin-right: 30px114 margin-right: 30px
115 width: 200px
116 .oe_kanban_group_title_text115 .oe_kanban_group_title_text
117 margin-right: 4px116 margin-right: 4px
118 white-space: nowrap117 white-space: nowrap
119118
=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js 2013-01-07 12:37:21 +0000
+++ addons/web_kanban/static/src/js/kanban.js 2013-01-09 09:51:20 +0000
@@ -55,6 +55,7 @@
55 self.$buttons.find('.oe_kanban_add_column').openerpBounce();55 self.$buttons.find('.oe_kanban_add_column').openerpBounce();
56 }56 }
57 });57 });
58 this.width = this.$el.width();
58 },59 },
59 destroy: function() {60 destroy: function() {
60 this._super.apply(this, arguments);61 this._super.apply(this, arguments);
@@ -300,6 +301,27 @@
300 group.destroy();301 group.destroy();
301 });302 });
302 },303 },
304 do_resize: function() {
305 var self = this;
306 var nb_unfolded = 0;
307 var nb_folded = 0;
308 _.each(self.groups, function (val) {
309 if (val.group && val.group.attributes && val.group.attributes.folded) {
310 nb_folded++;
311 } else {
312 nb_unfolded++;
313 }
314 });
315 var width_folded = 40;
316 var width_unfolded = Math.floor((this.width - width_folded*nb_folded)/nb_unfolded);
317 if (width_unfolded < 200) width_unfolded = 200;
318 else if (width_unfolded > 300) width_unfolded = 300;
319 _.each(self.groups, function (val) {
320 val.width_folded = width_folded ;
321 val.width_unfolded = width_unfolded;
322 val.do_resize();
323 });
324 },
303 do_add_groups: function(groups) {325 do_add_groups: function(groups) {
304 var self = this;326 var self = this;
305 var $parent = this.$el.parent();327 var $parent = this.$el.parent();
@@ -319,6 +341,7 @@
319 _.each(self.groups, function(group) {341 _.each(self.groups, function(group) {
320 group.compute_cards_auto_height();342 group.compute_cards_auto_height();
321 });343 });
344 self.do_resize();
322 });345 });
323 },346 },
324 on_groups_started: function() {347 on_groups_started: function() {
@@ -553,6 +576,7 @@
553 start: function() {576 start: function() {
554 var self = this,577 var self = this,
555 def = this._super();578 def = this._super();
579 this.do_resize();
556 if (! self.view.group_by) {580 if (! self.view.group_by) {
557 self.$el.addClass("oe_kanban_no_group");581 self.$el.addClass("oe_kanban_no_group");
558 self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false)582 self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false)
@@ -625,6 +649,12 @@
625 this.$records.remove();649 this.$records.remove();
626 }650 }
627 },651 },
652 do_resize: function() {
653 var $header = this.$(".oe_kanban_header");
654 var width = this.group && this.group.attributes && this.group.attributes.folded ? this.width_folded : this.width_unfolded;
655 width += $header.width() - this.$el.outerWidth(); // get margin
656 $header.css("width", width);
657 },
628 do_show_more: function(evt) {658 do_show_more: function(evt) {
629 var self = this;659 var self = this;
630 var ids = self.view.dataset.ids.splice(0);660 var ids = self.view.dataset.ids.splice(0);
@@ -674,6 +704,10 @@
674 },704 },
675 do_action_toggle_fold: function() {705 do_action_toggle_fold: function() {
676 this.do_toggle_fold();706 this.do_toggle_fold();
707 this.group = this.group || {};
708 this.group.attributes = this.group.attributes || {};
709 this.group.attributes.folded = !this.group.attributes.folded;
710 this.__parentedParent.do_resize();
677 },711 },
678 do_action_edit: function() {712 do_action_edit: function() {
679 var self = this;713 var self = this;