diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b10ac80416f..f4e076640c4 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1099,6 +1099,8 @@ class FormTicket
print '';
}
+ $uselocalbrowser = false;
+
// Intro
// External users can't send message email
if ($user->rights->ticket->write && !$user->socid) {
@@ -1109,15 +1111,15 @@ class FormTicket
print '| ';
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $uselocalbrowser = true;
- $doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+ $doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print ' | ';
}
// MESSAGE
+
$defaultmessage = "";
if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {
$defaultmessage = $arraydefaultmessage->content;
@@ -1147,7 +1149,7 @@ class FormTicket
//$toolbarname = 'dolibarr_details';
$toolbarname = 'dolibarr_notes';
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
+ $doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
$doleditor->Create();
print '';
@@ -1159,7 +1161,7 @@ class FormTicket
print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
print '';
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+ $doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print ' | ';
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b018b4d2fb0..165d9c503a4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3499,7 +3499,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
- 'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'multicurrency',
+ 'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
+ 'multicurrency',
'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 2f70ded9914..3fec075160b 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -234,6 +234,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
// Ref
print '| '.$langs->trans("Ref").' | ';
+ print img_picto('', 'ticket', 'class="pictofixedwidth"');
print dol_escape_htmltag($object->dao->ref);
print ' |
';
@@ -244,7 +245,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
// Subject
print '| '.$langs->trans("Subject").' | ';
+ print '';
print dol_escape_htmltag($object->dao->subject);
+ print '';
print ' |
';
// Statut
@@ -259,6 +262,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
// Category
print '| '.$langs->trans("Category").' | ';
+ print img_picto('', 'category', 'class="pictofixedwidth"');
print dol_escape_htmltag($object->dao->category_label);
print ' |
';
@@ -278,8 +282,10 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
$langs->load("users");
$fuser = new User($db);
$fuser->fetch($object->dao->fk_user_create);
+ print img_picto('', 'user', 'class="pictofixedwidth"');
print $fuser->getFullName($langs);
} else {
+ print img_picto('', 'email', 'class="pictofixedwidth"');
print dol_escape_htmltag($object->dao->origin_email);
}
@@ -304,6 +310,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
if ($object->dao->fk_user_assign > 0) {
$fuser = new User($db);
$fuser->fetch($object->dao->fk_user_assign);
+ print img_picto('', 'user', 'class="pictofixedwidth"');
print $fuser->getFullName($langs, 1);
}
print '';
@@ -320,7 +327,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
print '';
if ($action == 'presend') {
- print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'messages@ticket');
+ print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'conversation');
$formticket = new FormTicket($db);
@@ -364,7 +371,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
}
// Message list
- print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
+ print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation');
$object->viewTicketMessages(false, true, $object->dao);
} else {
print '';