diff --git a/addons/base/static/src/css/export.css b/addons/base/static/src/css/export.css index 051b5cb076c..13dfc3d5a3f 100644 --- a/addons/base/static/src/css/export.css +++ b/addons/base/static/src/css/export.css @@ -1,56 +1,56 @@ -.row tr{ +.openerp .oe_export_row tr{ background-color: #FFFFFF; font-size: 0.8em; height: 22px; } -tr.ui-selected td { +.openerp tr.ui-selected td { background-color: #CCCCCC; } -.requiredfield { +.openerp .oe_export_requiredfield { background-color: #D2D2FF; } -.readonlyfield{ - background-color: DarkGray; +.openerp .oe_export_readonlyfield{ + background-color: #999999; } -.row:hover{ +.openerp .oe_export_row:hover{ background-color: #F3F3F3; } -.fields-selector-export { +.openerp .oe_export_fields_selector_export { width: 100%; height: 400px; } -.fields-selector-left { +.openerp .oe_export_fields_selector_left { width: 50%; } -div#left_field_panel { +.openerp div#left_field_panel { overflow: scroll; width: 100%; height: 400px; border: solid #999999 1px; } -.fields-selector-center { +.openerp .oe_export_fields_selector_center { width: 102px; } -.fields-selector-right { +.openerp .oe_export_fields_selector_right { width: 45%; height: 400px; } -.fields-selector-export select{ +.openerp .oe_export_fields_selector_export select{ width: 100%; height: 100%; } -.tree_header{ +.openerp .oe_export_tree_header{ border: 0.5px solid #E3E3E3; text-align: left; white-space: nowrap; @@ -59,7 +59,7 @@ div#left_field_panel { } -table.tree-grid{ +.openerp table.tree_grid{ border: 1px solid #E3E3E3; text-align: left; white-space: nowrap; @@ -68,17 +68,17 @@ table.tree-grid{ width: 100%; } -table.tree-grid a:hover { +.openerp table.tree_grid a:hover { color: blue; border: none; } -table.tree-grid a { +.openerp table.tree_grid a { color: #5F5C5C; border: none; } -.button-export { +.openerp .oe_export_button_export { border: 1px solid #006; background-color: #F3F3F3; } diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/export.js index ff8e8604348..8fe42f900d1 100644 --- a/addons/base/static/src/js/export.js +++ b/addons/base/static/src/js/export.js @@ -207,11 +207,11 @@ openerp.base.Export = openerp.base.Dialog.extend({ _.each(result, function(record) { if((record.field_type == "one2many") && imp_cmpt){ var o2m_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); - o2m_fld.addClass("readonlyfield"); + o2m_fld.addClass("oe_export_readonlyfield"); } if ((record.required == true) || record.required == "True"){ var required_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); - required_fld.addClass("requiredfield"); + required_fld.addClass("oe_export_requiredfield"); } $("img[id='parentimg-" + record.id +"']").click(function(){ self.on_click(this.id, result); @@ -228,14 +228,14 @@ openerp.base.Export = openerp.base.Dialog.extend({ if (this.rowIndex >=self.row_index){ for (i = (self.row_index-1); i < this.rowIndex; i++) { scnd_click = $("tr[id^='treerow-']")[i]; - if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){ + if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){ $(scnd_click).addClass("ui-selected"); } } }else{ for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) { scnd_click = $("tr[id^='treerow-']")[i]; - if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){ + if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){ $(scnd_click).addClass("ui-selected"); } } @@ -248,7 +248,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ self.row_index = 0; }); var o2m_selection = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); - if ($(o2m_selection).hasClass("readonlyfield")){ + if ($(o2m_selection).hasClass("oe_export_readonlyfield")){ return false; } var selected = $("tr.ui-selected"); @@ -287,7 +287,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ while($(elem).prev().is(":visible") == false){ elem = $(elem).prev(); } - if(!$(elem).prev().find('#tree-column').hasClass("readonlyfield")){ + if(!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")){ $(elem).prev().addClass("ui-selected"); } $(elem).prev().find('a').focus(); @@ -303,7 +303,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ while($(elem).next().is(":visible") == false){ elem = $(elem).next(); } - if(!$(elem).next().find('#tree-column').hasClass("readonlyfield")){ + if(!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")){ $(elem).next().addClass("ui-selected"); } $(elem).next().find('a').focus(); @@ -312,7 +312,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ }); $("tr[id='treerow-" + record.id + "']").dblclick(function (e) { var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); - if (! $(o2m_selection).hasClass("readonlyfield")){ + if (! $(o2m_selection).hasClass("oe_export_readonlyfield")){ var field_id = $(this).find("a").attr("id"); if(field_id){ self.add_field(field_id.split('-')[1], $(this).find("a").attr("string")) @@ -325,7 +325,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){ field_id = event.relatedTarget.attributes["id"]["value"] if (field_id && field_id.split("-")[0] == 'export'){ - if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("readonlyfield")){ + if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){ self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); } } diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 89e23fece6d..1c35ce9a06d 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -983,7 +983,7 @@ - +
@@ -994,30 +994,30 @@ - - @@ -1028,17 +1028,17 @@ -
Available fields
+
- +
- +
- +
- +
+
- +
Name
+
Name
- + - - +
+ @@ -1067,7 +1067,7 @@ - + @@ -1082,7 +1082,7 @@ - +
&nbsp;