From 6d6fe67c538ca9497984d5baff85f99218993737 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 27 Sep 2016 12:41:29 -0400 Subject: [PATCH] Mail uses new UI --- admin/mail.php | 337 ++++++++++++++++++++++++------------------- language/en/text.php | 2 + 2 files changed, 189 insertions(+), 150 deletions(-) diff --git a/admin/mail.php b/admin/mail.php index 7c925a5f..f3a5ac7c 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_MAIL'); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -124,51 +125,72 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); //--> -
-
-
-
-
    - ' . $hesk_settings['mailtmp']['inbox'] . ' -
  • ' . $hesk_settings['mailtmp']['outbox'] . '
    • -
  • ' . $hesk_settings['mailtmp']['new'] . '
    • '; - ?> -
+
+
+
+
+
+

+ +

+
+ +
+
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+
-
-
-

- -
- - + +
+
+

+ +

+
+ +
+
+
+ +
+
+ - /* Show new message form */ - show_new_form(); + + /* Clean unneeded session variables */ + hesk_cleanSessionVars('hide'); + hesk_cleanSessionVars('mail'); + ?> +
-
+ '.$admins[$pm[$hesk_settings['mailtmp']['other']]].'' : (($pm['from'] == 9999) ? 'HESK.com' : $hesklang['e_udel']); - - echo $pm['dt']; $pm['dt'] = hesk_dateToString($pm['dt'],0,1,0,true); ?> - - - - - -
- - - - - - -
- - - - - - - - - - - - - +
+
+

+ +

+
+ +
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+ + + +
- 		- - '; - $folder = ''; - } - echo ''; - ?> - -
- -

- -
-
- - +

+ +
+
+ '.$hesklang['mau'].' '; + $folder = ''; + } + echo ' '.$hesklang['delm'].''; + ?> +
+
+ - + @@ -620,78 +646,89 @@ function show_new_form() { global $hesk_settings, $hesklang, $admins; ?> -
+
-

- -
- -
- - -
- -
-
-
-
- - -
- data-error="" required> -
+
+
+

+ +

+
+ +
-
-
- +
+
+ + +
+ +
+
+
+
+ + +
+ data-error="" required> +
+
+
+
+ -
+
-
-
-
-
-
-
- () +
+
+
+
+
+
+ () +
+
+
+
+
+ + + +
-
-
- - - -
-
+ diff --git a/language/en/text.php b/language/en/text.php index b452743c..166f8261 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -46,6 +46,8 @@ $hesklang['reply_by_customer'] = 'Reply by customer'; $hesklang['reply_by_staff'] = 'Reply by staff'; $hesklang['timeline_today'] = 'Today'; $hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket'; +$hesklang['private_message_header'] = 'Private Message'; +$hesklang['date_colon'] = 'Date:'; // ADDED OR MODIFIED IN Mods for HESK 2.6.0 $hesklang['search_logs'] = 'Search Logs';