lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix look and feel v6

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-10 13:54:43 +02:00
parent a8e16910c0
commit 6ab47a845e
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/listactions.php
View File

@ -405,8 +405,6 @@ if ($resql)
continue; continue;
} }
$actionstatic->id=$obj->id; $actionstatic->id=$obj->id;
$actionstatic->ref=$obj->id; $actionstatic->ref=$obj->id;
$actionstatic->type_code=$obj->type_code; $actionstatic->type_code=$obj->type_code;

17
htdocs/core/class/html.formactions.class.php
View File

@ -210,11 +210,22 @@ class FormActions
$ref=$action->getNomUrl(1,-1); $ref=$action->getNomUrl(1,-1);
$label=$action->getNomUrl(0,38); $label=$action->getNomUrl(0,38);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$ref.'</td>'; print '<td>'.$ref.'</td>';
print '<td>'.$label.'</td>'; print '<td>'.$label.'</td>';
print '<td>'.$action->type.'</td>'; print '<td>';
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
if ($action->type_picto) print img_picto('', $action->type_picto);
else {
if ($action->type_code == 'AC_RDV') print img_picto('', 'object_group').' ';
if ($action->type_code == 'AC_TEL') print img_picto('', 'object_phoning').' ';
if ($action->type_code == 'AC_FAX') print img_picto('', 'object_phoning_fax').' ';
if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
}
}
print $action->type;
print '</td>';
print '<td>'.dol_print_date($action->datep,'dayhour'); print '<td>'.dol_print_date($action->datep,'dayhour');
if ($action->datef) if ($action->datef)
{ {
@ -233,7 +244,7 @@ class FormActions
$userstatic->id = $action->author->id; $userstatic->id = $action->author->id;
$userstatic->firstname = $action->author->firstname; $userstatic->firstname = $action->author->firstname;
$userstatic->lastname = $action->author->lastname; $userstatic->lastname = $action->author->lastname;
print $userstatic->getNomUrl(1); print $userstatic->getNomUrl(1, '', 0, 0, 16, 0, '', '');
} }
print '</td>'; print '</td>';
print '<td align="right">'; print '<td align="right">';