summaryrefslogtreecommitdiff
path: root/addons/base_import/static/src
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-04-24 17:15:00 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commit7f10b55a5035bd3cab48ba58a519510a25b94f60 (patch)
treef7ef8d3ddec1c419d82dfe2eef3c00fff9b15cdd /addons/base_import/static/src
parentea7c3f4a698bd027c307aef89fa2974916c4b9f5 (diff)
[REF] *: BS4, adapt display classes
The system completely changed. I also had to adapt classes to new screen breakpoints. hidden/hide -> d-none show -> d-block hidden-xs -> d-none d-md-(block/inline/...) hidden-sm -> d-md-none d-lg-(block/inline/...) hidden-md -> d-lg-none d-xl-(block/inline/...) hidden-lg -> d-xl-none visible-xs-* -> d-* d-md-none visible-sm-* -> d-none d-md-* d-lg-none visible-md-* -> d-none d-lg-* d-xl-none visible-lg-* -> d-none d-xl-* hidden-print -> d-print-none visible-print-* -> d-none d-print-* ... and all possible combination of those had to be handled too.
Diffstat (limited to 'addons/base_import/static/src')
-rw-r--r--addons/base_import/static/src/js/import_action.js16
-rw-r--r--addons/base_import/static/src/xml/base_import.xml10
2 files changed, 13 insertions, 13 deletions
diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js
index 68dc6c663fa..44db3151e32 100644
--- a/addons/base_import/static/src/js/import_action.js
+++ b/addons/base_import/static/src/js/import_action.js
@@ -249,7 +249,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
//- File & settings change section
onfile_loaded: function () {
var file = this.$('.oe_import_file')[0].files[0];
- this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
+ this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
if (!this.$('input.oe_import_file').val()) { return this['settings_changed'](); }
this.$('.oe_import_date_format').val('');
this.$('.oe_import_datetime_format').val('');
@@ -268,7 +268,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
},
onpreviewing: function () {
var self = this;
- this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
+ this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
this.$el.addClass('oe_import_with_file');
// TODO: test that write // succeeded?
this.$el.removeClass('oe_import_preview_error oe_import_error');
@@ -287,10 +287,10 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
},
onpreview_error: function (event, from, to, result) {
this.$('.oe_import_options').show();
- this.$buttons.filter('.o_import_file_reload').removeClass('hidden');
+ this.$buttons.filter('.o_import_file_reload').removeClass('d-none');
this.$el.addClass('oe_import_preview_error oe_import_error');
- this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
- this.$el.find('.o_view_nocontent').addClass('hidden');
+ this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
+ this.$el.find('.o_view_nocontent').addClass('d-none');
this.$('.oe_import_error_report').html(
QWeb.render('ImportView.preview.error', result));
},
@@ -300,9 +300,9 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
.text(_t('Load New File'))
.removeClass('btn-primary').addClass('btn-default')
.blur();
- this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('hidden');
- this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
- this.$el.find('.o_view_nocontent').addClass('hidden');
+ this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('d-none');
+ this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
+ this.$el.find('.o_view_nocontent').addClass('d-none');
this.$el.addClass('oe_import_preview');
this.$('input.oe_import_advanced_mode').prop('checked', result.advanced_mode);
this.$('.oe_import_grid').html(QWeb.render('ImportView.preview', result));
diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index df9fbc3e5d1..95b54b5a5af 100644
--- a/addons/base_import/static/src/xml/base_import.xml
+++ b/addons/base_import/static/src/xml/base_import.xml
@@ -6,7 +6,7 @@
<input type="hidden" name="session_id"
t-att-value="widget.session.session_id"/>
<input type="hidden" name="import_id"/>
- <div class="oe_import_box col-md-12 hidden">
+ <div class="oe_import_box col-md-12 d-none">
<input accept=".csv, .xls, .xlsx, .xlsm, .ods" t-attf-id="file_#{_id}"
name="file" class="oe_import_file" type="file" style="display:none;"/>
<div class="oe_import_with_file">
@@ -35,7 +35,7 @@
</div>
</div>
- <div class="oe_import_with_file oe_padding col-sm-12 hidden">
+ <div class="oe_import_with_file oe_padding col-sm-12 d-none">
<h2>Map your columns to import</h2>
<div title="If the model uses openchatter, history tracking
will set up subscriptions and send notifications
@@ -93,10 +93,10 @@
</t>
<t t-name="ImportView.buttons">
- <button type="button" class="btn btn-sm btn-primary o_import_import hidden">Import</button>
- <button type="button" class="btn btn-sm btn-default o_import_validate hidden">Test Import</button>
+ <button type="button" class="btn btn-sm btn-primary o_import_import d-none">Import</button>
+ <button type="button" class="btn btn-sm btn-default o_import_validate d-none">Test Import</button>
<button type="button" class="btn btn-sm btn-primary oe_import_file">Load File</button>
- <button type="button" class="btn btn-sm btn-default o_import_file_reload hidden">Reload File</button>
+ <button type="button" class="btn btn-sm btn-default o_import_file_reload d-none">Reload File</button>
<button type="button" class="btn btn-sm btn-default o_import_cancel">Cancel</button>
</t>