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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-26 16:10:56 +02:00
parent e62ed28701
commit bbc6b9aa1b
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/agenda.lib.php
View File

@ -71,8 +71,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if ($canedit) {
print '<div class="divsearchfield">';
// Type
print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("Type").'"></span>';
print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
$multiselect = 0;
if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) { // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
@ -85,6 +86,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');
print '</div>';
// Assigned to user group
print '<div class="divsearchfield">';
print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');

4
htdocs/core/lib/functions.lib.php
View File

@ -1739,10 +1739,10 @@ function dol_get_fiche_end($notab = 0)
* @param int $shownav Show Condition (navigation is shown if value is 1)
* @param string $fieldid Nom du champ en base a utiliser pour select next et previous (we make the select max and min on this field). Use 'none' for no prev/next search.
* @param string $fieldref Nom du champ objet ref (object->ref) a utiliser pour select next et previous
* @param string $morehtmlref More html to show after ref
* @param string $morehtmlref More html to show after the ref (see $morehtmlleft for before)
* @param string $moreparam More param to add in nav link url.
* @param int $nodbprefix Do not include DB prefix to forge table name
* @param string $morehtmlleft More html code to show before ref
* @param string $morehtmlleft More html code to show before the ref (see $morehtmlref for after)
* @param string $morehtmlstatus More html code to show under navigation arrows
* @param int $onlybanner Put this to 1, if the card will contains only a banner (this add css 'arearefnobottom' on div)
* @param string $morehtmlright More html code to show before navigation arrows

6
htdocs/core/lib/ticket.lib.php
View File

@ -601,15 +601,15 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$out .= '<tr class="liste_titre">';
//$out.='<td class="liste_titre">';
$out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, '')."\n";
//$out.='</td>';
$out .= '<th class="liste_titre"><strong class="hideonsmartphone">'.$langs->trans("Search").' : </strong></th>';
if ($donetodo) {
$out .= '<th class="liste_titre"></th>';
}
$out .= '<th class="liste_titre">'.$langs->trans("Type").' ';
$out .= '<th class="liste_titre">';
$out .= '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
//$out .= img_picto($langs->trans("Type"), 'type');
$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1, 'minwidth200imp');
$out .= '</th>';
$out .= '<th class="liste_titre maxwidth100onsmartphone">';

4
htdocs/langs/en_US/ticket.lang
View File

@ -62,7 +62,8 @@ Notify_TICKET_SENTBYMAIL=Send ticket message by email
Read=Read
Assigned=Assigned
InProgress=In progress
NeedMoreInformation=Waiting for customer feedback
NeedMoreInformation=Waiting for reporter feedback
NeedMoreInformationShort=Waiting for feedback
Answered=Answered
Waiting=Waiting
Closed=Closed
@ -212,6 +213,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
TimeElapsedSince=Time elapsed since
TicketTimeToRead=Time elapsed before read
TicketTimeElapsedBeforeSince=Time elapsed before / since
TicketContacts=Contacts ticket
TicketDocumentsLinked=Documents linked to ticket
ConfirmReOpenTicket=Confirm reopen this ticket ?

15
htdocs/ticket/card.php
View File

@ -874,10 +874,11 @@ if ($action == 'create' || $action == 'presend') {
$langs->load("users");
$fuser = new User($db);
$fuser->fetch($object->fk_user_create);
$morehtmlref .= $fuser->getNomUrl(0);
$morehtmlref .= $fuser->getNomUrl(-1);
}
if (!empty($object->origin_email)) {
$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
}
@ -968,8 +969,8 @@ if ($action == 'create' || $action == 'presend') {
print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>';
if (!empty($object->date_read)) {
print dol_print_date($object->date_read, 'dayhour', 'tzuser');
print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeToRead").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
print ' - '.$langs->trans("TimeElapsedSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeElapsedBeforeSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
print ' / <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
}
print '</td></tr>';
@ -991,7 +992,7 @@ if ($action == 'create' || $action == 'presend') {
print '</td><td>';
if ($object->fk_user_assign > 0) {
$userstat->fetch($object->fk_user_assign);
print $userstat->getNomUrl(1);
print $userstat->getNomUrl(-1);
}
// Show user list to assignate one if status is "read"
@ -1183,7 +1184,7 @@ if ($action == 'create' || $action == 'presend') {
if ($tab[$i]['socid'] > 0) {
$companystatic->fetch($tab[$i]['socid']);
echo $companystatic->getNomUrl(1);
echo $companystatic->getNomUrl(-1);
}
if ($tab[$i]['socid'] < 0) {
echo $conf->global->MAIN_INFO_SOCIETE_NOM;
@ -1196,12 +1197,12 @@ if ($action == 'create' || $action == 'presend') {
print '<div class="tagtd">';
if ($tab[$i]['source'] == 'internal') {
if ($userstatic->fetch($tab[$i]['id'])) {
print $userstatic->getNomUrl(1);
print $userstatic->getNomUrl(-1);
}
}
if ($tab[$i]['source'] == 'external') {
if ($contactstatic->fetch($tab[$i]['id'])) {
print $contactstatic->getNomUrl(1);
print $contactstatic->getNomUrl(-1);
}
}
print ' </div>

2
htdocs/ticket/class/ticket.class.php
View File

@ -294,7 +294,7 @@ class Ticket extends CommonObject
self::STATUS_ASSIGNED => 'Assigned',
self::STATUS_IN_PROGRESS => 'InProgress',
self::STATUS_WAITING => 'OnHold',
self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
self::STATUS_NEED_MORE_INFO => 'NeedMoreInformationShort',
self::STATUS_CLOSED => 'Closed',
self::STATUS_CANCELED => 'Canceled'
);