Merge pull request #1781 from VSEphpbb/ticket/11921

Ticket/11921 - Streamline PMs and Notifications in Header Link List

phpBB/styles/prosilver/template/overall_header.html

@@ -98,7 +98,7 @@
 			<ul class="linklist leftside bulletin">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li class="icon-notification">
-					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a>
+					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]</a>
 					<div id="notification_list" class="notification_list">
 						<div class="pointer"><div class="pointer_inner"></div></div>
 						<div class="header">
@@ -135,9 +135,13 @@
 					</div>
 				</li>
 				<!-- ENDIF -->
+				<!-- IF S_DISPLAY_PM -->
+					<li class="icon-pm">
+						<a href="{U_PRIVATEMSGS}">{L_PRIVATE_MESSAGES} [<strong>{PRIVATE_MESSAGE_COUNT}</strong>]</a>
+					</li>
+				<!-- ENDIF -->
 				<li class="icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a>)<!-- ENDIF -->
 				</li>
 				<!-- IF S_DISPLAY_SEARCH -->
 					<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li>

phpBB/styles/prosilver/template/ucp_notifications.html

@@ -44,7 +44,7 @@
 				<div class="topic-actions">
 					<div class="pagination">
 						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
-						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF -->
 						<!-- IF .pagination -->
 							<!-- INCLUDE pagination.html -->
 						<!-- ELSE -->
@@ -93,7 +93,7 @@
 			<!-- IF .pagination or TOTAL_COUNT -->
 				<div class="topic-actions">
 					<div class="pagination">
-						<!-- IF TOTAL_COUNT -->{TOTAL_COUNT} &bull; <!-- ENDIF -->
+						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF -->
 						<!-- IF .pagination -->
 							<!-- INCLUDE pagination.html -->
 						<!-- ELSE -->

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-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;
 }

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-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-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;
 }

phpBB/styles/prosilver/theme/colours.css

@@ -707,6 +707,8 @@ a.sendemail {
 .icon-unsubscribe				{ background-image: url("./images/icon_unsubscribe.gif"); }
 .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"); }

phpBB/styles/prosilver/theme/common.css

@@ -378,20 +378,6 @@ ul.linklist.bulletin li.no-bulletin:before {
 	display: none;
 }
 
-.icon-notification:before, ul.linklist.bulletin li.icon-notification:before, .icon-notification:after {
-	display: inline;
-	font: inherit;
-}
-
-.icon-notification:before, ul.linklist.bulletin li.icon-notification:before {
-	content: '[';
-	padding-right: 0;
-}
-
-.icon-notification:after {
-	content: ']';
-}
-
 /* Table styles
 ----------------------------------------*/
 table.table1 {