@@ -887,155 +919,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
';
- }
- if ($ticket['locked']) {
- echo ' ';
- }
- if ($modsForHesk_settings['display_user_agent_information']
- && $ticket['user_agent'] !== NULL
- && $ticket['screen_resolution_height'] !== NULL
- && $ticket['screen_resolution_height'] != 0
- && $ticket['screen_resolution_width'] !== NULL
- && $ticket['screen_resolution_width'] != 0
- ):
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
- |
- |
-
-
-
-
- |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ' . $hesklang[$key] . '';
- endif;
- ?>
-
-
-
-
-
-
-
-
@@ -1359,23 +1242,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
-
-
- ';
- } else {
- echo '
';
- }
- } else {
- echo '
-
- ';
- }
- }
- ?>
+
:
' . $hesklang['edit'] . ' ';
+ $options .= '
' . $hesklang['edit'] . ' ';
+ }
+
+
+ /* Print ticket button */
+ $options .= '
' . $hesklang['printer_friendly'] . ' ';
+
+ /* Delete ticket */
+ if ($can_delete) {
+ if ($reply) {
+ $url = 'admin_ticket.php';
+ $tmp = 'delete_post=' . $reply['id'];
+ $txt = $hesklang['delt'];
+ } else {
+ $url = 'delete_tickets.php';
+ $tmp = 'delete_ticket=1';
+ $txt = $hesklang['dele'];
+ }
+ $options .= '
' . $txt . ' ';
}
$dropdown = '
-
-
';
+
';
+ $options .= $dropdown;
/* Return generated HTML */
- $options .= '
';
return $options;
} // END hesk_getAdminButtons()
@@ -2094,4 +2066,52 @@ function hesk_printCanned()
return $can_options;
} // End hesk_printCanned()
+
+function buildUserAgentModal($user_agent, $width, $height) {
+ global $hesklang;
+
+ echo '
+
+
+
+
+
+
+
+
+
+ ' . $hesklang['operating_system'] . '
+ |
+ |
+
+
+
+ ' . $hesklang['browser'] . ' |
+ |
+
+
+
+ ' . $hesklang['screen_resolution'] . '
+ |
+ |
+
+
+
+
+
+
+
+
';
+}
?>
diff --git a/css/colors.css b/css/colors.css
index 594b2d70..648fe20f 100644
--- a/css/colors.css
+++ b/css/colors.css
@@ -30,4 +30,13 @@
.blue {
color: blue;
+}
+
+/* Hover colors */
+.red-on-hover:hover {
+ color: red;
+}
+
+.gray-on-hover:hover {
+ color: grey;
}
\ No newline at end of file
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index fe6804b7..b7060037 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -5,4 +5,23 @@
.icon-link {
font-size: 16px; !important;
+}
+
+#due-date:hover,
+.click-to-edit:hover {
+ font-weight: bolder;
+ cursor: pointer;
+}
+
+.linkless-dropdown {
+ display: block;
+ padding: 3px 20px;
+ clear: both;
+ font-weight: normal;
+ line-height: 1.42857143;
+ white-space: nowrap;
+}
+
+.dropdown-menu>li>span>.fa {
+ margin-right: 10px;
}
\ No newline at end of file
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index aa15754a..1d278e42 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -1,8 +1,7 @@
$(document).ready(function() {
var $readonlyDueDateContainer = $('#readonly-due-date');
var $editableDueDateContainer = $('#editable-due-date');
- var $dueDateButton = $('#due-date-button');
- $dueDateButton.click(function() {
+ $readonlyDueDateContainer.click(function() {
$readonlyDueDateContainer.hide();
$editableDueDateContainer.show();
if ($readonlyDueDateContainer.find('span#due-date').text().trim() == 'None') {
@@ -37,4 +36,9 @@ $(document).ready(function() {
}
});
});
+
+ $('#related-tickets-link').click(function() {
+ $(this).hide();
+ $('.related-ticket').show();
+ })
});
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 99481507..3a26f03c 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -34,6 +34,12 @@ $hesklang['private_category_star'] = 'Private categories indicated by *';
$hesklang['private_article_star'] = 'Private articles indicated by *';
$hesklang['ticket_details'] = 'Ticket Details';
$hesklang['more'] = 'More';
+$hesklang['language_colon'] = 'Language:';
+$hesklang['created_colon'] = 'Created:';
+$hesklang['updated_colon'] = 'Updated:';
+$hesklang['last_replier_colon'] = 'Last replier:';
+$hesklang['click_to_edit'] = 'Click to edit';
+$hesklang['no_device_information'] = 'No device information';
// ADDED OR MODIFIED IN Mods for HESK 2.6.0
$hesklang['search_logs'] = 'Search Logs';