diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 6f679d4b125..0fdc2a8c5a4 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -613,6 +613,9 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
vertical-align: middle;
text-align: left;
}
+.openerp .oe-listview td.oe-record-delete {
+ text-align: right;
+}
.openerp .oe-listview th.oe-sortable,
.openerp .oe-listview th.oe-sortable .ui-icon {
cursor: pointer;
@@ -647,6 +650,14 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
cursor: pointer;
}
+.openerp .oe-listview .oe-group-name {
+ padding-right: 1em;
+}
+.openerp .oe-listview .oe-group-name,
+.openerp .oe-listview .oe-group-pagination {
+ white-space: nowrap;
+}
+
.openerp .oe-listview tfoot td {
padding: 3px 3px 0;
}
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7c312f3fd83..0d3096a7dcd 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -787,14 +787,9 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
this.columns = view.columns;
this.datagroup = null;
- this.sections = [];
+ this.$row = null;
this.children = {};
},
- pad: function ($row) {
- if (this.options.selectable) {
- $row.append('
');
- }
- },
make_fragment: function () {
return document.createDocumentFragment();
},
@@ -827,8 +822,13 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
},
open: function (point_insertion) {
this.render().insertAfter(point_insertion);
+ this.$row.children().last()
+ .append('< ')
+ .append('')
+ .append('> ');
},
close: function () {
+ this.$row.children().last().empty();
this.apoptosis();
},
/**
@@ -860,7 +860,7 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
self.bind_child_events(child);
child.datagroup = group;
- var $row = $(' ');
+ var $row = child.$row = $(' ');
if (group.openable) {
$row.click(function (e) {
if (!$row.data('open')) {
@@ -880,7 +880,7 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
}
placeholder.appendChild($row[0]);
- var $group_column = $('').appendTo($row);
+ var $group_column = $(' ').appendTo($row);
if (group.grouped_on) {
// Don't fill this if group_by_no_leaf but no group_by
$group_column
@@ -895,7 +895,9 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
// count column
$(' ').text(group.length).appendTo($row);
- self.pad($row);
+ if (self.options.selectable) {
+ $row.append(' ');
+ }
_(self.columns).chain()
.filter(function (column) {return !column.invisible;})
.each(function (column) {
@@ -916,6 +918,9 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
$row.append(' ');
}
});
+ if (self.options.deletable) {
+ $row.append('