[MERGE] Merged with trunk web.

bzr revid: tde@openerp.com-20120628105323-p50min2k8by55jg0
bzr revid: tde@openerp.com-20120628122649-affstbyq1mt80qnt

9 files changed, 96 insertions, 111 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4ad4d4b700a..9d84cd787ef 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -860,12 +860,12 @@ instance.web.WebClient = instance.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp-web-client-container");
+        this.$element.addClass("openerp openerp_webclient_container");
         if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
             $("body").addClass("kitten-mode-activated");
-            self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
-                self.$element.toggleClass('clark-gable');
-            });
+            if ($.blockUI) {
+                $.blockUI.defaults.message = '<img src="http://www.amigrave.com/kitten.gif">';
+            }
         }
         this.session.session_bind().then(function() {
             self.destroy_content();
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index bc98d8a1c10..6059f292df9 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -68,7 +68,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
         this.open({
             buttons: [
                 {text: _t("Close"), click: function() { self.destroy(); }},
-                {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe-dialog-import-button'}
+                {text: _t("Import File"), click: function() { self.do_import(); }, 'class': 'oe_import_dialog_button'}
             ],
             close: function(event, ui) {
                 self.destroy();
@@ -78,7 +78,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
         this.$element.find('#csvfile').change(this.on_autodetect_data);
         this.$element.find('fieldset').change(this.on_autodetect_data);
         this.$element.delegate('fieldset legend', 'click', function() {
-            $(this).parent().toggleClass('oe-closed');
+            $(this).parent().toggleClass('oe_closed');
         });
         this.ready.push(new instance.web.DataSet(this, this.model).call(
             'fields_get', [], function (fields) {
@@ -157,7 +157,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
     },
     toggle_import_button: function (newstate) {
     	instance.web.dialog(this.$element, 'widget')
-                .find('.oe-dialog-import-button')
+                .find('.oe_import_dialog_button')
                 .button('option', 'disabled', !newstate);
     },
     do_import: function() {
@@ -202,7 +202,7 @@ instance.web.DataImport = instance.web.Dialog.extend({
         if (results['error']) {
             result_node.append(QWeb.render('ImportView.error', {
                 'error': results['error']}));
-            this.$element.find('fieldset').removeClass('oe-closed');
+            this.$element.find('fieldset').removeClass('oe_closed');
             return;
         }
         if (results['success']) {
@@ -224,11 +224,11 @@ instance.web.DataImport = instance.web.Dialog.extend({
                           : with_headers ? results.records.slice(1)
                           : results.records
             }));
-            this.$element.find('fieldset').addClass('oe-closed');
+            this.$element.find('fieldset').addClass('oe_closed');
         }
-        this.$element.find('form').removeClass('oe-import-no-result');
+        this.$element.find('form').removeClass('oe_import_no_result');
 
-        this.$element.delegate('.oe-m2o-drop-down-button', 'click', function () {
+        this.$element.delegate('.oe_m2o_drop_down_button', 'click', function () {
             $(this).prev('input').focus();
         });
 
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index e0ee3359091..6ceb7090e44 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -309,7 +309,7 @@ instance.web.format_cell = function (row_data, column, options) {
             '</button>', {
                 title: column.string || '',
                 additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
-                    'disabled="disabled" class="oe-listview-button-disabled"' : '',
+                    'disabled="disabled" class="oe_list_button_disabled"' : '',
                 prefix: instance.connection.prefix,
                 icon: column.icon,
                 alt: column.string || ''
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 169c7053575..3dc8866b6b7 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -635,12 +635,13 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         (new instance.web.search.CustomFilters(this));
         // add Advanced to this.inputs
         (new instance.web.search.Advanced(this));
-        (new instance.web.search.AddToDashboard(this));
 
         // build drawer
         var drawer_started = $.when.apply(
             null, _(this.select_for_drawer()).invoke(
                 'appendTo', this.$element.find('.oe_searchview_drawer')));
+        
+        new instance.web.search.AddToDashboard(this).appendTo($('.oe_searchview_drawer', this.$element));
 
         // load defaults
         var defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
@@ -1638,7 +1639,7 @@ instance.web.search.Filters = instance.web.search.Input.extend({
         }));
     }
 });
-instance.web.search.AddToDashboard = instance.web.search.Input.extend({
+instance.web.search.AddToDashboard = instance.web.Widget.extend({
     template: 'SearchView.addtodashboard',
     _in_drawer: true,
     start: function () {
@@ -1646,44 +1647,18 @@ instance.web.search.AddToDashboard = instance.web.search.Input.extend({
         this.data_loaded = $.Deferred();
         this.dashboard_data =[];
         this.$element
-        .on('click', 'h4', this.proxy('show_option'))
-        .on('submit', 'form', function (e) {e.preventDefault(); self.add_dashboard();});
+            .on('click', 'h4', this.proxy('show_option'))
+            .on('submit', 'form', function (e) {
+                e.preventDefault();
+                self.add_dashboard();
+            });
         return $.when(this.load_data(),this.data_loaded).pipe(this.proxy("render_data"));
     },
     load_data:function(){
-        // get from database if dashboard position change than also works(from Reporting to else).
-        /*var self = this,
-        ir_actions_act_window = new instance.web.Model('ir.actions.act_window',{},[['res_model','=',"board.board"],['view_id','!=',false]])
-                                    .query(['name','id']),
-        map_data =  function(){
-            var ir_actions_values = arguments[0],ir_values = arguments[1];
-            _(ir_values).each(function(res){
-                var get_name = _.detect(ir_actions_values,function(name){ return name.id == parseInt((res.value).split(",")[1]);});
-                self.dashboard_data.push({"res_id":res.res_id,"name":get_name.name})
-            });
-            self.data_loaded.resolve();
-        },
-        make_domain = function(result){
-            var domain = [];
-            _(result).map(function(value,key){
-                domain.push(["value","=","ir.actions.act_window,"+value.id]);
-                ((result.length)- 1 !== key)?domain.unshift("|"):false;
-            })
-            return domain;
-        };
-        return ir_actions_act_window._execute().then(function(ir_actions_values){
-            if(!ir_actions_values.length) {self.data_loaded.resolve();return;}
-            var ir_value = new instance.web.Model('ir.values',{},make_domain(ir_actions_values)).query(['res_id','value']);
-            ir_value._execute().done(function(ir_values){
-                map_data(ir_actions_values,ir_values);
-            })
-        });*/
-       
-       //===============================get from instance.webclient.menu (with less rpc call)
-      var self = this,dashbaord_menu = instance.webclient.menu.data.data.children,
-        ir_model_data = new instance.web.Model('ir.model.data',{},[['name','=','menu_reporting_dashboard']]).query(['res_id']),
-        map_data = function(result){
-            _.detect(dashbaord_menu,function(dash){
+        var self = this,dashboard_menu = instance.webclient.menu.data.data.children;
+        var ir_model_data = new instance.web.Model('ir.model.data',{},[['name','=','menu_reporting_dashboard']]).query(['res_id']);
+        var map_data = function(result){
+            _.detect(dashboard_menu, function(dash){
                 var id = _.pluck(dash.children, "id"),indexof = _.indexOf(id, result.res_id);
                 if(indexof !== -1){
                     self.dashboard_data = dash.children[indexof].children
@@ -1701,8 +1676,10 @@ instance.web.search.AddToDashboard = instance.web.search.Input.extend({
         this.$element.find("input").before(selection)
     },
     add_dashboard:function(){
-        var self = this,getParent = this.getParent(),view_parent = this.view.getParent();
-        if(!view_parent.action || !this.$element.find("select").val())
+        var self = this;
+        var getParent = this.getParent();
+        var view_parent = this.getParent().getParent();
+        if (! view_parent.action || ! this.$element.find("select").val())
             return this.do_warn("Can't find dashboard action");
         data = getParent.build_search_data(),
         context = new instance.web.CompoundContext(getParent.dataset.get_context() || []),
@@ -1732,6 +1709,7 @@ instance.web.search.AddToDashboard = instance.web.search.Input.extend({
         this.$element.find("input").val(this.getParent().fields_view.name || "" );
     }
 });
+
 instance.web.search.Advanced = instance.web.search.Input.extend({
     template: 'SearchView.advanced',
     _in_drawer: true,
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 652ad74c012..9315e08871a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1513,7 +1513,9 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         this._super.apply(this, arguments);
     },
     /**
-     * Sets up blur/focus forwarding from DOM elements to a widget (`this`)
+     * Sets up blur/focus forwarding from DOM elements to a widget (`this`).
+     *
+     * This method is an utility method that is meant to be called by child classes.
      *
      * @param {jQuery} $e jQuery object of elements to bind focus/blur on
      */
@@ -1790,8 +1792,9 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this._super(field_manager, node);
         this.field_manager = field_manager;
         this.name = this.node.attrs.name;
-        this.set({'value': false});
         this.field = this.field_manager.get_field(this.name);
+        this.widget = this.node.attrs.widget;
+        this.set({'value': false});
         this.set({required: this.modifiers['required'] === true});
         
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
@@ -2002,7 +2005,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
         } else {
             this.$element.find('a')
                     .attr('href', 'mailto:' + this.get('value'))
-                    .text(this.get('value'));
+                    .text(this.get('value') || '');
         }
     },
     on_button_clicked: function() {
@@ -2031,7 +2034,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
             if (!s) {
                 tmp = "http://" + this.get('value');
             }
-            this.$element.find('a').attr('href', tmp).text(tmp);
+            this.$element.find('a').attr('href', tmp).text(this.get('value') ? tmp : '');
         }
     },
     on_button_clicked: function() {
@@ -2564,8 +2567,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             fade: true,
         });
         
-        this.$drop_down = this.$element.find(".oe-m2o-drop-down-button");
-        this.$follow_button = $(".oe-m2o-cm-button", this.$element);
+        this.$drop_down = this.$element.find(".oe_m2o_drop_down_button");
+        this.$follow_button = $(".oe_m2o_cm_button", this.$element);
         
         this.$follow_button.click(function() {
             if (!self.get('value')) {
@@ -2719,9 +2722,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         if (!this.get("effective_readonly")) {
             this.$input.val(str);
         } else {
+            str = _.escape(str).replace("\n", "<br />");
             this.$element.find('a')
                  .unbind('click')
-                 .text(str)
+                 .html(str)
                  .click(function () {
                     self.do_action({
                         type: 'ir.actions.act_window',
@@ -3251,8 +3255,8 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         return this._super.apply(this, arguments).then(function () {
             // Replace the "Save Row" button with "Cancel Edition"
             self.edition_form.$element
-                .undelegate('button.oe-edit-row-save', 'click')
-                .delegate('button.oe-edit-row-save', 'click', function () {
+                .undelegate('button.oe_list_edit_row_save', 'click')
+                .delegate('button.oe_list_edit_row_save', 'click', function () {
                     self.cancel_pending_edition();
                 });
 
@@ -3852,7 +3856,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
         if (this.options.alternative_form_view) {
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
-        this.view_form.appendTo(this.$element.find(".oe-form-view-popup-form-placeholder"));
+        this.view_form.appendTo(this.$element.find(".oe_popup_form"));
         this.view_form.on_loaded.add_last(function() {
             var $buttons = self.view_form.$element.find(".oe_form_buttons");
             var multi_select = self.row_id === null && ! self.options.disable_multiple_selection;
@@ -3983,7 +3987,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                         'read_only': true,
                     }, self.options.list_view_options || {}));
             self.view_list.popup = self;
-            self.view_list.appendTo($(".oe-select-create-popup-view-list", self.$element)).pipe(function() {
+            self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() {
                 self.view_list.do_show();
             }).pipe(function() {
                 self.searchview.do_search();
@@ -4005,7 +4009,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                 });
             });
         });
-        this.searchview.appendTo($(".oe-select-create-popup-view-list", self.$element));
+        this.searchview.appendTo($(".oe_popup_list", self.$element));
     },
     do_search: function(domains, contexts, groupbys) {
         var self = this;
@@ -4167,9 +4171,9 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
         this._super.apply(this, arguments);
     },
     initialize_content: function() {
-        this.$element.find('input.oe-binary-file').change(this.on_file_change);
-        this.$element.find('button.oe_binary_file_save').click(this.on_save_as);
-        this.$element.find('.oe-binary-file-clear').click(this.on_clear);
+        this.$element.find('input.oe_form_binary_file').change(this.on_file_change);
+        this.$element.find('button.oe_form_binary_file_save').click(this.on_save_as);
+        this.$element.find('.oe_form_binary_file_clear').click(this.on_clear);
     },
     human_filesize : function(size) {
         var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
@@ -4186,10 +4190,10 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
         // http://deepliquid.com/projects/Jcrop/demos.php?demo=handler
 
         if ($(e.target).val() !== '') {
-            this.$element.find('form.oe-binary-form input[name=session_id]').val(this.session.session_id);
-            this.$element.find('form.oe-binary-form').submit();
-            this.$element.find('.oe-binary-progress').show();
-            this.$element.find('.oe-binary').hide();
+            this.$element.find('form.oe_form_binary_form input[name=session_id]').val(this.session.session_id);
+            this.$element.find('form.oe_form_binary_form').submit();
+            this.$element.find('.oe_form_binary_progress').show();
+            this.$element.find('.oe_form_binary').hide();
         }
     },
     on_file_uploaded: function(size, name, content_type, file_base64) {
@@ -4201,8 +4205,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
             this.filename = name;
             this.on_file_uploaded_and_valid.apply(this, arguments);
         }
-        this.$element.find('.oe-binary-progress').hide();
-        this.$element.find('.oe-binary').show();
+        this.$element.find('.oe_form_binary_progress').hide();
+        this.$element.find('.oe_form_binary').show();
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
     },
@@ -4212,7 +4216,7 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
             this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !"));
             ev.stopPropagation();
         } else if (this._dirty_flag) {
-            var link = this.$('.oe_binary_file_save_data')[0];
+            var link = this.$('.oe_form_binary_file_save_data')[0];
             link.download = this.filename || "download.bin"; // Works on only on Google Chrome
             //link.target = '_blank';
             link.href = "data:application/octet-stream;base64," + value;
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 95c425a0e1d..a55a3decf1e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -140,13 +140,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         });
     },
     /**
-     * View startup method, the default behavior is to set the ``oe-listview``
+     * View startup method, the default behavior is to set the ``oe_listw``
      * class on its root element and to perform an RPC load call.
      *
      * @returns {$.Deferred} loading promise
      */
     start: function() {
-        this.$element.addClass('oe-listview');
+        this.$element.addClass('oe_list');
         return this.reload_view(null, null, true);
     },
     /**
@@ -250,18 +250,19 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         this.setup_columns(this.fields_view.fields, grouped);
 
         this.$element.html(QWeb.render(this._template, this));
+        this.$element.addClass(this.fields_view.arch.attrs['class']);
         // Head hook
         // Selecting records
-        this.$element.find('.all-record-selector').click(function(){
-            self.$element.find('.oe-record-selector input').prop('checked',
-                self.$element.find('.all-record-selector').prop('checked')  || false);
+        this.$element.find('.oe_list_record_selector').click(function(){
+            self.$element.find('.oe_list_record_selector input').prop('checked',
+                self.$element.find('.oe_list_record_selector').prop('checked')  || false);
             var selection = self.groups.get_selection();
             $(self.groups).trigger(
                 'selected', [selection.ids, selection.records]);
         });
 
         // Sorting columns
-        this.$element.find('thead').delegate('th.oe-sortable[data-id]', 'click', function (e) {
+        this.$element.find('thead').delegate('th.oe_sortable[data-id]', 'click', function (e) {
             e.stopPropagation();
             var $this = $(this);
             self.dataset.sort($this.data('id'));
@@ -270,7 +271,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             } else {
                 $this.toggleClass("sortdown");
             }
-            $this.siblings('.oe-sortable').removeClass("sortup sortdown");
+            $this.siblings('.oe_sortable').removeClass("sortup sortdown");
 
             self.reload_content();
         });
@@ -322,7 +323,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                         self.page = 0;
                     }
                     self.reload_content();
-                }).find('.oe-pager-state')
+                }).find('.oe_list_pager_state')
                     .click(function (e) {
                         e.stopPropagation();
                         var $this = $(this);
@@ -372,18 +373,19 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         }
 
         var total = dataset.size();
-        this.$pager.toggleClass('oe_list_pager_single_page', (total <= this.limit()));
+        var limit = this.limit() || total;
+        this.$pager.toggleClass('oe_list_pager_single_page', (total <= limit));
         var spager = '-';
         if (total) {
-            var range_start = this.page * this.limit() + 1;
-            var range_stop = range_start - 1 + this.limit();
+            var range_start = this.page * limit + 1;
+            var range_stop = range_start - 1 + limit;
             if (range_stop > total) {
                 range_stop = total;
             }
             spager = _.str.sprintf('%d-%d of %d', range_start, range_stop, total);
         }
 
-        this.$pager.find('.oe-pager-state').text(spager);
+        this.$pager.find('.oe_list_pager_state').text(spager);
     },
     /**
      * Sets up the listview's columns: merges view and fields data, move
@@ -533,10 +535,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      */
     reload_content: function () {
         var self = this;
-        self.$element.find('.all-record-selector').prop('checked', false);
+        self.$element.find('.oe_list_record_selector').prop('checked', false);
         this.records.reset();
         var reloaded = $.Deferred();
-        this.$element.find('.oe-listview-content').append(
+        this.$element.find('.oe_list_content').append(
             this.groups.render(function () {
                 if (self.dataset.index == null) {
                     var has_one = false;
@@ -788,7 +790,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
     },
     display_aggregates: function (aggregation) {
         var self = this;
-        var $footer_cells = this.$element.find('.oe-list-footer');
+        var $footer_cells = this.$element.find('.oe_list_footer');
         _(this.aggregate_columns).each(function (column) {
             if (!column['function']) {
                 return;
@@ -826,9 +828,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         }
         // Padding for column titles, footer and data rows
         var $rows = this.$element
-                .find('.oe-listview-header-columns, tr:not(thead tr)')
+                .find('.oe_list_header_columns, tr:not(thead tr)')
                 .not(options['except']);
-        var newcols = new Array(count+1).join('<td class="oe-listview-padding"></td>');
+        var newcols = new Array(count+1).join('<td class="oe_list_padding"></td>');
         if (options.position === 'before') {
             $rows.prepend(newcols);
         } else {
@@ -839,7 +841,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      * Removes all padding columns of the table
      */
     unpad_columns: function () {
-        this.$element.find('.oe-listview-padding').remove();
+        this.$element.find('.oe_list_padding').remove();
         if (this.previous_colspan) {
             this.$element
                     .find('thead tr:first th')
@@ -939,18 +941,18 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
 
         this.$_element = $('<tbody>')
             .appendTo(document.body)
-            .delegate('th.oe-record-selector', 'click', function (e) {
+            .delegate('th.oe_list_record_selector', 'click', function (e) {
                 e.stopPropagation();
                 var selection = self.get_selection();
                 $(self).trigger(
                         'selected', [selection.ids, selection.records]);
             })
-            .delegate('td.oe-record-delete button', 'click', function (e) {
+            .delegate('td.oe_list_record_delete button', 'click', function (e) {
                 e.stopPropagation();
                 var $row = $(e.target).closest('tr');
                 $(self).trigger('deleted', [[self.row_id($row)]]);
             })
-            .delegate('td.oe-field-cell button', 'click', function (e) {
+            .delegate('td.oe_list_field_cell button', 'click', function (e) {
                 e.stopPropagation();
                 var $target = $(e.currentTarget),
                       field = $target.closest('td').data('field'),
@@ -1048,20 +1050,20 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
         }
         var cells = [];
         if (this.options.selectable) {
-            cells.push('<th class="oe-record-selector"></td>');
+            cells.push('<th class="oe_list_record_selector"></td>');
         }
         _(this.columns).each(function(column) {
             if (column.invisible === '1') {
                 return;
             }
             if (column.tag === 'button') {
-                cells.push('<td class="oe-button" title="' + column.string + '">&nbsp;</td>');
+                cells.push('<td class="oe_button" title="' + column.string + '">&nbsp;</td>');
             } else {
                 cells.push('<td title="' + column.string + '">&nbsp;</td>');
             }
         });
         if (this.options.deletable) {
-            cells.push('<td class="oe-record-delete"><button type="button" style="visibility: hidden"> </button></td>');
+            cells.push('<td class="oe_list_record_delete"><button type="button" style="visibility: hidden"> </button></td>');
         }
         cells.unshift('<tr>');
         cells.push('</tr>');
@@ -1082,7 +1084,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
             return result;
         }
         var records = this.records;
-        this.$current.find('th.oe-record-selector input:checked')
+        this.$current.find('th.oe_list_record_selector input:checked')
                 .closest('tr').each(function () {
             var record = records.get($(this).data('id'));
             result.ids.push(record.get('id'));
@@ -1249,7 +1251,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             });
         this.$row.children().last()
             .append($prev)
-            .append('<span class="oe-pager-state"></span>')
+            .append('<span class="oe_list_pager_state"></span>')
             .append($next);
     },
     open: function (point_insertion) {
@@ -1315,7 +1317,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             }
             placeholder.appendChild($row[0]);
 
-            var $group_column = $('<th class="oe-group-name">').appendTo($row);
+            var $group_column = $('<th class="oe_list_group_name">').appendTo($row);
             // Don't fill this if group_by_no_leaf but no group_by
             if (group.grouped_on) {
                 var row_data = {};
@@ -1365,7 +1367,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     }
                 });
             if (self.options.deletable) {
-                $row.append('<td class="oe-group-pagination">');
+                $row.append('<td class="oe_list_group_pagination">');
             }
         });
         return placeholder;
@@ -1416,11 +1418,11 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             } else {
                 if (dataset.size() == records.length) {
                     // only one page
-                    self.$row.find('td.oe-group-pagination').empty();
+                    self.$row.find('td.oe_list_group_pagination').empty();
                 } else {
                     var pages = Math.ceil(dataset.size() / limit);
                     self.$row
-                        .find('.oe-pager-state')
+                        .find('.oe_list_pager_state')
                             .text(_.str.sprintf(_t("%(page)d/%(page_count)d"), {
                                 page: page + 1,
                                 page_count: pages
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 831169511cf..c370aeaf7fd 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -210,7 +210,7 @@ openerp.web.list_editable = function (instance) {
                         click: function (e) {e.stopPropagation();}
                     })
                     .addClass('oe_form oe_form_container')
-                    .delegate('button.oe-edit-row-save', 'click', function () {
+                    .delegate('button.oe_list_edit_row_save', 'click', function () {
                         self.save_row();
                     })
                     .delegate('button', 'keyup', function (e) {
@@ -258,7 +258,7 @@ openerp.web.list_editable = function (instance) {
                 return $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () {
                     $new_row.find('> td')
                       .end()
-                      .find('td:last').removeClass('oe-field-cell').end();
+                      .find('td:last').removeClass('oe_list_field_cell').end();
                     // pad in case of groupby
                     _(self.columns).each(function (column) {
                         if (column.meta) {
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 9e938fe293a..e8bd7351f1f 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -84,6 +84,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             'fields': this.fields,
             'toolbar': has_toolbar
         }));
+        this.$element.addClass(this.fields_view.arch.attrs['class']);
 
         this.dataset.read_slice(this.fields_list()).then(function(records) {
             if (!has_toolbar) {
@@ -179,7 +180,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
                 }
             });
             if (is_loaded === 0) {
-                if (!$this.parent().hasClass('oe-open')) {
+                if (!$this.parent().hasClass('oe_open')) {
                     self.getdata(record_id, children_ids);
                 }
             } else {
@@ -208,7 +209,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             });
 
             if ($curr_node.length) {
-                $curr_node.addClass('oe-open');
+                $curr_node.addClass('oe_open');
                 $curr_node.after(children_rows);
             } else {
                 self.$element.find('tbody').html(children_rows);
@@ -247,11 +248,11 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
     // show & hide the contents
     showcontent: function (record_id, show) {
         this.$element.find('#treerow_' + record_id)
-                .toggleClass('oe-open', show);
+                .toggleClass('oe_open', show);
 
         _(this.records[record_id][this.children_field]).each(function (child_id) {
             var $child_row = this.$element.find('#treerow_' + child_id);
-            if ($child_row.hasClass('oe-open')) {
+            if ($child_row.hasClass('oe_open')) {
                 this.showcontent(child_id, false);
             }
             $child_row.toggle(show);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e82d3d0ae9b..8d0493a9753 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -862,13 +862,13 @@ instance.web.Sidebar = instance.web.Widget.extend({
         });
         self.items['files'] = attachments;
         self.redraw();
-        this.$('.oe_sidebar_add_attachment .oe-binary-file').change(this.on_attachment_changed);
+        this.$('.oe_sidebar_add_attachment .oe_form_binary_file').change(this.on_attachment_changed);
         this.$element.find('.oe_sidebar_delete_item').click(this.on_attachment_delete);
     },
     on_attachment_changed: function(e) {
         var $e = $(e.target);
         if ($e.val() !== '') {
-            this.$element.find('form.oe-binary-form').submit();
+            this.$element.find('form.oe_form_binary_form').submit();
             $e.parent().find('input[type=file]').prop('disabled', true);
             $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
             this.$('.oe_sidebar_add_attachment span').text(_t('Uploading...'));