diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 1658568b93..9f8a85d0b8 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2143,6 +2143,7 @@ lion-validation-feedback[type] {
border-color: #9ea930;
background-image: url(images/tick.png);
background-repeat: no-repeat;
+ background-size: contain;
padding-left: 20px;
white-space: nowrap;
}
diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php
index 412b5a1a57..9f3c5509b5 100644
--- a/importexport/inc/class.importexport_import_ui.inc.php
+++ b/importexport/inc/class.importexport_import_ui.inc.php
@@ -399,8 +399,8 @@ use EGroupware\Api\Etemplate;
if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
{
$message[] = lang("Column mismatch. Expected %1 columns, your file has %2.",
- count($options['field_mapping']),
- count($data)
+ count($options['csv_fields']),
+ count($data)
);
$ok = false;
}
diff --git a/importexport/js/app.ts b/importexport/js/app.ts
index a019c9080a..6af73149df 100644
--- a/importexport/js/app.ts
+++ b/importexport/js/app.ts
@@ -100,35 +100,44 @@ class ImportExportApp extends EgwApp
export_preview(event, widget)
{
var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode());
- jQuery('.content',preview).empty()
+ // TD gets the class too
+ preview.parent().show();
+ jQuery('.content', preview).empty()
.append('');
preview
- .show(100, jQuery.proxy(function() {
+ .show(100, jQuery.proxy(function()
+ {
widget.clicked = true;
widget.getInstanceManager().submit(false, true);
widget.clicked = false;
- },this));
+ }, this));
return false;
}
import_preview(event, widget)
{
var test = widget.getRoot().getWidgetById('dry-run');
- if(test.getValue() == test.options.unselected_value) return true;
+ if(test.getValue() == test.options.unselected_value)
+ {
+ return true;
+ }
// Show preview
var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode());
- jQuery('.content',preview).empty();
+ // TD gets the class too
+ preview.parent().show();
+ jQuery('.content', preview).empty();
preview
.addClass('loading')
- .show(100, jQuery.proxy(function() {
+ .show(100, jQuery.proxy(function()
+ {
widget.clicked = true;
widget.getInstanceManager().submit(false, true);
- widget.clicked = false;
- jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode())
- .removeClass('loading');
- },this));
+ widget.clicked = false;
+ jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode())
+ .removeClass('loading');
+ }, this));
return false;
}
diff --git a/importexport/templates/default/app.css b/importexport/templates/default/app.css
index 8a796b47f5..883202e0a6 100644
--- a/importexport/templates/default/app.css
+++ b/importexport/templates/default/app.css
@@ -1,38 +1,36 @@
-div.preview {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 97%;
- height: 95%;
- overflow: hidden;
- background-color: white;
- z-index: 999;
- display: none;
- border: 1px solid black;
- margin: 1.5%;
+.preview {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 97%;
+ height: 95%;
+ overflow: hidden;
+ background-color: white;
+ z-index: 999;
+ display: none;
+ border: 1px solid black;
+ margin: 1.5%;
}
-div.preview .content {
- overflow: auto;
- max-height: 99%;
- display: block;
+.preview .content {
+ overflow: auto;
+ max-height: 99%;
+ display: block;
}
+
.preview_box .header, .preview .header {
- font-size: 150%;
- margin-bottom: 5px;
- padding: 5px;
- border-bottom: 1px outset;
+ font-size: 150%;
+ margin-bottom: 5px;
+ padding: 5px;
+ border-bottom: 1px outset;
}
.preview tr{
vertical-align: top;
}
-.preview div[id$='buttons'] {
- position: absolute;
- bottom: 0px;
- width: 100%;
- margin-left: 50%;
+.preview [id$='buttons'] {
+ margin-left: 50%;
}
.wizard_content > div > table {
diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet
index 8490c334f1..4f833fec91 100644
--- a/importexport/templates/default/definition_index.xet
+++ b/importexport/templates/default/definition_index.xet
@@ -21,14 +21,17 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/importexport/templates/default/export_dialog.xet b/importexport/templates/default/export_dialog.xet
index 1d0b0bb3f2..9661644f21 100644
--- a/importexport/templates/default/export_dialog.xet
+++ b/importexport/templates/default/export_dialog.xet
@@ -3,55 +3,56 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -136,45 +137,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
div.preview_box {
@@ -203,9 +207,6 @@
overflow: auto;
}
.preview-box-buttons {
- position: absolute;
- bottom: 0px;
- width: 100%;
margin-left: 50%;
}
diff --git a/importexport/templates/default/import_dialog.xet b/importexport/templates/default/import_dialog.xet
index 716e173ff1..643a303d29 100644
--- a/importexport/templates/default/import_dialog.xet
+++ b/importexport/templates/default/import_dialog.xet
@@ -22,42 +22,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
index fa8629d782..f2a37e61b3 100644
--- a/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
+++ b/importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
@@ -13,28 +13,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css
index 939004b1f6..d51857440c 100755
--- a/importexport/templates/pixelegg/app.css
+++ b/importexport/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
* @package projectmanager
* @version $Id$
*/
-div.preview {
+.preview {
position: absolute;
top: 0px;
left: 0px;
@@ -24,7 +24,7 @@ div.preview {
border: 1px solid black;
margin: 1.5%;
}
-div.preview .content {
+.preview .content {
overflow: auto;
max-height: 99%;
display: block;
@@ -39,10 +39,7 @@ div.preview .content {
.preview tr {
vertical-align: top;
}
-.preview div[id$='buttons'] {
- position: absolute;
- bottom: 0px;
- width: 100%;
+.preview [id$='buttons'] {
margin-left: 50%;
}
.wizard_content > div > table {