This commit is contained in:
Laurent Destailleur 2020-11-22 13:23:56 +01:00
parent 1fc0121552
commit f6d6efa288
4 changed files with 26 additions and 11 deletions

View File

@ -887,8 +887,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '</div>'; print '</div>';
print "</form>"; print "</form>";
} elseif ($action == 'edit' && !empty($id)) } elseif ($action == 'edit' && !empty($id)) {
{
/* /*
* Fiche en mode edition * Fiche en mode edition
*/ */

View File

@ -233,13 +233,15 @@ class FormActions
if ($max && $cursorevent >= $max) break; if ($max && $cursorevent >= $max) break;
$ref = $actioncomm->getNomUrl(1, -1); $ref = $actioncomm->getNomUrl(1, -1);
$label = $actioncomm->getNomUrl(0, 38); $label = $actioncomm->getNomUrl(0, 36);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref
print '<td class="nowraponall">'.$ref.'</td>'; print '<td class="nowraponall">'.$ref.'</td>';
// Onwer // Onwer
print '<td class="tdoverflowmax150">'; print '<td class="nowraponall tdoverflowmax125">';
if (!empty($actioncomm->userownerid)) if (!empty($actioncomm->userownerid))
{ {
if (is_object($cacheusers[$actioncomm->userownerid])) if (is_object($cacheusers[$actioncomm->userownerid]))
@ -266,13 +268,13 @@ class FormActions
if ($actioncomm->type_picto) { if ($actioncomm->type_picto) {
$imgpicto = img_picto('', $actioncomm->type_picto); $imgpicto = img_picto('', $actioncomm->type_picto);
} else { } else {
if ($actioncomm->type_code == 'AC_RDV') $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' '; if ($actioncomm->type_code == 'AC_RDV') $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright');
elseif ($actioncomm->type_code == 'AC_TEL') $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' '; elseif ($actioncomm->type_code == 'AC_TEL') $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
elseif ($actioncomm->type_code == 'AC_FAX') $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' '; elseif ($actioncomm->type_code == 'AC_FAX') $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
elseif ($actioncomm->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' '; elseif ($actioncomm->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
elseif ($actioncomm->type_code == 'AC_INT') $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' '; elseif ($actioncomm->type_code == 'AC_INT') $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright');
elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' '; elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright');
elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' '; elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright');
} }
} }
print $imgpicto; print $imgpicto;
@ -282,8 +284,10 @@ class FormActions
print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type; print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
} }
print '</td>'; print '</td>';
// Label // Label
print '<td>'.$label.'</td>'; print '<td>'.$label.'</td>';
// Date // Date
print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel'); print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
if ($actioncomm->datef) if ($actioncomm->datef)

View File

@ -986,6 +986,12 @@ select.flat.selectlimit {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.tdoverflowmax125 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 125px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax150 { /* For tdoverflow, the max-midth become a minimum ! */ .tdoverflowmax150 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 150px; max-width: 150px;
overflow: hidden; overflow: hidden;

View File

@ -1011,6 +1011,12 @@ select.flat.selectlimit {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.tdoverflowmax125 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 125px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax150 { /* For tdoverflow, the max-midth become a minimum ! */ .tdoverflowmax150 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 150px; max-width: 150px;
overflow: hidden; overflow: hidden;