Add bootstrap-select to all dropdowns in green, change background on ticket list

master
Mike Koch 7 years ago
parent 8de106cbb2
commit 3c0148ddc2
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED

@ -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 = "<i class='fa fa-fw fa-%s %s' style='font-size: 1em'></i> {$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, '<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 . '">';
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="selectpicker full-width" name="priority" onchange="document.getElementById(\'changePriorityForm\').submit();">';
<select class="selectpicker form-control" name="priority" onchange="document.getElementById(\'changePriorityForm\').submit();">';
echo implode('', $options);
echo '
</select>
@ -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']] = '<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>
@ -991,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 = '';
@ -1026,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>

@ -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;
}

@ -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;
}

@ -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>';
$color = 'danger';
$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 = '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>';

@ -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;

Loading…
Cancel
Save