From e57f2e34c238bcd13bf706e99bd341ed01ab67f6 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 29 Jul 2016 13:05:27 -0400 Subject: [PATCH] More progress on the new staff dashboard --- admin/admin_new_main.php | 1 + css/colors.css | 3 + inc/header_new_admin.inc.php | 1 + inc/mail_functions.inc.php | 21 ++ inc/new_admin_header_and_sidebar.inc.php | 266 +++-------------------- language/en/text.php | 6 + 6 files changed, 66 insertions(+), 232 deletions(-) create mode 100644 css/colors.css create mode 100644 inc/mail_functions.inc.php diff --git a/admin/admin_new_main.php b/admin/admin_new_main.php index 71a3534f..14df905f 100644 --- a/admin/admin_new_main.php +++ b/admin/admin_new_main.php @@ -41,6 +41,7 @@ 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/status_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); diff --git a/css/colors.css b/css/colors.css new file mode 100644 index 00000000..971fd4ed --- /dev/null +++ b/css/colors.css @@ -0,0 +1,3 @@ +.white { + color: #fff; +} \ No newline at end of file diff --git a/inc/header_new_admin.inc.php b/inc/header_new_admin.inc.php index 19225b0b..727957a4 100644 --- a/inc/header_new_admin.inc.php +++ b/inc/header_new_admin.inc.php @@ -58,6 +58,7 @@ $modsForHesk_settings = mfh_getSettings(); + diff --git a/inc/mail_functions.inc.php b/inc/mail_functions.inc.php new file mode 100644 index 00000000..c492fd8c --- /dev/null +++ b/inc/mail_functions.inc.php @@ -0,0 +1,21 @@ + -'; @@ -54,11 +53,11 @@ if (hesk_check_kb_only(false)) {
- @@ -74,240 +73,54 @@ if (hesk_check_kb_only(false)) {
  • - 4 + 0): ?> + +
    • - -
  • - - - 10 - - -
    • - -
  • - - - 9 - - -
  • - - User Image - + + + + -
  • - + + +
    • @@ -319,25 +132,14 @@ if (hesk_check_kb_only(false)) {
    -
    - User Image -
    -

    Alexander Pierce

    - Online +

    -
    - -
    -
    - - - - +
    + +  
    - - +
    • MAIN NAVIGATION
      • diff --git a/language/en/text.php b/language/en/text.php index 9aeaee03..60f80bd8 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -21,6 +21,12 @@ $hesklang['_COLLATE']='utf8_unicode_ci'; // This is the email break line that will be used in email piping $hesklang['EMAIL_HR']='------ Reply above this line ------'; +// ADDED OR MODIFIED IN Mods for HESK 2.7.0 +$hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # +$hesklang['message_lower_case'] = 'message'; +$hesklang['messages_lower_case'] = 'messages'; +$hesklang['deleted_user_title_case'] = 'Deleted User'; + // ADDED OR MODIFIED IN Mods for HESK 2.6.0 $hesklang['search_logs'] = 'Search Logs'; $hesklang['date_logged'] = 'Date Logged';