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

Fix duplicate instructions

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-03 14:46:18 +01:00
parent c3f8012dfb
commit bc1f741600
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/exports/export.php
View File

@ -447,7 +447,7 @@ if ($step == 1 || ! $datatoexport)
print '<table class="notopnoleftnoright" width="100%">';
print $langs->trans("SelectExportDataSet").'<br>';
print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
// Affiche les modules d'exports
print '<table class="noborder" width="100%">';

16
htdocs/exports/index.php
View File

@ -47,15 +47,16 @@ llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Export
print load_fiche_titre($langs->trans("ExportsArea"));
print $langs->trans("FormatedExportDesc1").'<br>';
print $langs->trans("FormatedExportDesc2").' ';
print $langs->trans("FormatedExportDesc3").'<br>';
//print $langs->trans("FormatedExportDesc2").' ';
//print $langs->trans("FormatedExportDesc3").'<br>';
print '<br>';
print '<div class="fichecenter"><div class="fichehalfleft">';
//print '<div class="fichecenter"><div class="fichehalfleft">';
// List export set
/*
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
@ -67,7 +68,7 @@ if (count($export->array_export_code))
{
foreach ($export->array_export_code as $key => $value)
{
print '<tr class="oddeven"><td>';
//print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
print $export->array_export_module[$key]->getName();
@ -89,6 +90,7 @@ else
}
print '</table>';
print '<br>';
*/
print '<div class="center">';
if (count($export->array_export_code))
@ -110,7 +112,7 @@ if (count($export->array_export_code))
print '</div>';
print '<br>';
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
// List of available export format
@ -134,7 +136,7 @@ foreach($liste as $key => $val)
$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
}
print '<tr class="oddeven">';
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
$text=$model->getDriverDescForKey($key);
@ -148,7 +150,7 @@ foreach($liste as $key => $val)
print '</table>';
print '</div></div></div>';
//print '</div></div></div>';
llxFooter();

2
htdocs/imports/import.php
View File

@ -343,7 +343,7 @@ if ($step == 1 || ! $datatoimport)
dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
print $langs->trans("SelectImportDataSet").'<br>';
print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
// Affiche les modules d'imports
print '<table class="noborder" width="100%">';

12
htdocs/imports/index.php
View File

@ -44,14 +44,15 @@ llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports
print load_fiche_titre($langs->trans("ImportArea"));
print $langs->trans("FormatedImportDesc1").'<br>';
print $langs->trans("FormatedImportDesc2").'<br>';
//print $langs->trans("FormatedImportDesc2").'<br>';
print '<br>';
print '<div class="fichecenter"><div class="fichehalfleft">';
//print '<div class="fichecenter"><div class="fichehalfleft">';
// List of import set
/*
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
@ -84,6 +85,7 @@ else
}
print '</table>';
print '<br>';
*/
print '<div class="center">';
if (count($import->array_import_code))
@ -101,7 +103,7 @@ print '</div>';
print '<br>';
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
// List of available import format
@ -119,7 +121,7 @@ $liste=$model->liste_modeles($db);
foreach($liste as $key)
{
print '<tr class="oddeven">';
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
$text=$model->getDriverDescForKey($key);
@ -132,7 +134,7 @@ foreach($liste as $key)
print '</table>';
print '</div></div></div>';
//print '</div></div></div>';
llxFooter();