diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-10-04 12:22:36 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-10-04 12:22:36 +0200 |
| commit | 8f3db5bcf1f1eb6eb505e9847536fd8d26e46497 (patch) | |
| tree | 52d01294c280d56a196bf215bf8e55c2bc4ed12d /addons/base_import/static | |
| parent | 82e849e180c89698fd86fb1e6aa9a6d59119216e (diff) | |
[IMP] move file format options from below preview table to below file field
bzr revid: xmo@openerp.com-20121004102236-auj053d38tp5fpvy
Diffstat (limited to 'addons/base_import/static')
| -rw-r--r-- | addons/base_import/static/src/css/import.css | 2 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/import.xml | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 25678cbe98a..21e598ff707 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -52,7 +52,7 @@ } .oe_import .oe_import_options label { display: inline-block; - width: 10em; + width: 8em; text-align: right; } diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index b0eea1fcf75..91debd64897 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -24,6 +24,20 @@ <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label> <input type="file" id-attf-id="file_#{_id}" name="file" class="oe_import_file"/> + <div class="oe_import_with_file"> + <a href="#" class="oe_import_toggle"> + File Format Options…</a> + <div class="oe_import_toggled oe_import_options"> + <p t-foreach="widget.opts" t-as="option"> + <!-- no @name, avoid submission when file_update called --> + <label t-attf-for="#{option.name}_#{_id}"> + <t t-esc="option.label"/></label> + <input t-attf-id="#{option.name}_#{_id}" + t-attf-class="oe_import_#{option.name}" + t-att-value="option.value"/> + </p> + </div> + </div> <div class="oe_import_with_file"> <h2>Map your data to OpenERP</h2> @@ -38,18 +52,6 @@ <div class="oe_import_error_report"></div> <table class="oe_import_grid" width="100%"/> - <a href="#" class="oe_import_toggle"> - File Format Options…</a> - <div class="oe_import_toggled oe_import_options"> - <p t-foreach="widget.opts" t-as="option"> - <!-- no @name, avoid submission when file_update called --> - <label t-attf-for="#{option.name}_#{_id}"> - <t t-esc="option.label"/></label> - <input t-attf-id="#{option.name}_#{_id}" - t-attf-class="oe_import_#{option.name}" - t-att-value="option.value"/> - </p> - </div> <h2>Frequently Asked Questions</h2> <dl> |