From 0bf100cb537f5eee493379b92968a40a7206d784 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 21 Jul 2011 10:42:32 +0530 Subject: [PATCH] [IMP] Improve code, css and template. add image file. bzr revid: ysa@tinyerp.com-20110721051232-welyq15eoo9rhmb4 --- addons/base_export/controllers/main.py | 2 +- .../static/src/css/base_export.css | 69 ++++++++++-------- .../base_export/static/src/img/collapse.gif | Bin 0 -> 80 bytes addons/base_export/static/src/img/expand.gif | Bin 0 -> 81 bytes addons/base_export/static/src/img/header.gif | Bin 0 -> 182 bytes .../base_export/static/src/js/base_export.js | 22 +++--- .../static/src/xml/base_export.xml | 46 ++++++------ 7 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 addons/base_export/static/src/img/collapse.gif create mode 100644 addons/base_export/static/src/img/expand.gif create mode 100644 addons/base_export/static/src/img/header.gif diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index dec0829b83b..9c09d8f3749 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -221,5 +221,5 @@ class Export(View): result = modle_obj.export_data(ids, field , context).get('datas',[]) if not import_compat: - field = fields.values() + field = [val.strip() for val in fields.values()] return self.export_csv(req, field, result) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 61ddb47451b..65dbbdbf7c1 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -1,34 +1,27 @@ -.row { +.row tr{ background-color: #FFFFFF; + font-size: 0.9em; + height: 22px; } -.row:hover { +.row:hover{ background-color: #F3F3F3; - color : #4F4F4F; + color : blue; } -.row.selected{ - background-color: #E0E0E0; - -} .fields-selector-export { width: 100%; height: 400px; } -.fields-selector-import { - width: 100%; - height: 300px; -} - .fields-selector-left { width: 45%; } -td.fields-selector-left div#fields_left { +div#left_field_panel { overflow: scroll; width: 100%; - height: 100%; + height: 400px; border: solid #999999 1px; } @@ -36,30 +29,44 @@ td.fields-selector-left div#fields_left { width: 15%; } -.fields-selector-center td { - padding: 2px 3px; -} - -.fields-selector-center a.button-a { - float: none; -} - .fields-selector-right { width: 45%; + height: 400px; } -.fields-selector-export select, -.fields-selector-import select { +.fields-selector-export select{ width: 100%; height: 100%; } -.fields-selector-export button, -.fields-selector-import button { - width: 100%; - margin: 5px 0; +.tree_header{ + border: 0.5px solid #E3E3E3; + text-align: left; + white-space: nowrap; + padding: 4px 5px; + background: url(/base_export/static/src/img/header.gif); } -td.side_spacing { - padding: 5px 5px 0px; -} \ No newline at end of file + +table.tree-grid{ + border: 1px solid #E3E3E3; + text-align: left; + white-space: nowrap; + background-color:#E3E3E3; + border-collapse: collapse; + width: 100%; +} + +table.tree-grid a:hover { + color: blue; + border: none; +} + +table.tree-grid a { + color: #5F5C5C; + border: none; +} + +.button { + border: 1px solid #006; +} diff --git a/addons/base_export/static/src/img/collapse.gif b/addons/base_export/static/src/img/collapse.gif new file mode 100644 index 0000000000000000000000000000000000000000..759e72ebcfe18bc1bc714b6451c301b12a1f27d5 GIT binary patch literal 80 zcmZ?wbhEHb6krfwSjfZx1Zin$|G_}ER?(XjE>+9+1>F4L?<>lq$z>(a_M) z&d$!w&CSfr%>V!YEC2ui00IC!000F$U=RqxFc3sh7{+lRNRlYZvM@~3IL`AxkVr%# knM^2@O2uNiTrikSMx)tmIGj$$!|i&%;IMd14u=2$JFIAN1ONa4 literal 0 HcmV?d00001 diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index c4f80994c8f..4ef196c2d65 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -35,6 +35,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ close: function(event, ui){ self.close();} }); this.on_show_exists_export_list(); + jQuery(this.$dialog).removeClass('ui-dialog-content ui-widget-content'); $('#add_field').click(function(){ for (var key in self.selected_fields) { self.add_field(key, self.selected_fields[key]) @@ -52,9 +53,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} this.rpc("/base_export/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data); + $("#import_compat").change(function(){ $("#fields_list option").remove(); - $("tr[id^='treerow-']").remove(); + $("#field-tree-structure").remove(); import_comp = $("#import_compat option:selected").val(); if(import_comp){ var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} @@ -170,7 +172,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); if (is_loaded == 0) { - if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base_export/static/src/img/expand.gif') { if (model){ import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']} @@ -193,8 +195,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ var self = this; var current_tr = $("tr[id='treerow-" + self.field_id + "']"); if (current_tr.length >= 1){ - current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); - current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + current_tr.find('img').attr('src','/base_export/static/src/img/collapse.gif'); + current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result})); } else{ $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); @@ -215,7 +217,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ arrow = {left: 37, up: 38, right: 39, down: 40 }; switch (keyCode) { case arrow.left: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ self.on_click(this.id, result); } break; @@ -227,7 +229,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $(elem).prev().find('a').focus(); break; case arrow.right: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ + if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/expand.gif'){ self.on_click(this.id, result); } break; @@ -266,10 +268,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ showcontent: function (id, flag) { var first_child = $("tr[id='treerow-" + id + "']").find('img') if (flag) { - first_child.attr('src', '/base/static/src/img/expand.gif'); + first_child.attr('src', '/base_export/static/src/img/expand.gif'); } else { - first_child.attr('src', '/base/static/src/img/collapse.gif'); + first_child.attr('src', '/base_export/static/src/img/collapse.gif'); } var child_field = $("tr[id^='treerow-" + id +"/']") var child_len = (id.split("/")).length + 1 @@ -279,8 +281,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } else { if(child_len == (child_field[i].id.split("/")).length){ - if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ - jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif') + if( jQuery(child_field[i]).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ + jQuery(child_field[i]).find('img').attr('src', '/base_export/static/src/img/expand.gif') } $(child_field[i]).show(); } diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index c5459ad888b..f8b41c06d77 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -5,20 +5,20 @@ - +
- -
+ This wizard will export all data that matches the current search criteria to a CSV file. You can export all data or only the fields that can be reimported after modification.
+
- @@ -30,7 +30,7 @@
- +
@@ -41,40 +41,30 @@ - - @@ -85,10 +75,16 @@ +
Available fields
-
- - - - - -
Name
- -
-
-
+
+
- +
- +
- +
- +
+
+ + +
Name
+ +
- +
@@ -98,12 +94,12 @@
- + - +