diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index a1eb3acf7..f6197ee2c 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -46,7 +46,7 @@ function activeClueTip() { - $('.info').cluetip({ + $('.info_import').cluetip({ splitTitle: '|', showTitle: false }); diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index ae2448ddc..e4e4dded8 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -671,16 +671,18 @@ class AdminImportControllerCore extends AdminController { $i = 0; $fields = array(); + $keys = array_keys($this->available_fields); + array_shift($keys); foreach ($this->available_fields as $k => $field) { if ($k === 'no') continue; if ($k === 'price_tin') - $fields[$i - 1]['label'] = $fields[$i - 1]['label'].' '.$this->l('or').' '.$field['label']; + $fields[$i - 1] = '
';
+ $html = '
';
else
$html = '';
$fields[] = '