2
0
forked from Wavyzz/dolibarr
This commit is contained in:
Laurent Destailleur
2024-04-20 18:49:24 +02:00
parent e18bab684f
commit 9da13e94e0
6 changed files with 29 additions and 16 deletions

View File

@@ -352,7 +352,7 @@ class FormTicket
$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1); $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);
print '</td></tr>'; print '</td></tr>';
if (!empty($conf->knowledgemanagement->enabled)) { if (isModEnabled('knowledgemanagement')) {
// KM Articles // KM Articles
print '<tr id="KWwithajax" class="hidden"><td></td></tr>'; print '<tr id="KWwithajax" class="hidden"><td></td></tr>';
print '<!-- Script to manage change of ticket group --> print '<!-- Script to manage change of ticket group -->
@@ -513,7 +513,7 @@ class FormTicket
$out .= '<br></div>'; $out .= '<br></div>';
} }
} else { } else {
$out .= $langs->trans("NoAttachedFiles").'<br>'; $out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
} }
if ($this->withfile == 2) { // Can add other files if ($this->withfile == 2) { // Can add other files
$maxfilesizearray = getMaxFileSizeArray(); $maxfilesizearray = getMaxFileSizeArray();

View File

@@ -533,7 +533,7 @@ if ($action != "infos_success") {
print load_fiche_titre($langs->trans('NewTicket'), '', '', 0, 0, 'marginleftonly'); print load_fiche_titre($langs->trans('NewTicket'), '', '', 0, 0, 'marginleftonly');
if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM')=='') { if (!getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM')) {
$langs->load("errors"); $langs->load("errors");
print '<div class="error">'; print '<div class="error">';
print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>'; print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';

View File

@@ -715,7 +715,7 @@ if ($action == "view_ticketlist") {
$url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 1)); $url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 1));
print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.$url_public_ticket.'view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" style="display:none;">'; print '<form method="POST" id="form_view_ticket" name="form_view_ticket" action="'.$url_public_ticket.'view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" style="display:none;">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="view_ticket">'; print '<input type="hidden" name="action" value="view_ticket">';
print '<input type="hidden" name="btn_view_ticket_list" value="1">'; print '<input type="hidden" name="btn_view_ticket_list" value="1">';
@@ -746,21 +746,28 @@ if ($action == "view_ticketlist") {
print '<br>'; print '<br>';
print '<div id="form_view_ticket">'; print '<div id="form_view_ticket">';
print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">'; print '<form method="POST" class="maxwidth1000 center" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="view_ticketlist">'; print '<input type="hidden" name="action" value="view_ticketlist">';
//print '<input type="hidden" name="search_fk_status" value="non_closed">'; //print '<input type="hidden" name="search_fk_status" value="non_closed">';
print '<p><label for="track_id" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans("OneOfTicketTrackId").'</span></label>'; print '<p><label for="track_id" style="display: inline-block" class="titlefieldcreate left"><span class="fieldrequired">';
print '<input size="30" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />'; print img_picto($langs->trans("TicketTrackId"), 'generic', 'class="pictofixedwidth"');
print $langs->trans("OneOfTicketTrackId");
print '</span></label>';
print '<br class="showonsmartphone hidden">';
print '<input class="minwidth100" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />';
print '</p>'; print '</p>';
print '<p><label for="email" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans('Email').'</span></label>'; print '<p><label for="email" style="display: inline-block" class="titlefieldcreate left"><span class="fieldrequired">';
print '<input size="30" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : (!empty($_SESSION['customer_email']) ? $_SESSION['customer_email'] : "")).'" />'; print img_picto($langs->trans("Email"), 'email', 'class="pictofixedwidth"');
print $langs->trans('Email').'</span></label>';
print '<br class="showonsmartphone hidden">';
print '<input class="minwidth100" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : (!empty($_SESSION['customer_email']) ? $_SESSION['customer_email'] : "")).'" />';
print '</p>'; print '</p>';
print '<p style="text-align: center; margin-top: 1.5em;">'; print '<p style="text-align: center; margin-top: 1.5em;">';
print '<input type="submit" class="button" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />'; print '<input type="submit" class="button button-select" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
print ' &nbsp; '; print ' &nbsp; ';
print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
print "</p>\n"; print "</p>\n";

View File

@@ -406,7 +406,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
if ($action != 'presend') { if ($action != 'presend') {
$baseurl = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', DOL_URL_ROOT.'/public/ticket/'); $baseurl = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', DOL_URL_ROOT.'/public/ticket/');
print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.$baseurl.'list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">'; print '<form method="POST" id="form_view_ticket_list" name="form_view_ticket_list" action="'.$baseurl.'list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="view_ticketlist">'; print '<input type="hidden" name="action" value="view_ticketlist">';
print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">'; print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';
@@ -455,19 +455,19 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
print '<div class="center opacitymedium margintoponly marginbottomonly ticketlargemargin">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>'; print '<div class="center opacitymedium margintoponly marginbottomonly ticketlargemargin">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
print '<div id="form_view_ticket">'; print '<div id="form_view_ticket">';
print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">'; print '<form method="POST" class="maxwidth1000 center" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="view_ticket">'; print '<input type="hidden" name="action" value="view_ticket">';
print '<p><label for="track_id" style="display: inline-block;" class="titlefieldcreate"><span class="fieldrequired">'; print '<p><label for="track_id" style="display: inline-block;" class="titlefieldcreate left"><span class="fieldrequired">';
print img_picto($langs->trans("TicketTrackId"), 'generic', 'class="pictofixedwidth"'); print img_picto($langs->trans("TicketTrackId"), 'generic', 'class="pictofixedwidth"');
print $langs->trans("TicketTrackId").'</span></label>'; print $langs->trans("TicketTrackId").'</span></label>';
print '<br class="showonsmartphone hidden">'; print '<br class="showonsmartphone hidden">';
print '<input class="minwidth100" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />'; print '<input class="minwidth100" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />';
print '</p>'; print '</p>';
print '<p><label for="email" style="display: inline-block;" class="titlefieldcreate"><span class="fieldrequired">'; print '<p><label for="email" style="display: inline-block;" class="titlefieldcreate left"><span class="fieldrequired">';
print img_picto($langs->trans("Email"), 'email', 'class="pictofixedwidth"'); print img_picto($langs->trans("Email"), 'email', 'class="pictofixedwidth"');
print $langs->trans('Email').'</span></label>'; print $langs->trans('Email').'</span></label>';
print '<br class="showonsmartphone hidden">'; print '<br class="showonsmartphone hidden">';

View File

@@ -390,7 +390,8 @@ div.tabBar textarea:focus {
border: 1px solid #aaa !important; border: 1px solid #aaa !important;
} }
input:focus:not(.button):not(.buttonwebsite):not(.buttonreset):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-nobottom), input:focus:not(.button):not(.buttonwebsite):not(.buttonreset):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-nobottom),
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single { select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single,
.select2-container--focus span.selection span.select2-selection {
border-bottom: 1px solid #666 !important; border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important; border-bottom-right-radius: 0 !important;

View File

@@ -488,8 +488,13 @@ select.vmenusearchselectcombo {
textarea:focus { textarea:focus {
/* v6 box-shadow: 0 0 4px #8091BF; */ /* v6 box-shadow: 0 0 4px #8091BF; */
border: 1px solid #aaa !important; border: 1px solid #aaa !important;
padding-left: 3px;
padding-right: 3px;
padding-top: 3px;
} }
input:focus, textarea:focus, button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus { input:focus, textarea:focus,
button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus,
.select2-container--focus span.selection span.select2-selection {
border-bottom: 1px solid #666; border-bottom: 1px solid #666;
} }