Look and feel v24
This commit is contained in:
parent
95579849dc
commit
ffcbe0263d
4 changed files with 18 additions and 9 deletions
|
|
@ -10629,9 +10629,11 @@ class Form
|
|||
$htmltoenteralink .= '<table class="noborder">';
|
||||
$htmltoenteralink .= '<tr class="liste_titre">';
|
||||
//print '<td>' . $langs->trans("Ref") . '</td>';
|
||||
$htmltoenteralink .= '<td class="center"><input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Ref")).'" name="reftolinkto" value="' . dol_escape_htmltag(GETPOST('reftolinkto', 'alpha')) . '"> ';
|
||||
$htmltoenteralink .= '<td class="center"><input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Ref")).'" name="reftolinkto" value="' . dol_escape_htmltag(GETPOST('reftolinkto', 'alpha')) . '">';
|
||||
$htmltoenteralink .= '<br>';
|
||||
$htmltoenteralink .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans('ToLink') . '"> ';
|
||||
$htmltoenteralink .= '<input type="submit" class="button smallpaddingimp" name="cancel" value="' . $langs->trans('Cancel') . '"></td>';
|
||||
$htmltoenteralink .= '<input type="submit" class="button smallpaddingimp" name="cancel" value="' . $langs->trans('Cancel') . '">';
|
||||
$htmltoenteralink .= '</td>';
|
||||
$htmltoenteralink .= '</tr>';
|
||||
$htmltoenteralink .= '</table>';
|
||||
$htmltoenteralink .= '</form>';
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @var ?Conf $conf Object config
|
||||
*/
|
||||
// Protection to avoid direct call of template
|
||||
if (empty($conf) || !is_object($conf)) {
|
||||
print "Error, template page can't be called as URL";
|
||||
|
|
|
|||
|
|
@ -1350,6 +1350,8 @@ td.wordbreak img, td.wordbreakimp img {
|
|||
max-width: 100%;
|
||||
overflow-y: auto;
|
||||
word-break: break-word;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
div.urllink {
|
||||
padding: 5px;
|
||||
|
|
@ -5153,7 +5155,7 @@ tr.liste_titre_topborder td {
|
|||
border-top-color: var(--colortopbordertitle1);
|
||||
border-top-style: solid;
|
||||
}
|
||||
.liste_titre td a:not(.button), .liste_titre td a:not(.button) span {
|
||||
.liste_titre td a:not(.button):not(.editfielda), .liste_titre td a:not(.button):not(.editfielda) span {
|
||||
text-shadow: none !important;
|
||||
color: var(--colortexttitle) !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,7 +163,6 @@ if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->tabl
|
|||
$upload_dir = $conf->ticket->dir_output;
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Actions
|
||||
*/
|
||||
|
|
@ -645,6 +644,12 @@ if (empty($reshook)) {
|
|||
$error++;
|
||||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
}
|
||||
} else {
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX."ticket SET date_read = null WHERE rowid = ".((int) $object->id);
|
||||
$resql = $db->query($sql);
|
||||
if (!$resql) {
|
||||
dol_print_error($db);
|
||||
}
|
||||
}
|
||||
$url = 'card.php?track_id=' . $object->track_id;
|
||||
header("Location: " . $url);
|
||||
|
|
@ -728,9 +733,6 @@ $userstat = new User($db);
|
|||
$form = new Form($db);
|
||||
$formfile = new FormFile($db);
|
||||
$formticket = new FormTicket($db);
|
||||
if (isModEnabled('project')) {
|
||||
$formproject = new FormProjets($db);
|
||||
}
|
||||
|
||||
$help_url = 'EN:Module_Ticket|FR:DocumentationModuleTicket';
|
||||
|
||||
|
|
@ -956,7 +958,7 @@ if ($action == 'create' || $action == 'presend') {
|
|||
$morehtmlref = '<div class="refidno">';
|
||||
|
||||
if ($user->hasRight('ticket', 'write') && !$user->socid) {
|
||||
$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editsubject&token='.newToken().'&track_id='.$object->track_id.'">'.img_edit($langs->transnoentitiesnoconv('SetTitle'), 0).'</a> ';
|
||||
$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editsubject&token='.newToken().'&track_id='.urlencode($object->track_id).'">'.img_edit($langs->transnoentitiesnoconv('SetTitle'), 0).'</a> ';
|
||||
}
|
||||
if ($action != 'editsubject') {
|
||||
$morehtmlref .= '<span class="smallonsmartphone">'.dolPrintLabel($object->subject).'</span>';
|
||||
|
|
@ -1033,7 +1035,7 @@ if ($action == 'create' || $action == 'presend') {
|
|||
}
|
||||
$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, (string) $object->socid, $action == 'editcustomer' ? 'editcustomer' : 'none', '', 1, 0, 0, array(), 1);
|
||||
if (!empty($object->socid)) {
|
||||
$morehtmlref .= ' - <a href="'.DOL_URL_ROOT.'/ticket/list.php?socid='.$object->socid.'&sortfield=t.datec&sortorder=desc'.(getDolGlobalBool('TICKET_CLIENT_OTHER_TICKET_ONLY_OPEN') ? '&search_fk_statut[]=openall' : '').'">'.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth"').' '.$langs->trans("TicketHistory").'</a>';
|
||||
$morehtmlref .= ' - <a href="'.DOL_URL_ROOT.'/ticket/list.php?socid='.$object->socid.'&sortfield=t.datec&sortorder=desc'.(getDolGlobalBool('TICKET_CLIENT_OTHER_TICKET_ONLY_OPEN') ? '&search_fk_statut[]=openall' : '').'">'.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth paddingright"').$langs->trans("TicketHistory").'</a>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue