diff --git a/CHANGELOG b/CHANGELOG index f12e957b82..5ceaa8c9c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Improve treeview headers * Add keyboard shortcuts * Update states of both toolbar and menu * Improve toolbar order diff --git a/src/sao.js b/src/sao.js index ed873a9f08..d540c24b3f 100644 --- a/src/sao.js +++ b/src/sao.js @@ -422,6 +422,7 @@ var Sao = {}; form.view_prm.done(function() { Sao.main_menu_screen = form.screen; var view = form.screen.current_view; + view.table.removeClass('table-bordered'); view.table.find('thead').hide(); jQuery('#menu').children().remove(); diff --git a/src/sao.less b/src/sao.less index 97d939be57..cfd3bb4b24 100644 --- a/src/sao.less +++ b/src/sao.less @@ -69,6 +69,13 @@ button { text-overflow: ellipsis; min-width: 30px; text-align: center; + &.char, &.text, &.many2one, &.one2one, &.date, &.time, &.selection, + &.reference, &.url, &.email, &.callto, &.sip { + text-align: left; + } + &.timedelta, &.float, &.numeric, &.integer, &.biginteger { + text-align: right; + } } & > tbody > tr > td { cursor: pointer; @@ -210,6 +217,9 @@ button { .column-integer, .column-float, .column-timedelta { text-align: right; } +.column-many2many, .column-one2many { + text-align: center; +} input.column-boolean { .center-block(); } diff --git a/src/view/tree.js b/src/view/tree.js index d4ba0b4446..d47b86c60c 100644 --- a/src/view/tree.js +++ b/src/view/tree.js @@ -71,6 +71,9 @@ this.table = jQuery('', { 'class': 'tree table table-hover table-striped' }); + if (this.editable) { + this.table.addClass('table-bordered'); + } this.el.append(this.table); this.thead = jQuery('').appendTo(this.table); var tr = jQuery(''); @@ -87,7 +90,9 @@ } this.thead.append(tr); this.columns.forEach(function(column) { - th = jQuery('
'); + th = jQuery('', { + 'class': column.attributes.widget, + }); var label = jQuery('