From e3d20529128afb7c64281b2d65789953b5e0c27b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 15 Sep 2016 22:06:22 -0400 Subject: [PATCH] Still working on admin ticket --- admin/admin_ticket.php | 308 ++++++++++++++++++++------------------ css/colors.css | 11 +- css/mods-for-hesk-new.css | 57 +++++++ language/en/text.php | 1 + 4 files changed, 232 insertions(+), 145 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index e59b7882..e32e189d 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -690,6 +690,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+ - + + + + +
@@ -713,7 +714,37 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?>
+ ' . $ticket['ip'] . ''; + + if ($can_ban_ips) { + if ($ip_id = hesk_isBannedIP($ticket['ip'])) { + if ($can_unban_ips) { + echo ' + + '; + } else { + echo ''; + } + } else { + echo ' + + '; + } + } + } + ?> +
@@ -903,80 +934,61 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); - -
-
-
-
- -
- -
-
-
-

-

-
-
-
- +
+ $hesklang['critical'], - 1 => $hesklang['high'], - 2 => $hesklang['medium'], - 3 => $hesklang['low'] - ); - $options = array(); - for ($i = 0; $i < 4; $i++) { - $selected = $ticket['priority'] == $i ? 'selected' : ''; - array_push($options, ''); - } + $priorityLanguages = array( + 0 => $hesklang['critical'], + 1 => $hesklang['high'], + 2 => $hesklang['medium'], + 3 => $hesklang['low'] + ); + $options = array(); + for ($i = 0; $i < 4; $i++) { + $selected = $ticket['priority'] == $i ? 'selected' : ''; + array_push($options, ''); + } - echo '
'; - } elseif ($ticket['priority'] == 1) { - echo 'highPriority">'; - } else { - echo 'medLowPriority">'; - } + echo '
'; + } elseif ($ticket['priority'] == 1) { + echo 'high-priority">'; + } else { + echo 'med-low-priority">'; + } - echo '

' . $hesklang['priority'] . '

'; + echo '

' . $hesklang['priority'] . '

'; - echo '
+ echo ' '; - if ($isManager) { - echo ''; - } - echo ' + if ($isManager) { + echo ''; + } + echo '
'; - echo '

' . $hesklang['status'] . '

'; - $status_options = array(); - $results = mfh_getAllStatuses(); - foreach ($results as $row) { - $selected = $ticket['status'] == $row['ID'] ? 'selected' : ''; - $status_options[$row['ID']] = ''; - } + echo '

' . $hesklang['status'] . '

'; + $status_options = array(); + $results = mfh_getAllStatuses(); + foreach ($results as $row) { + $selected = $ticket['status'] == $row['ID'] ? 'selected' : ''; + $status_options[$row['ID']] = ''; + } - echo ' + echo '
'; - if ($isManager) { - echo ''; - } - echo ' + if ($isManager) { + echo ''; + } + echo '
'; - echo '

' . $hesklang['owner'] . '

'; + echo '

' . $hesklang['owner'] . '

'; - if (hesk_checkPermission('can_assign_others', 0) || $isManager) { - echo ' + if (hesk_checkPermission('can_assign_others', 0) || $isManager) { + echo '
- - - - '; - } else { - echo '

'; - echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : - ($can_assign_self ? $hesklang['unas'] . ' [' . $hesklang['asss'] . ']' : $hesklang['unas']); - echo '

'; + echo ''; } - echo '
'; - echo '

' . $hesklang['category'] . '

'; - if ($can_change_cat) { - echo ' + echo ''; + echo ' + + + + '; + } else { + echo '

'; + echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : + ($can_assign_self ? $hesklang['unas'] . ' [' . $hesklang['asss'] . ']' : $hesklang['unas']); + echo '

'; + } + echo '
'; + echo '

' . $hesklang['category'] . '

'; + if ($can_change_cat) { + echo '
@@ -1031,18 +1043,76 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ' . $categories_options . ' - - + + +
'; - } else { - echo '

' . $category['name'] . '

'; + } else { + echo '

' . $category['name'] . '

'; + } + echo '
'; + ?> +
+
+
+
+

+ +

+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ $v) { + if ($v['use'] && $v['place'] == 0) { + if ($modsForHesk_settings['custom_field_setting']) { + $v['name'] = $hesklang[$v['name']]; + } + echo '
'; + echo '
' . $v['name'] . ':
'; + if ($v['type'] == 'date' && !empty($ticket[$k])) { + $dt = date('Y-m-d h:i:s', $ticket[$k]); + echo '
' . hesk_dateToString($dt, 0) . '
'; + } else { + echo '
' . $ticket[$k] . '
'; + } + echo '
'; } - echo '
'; - ?> + } + ?> +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
-
-
- -
-
: - - - '; - } else { - echo ''; - } - } else { - echo ' - - '; - } - } - - echo '' . $ticket['ip'] . ''; - } - ?> -
-
@@ -1216,24 +1253,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');


: - $v) { - if ($v['use'] && $v['place'] == 0) { - if ($modsForHesk_settings['custom_field_setting']) { - $v['name'] = $hesklang[$v['name']]; - } - echo '

' . $v['name'] . ': '; - if ($v['type'] == 'date' && !empty($ticket[$k])) { - $dt = date('Y-m-d h:i:s', $ticket[$k]); - echo hesk_dateToString($dt, 0); - } else { - echo $ticket[$k]; - } - echo '

'; - } - } - ?>
diff --git a/css/colors.css b/css/colors.css index 648fe20f..afe383f8 100644 --- a/css/colors.css +++ b/css/colors.css @@ -3,7 +3,8 @@ } .red, -.important { +.important, +.critical-priority { color: red; } @@ -32,6 +33,14 @@ color: blue; } +.med-low-priority { + background-color: #8BB467; +} + +.high-priority { + background-color: #ff6a00; +} + /* Hover colors */ .red-on-hover:hover { color: red; diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css index b7060037..601397ce 100644 --- a/css/mods-for-hesk-new.css +++ b/css/mods-for-hesk-new.css @@ -24,4 +24,61 @@ .dropdown-menu>li>span>.fa { margin-right: 10px; +} + +.no-margins { + margin: 0; +} + +@media (max-width: 991px) { + .ticket-cell-admin { + border-bottom: solid 1px #ddd; + border-right: 0; + padding-top: 5px; + height: 100px; + } +} + +@media (min-width: 992px) { + .ticket-cell-admin { + border-bottom: 0; + border-right: solid 1px #ddd; + margin-top: 1px; + height: 100px; + padding-top: 10px; + } +} + +.ticket-property-title { + color: rgba(255, 255, 255, .75); + font-size: 11px; + text-transform: uppercase; +} + +@media (min-width: 992px) { + .ticketPropertyText { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .ticketPropertyText:hover { + white-space: normal; + overflow: visible; + } +} + +.ticketPropertyText { + font-size: 16px; + line-height: 1em; + color: #fff; + padding-bottom: 2px; +} + +.status-row { + margin-bottom: 20px; +} + +.push-down-10 { + margin-top: 10px; } \ No newline at end of file diff --git a/language/en/text.php b/language/en/text.php index 3a26f03c..02e03248 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -40,6 +40,7 @@ $hesklang['updated_colon'] = 'Updated:'; $hesklang['last_replier_colon'] = 'Last replier:'; $hesklang['click_to_edit'] = 'Click to edit'; $hesklang['no_device_information'] = 'No device information'; +$hesklang['message_colon'] = 'Message:'; // ADDED OR MODIFIED IN Mods for HESK 2.6.0 $hesklang['search_logs'] = 'Search Logs';