lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix height in mapping impot step

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-30 15:07:22 +01:00
parent b162eb1bb0
commit cc7d105d88
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/imports/import.php
View File

@ -836,6 +836,7 @@ if ($step == 4 && $datatoimport)
print '</td><td width="50%">'; print '</td><td width="50%">';
// List of targets fields // List of targets fields
$height=24;
$i = 0; $i = 0;
$var=true; $var=true;
$mandatoryfieldshavesource=true; $mandatoryfieldshavesource=true;
@ -843,7 +844,7 @@ if ($step == 4 && $datatoimport)
foreach($fieldstarget as $code=>$label) foreach($fieldstarget as $code=>$label)
{ {
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].' height="20">'; print '<tr '.$bc[$var].' height="'.$height.'">';
$i++; $i++;
@ -1704,13 +1705,15 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='')
{ {
global $langs,$bc; global $langs,$bc;
$height='24';
print "\n\n<!-- Box ".$pos." start -->\n"; print "\n\n<!-- Box ".$pos." start -->\n";
print '<div class="box" style="padding: 0px 0px 0px 0px;" id="boxto_'.$pos.'">'."\n"; print '<div class="box" style="padding: 0px 0px 0px 0px;" id="boxto_'.$pos.'">'."\n";
print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n"; print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
if ($pos && $pos > count($fieldssource)) // No fields if ($pos && $pos > count($fieldssource)) // No fields
{ {
print '<tr '.($nostyle?'':$bc[$var]).' height="20">'; print '<tr '.($nostyle?'':$bc[$var]).' height="'.$height.'">';
print '<td class="nocellnopadding" width="16" style="font-weight: normal">'; print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
print img_picto(($pos>0?$langs->trans("MoveField",$pos):''),'uparrow','class="boxhandle" style="cursor:move;"'); print img_picto(($pos>0?$langs->trans("MoveField",$pos):''),'uparrow','class="boxhandle" style="cursor:move;"');
print '</td>'; print '</td>';
@ -1721,7 +1724,7 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='')
} }
elseif ($key == 'none') // Empty line elseif ($key == 'none') // Empty line
{ {
print '<tr '.($nostyle?'':$bc[$var]).' height="20">'; print '<tr '.($nostyle?'':$bc[$var]).' height="'.$height.'">';
print '<td class="nocellnopadding" width="16" style="font-weight: normal">'; print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
print '&nbsp;'; print '&nbsp;';
print '</td>'; print '</td>';
@ -1732,7 +1735,7 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='')
} }
else // Print field of source file else // Print field of source file
{ {
print '<tr '.($nostyle?'':$bc[$var]).' height="20">'; print '<tr '.($nostyle?'':$bc[$var]).' height="'.$height.'">';
print '<td class="nocellnopadding" width="16" style="font-weight: normal">'; 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 // 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),'uparrow','class="boxhandle" style="cursor:move;"'); print img_picto($langs->trans("MoveField",$pos),'uparrow','class="boxhandle" style="cursor:move;"');