mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Debug v21
This commit is contained in:
Laurent Destailleur (aka Eldy)
parent
fcd294cd89
commit
60624b0b53
|
|
@ -474,7 +474,7 @@ if ($step == 1 || !$datatoexport) {
|
|||
|
||||
// Affiche les modules d'exports
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<table class="noborder centpercent nomarginbottom">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Module").'</td>';
|
||||
print '<td>'.$langs->trans("ExportableDatas").'</td>';
|
||||
|
|
@ -486,16 +486,17 @@ if ($step == 1 || !$datatoexport) {
|
|||
//var_dump($objexport->array_export_code_for_sort);
|
||||
//$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
|
||||
foreach ($objexport->array_export_code_for_sort as $key => $value) {
|
||||
print '<tr class="oddeven"><td nospan="nospan">';
|
||||
//print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
|
||||
print $objexport->array_export_module[$key]->getName();
|
||||
$titleofmodule = $objexport->array_export_module[$key]->getName();
|
||||
print '<tr class="oddeven"><td class="tdoverflowmax200" title="'.dolPrintHTML($titleofmodule).'">';
|
||||
print dolPrintHTML($titleofmodule);
|
||||
print '</td><td>';
|
||||
$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
|
||||
$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
|
||||
$label = $objexport->array_export_label[$key];
|
||||
//print $value.'-'.$icon.'-'.$label."<br>";
|
||||
print img_object($objexport->array_export_module[$key]->getName(), $entityicon).' ';
|
||||
print $label;
|
||||
print '<div class="twolinesmax-normallineheight minwidth200onall">';
|
||||
print img_object($objexport->array_export_module[$key]->getName(), $entityicon, 'class="pictofixedwidth"');
|
||||
print dolPrintHTML($label);
|
||||
print '</div>';
|
||||
print '</td><td class="right">';
|
||||
if ($objexport->array_export_perms[$key]) {
|
||||
print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15"').'</a>';
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ if ($step == 1 || !$datatoimport) {
|
|||
|
||||
// Affiche les modules d'imports
|
||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||
print '<table class="noborder centpercent">';
|
||||
print '<table class="noborder centpercent nomarginbottom">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Module").'</td>';
|
||||
print '<td>'.$langs->trans("ImportableDatas").'</td>';
|
||||
|
|
@ -362,18 +362,21 @@ if ($step == 1 || !$datatoimport) {
|
|||
$sortedarrayofmodules = dol_sort_array($objimport->array_import_module, 'position_of_profile', 'asc', 0, 0, 1);
|
||||
foreach ($sortedarrayofmodules as $key => $value) {
|
||||
//var_dump($key.' '.$value['position_of_profile'].' '.$value['import_code'].' '.$objimport->array_import_module[$key]['module']->getName().' '.$objimport->array_import_code[$key]);
|
||||
print '<tr class="oddeven"><td>';
|
||||
$titleofmodule = $objimport->array_import_module[$key]['module']->getName();
|
||||
print '<tr class="oddeven"><td class="tdoverflowmax200" title="'.dolPrintHTML($titleofmodule).'">';
|
||||
// Special case for import common to module/services
|
||||
if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) {
|
||||
$titleofmodule = $langs->trans("ProductOrService");
|
||||
}
|
||||
print $titleofmodule;
|
||||
print dolPrintHTML($titleofmodule);
|
||||
print '</td><td>';
|
||||
$entity = preg_replace('/:.*$/', '', $objimport->array_import_icon[$key]);
|
||||
$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
|
||||
print img_object($objimport->array_import_module[$key]['module']->getName(), $entityicon).' ';
|
||||
print $objimport->array_import_label[$key];
|
||||
$label = $objimport->array_import_label[$key];
|
||||
print '<div class="twolinesmax-normallineheight minwidth200onall">';
|
||||
print img_object($objimport->array_import_module[$key]['module']->getName(), $entityicon, 'class="pictofixedwidth"');
|
||||
print dolPrintHtml($label);
|
||||
print '</div>';
|
||||
print '</td><td style="text-align: right">';
|
||||
if ($objimport->array_import_perms[$key]) {
|
||||
print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15"').'</a>';
|
||||
|
|
|
|||
|
|
@ -383,8 +383,8 @@ ExportCardToFormat=Export card to format
|
|||
ContactNotLinkedToCompany=Contact not linked to any third party
|
||||
DolibarrLogin=Dolibarr login
|
||||
NoDolibarrAccess=No Dolibarr access
|
||||
ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
|
||||
ExportDataset_company_2=Contacts and their properties
|
||||
ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
|
||||
ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
|
||||
ExportDataset_company_3=Third-parties payment modes (bank accounts)
|
||||
ImportDataset_company_1=Third-parties and their properties
|
||||
ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
|
||||
|
|
|
|||
|
|
@ -1712,7 +1712,7 @@ select.flat.selectlimit {
|
|||
-webkit-line-clamp: 2;
|
||||
overflow: hidden;
|
||||
}
|
||||
.twolinesmax {
|
||||
.twolinesmax, .twolinesmax-normallineheight { /* To be used into a <div class="twolinesmax-normallineheight minwidth200onall"> into a td for example */
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
|
|
@ -1720,6 +1720,9 @@ select.flat.selectlimit {
|
|||
height: auto !important;
|
||||
word-break: break-word;
|
||||
}
|
||||
.twolinesmax-normallineheight {
|
||||
line-height: normal;
|
||||
}
|
||||
.tenlinesmax {
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
|
|
@ -4481,8 +4484,8 @@ table.tableforfield td, .tagtr.table-border-row .tagtd {
|
|||
}
|
||||
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
|
||||
padding: 6px 10px 6px 12px; /* t r b l */
|
||||
/* line-height: 22px; This create trouble on cell login on list of last events of a contract*/
|
||||
height: 30px;
|
||||
/* line-height: 22px; This create trouble on cell login on list of last events of a contract */
|
||||
height: 32px;
|
||||
}
|
||||
table.liste tr.trkanban td {
|
||||
padding: 12px 15px 12px 15px; /* t r b l */
|
||||
|
|
|
|||
|
|
@ -107,14 +107,15 @@ div.mainmenu.generic4::before {
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
.menu_titre .em092 {
|
||||
|
||||
.em092 {
|
||||
font-size: 0.92em;
|
||||
}
|
||||
|
||||
.menu_titre .em088 {
|
||||
.em088 {
|
||||
font-size: 0.88em;
|
||||
}
|
||||
|
||||
.menu_titre .em080 {
|
||||
.em080 {
|
||||
font-size: 0.80em;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1863,7 +1863,7 @@ select.flat.selectlimit {
|
|||
-webkit-line-clamp: 2;
|
||||
overflow: hidden;
|
||||
}
|
||||
.twolinesmax {
|
||||
.twolinesmax, .twolinesmax-normallineheight { /* To be used into a <div class="twolinesmax-normallineheight minwidth200onall"> into a td for example */
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
|
|
@ -1871,6 +1871,9 @@ select.flat.selectlimit {
|
|||
height: auto !important;
|
||||
word-break: break-word;
|
||||
}
|
||||
.twolinesmax-normallineheight {
|
||||
line-height: normal;
|
||||
}
|
||||
.tenlinesmax {
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
|
|
@ -4515,7 +4518,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
|
|||
|
||||
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
|
||||
padding: 4px 8px 4px 10px; /* t r b l */
|
||||
height: 22px;
|
||||
height: 28px;
|
||||
}
|
||||
table.liste tr.trkanban td {
|
||||
padding: 12px 15px 12px 15px; /* t r b l */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user