diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 5e5cd8ad..4e23cb80 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -929,11 +929,23 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ); $options = array(); for ($i = 0; $i < 4; $i++) { + if ($ticket['priority'] == $i) { + if ($i === 0) { + $cssClass = 'critical-priority'; + } elseif ($i === 1) { + $cssClass = 'high-priority'; + } elseif ($i === 2) { + $cssClass = 'medium-priority'; + } else { + $cssClass = 'low-priority'; + } + } + $selected = $ticket['priority'] == $i ? 'selected' : ''; $content = " {$priorityLanguages[$i]}"; if ($i === 0) { - $content = sprintf($content, 'long-arrow-up', 'red'); + $content = sprintf($content, 'long-arrow-up', 'critical'); } elseif ($i === 1) { $content = sprintf($content, 'angle-double-up', 'orange'); } elseif ($i === 2) { @@ -945,14 +957,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); array_push($options, ''); } - echo '
'; + echo '
'; echo '

' . $hesklang['priority'] . '

'; echo '
- '; echo implode('', $options); echo ' @@ -970,13 +982,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); $results = mfh_getAllStatuses(); foreach ($results as $row) { $selected = $ticket['status'] == $row['ID'] ? 'selected' : ''; - $status_options[$row['ID']] = ''; + $status_options[$row['ID']] = ''; } echo ' - ' . implode('', $status_options) . ' @@ -991,7 +1003,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); echo ' - '; $selectedForUnassign = 'selected'; foreach ($admins as $k => $v) { $selected = ''; @@ -1026,7 +1038,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); - ' . $categories_options . ' diff --git a/css/colors.css b/css/colors.css index 6dfae0a4..6e0ae132 100644 --- a/css/colors.css +++ b/css/colors.css @@ -7,8 +7,7 @@ } .red, -.important, -.critical-priority { +.important { color: red; } @@ -41,10 +40,19 @@ color: #3c8dbc; } -.med-low-priority { +.critical-priority { + background-color: #9400d3; +} + +.med-low-priority, +.medium-priority { background-color: #8BB467; } +.low-priority { + background-color: blue; +} + .high-priority { background-color: #ff6a00; } @@ -56,4 +64,12 @@ .gray-on-hover:hover { color: grey; +} + +tr.critical-row > td, td.critical-row { + background: #f5e6fb; +} + +tr:hover > .critical-row, tr > td.critical-row:hover { + background: #edd4f8; } \ No newline at end of file diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css index e21d41c5..756fd12c 100644 --- a/css/mods-for-hesk-new.css +++ b/css/mods-for-hesk-new.css @@ -280,10 +280,6 @@ button.dropdown-submit { width: 100%; } -.bootstrap-select.full-width { - width: 100% !important; -} - .dropdown-title { padding: 3px 20px; } @@ -337,4 +333,21 @@ div.ticket-info { .input-group-addon.button > button { border-radius: 0; +} + +.bootstrap-select .btn-default { + background-color: #fff; + border-radius: 0; +} + +.bootstrap-select .btn-default:hover, +.bootstrap-select .btn-default:active { + background-color: #fff; +} + +.bootstrap-select .btn-default:focus { + background-color: #fff; + border-color: #3c8dbc; + box-shadow: none; + outline: 0; } \ No newline at end of file diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php index b958aa73..1e871e48 100644 --- a/inc/ticket_list.inc.php +++ b/inc/ticket_list.inc.php @@ -229,8 +229,8 @@ if ($total > 0) { // Prepare ticket priority switch ($ticket['priority']) { case 0: - $ticket['priority'] = ''; - $color = 'danger'; + $ticket['priority'] = ''; + $color = 'critical-row'; break; case 1: $ticket['priority'] = ''; diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js index af22aabf..1f4cebe9 100644 --- a/js/modsForHesk-javascript.js +++ b/js/modsForHesk-javascript.js @@ -104,6 +104,11 @@ var loadJquery = function() $(deactivate).attr('disabled', 'disabled'); }); + $('.selectpicker').selectpicker({ + iconBase: 'fa fa-fw', + tickIcon: 'fa-check' + }); + //-- Initialize toastr properties toastr.options.progressBar = true; toastr.options.closeButton = true;