diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7a649ca2596..495271e339b 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -887,8 +887,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '';
print "";
- } elseif ($action == 'edit' && !empty($id))
- {
+ } elseif ($action == 'edit' && !empty($id)) {
/*
* Fiche en mode edition
*/
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 54406b1075b..843c9ec759f 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -233,13 +233,15 @@ class FormActions
if ($max && $cursorevent >= $max) break;
$ref = $actioncomm->getNomUrl(1, -1);
- $label = $actioncomm->getNomUrl(0, 38);
+ $label = $actioncomm->getNomUrl(0, 36);
print '
';
+
// Ref
print '| '.$ref.' | ';
+
// Onwer
- print '';
+ print ' | ';
if (!empty($actioncomm->userownerid))
{
if (is_object($cacheusers[$actioncomm->userownerid]))
@@ -266,13 +268,13 @@ class FormActions
if ($actioncomm->type_picto) {
$imgpicto = img_picto('', $actioncomm->type_picto);
} else {
- 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_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_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 (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', 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_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_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 (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright');
}
}
print $imgpicto;
@@ -282,8 +284,10 @@ class FormActions
print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
}
print ' | ';
+
// Label
print ''.$label.' | ';
+
// Date
print ''.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
if ($actioncomm->datef)
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4e63e915593..af1e6873016 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -986,6 +986,12 @@ select.flat.selectlimit {
text-overflow: ellipsis;
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 ! */
max-width: 150px;
overflow: hidden;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d863f53285b..51678064568 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1011,6 +1011,12 @@ select.flat.selectlimit {
text-overflow: ellipsis;
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 ! */
max-width: 150px;
overflow: hidden;
|