Fix responsive

This commit is contained in:
Laurent Destailleur 2019-03-04 10:42:09 +01:00
parent d502d10da4
commit 34c179ab2b
4 changed files with 41 additions and 66 deletions

View File

@ -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 '<span class="opacitymedium">'.$langs->trans("ModulesDesc")."</span><br>\n";
if ($mode=='marketplace') print '<span class="opacitymedium">'.$langs->trans("ModulesMarketPlaceDesc")."</span><br>\n";
if ($mode=='deploy') print '<span class="opacitymedium">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."</span><br>\n";
if ($mode=='develop') print '<span class="opacitymedium">'.$langs->trans("ModulesDevelopDesc")."</span><br>\n";
if ($mode=='common') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDesc")."</span><br>\n";
if ($mode=='marketplace') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."</span><br>\n";
if ($mode=='deploy') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."</span><br>\n";
if ($mode=='develop') print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."</span><br>\n";
$head = modules_prepare_head();

View File

@ -438,11 +438,10 @@ if ($step == 1 || ! $datatoexport)
dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
print '<table class="notopnoleftnoright" width="100%">';
print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
// Affiche les modules d'exports
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
@ -481,8 +480,7 @@ if ($step == 1 || ! $datatoexport)
print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
}
print '</table>';
print '</table>';
print '</div>';
print '</div>';
}
@ -506,6 +504,7 @@ if ($step == 2 && $datatoexport)
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table width="100%" class="border tableforfield">';
// Module
@ -548,6 +547,7 @@ if ($step == 2 && $datatoexport)
print '</form>';
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Entities").'</td>';
@ -646,7 +646,7 @@ if ($step == 2 && $datatoexport)
}
print '</table>';
print '</div>';
/*
* Barre d'action
@ -743,6 +743,8 @@ if ($step == 3 && $datatoexport)
// un formulaire en plus pour recuperer les filtres
print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Entities").'</td>';
@ -832,6 +834,7 @@ if ($step == 3 && $datatoexport)
}
print '</table>';
print '</div>';
print '</div>';
@ -945,6 +948,7 @@ if ($step == 4 && $datatoexport)
print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Entities").'</td>';
@ -1015,6 +1019,7 @@ if ($step == 4 && $datatoexport)
}
print '</table>';
print '</div>';
print '</div>';
@ -1045,6 +1050,7 @@ if ($step == 4 && $datatoexport)
print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
print '<input type="hidden" name="hexa" value="'.$hexa.'">';
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ExportModelName").'</td>';
@ -1085,6 +1091,8 @@ if ($step == 4 && $datatoexport)
}
print '</table>';
print '</div>';
print '</form>';
}
}
@ -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, '', '&nbsp;', '', '', '');
}
llxFooter();

View File

@ -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").'<br>';
//print $langs->trans("FormatedExportDesc2").' ';
//print $langs->trans("FormatedExportDesc3").'<br>';
print '<br>';
//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>';
print '<td>'.$langs->trans("ExportableDatas").'</td>';
//print '<td>&nbsp;</td>';
print '</tr>';
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();
print '</td><td>';
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 '</td>';
// print '<td width="24">';
// print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&amp;datatoexport='.$export->array_export_code[$key].'&amp;action=cleanselect">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
// print '</td>';
print '</tr>';
}
}
else
{
print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoExportableData").'</td></tr>';
}
print '</table>';
print '<br>';
*/
print '<div class="center">';
if (count($export->array_export_code))
{
@ -99,19 +58,15 @@ if (count($export->array_export_code))
{
print '<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
}
/*
print '<form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"';
print ($user->rights->export->creer?'':' disabled');
print '><div class="center"></div></form>';
*/
}
print '</div>';
print '<br>';
//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
// List of available export formats
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" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
@ -141,9 +96,7 @@ foreach($liste as $key => $val)
}
print '</table>';
//print '</div></div></div>';
print '</div>';
// End of page
llxFooter();

View File

@ -345,6 +345,7 @@ if ($step == 1 || ! $datatoimport)
print '<div class="opacitymedium">'.$langs->trans("SelectImportDataSet").'</div><br>';
// Affiche les modules d'imports
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
@ -384,6 +385,7 @@ if ($step == 1 || ! $datatoimport)
print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
}
print '</table>';
print '</div>';
dol_fiche_end();
}
@ -437,6 +439,8 @@ if ($step == 2 && $datatoimport)
print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).'</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" width="100%" cellspacing="0" cellpadding="4">';
$filetoimport='';
@ -461,7 +465,10 @@ if ($step == 2 && $datatoimport)
print '</tr>';
}
print '</table></form>';
print '</table>';
print '</div>';
print '</form>';
}
@ -553,6 +560,7 @@ if ($step == 3 && $datatoimport)
print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).'</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" width="100%" cellspacing="0" cellpadding="4">';
$filetoimport='';
@ -631,7 +639,10 @@ if ($step == 3 && $datatoimport)
}
}
print '</table></form>';
print '</table>';
print '</div>';
print '</form>';
}
@ -834,15 +845,17 @@ if ($step == 4 && $datatoimport)
print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
print '<table><tr><td colspan="2" class="opacitymedium">';
print '<div class="marginbottomonly opacitymedium">';
print $langs->trans("SelectImportFields", img_picto('', 'grip_title', '')).' ';
$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
print '</td></tr></table>';
print '</div>';
print '</form>';
// Title of array with fields
print '<table class="noborder" width="100%">';
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" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("FieldsInSourceFile").'</td>';
print '<td>'.$langs->trans("FieldsInTargetDatabase").'</td>';
@ -1039,6 +1052,7 @@ if ($step == 4 && $datatoimport)
print '</td></tr>';
print '</table>';
print '</div>';
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 '<div class="center">';
print $langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'<br>';
print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'<br>';
print '</div>';