This commit is contained in:
Laurent Destailleur 2021-06-22 15:45:47 +02:00
parent 2f6a91f506
commit f6eb5b76f5
2 changed files with 21 additions and 20 deletions

View File

@ -1009,7 +1009,7 @@ if ($step == 4 && $datatoexport) {
print '</tr>';
print '<tr class="oddeven">';
print '<td><input name="export_name" size="32" value=""></td>';
print '<td><input name="export_name" value=""></td>';
print '<td>';
$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
print $form->selectarray('visibility', $arrayvisibility, 'private');

View File

@ -604,11 +604,13 @@ if ($step == 3 && $datatoimport) {
// Source file format
print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>';
print '<td class="nowraponall">';
$text = $objmodelimport->getDriverDescForKey($format);
print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
print '</td><td style="text-align:right" class="nowrap">';
print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample");
print '</a>';
print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
print '</td></tr>';
print '</table>';
@ -643,18 +645,13 @@ if ($step == 3 && $datatoimport) {
print $s;
print '</span><br><br>';
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<table class="noborder centpercent" width="100%" cellpadding="4">';
$filetoimport = '';
//print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("FileWithDataToImport").'</td></tr>';
// Input file name box
print '<tr class="oddeven nohover"><td colspan="6">';
print '<div class="marginbottomonly">';
print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
$out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
print '<input type="submit" class="button" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
print '<input type="submit" class="button small" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
$out = '';
if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
@ -707,8 +704,10 @@ if ($step == 3 && $datatoimport) {
$out .= ' ('.$langs->trans("UploadDisabled").')';
}
print $out;
print '</td>';
print "</tr>\n";
print '</div>';
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<table class="noborder centpercent" width="100%" cellpadding="4">';
// Search available imports
$filearray = dol_dir_list($conf->import->dir_temp, 'files', 0, '', '', 'name', SORT_DESC);
@ -1053,8 +1052,8 @@ if ($step == 4 && $datatoimport) {
$entityicon = $entitytoicon[$entity] ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
print '<td class="nowrap" style="font-weight: normal">=>'.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
print '<td style="font-weight: normal">';
print '<td class="nowraponall" style="font-weight: normal">=>'.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
print '<td class="nowraponall" style="font-weight: normal">';
$newlabel = preg_replace('/\*$/', '', $label);
$text = $langs->trans($newlabel);
$more = '';
@ -1069,7 +1068,7 @@ if ($step == 4 && $datatoimport) {
print $text;
print '</td>';
// Info field
print '<td style="font-weight:normal; text-align:right">';
print '<td class="nowraponall" style="font-weight:normal; text-align:right">';
$filecolumn = $array_match_database_to_file[$code];
// Source field info
$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
@ -1128,7 +1127,6 @@ if ($step == 4 && $datatoimport) {
print '</td>';
print '</tr>';
$save_select .= $bit;
}
print '</table>';
@ -1249,6 +1247,7 @@ if ($step == 4 && $datatoimport) {
print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<table summary="selectofimportprofil" class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ImportModelName").'</td>';
@ -1257,7 +1256,7 @@ if ($step == 4 && $datatoimport) {
print '</tr>';
print '<tr class="oddeven">';
print '<td><input name="import_name" size="48" value=""></td>';
print '<td><input name="import_name" value=""></td>';
print '<td>';
$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
print $form->selectarray('visibility', $arrayvisibility, 'private');
@ -1308,6 +1307,8 @@ if ($step == 4 && $datatoimport) {
}
print '</table>';
print '</div>';
print '</form>';
}
}
@ -2126,14 +2127,14 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
print '&nbsp;';
print '</td>';
print '</tr>';
} else // Print field of source file
{
} else {
// Print field of source file
print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
print '</td>';
print '<td style="font-weight: normal">';
print '<td class="nowraponall" style="font-weight: normal">';
print $langs->trans("Field").' '.$pos;
$example = $fieldssource[$pos]['example1'];
if ($example) {