From bc1f741600a45129a4196e23ba7f0ccefd7d0592 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Jan 2018 14:46:18 +0100 Subject: [PATCH] Fix duplicate instructions --- htdocs/exports/export.php | 2 +- htdocs/exports/index.php | 16 +++++++++------- htdocs/imports/import.php | 2 +- htdocs/imports/index.php | 12 +++++++----- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index fe19d3073ae..a21dcdce7a6 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -447,7 +447,7 @@ if ($step == 1 || ! $datatoexport) print ''; - print $langs->trans("SelectExportDataSet").'
'; + print '
'.$langs->trans("SelectExportDataSet").'

'; // Affiche les modules d'exports print '
'; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 58810ee84c0..0fea98fcec7 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -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").'
'; -print $langs->trans("FormatedExportDesc2").' '; -print $langs->trans("FormatedExportDesc3").'
'; +//print $langs->trans("FormatedExportDesc2").' '; +//print $langs->trans("FormatedExportDesc3").'
'; print '
'; -print '
'; +//print '
'; // List export set +/* print '
'; print ''; print ''; @@ -67,7 +68,7 @@ if (count($export->array_export_code)) { foreach ($export->array_export_code as $key => $value) { - + print '
'.$langs->trans("Module").'
'; //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 '
'; print '
'; +*/ print '
'; if (count($export->array_export_code)) @@ -110,7 +112,7 @@ if (count($export->array_export_code)) print '
'; print '
'; -print '
'; +//print '
'; // 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 ''; print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; $text=$model->getDriverDescForKey($key); @@ -148,7 +150,7 @@ foreach($liste as $key => $val) print ''; -print '
'; +//print ''; llxFooter(); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6223bf92aad..93cb22ea469 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -343,7 +343,7 @@ if ($step == 1 || ! $datatoimport) dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1); - print $langs->trans("SelectImportDataSet").'
'; + print '
'.$langs->trans("SelectImportDataSet").'

'; // Affiche les modules d'imports print ''; diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 32f08d5bda5..36811acc587 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -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").'
'; -print $langs->trans("FormatedImportDesc2").'
'; +//print $langs->trans("FormatedImportDesc2").'
'; print '
'; -print '
'; +//print '
'; // List of import set +/* print '
'; print ''; print ''; @@ -84,6 +85,7 @@ else } print '
'.$langs->trans("Module").'
'; print '
'; +*/ print '
'; if (count($import->array_import_code)) @@ -101,7 +103,7 @@ print '
'; print '
'; -print '
'; +//print '
'; // List of available import format @@ -119,7 +121,7 @@ $liste=$model->liste_modeles($db); foreach($liste as $key) { - + print ''; print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; $text=$model->getDriverDescForKey($key); @@ -132,7 +134,7 @@ foreach($liste as $key) print ''; -print '
'; +//print ''; llxFooter();