From 86082040975ca453edb3871febce74517c676084 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 15 Oct 2013 10:29:15 -0700 Subject: [PATCH] [ticket/11921] Improve appearance of PM notifications in linklist PHPBB3-11921 --- phpBB/includes/functions.php | 13 +++++-------- phpBB/language/en/common.php | 8 -------- .../styles/prosilver/template/overall_header.html | 6 +++++- phpBB/styles/prosilver/theme/bidi.css | 2 +- phpBB/styles/prosilver/theme/buttons.css | 4 ++-- phpBB/styles/prosilver/theme/colours.css | 1 + phpBB/styles/prosilver/theme/images/icon_pm.gif | Bin 0 -> 576 bytes .../subsilver2/template/overall_header.html | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 phpBB/styles/prosilver/theme/images/icon_pm.gif diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 947e29ea02..527d955b0b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5225,7 +5225,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $l_online_time = $user->lang('VIEW_ONLINE_TIMES', (int) $config['load_online_time']); } - $l_privmsgs_text = $l_privmsgs_text_unread = ''; + $l_privmsgs_count = ''; $s_privmsg_new = false; // Obtain number of new private messages if user is logged in @@ -5233,7 +5233,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 { if ($user->data['user_new_privmsg']) { - $l_privmsgs_text = $user->lang('NEW_PMS', (int) $user->data['user_new_privmsg']); + $l_privmsgs_count = (int) $user->data['user_new_privmsg']; if (!$user->data['user_last_privmsg'] || $user->data['user_last_privmsg'] > $user->data['session_last_visit']) { @@ -5251,15 +5251,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 } else { - $l_privmsgs_text = $user->lang('NEW_PMS', 0); + $l_privmsgs_count = 0; $s_privmsg_new = false; } - $l_privmsgs_text_unread = ''; - if ($user->data['user_unread_privmsg'] && $user->data['user_unread_privmsg'] != $user->data['user_new_privmsg']) { - $l_privmsgs_text_unread = $user->lang('UNREAD_PMS', (int) $user->data['user_unread_privmsg']); + $l_privmsgs_count = (int) $user->data['user_unread_privmsg']; } } @@ -5350,8 +5348,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => $l_online_record, - 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, - 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, + 'PRIVATE_MESSAGE_COUNT' => $l_privmsgs_count, 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d04fe96d97..3afbc426aa 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -401,10 +401,6 @@ $lang = array_merge($lang, array( 'NEWEST_USER' => 'Our newest member %s', 'NEW_MESSAGE' => 'New message', 'NEW_MESSAGES' => 'New messages', - 'NEW_PMS' => array( - 1 => '%d new message', - 2 => '%d new messages', - ), 'NEW_POST' => 'New post', // Not used anymore 'NEW_POSTS' => 'New posts', // Not used anymore 'NEXT' => 'Next', // Used in pagination @@ -753,10 +749,6 @@ $lang = array_merge($lang, array( 'UNKNOWN_BROWSER' => 'Unknown browser', 'UNMARK_ALL' => 'Unmark all', 'UNREAD_MESSAGES' => 'Unread messages', - 'UNREAD_PMS' => array( - 1 => '%d unread message', - 2 => '%d unread messages', - ), 'UNREAD_POST' => 'Unread post', 'UNREAD_POSTS' => 'Unread posts', 'UNWATCH_FORUM_CONFIRM' => 'Are you sure you wish to unsubscribe from this forum?', diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 92baf6ee51..6f787f023c 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -135,9 +135,13 @@ + +
  • + {L_PRIVATE_MESSAGES} ({PRIVATE_MESSAGE_COUNT}) +
    • +
  • {L_PROFILE} - ({PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD})
  • {L_SEARCH_SELF}
    • diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index c5b72e913e..c06ad4eb1c 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -535,7 +535,7 @@ /* Icon images ---------------------------------------- */ .rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, -.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search, .rtl .icon-notification { +.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search, .rtl .icon-notification, .rtl .icon-pm { background-position: 100% 50%; padding: 1px 17px 0 0; } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index d83fefcef3..b05883b465 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -91,14 +91,14 @@ a.sendemail { /* Icon images ---------------------------------------- */ .sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout, -.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search, .icon-notification { +.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search, .icon-notification, .icon-pm { background-position: 0 50%; background-repeat: no-repeat; background-image: none; padding: 1px 0 0 17px; } -ul.linklist.bulletin li.icon-home:before, ul.linklist.bulletin li.icon-ucp:before, ul.linklist.bulletin li.icon-notification:before, +ul.linklist.bulletin li.icon-home:before, ul.linklist.bulletin li.icon-ucp:before, ul.linklist.bulletin li.icon-notification:before, ul.linklist.bulletin li.icon-pm:before, ul.linklist.bulletin li.icon-bookmark:before, ul.linklist.bulletin li.icon-bump:before, ul.linklist.bulletin li.icon-subscribe:before, ul.linklist.bulletin li.icon-unsubscribe:before { display: none; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 40311f95fe..3f837976bf 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -708,6 +708,7 @@ a.sendemail { .icon-pages { background-image: url("./images/icon_pages.gif"); } .icon-search { background-image: url("./images/icon_search.gif"); } .icon-notification { background-image: url("./images/icon_notification.gif"); } +.icon-pm { background-image: url("./images/icon_pm.gif"); } /* Profile & navigation icons */ .email-icon, .email-icon a { background-image: url("./images/icon_contact_email.gif"); } diff --git a/phpBB/styles/prosilver/theme/images/icon_pm.gif b/phpBB/styles/prosilver/theme/images/icon_pm.gif new file mode 100644 index 0000000000000000000000000000000000000000..6d308f37c2a8d02668d389dad5fd2512b322ad08 GIT binary patch literal 576 zcmZ?wbhEHb6kyU7r*`ZwP^E!7jHhie*132{?li#KX~=#{rzXJ?>%{0)-(Ivr?2O4 z-2d|J$A`~fpT2ti_s`$?8}`2a`1Qw+pC3Pe*>>do`n{*#fBN+L&AVmWkCk@Me){Tt z)zr166IV=Fy0dE9+UKv|ZasAJ+s~g1Hy@s~e0M?b;&V41{`mE~WybP%pT0CqUHbm> z*OQm8m-R1;DC=Fd>*Th>Cttn&@aNyZBj+zil=YmxdgK59f3IG@|M}}z>BQwffBkv# z;_dU-Z`SQSUC^`m*PlQ4pFV%^^u>>#zc1f@`0DlB+qZAm&DoMv+y5U77zPL^{$ycf zU0of0V69)FV4dG4AEv;?sE!-j9J-t2L;T&O;r%au~5zfWnF>R_T16R1NftU%; zG$s+v0IhI$9!XnunJI#X-j)v9;XYwZ3i4*2Vd547=DuOZ;p~(3^i_1Mjg;-YCbNgL zhAFY|N=pd`@-y~-mk5(N+ae( Vfnu9B=Q58u9)(Fw+Kmhh)&Qa80n`8h literal 0 HcmV?d00001 diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 1693b8424f..224d02d9c9 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -193,7 +193,7 @@ function marklist(id, name, state) -  * {PRIVATE_MESSAGE_INFO}, {PRIVATE_MESSAGE_INFO_UNREAD} +  * {L_PRIVATE_MESSAGES} ({PRIVATE_MESSAGE_COUNT})  * {L_REGISTER}