[MERGE} from trunk

bzr revid: xmo@openerp.com-20120711112959-tcb9epdfc9frt6ux

1 files changed, 95 insertions, 85 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8eee2bcc6bb..a85e8817ad8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -27,9 +27,9 @@
 </t>
 
 <t t-name="CrashManager.warning">
-    <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
+    <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
     <tr>
-        <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe-dialog-icon"/></td>
+        <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe_dialog_icon"/></td>
         <td>
             <p>
                 <t t-js="d">
@@ -537,7 +537,7 @@
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
     </select>
-    <table class="oe-treeview-table">
+    <table class="oe_tree_table">
         <thead>
             <tr>
                 <th t-foreach="fields_view" t-as="field"
@@ -557,7 +557,7 @@
         t-att-data-id="record.id" t-att-data-level="level + 1">
     <t t-set="children" t-value="record[children_field]"/>
     <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
-    <t t-set="rank" t-value="'oe-treeview-first'"/>
+    <t t-set="rank" t-value="'oe_tree_first'"/>
     <t t-set="style" t-value="'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;'"/>
 
     <td t-foreach="fields_view" t-as="field"
@@ -576,7 +576,7 @@
     </td>
 </tr>
 
-<table t-name="ListView" class="oe-listview-content">
+<table t-name="ListView" class="oe_list_content">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
     <thead>
         <tr t-if="(!!options.action_buttons and !options.$buttons) or (!!options.pager and !options.$pager)">
@@ -586,18 +586,18 @@
                 <div class="oe_list_pager"/>
             </th>
         </tr>
-        <tr t-if="options.header" class="oe-listview-header-columns">
+        <tr t-if="options.header" class="oe_list_header_columns">
             <t t-foreach="columns" t-as="column">
                 <th t-if="column.meta">
                     <t t-esc="column.string"/>
                 </th>
             </t>
             <th t-if="options.selectable" width="1"  >
-                <input type="checkbox" class="all-record-selector"/>
+                <input type="checkbox" class="oe_list_record_selector"/>
             </th>
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
-                    t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
+                    t-att-class="((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)">
                     <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t>
                 </th>
             </t>
@@ -607,7 +607,7 @@
     <tfoot>
         <tr>
             <td t-if="options.selectable"/>
-            <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe_number"
+            <td t-foreach="aggregate_columns" t-as="column" class="oe_list_footer oe_number"
                 t-att-data-field="column.id" t-att-title="column.label">
             </td>
             <td t-if="options.deletable"/>
@@ -619,7 +619,7 @@
         <button type="button" class="oe_button oe_list_add oe_highlight">
             <t t-esc="widget.options.addable"/>
         </button>
-        <span class="oe_alternative">
+        <span class="oe_alternative" t-if="widget.options.import_enabled">
             <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
         </span>
     </t>
@@ -627,7 +627,7 @@
 <t t-name="ListView.pager">
     <div class="oe_list_pager" t-att-colspan="widget.columns_count">
         <t t-if="!widget.no_leaf and widget.options.pager !== false" t-call="ViewPager">
-            <span class="oe-pager-state">
+            <span class="oe_list_pager_state">
             </span>
         </t>
     </div>
@@ -647,8 +647,8 @@
 
         </td>
     </t>
-    <th t-if="options.selectable" class="oe-record-selector" width="1">
-        <t t-set="checked" t-value="(options.select_view_id and options.select_view_id == record.get('id')) ? 'checked' : null"/>
+    <th t-if="options.selectable" class="oe_list_record_selector" width="1">
+        <t t-set="checked" t-value="options.select_view_id == record.get('id') ? 'checked' : null"/>
         <input t-if="options.radio" type="radio" name="radiogroup" t-att-checked="checked"/>
         <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/>
     </th>
@@ -656,12 +656,12 @@
         <t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/>
         <t t-set="modifiers" t-value="column.modifiers_for(asData)"/>
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
-            t-attf-class="oe-field-cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''}"
+            t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''}"
             t-att-data-field="column.id">
             <t t-raw="render_cell(record, column)"/>
         </td>
     </t>
-    <td t-if="options.deletable" class='oe-record-delete' width="1">
+    <td t-if="options.deletable" class='oe_list_record_delete' width="1">
         <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>
@@ -688,7 +688,7 @@
             <button type="button" class="oe_button oe_form_button_create">Create</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save oe_highlight_on_dirty">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>
+            <button type="button" class="oe_button oe_form_button_save oe_highlight">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>
         </span>
     </t>
 </div>
@@ -865,7 +865,7 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <span t-att-class="'oe_form_field '+widget.widget_class">
+    <span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style">
         <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
@@ -877,8 +877,8 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button">
-        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
+    <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
+        <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
                 <input type="text"
@@ -895,20 +895,15 @@
     <t t-jquery="span:first">
         this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-jquery="button.oe_button" t-operation="replace">
-        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
-            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-        </button>
-    </t>
 </t>
 <t t-name="FieldText">
-    <div class="oe_form_field oe_form_field_text">
+    <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
         <textarea rows="6"
             t-att-name="widget.name"
             class="field_text"
             t-att-tabindex="widget.node.attrs.tabindex"
             t-att-autofocus="widget.node.attrs.autofocus"
-            t-att-placeholder="widget.node.attrs.placeholder"
+            t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''"
         ></textarea>
         <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate"
             t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -927,13 +922,13 @@
     </span>
 </t>
 <t t-name="FieldDate">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_date" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldDatetime">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldSelection">
-    <span class="oe_form_field oe_form_field_selection">
+    <span class="oe_form_field oe_form_field_selection" t-att-style="widget.node.attrs.style">
         <select t-if="!widget.get('effective_readonly')"
             t-att-name="widget.name"
             t-att-tabindex="widget.node.attrs.tabindex"
@@ -946,10 +941,10 @@
     </span>
 </t>
 <t t-name="FieldMany2One">
-    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
+    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
         <t t-if="!widget.get('effective_readonly')">
-            <button class="oe_button oe-m2o-cm-button" title="Open Resource">
+            <button class="oe_button oe_m2o_cm_button" title="Open Resource">
                 <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
             </button>
             <div>
@@ -959,7 +954,7 @@
                     t-att-autofocus="widget.node.attrs.autofocus"
                     t-att-placeholder="widget.node.attrs.placeholder"
                 />
-                <span class="oe-m2o-drop-down-button">
+                <span class="oe_m2o_drop_down_button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"'/>
                 </span>
             </div>
@@ -967,9 +962,10 @@
     </span>
 </t>
 <t t-name="FieldMany2ManyTags">
-    <div class="oe_form_field oe_form_field_many2manytags">
+    <div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
-            <textarea rows="1" style="width: 100%"></textarea>
+            <textarea rows="1" style="width: 100%"
+                t-att-placeholder="widget.node.attrs.placeholder"></textarea>
         </t>
     </div>
 </t>
@@ -983,7 +979,7 @@
     </t>
 </t>
 <t t-name="FieldReference">
-    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0">
+    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0" t-att-style="widget.node.attrs.style">
     <tr>
         <td t-attf-class="oe_form_frame_cell oe_form_selection">
             <span t-attf-class="oe_form_view_reference_selection"/>
@@ -995,7 +991,7 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <span class="oe_form_field oe_form_field_boolean">
+    <span class="oe_form_field oe_form_field_boolean" t-att-style="widget.node.attrs.style">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
@@ -1005,24 +1001,24 @@
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <span class="oe_form_field oe_form_field_progressbar" t-opentag="true">
+    <span class="oe_form_field oe_form_field_progressbar" t-att-style="widget.node.attrs.style">
         <span></span>
     </span>
 </t>
+<t t-name="FieldStatus">
+    <ul class="oe_form_steps" t-att-style="widget.node.attrs.style"/>
+</t>
 <t t-name="FieldStatus.content">
-    <ul class="oe_form_steps">
-        <t t-set="size" t-value="widget.to_show.length"/>
-        <t t-foreach="_.range(size)" t-as="i">
-            <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
-                <span><t t-esc="widget.to_show[i][1]"/></span>
-                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-            </li>
-        </t>
-    </ul>
-    <div class="oe_clear"/>
+    <t t-set="size" t-value="widget.to_show.length"/>
+    <t t-foreach="_.range(size)" t-as="i">
+        <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
+            <span><t t-esc="widget.to_show[i][1]"/></span>
+            <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
+        </li>
+    </t>
 </t>
 <t t-name="FieldBinaryImage">
-    <span class="oe_form_field oe_form_field_image">
+    <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
         <div class="oe_form_field_image_controls oe_edit_only">
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
@@ -1030,10 +1026,10 @@
                     <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                 </button>
             </t>
-            <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
+            <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
                 <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
             </button>
-            <div class="oe-binary-progress" style="display: none">
+            <div class="oe_form_binary_progress" style="display: none">
                 <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
                 <b>Uploading ...</b>
             </div>
@@ -1050,7 +1046,7 @@
 </t>
 <t t-name="FieldBinaryFile">
     <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0" t-att-style="widget.node.attrs.style">
         <tr>
             <td>
                 <input type="text" size="1" readonly="readonly"
@@ -1060,7 +1056,7 @@
                     class="field_binary"
                 />
             </td>
-            <td class="oe-binary" nowrap="true">
+            <td class="oe_form_binary" nowrap="true">
                 <table cellspacing="0" cellpadding="0" border="0">
                 <tr>
                     <td>
@@ -1074,15 +1070,15 @@
                         </t>
                     </td>
                     <td>
-                        <a class="oe_binary_file_save_data">
-                            <button class="oe_button oe_binary_file_save" type="button" title="Save As">
+                        <a class="oe_form_binary_file_save_data">
+                            <button class="oe_button oe_form_binary_file_save" type="button" title="Save As">
                                 <img t-att-src='_s + "/web/static/src/img/icons/gtk-save.png"'/>
                                 <span>Save As</span>
                             </button>
                         </a>
                     </td>
                     <td>
-                        <button class="oe_button oe-binary-file-clear" type="button" title="Clear">
+                        <button class="oe_button oe_form_binary_file_clear" type="button" title="Clear">
                             <img t-att-src='_s + "/web/static/src/img/icons/STOCK_MISSING_IMAGE.png"'/>
                             <span>Clear</span>
                         </button>
@@ -1090,7 +1086,7 @@
                 </tr>
                 </table>
             </td>
-            <td class="oe-binary-progress" style="display: none" nowrap="true">
+            <td class="oe_form_binary_progress" style="display: none" nowrap="true">
                 <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
                 <b>Uploading ...</b>
             </td>
@@ -1098,25 +1094,26 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <span>
+        <span t-att-style="widget.node.attrs.style">
             <a href="javascript:void(0)" class="oe_form_uri"/>
         </span>
     </t>
 </t>
 <t t-name="HiddenInputFile">
     <div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style">
-        <form class="oe-binary-form" t-att-target="fileupload_id"
+        <form class="oe_form_binary_form" t-att-target="fileupload_id"
             method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'">
             <input type="hidden" name="session_id" value=""/>
             <input type="hidden" name="callback" t-att-value="fileupload_id"/>
             <t t-raw="__content__"/>
-            <input type="file" class="oe-binary-file" name="ufile"/>
+            <input type="file" class="oe_form_binary_file" name="ufile"/>
         </form>
         <iframe t-att-id="fileupload_id" t-att-name="fileupload_id" style="display: none"/>
     </div>
 </t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button oe_form_button"
+        t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
@@ -1205,7 +1202,7 @@
 <div t-name="SearchView" class="oe_searchview">
     <div class="oe_searchview_facets"/>
     <div class="oe_searchview_clear"/>
-    <div class="oe_searchview_unfold_drawer"/>
+    <div class="oe_searchview_unfold_drawer" title="Advanced Search..."/>
     <div class="oe_searchview_drawer"/>
 </div>
 
@@ -1229,7 +1226,7 @@
 </span>
 
 <t t-name="SearchView.managed-filters">
-    <option class="oe-filters-title" value="">Filters</option>
+    <option class="oe_search_filters_title" value="">Filters</option>
     <optgroup label="-- Filters --">
         <t t-foreach="filters" t-as="filter">
             <option t-attf-value="get:#{filter_index}"
@@ -1242,7 +1239,6 @@
     <optgroup label="-- Actions --">
         <option value="advanced_filter">Add Advanced Filter</option>
         <option value="save_filter">Save Filter</option>
-        <option value="add_to_dashboard">Add to Dashboard</option>
         <option value="manage_filters">Manage Filters</option>
     </optgroup>
 </t>
@@ -1253,18 +1249,9 @@
         <p>(Any existing filter with the same name will be replaced)</p>
     </div>
 </t>
-<t t-name="SearchView.add_to_dashboard">
-    <div>
-        <p><b>Select Dashboard to add this filter to:</b></p>
-        <select style="width: 100%; margin-right: 1em;">
-            <option t-foreach="dashboards" t-as="menu" t-att-value="menu.id" t-att-selected="(menu.id == selected_menu_id) || undefined"><t t-esc="menu.name"/></option>
-        </select>
-        <p><b>Title of new Dashboard item:</b></p>
-        <input type="text" style="width: 100%; margin-right: 1em;"/>
-    </div>
-</t>
+
 <t t-name="SearchView.render_lines">
-    <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
+    <table class="oe_search_render_line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
         <tr>
             <td t-foreach="line" t-as="widget" class="oe_searchview_field">
@@ -1401,6 +1388,20 @@
     <div>
     </div>
 </div>
+<div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard">
+    <h4>Add to Dashboard</h4>
+    <form>
+         <input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/>
+         <button class="oe_apply" type="submit">save</button>
+    </form>
+</div>
+<t t-name="SearchView.addtodashboard.selection">
+    <select  title = "Select Dashboard to add this filter to">
+        <t t-foreach="selections" t-as="element">
+        <option t-att-value="element.id || element.res_id "><t t-esc="element.name"/></option>
+        </t>
+    </select>
+</t>
 <div t-name="SearchView.advanced" class="oe_searchview_advanced">
     <h4>Advanced Search</h4>
     <form>
@@ -1450,16 +1451,16 @@
         <table style="width:100%">
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div class="oe-select-create-popup-view-search" style="width:100%"></div>
+                    <div class="oe_popup_search" style="width:100%"></div>
                 </td>
             </tr>
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div class="oe-select-create-popup-view-list" style="width:100%"></div>
+                    <div class="oe_popup_list" style="width:100%"></div>
                 </td>
             </tr>
         </table>
-        <div class="oe-form-view-popup-form-placeholder oe-select-create-popup-view-form" style="width:100%"></div>
+        <div class="oe_popup_form" style="width:100%"></div>
     </div>
 </t>
 <t t-name="SelectCreatePopup.search.buttons">
@@ -1468,14 +1469,23 @@
 </t>
 <t t-name="AbstractFormPopup.buttons">
     <t t-if="! multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save">Save</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
     </t>
     <t t-if="multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save-new">Save &amp; New</button>
-        <button type="button" class="oe_button oe_abstractformpopup-form-save">Save &amp; Close</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
     </t>
     <button type="button" class="oe_button oe_abstractformpopup-form-close">Cancel</button>
 </t>
+<t t-extend="ListView.row">
+    <!-- adds back padding to row being rendered after edition, if necessary
+         (if not deletable add back padding), otherwise the row being added is
+         missing columns
+     -->
+    <t t-jquery="&gt; :last" t-operation="after">
+        <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
+    </t>
+</t>
 
 <t t-name="view_editor">
     <table class="oe_view_editor">
@@ -1543,7 +1553,7 @@
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>
-<table t-name="ExportTreeView" class="oe-export"
+<table t-name="ExportTreeView" class="oe_export"
        style="background-color: #F3F3F3;">
     <tr>
         <td colspan="3">
@@ -1648,7 +1658,7 @@
 </t>
 <t t-name="ImportDataView">
 <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
-        class="oe-import oe-import-no-result">
+        class="oe_import oe_import_no_result">
     <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
     <h2 class="separator horizontal">1. Import a .CSV file</h2>
     <p>Select a .CSV file to import. If you need a sample of file to import,
@@ -1658,9 +1668,9 @@
         <label for="csvfile">CSV File:</label>
         <input type="file" id="csvfile" size="50" name="csvfile"/>
     </p>
-    <h2 class="separator horizontal oe-import-result">2. Check your file format</h2>
-    <div id="result" class="oe-import-result"></div>
-    <fieldset class="oe-closed oe-import-result">
+    <h2 class="separator horizontal oe_import_result">2. Check your file format</h2>
+    <div id="result" class="oe_import_result"></div>
+    <fieldset class="oe_closed oe_import_result">
         <legend>Import Options</legend>
         <table>
             <tr>
@@ -1700,7 +1710,7 @@
         </tr>
         <tr>
             <td t-foreach="records[0]" t-as="column">
-                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
+                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe_m2o_drop_down_button">
                         <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
         </tr>