Merge branch '354-priority-tweaks' into '3-2-0'

Resolve "Ticket Priority Improvements"

See merge request !69

admin/admin_ticket.php

@@ -929,25 +929,42 @@ 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' : '';
-                        array_push($options, '<option value="' . $i . '" ' . $selected . '>' . $priorityLanguages[$i] . '</option>');
+                        $content = "<i class='fa fa-fw fa-%s %s' style='font-size: 1em'></i> {$priorityLanguages[$i]}";
+
+                        if ($i === 0) {
+                            $content = sprintf($content, 'long-arrow-up', 'critical');
+                        } elseif ($i === 1) {
+                            $content = sprintf($content, 'angle-double-up', 'orange');
+                        } elseif ($i === 2) {
+                            $content = sprintf($content, 'angle-double-down', 'green');
+                        } else {
+                            $content = sprintf($content, 'long-arrow-down', 'blue');
+                        }
+
+                        array_push($options, '<option data-content="' . $content . '" value="' . $i . '" ' . $selected . '>' . $priorityLanguages[$i] . '</option>');
                     }
 
-                    echo '<div class="ticket-cell-admin col-md-3 col-sm-12 ';
+                    echo '<div class="ticket-cell-admin col-md-3 col-sm-12 ' . $cssClass . '">';
-                    if ($ticket['priority'] == 0) {
-                        echo 'critical-priority">';
-                    } elseif ($ticket['priority'] == 1) {
-                        echo 'high-priority">';
-                    } else {
-                        echo 'med-low-priority">';
-                    }
 
                     echo '<p class="ticket-property-title">' . $hesklang['priority'] . '</p>';
 
                     echo '<form style="margin-bottom:0;" id="changePriorityForm" action="priority.php" method="post">
 
                     <span style="white-space:nowrap;">
-                    <select class="form-control" name="priority" onchange="document.getElementById(\'changePriorityForm\').submit();">';
+                    <select class="selectpicker form-control" name="priority" onchange="document.getElementById(\'changePriorityForm\').submit();">';
                     echo implode('', $options);
                     echo '
                     </select>
@@ -965,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']] = '<option value="' . $row['ID'] . '" ' . $selected . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                        $status_options[$row['ID']] = '<option style="color: ' . $row['TextColor'] . '" value="' . $row['ID'] . '" ' . $selected . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
                     }
 
                     echo '
                     <form role="form" id="changeStatusForm" style="margin-bottom:0;" action="change_status.php" method="post">
                         <span style="white-space:nowrap;">
-                            <select class="form-control" onchange="document.getElementById(\'changeStatusForm\').submit();" name="s">
+                            <select class="selectpicker form-control" onchange="document.getElementById(\'changeStatusForm\').submit();" name="s">
                                 ' . implode('', $status_options) . '
                             </select>
 
@@ -986,7 +1003,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         echo '
                             <form style="margin-bottom:0;" id="changeOwnerForm" action="assign_owner.php" method="post">
                             <span style="white-space:nowrap;">
-                            <select class="form-control"  name="owner" onchange="document.getElementById(\'changeOwnerForm\').submit();">';
+                            <select class="selectpicker form-control"  name="owner" onchange="document.getElementById(\'changeOwnerForm\').submit();">';
                         $selectedForUnassign = 'selected';
                         foreach ($admins as $k => $v) {
                             $selected = '';
@@ -1021,7 +1038,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <form style="margin-bottom:0;" id="changeCategory" action="move_category.php" method="post">
 
                             <span style="white-space:nowrap;">
-                            <select name="category" class="form-control" onchange="document.getElementById(\'changeCategory\').submit();">
+                            <select name="category" class="selectpicker form-control" onchange="document.getElementById(\'changeCategory\').submit();">
                             ' . $categories_options . '
                             </select>
 

css/colors.css

@@ -7,8 +7,7 @@
 }
 
 .red,
-.important,
+.important {
-.critical-priority {
     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;
 }
@@ -57,3 +65,11 @@
 .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;
+}

css/mods-for-hesk-new.css

@@ -334,3 +334,20 @@ 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;
+}

inc/headerAdmin.inc.php

@@ -45,10 +45,11 @@ header('X-UA-Compatible: IE=edge');
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/magnific-popup.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-select.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -76,6 +77,7 @@ header('X-UA-Compatible: IE=edge');
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/alerts.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/lang.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/clipboard.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-select.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php
     if (defined('EXTRA_JS')) {
         echo EXTRA_JS;

inc/ticket_list.inc.php

@@ -229,8 +229,8 @@ if ($total > 0) {
             // Prepare ticket priority
             switch ($ticket['priority']) {
                 case 0:
-                    $ticket['priority'] = '<span style="color: red; font-size:1.3em" class="fa fa-fw fa-long-arrow-up" data-toggle="tooltip" data-placement="top" title="' . $hesklang['critical'] . '"></span>';
+                    $ticket['priority'] = '<span style="font-size:1.3em" class="fa fa-fw fa-long-arrow-up critical" data-toggle="tooltip" data-placement="top" title="' . $hesklang['critical'] . '"></span>';
-                    $color = 'danger';
+                    $color = 'critical-row';
                     break;
                 case 1:
                     $ticket['priority'] = '<span style="color: orange; font-size:1.3em" class="fa fa-fw fa-angle-double-up" data-toggle="tooltip" data-placement="top" title="' . $hesklang['high'] . '"></span>';

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;