From e2c144d8ed1574d434be197d169a4f8e8e2e3b79 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 11 Sep 2016 22:14:15 -0400 Subject: [PATCH] Start working on ticket screen --- admin/admin_ticket.php | 63 ++++++++++++++++++++++++++++-------------- language/en/text.php | 2 ++ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 7f79447d..f218267c 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -41,6 +41,7 @@ require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/status_functions.inc.php'); require(HESK_PATH . 'inc/view_attachment_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -624,9 +625,26 @@ if ($ticket['email'] != '') { } } +// TODO Here we go! /* Print admin navigation */ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> +
+

+

+
+
+

+ + +

+
+
+
+
+
+
+
@@ -1522,29 +1540,42 @@ function hesk_getAdminButtons($reply = 0, $white = 1) { global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; - $options = '
'; + $options = ''; - /* Style and mousover/mousout */ - $tmp = $white ? 'White' : 'Blue'; - $style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"'; + /* Edit post */ + if ($can_edit) { + $tmp = $reply ? '&reply=' . $reply['id'] : ''; + $mgr = $isManager ? '&isManager=true' : ''; + $options .= ' ' . $hesklang['edit'] . ' '; + } + + $dropdown = ' +
+ + +
'; + + $options .= $dropdown; /* Lock ticket button */ - if ( /* ! $reply && */ - $can_edit - ) { + if ($can_edit) { if ($ticket['locked']) { - $des = $hesklang['tul'] . ' - ' . $hesklang['isloc']; $options .= ' ' . $hesklang['tul'] . ' '; } else { - $des = $hesklang['tlo'] . ' - ' . $hesklang['isloc']; $options .= ' ' . $hesklang['tlo'] . ' '; } } /* Tag ticket button */ - if ( /* ! $reply && */ - $can_archive - ) { + if ($can_archive) { if ($ticket['archive']) { $options .= '' . $hesklang['remove_archive'] . ' '; } else { @@ -1560,12 +1591,6 @@ function hesk_getAdminButtons($reply = 0, $white = 1) /* Print ticket button */ $options .= ' ' . $hesklang['printer_friendly'] . ' '; - /* Edit post */ - if ($can_edit) { - $tmp = $reply ? '&reply=' . $reply['id'] : ''; - $mgr = $isManager ? '&isManager=true' : ''; - $options .= ' ' . $hesklang['edtt'] . ' '; - } /* Delete ticket */ @@ -1573,12 +1598,10 @@ function hesk_getAdminButtons($reply = 0, $white = 1) if ($reply) { $url = 'admin_ticket.php'; $tmp = 'delete_post=' . $reply['id']; - $img = 'delete.png'; $txt = $hesklang['delt']; } else { $url = 'delete_tickets.php'; $tmp = 'delete_ticket=1'; - $img = 'delete_ticket.png'; $txt = $hesklang['dele']; } $options .= ' ' . $txt . ' '; diff --git a/language/en/text.php b/language/en/text.php index 7fbf75bf..99481507 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -32,6 +32,8 @@ $hesklang['warnings_title_case'] = 'Warnings'; $hesklang['articles_in_category_x'] = 'Articles in Category %s'; // %s: category name $hesklang['private_category_star'] = 'Private categories indicated by *'; $hesklang['private_article_star'] = 'Private articles indicated by *'; +$hesklang['ticket_details'] = 'Ticket Details'; +$hesklang['more'] = 'More'; // ADDED OR MODIFIED IN Mods for HESK 2.6.0 $hesklang['search_logs'] = 'Search Logs';