From 34c179ab2b000b1bb8bac9d57004b1f391083f99 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Mar 2019 10:42:09 +0100 Subject: [PATCH] Fix responsive --- htdocs/admin/modules.php | 8 +++--- htdocs/exports/export.php | 20 ++++++++++----- htdocs/exports/index.php | 53 +++------------------------------------ htdocs/imports/import.php | 26 ++++++++++++++----- 4 files changed, 41 insertions(+), 66 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 630e04d2f89..c735362d87f 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -457,10 +457,10 @@ if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouM print load_fiche_titre($langs->trans("ModulesSetup"), $moreinfo, 'title_setup'); // Start to show page -if ($mode=='common') print ''.$langs->trans("ModulesDesc")."
\n"; -if ($mode=='marketplace') print ''.$langs->trans("ModulesMarketPlaceDesc")."
\n"; -if ($mode=='deploy') print ''.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."
\n"; -if ($mode=='develop') print ''.$langs->trans("ModulesDevelopDesc")."
\n"; +if ($mode=='common') print ''.$langs->trans("ModulesDesc")."
\n"; +if ($mode=='marketplace') print ''.$langs->trans("ModulesMarketPlaceDesc")."
\n"; +if ($mode=='deploy') print ''.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."
\n"; +if ($mode=='develop') print ''.$langs->trans("ModulesDevelopDesc")."
\n"; $head = modules_prepare_head(); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 8b179f29f75..4b81697be66 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -438,11 +438,10 @@ if ($step == 1 || ! $datatoexport) dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); - print ''; - print '
'.$langs->trans("SelectExportDataSet").'

'; // Affiche les modules d'exports + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '
'; print ''; print ''; @@ -481,8 +480,7 @@ if ($step == 1 || ! $datatoexport) print ''; } print '
'.$langs->trans("Module").'
'.$langs->trans("NoExportableData").'
'; - - print ''; + print ''; print ''; } @@ -506,6 +504,7 @@ if ($step == 2 && $datatoexport) print '
'; print '
'; + print ''; // Module @@ -548,6 +547,7 @@ if ($step == 2 && $datatoexport) print ''; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '
'; print ''; print ''; @@ -646,7 +646,7 @@ if ($step == 2 && $datatoexport) } print '
'.$langs->trans("Entities").'
'; - + print '
'; /* * Barre d'action @@ -743,6 +743,8 @@ if ($step == 3 && $datatoexport) // un formulaire en plus pour recuperer les filtres print '
'; + + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; print ''; @@ -832,6 +834,7 @@ if ($step == 3 && $datatoexport) } print '
'.$langs->trans("Entities").'
'; + print '
'; print ''; @@ -945,6 +948,7 @@ if ($step == 4 && $datatoexport) print '
'.$langs->trans("ChooseFieldsOrdersAndTitle").'
'; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; print ''; @@ -1015,6 +1019,7 @@ if ($step == 4 && $datatoexport) } print '
'.$langs->trans("Entities").'
'; + print '
'; print ''; @@ -1045,6 +1050,7 @@ if ($step == 4 && $datatoexport) print ''; print ''; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; print ''; @@ -1085,6 +1091,8 @@ if ($step == 4 && $datatoexport) } print '
'.$langs->trans("ExportModelName").'
'; + print '
'; + print '
'; } } @@ -1248,7 +1256,7 @@ if ($step == 5 && $datatoexport) // Show existing generated documents // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste - print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (! empty($_POST['model'])?$_POST['model']:'csv'), 1, 1, 0, 0, 0, '', $langs->trans('Files'), '', '', ''); + print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (! empty($_POST['model'])?$_POST['model']:'csv'), 1, 1, 0, 0, 0, '', ' ', '', '', ''); } llxFooter(); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 698e44190dd..f84f7bb8418 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -44,50 +44,9 @@ llxHeader('', $langs->trans("ExportsArea"), 'EN:Module_Exports_En|FR:Module_Expo print load_fiche_titre($langs->trans("ExportsArea")); print $langs->trans("FormatedExportDesc1").'
'; -//print $langs->trans("FormatedExportDesc2").' '; -//print $langs->trans("FormatedExportDesc3").'
'; print '
'; -//print '
'; - - -// List export set -/* -print ''; -print ''; -print ''; -print ''; -//print ''; -print ''; -if (count($export->array_export_code)) -{ - foreach ($export->array_export_code as $key => $value) - { - - print ''; - // print ''; - print ''; - - } -} -else -{ - print ''; -} -print '
'.$langs->trans("Module").''.$langs->trans("ExportableDatas").' 
'; - //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' '; - print $export->array_export_module[$key]->getName(); - print ''; - print img_object($export->array_export_module[$key]->getName(),$export->array_export_icon[$key]).' '; - $string=$langs->trans($export->array_export_label[$key]); - print ($string!=$export->array_export_label[$key]?$string:$export->array_export_label[$key]); - print ''; - // print ''.img_picto($langs->trans("NewExport"),'filenew').''; - // print '
'.$langs->trans("NoExportableData").'
'; -print '
'; -*/ - print '
'; if (count($export->array_export_code)) { @@ -99,19 +58,15 @@ if (count($export->array_export_code)) { print ''.$langs->trans("NewExport").''; } - /* - print '
rights->export->creer?'':' disabled'); - print '>
'; - */ } print '
'; print '
'; -//print '
'; // List of available export formats + +print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; print ''; @@ -141,9 +96,7 @@ foreach($liste as $key => $val) } print '
'.$langs->trans("AvailableFormats").'
'; - - -//print '
'; +print '
'; // End of page llxFooter(); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 993c2003058..9227998e4a0 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -345,6 +345,7 @@ if ($step == 1 || ! $datatoimport) print '
'.$langs->trans("SelectImportDataSet").'

'; // Affiche les modules d'imports + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; print ''; print ''; @@ -384,6 +385,7 @@ if ($step == 1 || ! $datatoimport) print ''; } print '
'.$langs->trans("Module").'
'.$langs->trans("NoImportableData").'
'; + print '
'; dol_fiche_end(); } @@ -437,6 +439,8 @@ if ($step == 2 && $datatoimport) print ''; print ''.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).'

'; + + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; $filetoimport=''; @@ -461,7 +465,10 @@ if ($step == 2 && $datatoimport) print ''; } - print '
'; + print ''; + print '
'; + + print ''; } @@ -553,6 +560,7 @@ if ($step == 3 && $datatoimport) print ''.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).'

'; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; $filetoimport=''; @@ -631,7 +639,10 @@ if ($step == 3 && $datatoimport) } } - print '
'; + print ''; + print '
'; + + print ''; } @@ -834,15 +845,17 @@ if ($step == 4 && $datatoimport) print ''; print ''; print ''; - print '
'; + + print '
'; print $langs->trans("SelectImportFields", img_picto('', 'grip_title', '')).' '; $htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1); print ''; - print '
'; + print ''; print ''; // Title of array with fields - print ''; + print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
'; print ''; print ''; print ''; @@ -1039,6 +1052,7 @@ if ($step == 4 && $datatoimport) print ''; print '
'.$langs->trans("FieldsInSourceFile").''.$langs->trans("FieldsInTargetDatabase").'
'; + print ''; if ($conf->use_javascript_ajax) @@ -1577,7 +1591,7 @@ if ($step == 5 && $datatoimport) $importid=dol_print_date(dol_now(), '%Y%m%d%H%M%S'); print '
'; - print $langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'
'; + print ''.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'
'; if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'
'; print '
';