Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeus

* PayBas/ticket/12662: (29 commits)
  [ticket/12662] Hide quick-links when empty
  [ticket/12662] Fix white-space issue to make dropdowns uniform
  [ticket/12662] Remove last remaining linklist outside navbars
  [ticket/12662] Use data-last-responsive attr instead of hardcoded list
  [ticket/12662] Remove <li> container from logged_out_content event
  [ticket/12662] Username <span> fix for list columns
  [ticket/12662] Fix notifications dropdown positioning for RTL
  [ticket/12662] Update tests that utilize get_username_string
  [ticket/12662] Update subsilver2 index template event names
  [ticket/12662] Update events docs from b5 to rc1/rc2
  [ticket/12662] Move dropdown container from <li> to new inner div
  [ticket/12662] Remove linklist container and update template events
  [ticket/12662] Add span containers to all usernames for consistency
  [ticket/12662] IE8 fixes
  [ticket/12662] Fix responsive positioning of notifications dropdown
  [ticket/12662] Remove inherited props from ddown-extendended
  [ticket/12662] Change CSS selectors to direct descendants for linklist
  [ticket/12662] Reorder icon CSS rules alphabetically
  [ticket/12662] Use slack variable to determine line-break sensitivity
  [ticket/12662] Change new event names and fix events.md
  ...

phpBB/assets/javascript/core.js

@@ -1301,6 +1301,20 @@ phpbb.toggleDropdown = function() {
 
 		if (direction == 'left') {
 			options.dropdown.css('margin-left', '-' + freeSpace + 'px');
+
+			// Try to position the notification dropdown correctly in RTL-responsive mode
+			if (options.dropdown.hasClass('dropdown-extended')) {
+				var contentWidth,
+					fullFreeSpace = freeSpace + parent.outerWidth();
+
+				options.dropdown.find('.dropdown-contents').each(function() {
+					contentWidth = parseInt($(this).outerWidth());
+					$(this).css({marginLeft: 0, left: 0});
+				});
+
+				var maxOffset = Math.min(contentWidth, fullFreeSpace) + 'px';
+				options.dropdown.css({'width': maxOffset, 'margin-left': '-' + maxOffset});
+			}
 		} else {
 			options.dropdown.css('margin-right', '-' + (windowWidth + freeSpace) + 'px');
 		}

phpBB/docs/events.md

@@ -246,21 +246,21 @@ index_body_block_stats_prepend
 * Since: 3.1.0-b3
 * Purpose: Prepend content to the statistics list on the Board index
 
-index_body_linklist_after
+index_body_markforums_after
 ===
 * Locations:
     + styles/prosilver/template/index_body.html
     + styles/subsilver2/template/index_body.html
-* Since: 3.1.0-a3
+* Since: 3.1.0-RC2
-* Purpose: Add content after the linklist above the forum list on Board index
+* Purpose: Add content after the mark-read link above the forum list on Board index
 
-index_body_linklist_before
+index_body_markforums_before
 ===
 * Locations:
     + styles/prosilver/template/index_body.html
     + styles/subsilver2/template/index_body.html
-* Since: 3.1.0-a3
+* Since: 3.1.0-RC2
-* Purpose: Add content before the linklist above the forum list on Board index
+* Purpose: Add content before the mark-read link above the forum list on Board index
 
 index_body_stat_blocks_after
 ===
@@ -344,25 +344,54 @@ memberlist_view_user_statistics_before
 * Since: 3.1.0-a1
 * Purpose: Add entries before the user statistics part of any user profile
 
-navbar_header_username_append
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
-* Purpose: Add text and HTMl after the username shown in the navbar.
-
 navbar_header_logged_out_content
 ===
 * Locations:
     + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
+* Since: 3.1.0-RC1
 * Purpose: Add text and HTML in place of the username when not logged in.
 
+navbar_header_profile_list_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-RC2
+* Purpose: Add links to the bottom of the profile drop-down menu in the header navbar
+
+navbar_header_profile_list_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-RC2
+* Purpose: Add links to the top of the profile drop-down menu in the header navbar
+
+navbar_header_quick_links_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-RC2
+* Purpose: Add links to the bottom of the quick-links drop-down menu in the header
+
+navbar_header_quick_links_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-RC2
+* Purpose: Add links to the top of the quick-links drop-down menu in the header
+
+navbar_header_username_append
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-RC1
+* Purpose: Add text and HTMl after the username shown in the navbar.
+
 navbar_header_username_prepend
 ===
 * Locations:
     + styles/prosilver/template/navbar_header.html
-* Since: 3.1.0-b4
+* Since: 3.1.0-RC1
+* Purpose: Add text and HTMl before the username shown in the navbar.
 
 overall_footer_after
 ===

phpBB/includes/functions.php

@@ -4912,6 +4912,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 
 		'PRIVATE_MESSAGE_COUNT'			=> (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0,
 		'CURRENT_USER_AVATAR'			=> phpbb_get_user_avatar($user->data),
+		'CURRENT_USERNAME_SIMPLE'		=> get_username_string('no_profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
 		'CURRENT_USERNAME_FULL'			=> get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
 		'UNREAD_NOTIFICATIONS_COUNT'	=> ($notifications !== false) ? $notifications['unread_count'] : '',
 		'NOTIFICATIONS_COUNT'			=> ($notifications !== false) ? $notifications['unread_count'] : '',

phpBB/includes/functions_content.php

@@ -1334,9 +1334,9 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 		global $phpbb_root_path, $phpEx;
 
 		$_profile_cache['base_url'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u={USER_ID}');
-		$_profile_cache['tpl_noprofile'] = '{USERNAME}';
+		$_profile_cache['tpl_noprofile'] = '<span class="username">{USERNAME}</span>';
 		$_profile_cache['tpl_noprofile_colour'] = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
-		$_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}">{USERNAME}</a>';
+		$_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}" class="username">{USERNAME}</a>';
 		$_profile_cache['tpl_profile_colour'] = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
 	}
 

phpBB/language/en/common.php

@@ -64,7 +64,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
 	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
 	'ACP'							=> 'Administration Control Panel',
-	'ACP_SHORT'						=> 'Administer',
+	'ACP_SHORT'						=> 'ACP',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
 	'ADMINISTRATOR'					=> 'Administrator',
@@ -393,7 +393,7 @@ $lang = array_merge($lang, array(
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
-	'MCP_SHORT'				=> 'Moderate',
+	'MCP_SHORT'				=> 'MCP',
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE'					=> 'Merge',
@@ -595,6 +595,8 @@ $lang = array_merge($lang, array(
 	'PRIVATE_MESSAGING'		=> 'Private messaging',
 	'PROFILE'				=> 'User Control Panel',
 
+	'QUICK_LINKS'			=> 'Quick links',
+
 	'RANK'						=> 'Rank',
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
@@ -661,15 +663,15 @@ $lang = array_merge($lang, array(
 	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
 	'SEARCH_KEYWORDS'			=> 'Search for keywords',
 	'SEARCHING_FORUMS'			=> 'Searching forums',
-	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
+	'SEARCH_ACTIVE_TOPICS'		=> 'Active topics',
 	'SEARCH_FOR'				=> 'Search for',
 	'SEARCH_FORUM'				=> 'Search this forum…',
-	'SEARCH_NEW'				=> 'View new posts',
+	'SEARCH_NEW'				=> 'New posts',
 	'SEARCH_POSTS_BY'			=> 'Search posts by',
-	'SEARCH_SELF'				=> 'View your posts',
+	'SEARCH_SELF'				=> 'Your posts',
 	'SEARCH_TOPIC'				=> 'Search this topic…',
-	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
+	'SEARCH_UNANSWERED'			=> 'Unanswered posts',
-	'SEARCH_UNREAD'				=> 'View unread posts',
+	'SEARCH_UNREAD'				=> 'Unread posts',
 	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
 	'SEE_ALL'					=> 'See All',

phpBB/styles/prosilver/template/forum_fn.js

@@ -382,10 +382,7 @@ function parse_document(container)
 	*/
 	if (oldBrowser) {
 		// Fix .linklist.bulletin lists
-		container.find('ul.linklist.bulletin li:first-child, ul.linklist.bulletin li.rightside:last-child').addClass('no-bulletin');
+		container.find('ul.linklist.bulletin > li:first-child, ul.linklist.bulletin > li.rightside:last-child').addClass('no-bulletin');
-
-		// Do not run functions below for old browsers
-		return;
 	}
 
 	/**
@@ -482,6 +479,167 @@ function parse_document(container)
 		$(window).resize(check);
 	});
 
+	/**
+	* Responsive link lists
+	*/
+	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
+		var $this = $(this),
+			$body = $('body'),
+			filterSkip = '.breadcrumbs, [data-skip-responsive]',
+			filterLast = '.edit-icon, .quote-icon, [data-last-responsive]',
+			persist = $this.attr('id') == 'nav-main',
+			allLinks = $this.children(),
+			links = allLinks.not(filterSkip),
+			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
+			filterLastList = links.filter(filterLast),
+			slack = 1; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. 
+
+		if (!persist) {
+			if (links.is('.rightside'))
+			{
+				links.filter('.rightside:first').before(html);
+				$this.children('.responsive-menu').addClass('rightside');
+			}
+			else
+			{
+				$this.append(html);
+			}
+		}
+
+		var item = $this.children('.responsive-menu'),
+			menu = item.find('.dropdown-contents'),
+			lastWidth = false,
+			compact = false,
+			responsive = false,
+			copied = false;
+
+		function check() {
+			var width = $body.width();
+			if (responsive && width <= lastWidth) {
+				return;
+			}
+
+			// Unhide the quick-links menu if it has content
+			if (persist) {
+				item.addClass('hidden');
+				if (menu.find('li:not(.separator, .clone)').length || (responsive && menu.find('li.clone').length)) {
+					item.removeClass('hidden');
+				}
+			}
+
+			// Reset responsive and compact layout
+			if (responsive) {
+				responsive = false;
+				$this.removeClass('responsive');
+				links.css('display', '');
+				if (!persist) item.css('display', 'none');
+			}
+
+			if (compact) {
+				compact = false;
+				$this.removeClass('compact');
+			}
+
+			// Find tallest element
+			var maxHeight = 0;
+			allLinks.each(function() {
+				if (!$(this).height()) return;
+				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+			});
+
+			if (maxHeight < 1) {
+				return;
+			}
+
+			// Nothing to resize if block's height is not bigger than tallest element's height
+			if ($this.height() <= (maxHeight + slack)) {
+				return;
+			}
+
+			// Enable compact layout, find tallest element, compare to height of whole block
+			compact = true;
+			$this.addClass('compact');
+
+			var compactMaxHeight = 0;
+			allLinks.each(function() {
+				if (!$(this).height()) return;
+				compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
+			});
+
+			if ($this.height() <= (maxHeight + slack)) {
+				return;
+			}
+
+			// Compact layout did not resize block enough, switch to responsive layout
+			compact = false;
+			$this.removeClass('compact');
+			responsive = true;
+
+			if (!copied) {
+				var clone = links.clone(true);
+				clone.filter('.rightside').each(function() {
+					if (persist) $(this).addClass('clone');
+					menu.prepend(this);
+				});
+				
+				if (persist) {
+					menu.prepend(clone.not('.rightside').addClass('clone'));
+				} else {
+					menu.prepend(clone.not('.rightside'));
+				}
+
+				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
+				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
+
+				if ($this.hasClass('post-buttons')) {
+					$('.button', menu).removeClass('button icon-button');
+					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
+				}
+				copied = true;
+			}
+			else {
+				menu.children().css('display', '');
+			}
+
+			item.css('display', '');
+			$this.addClass('responsive');
+
+			// Try to not hide filtered items
+			if (filterLastList.length) {
+				links.not(filterLast).css('display', 'none');
+
+				maxHeight = 0;
+				filterLastList.each(function() {
+					if (!$(this).height()) return;
+					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+				});
+
+				if ($this.height() <= (maxHeight + slack)) {
+					menu.children().filter(filterLast).css('display', 'none');
+					return;
+				}
+			}
+
+			// If even responsive isn't enough, use both responsive and compact at same time
+			compact = true;
+			$this.addClass('compact');
+
+			links.css('display', 'none');
+		}
+
+		if (!persist) phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
+
+		check();
+		$(window).resize(check);
+	});
+
+	/**
+	* Do not run functions below for old browsers	
+	*/
+	if (oldBrowser) {
+		return;
+	}
+
 	/**
 	* Adjust topiclist lists with check boxes
 	*/
@@ -666,136 +824,6 @@ function parse_document(container)
 		}
 	});
 
-	/**
-	* Responsive link lists
-	*/
-	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
-		var $this = $(this),
-			$body = $('body'),
-			filterSkip = '.breadcrumbs, [data-skip-responsive]',
-			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
-			allLinks = $this.children(),
-			links = allLinks.not(filterSkip),
-			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
-			filterLastList = links.filter(filterLast);
-
-		if (links.is('.rightside'))
-		{
-			links.filter('.rightside:first').before(html);
-		}
-		else
-		{
-			$this.append(html);
-		}
-
-		var item = $this.children('.responsive-menu'),
-			menu = item.find('.dropdown-contents'),
-			lastWidth = false,
-			compact = false,
-			responsive = false,
-			copied = false;
-
-		function check() {
-			var width = $body.width();
-			if (responsive && width <= lastWidth) {
-				return;
-			}
-
-			// Reset responsive and compact layout
-			if (responsive) {
-				responsive = false;
-				$this.removeClass('responsive');
-				links.css('display', '');
-				item.css('display', 'none');
-			}
-
-			if (compact) {
-				compact = false;
-				$this.removeClass('compact');
-			}
-
-			// Find tallest element
-			var maxHeight = 0;
-			allLinks.each(function() {
-				if (!$(this).height()) return;
-				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
-			});
-
-			if (maxHeight < 1) {
-				return;
-			}
-
-			// Nothing to resize if block's height is not bigger than tallest element's height
-			if ($this.height() <= maxHeight) {
-				return;
-			}
-
-			// Enable compact layout, find tallest element, compare to height of whole block
-			compact = true;
-			$this.addClass('compact');
-
-			var compactMaxHeight = 0;
-			allLinks.each(function() {
-				if (!$(this).height()) return;
-				compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
-			});
-
-			if ($this.height() <= maxHeight) {
-				return;
-			}
-
-			// Compact layout did not resize block enough, switch to responsive layout
-			compact = false;
-			$this.removeClass('compact');
-			responsive = true;
-
-			if (!copied) {
-				var clone = links.clone(true);
-				clone.filter('.rightside').each(function() {
-					menu.prepend(this);
-				});
-				menu.prepend(clone.not('.rightside'));
-				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
-				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
-
-				if ($this.hasClass('post-buttons')) {
-					$('.button', menu).removeClass('button icon-button');
-					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
-				}
-				copied = true;
-			}
-			else {
-				menu.children().css('display', '');
-			}
-
-			item.css('display', '');
-			$this.addClass('responsive');
-
-			// Try to not hide filtered items
-			if (filterLastList.length) {
-				links.not(filterLast).css('display', 'none');
-
-				maxHeight = 0;
-				filterLastList.each(function() {
-					if (!$(this).height()) return;
-					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
-				});
-
-				if ($this.height() <= maxHeight) {
-					menu.children().filter(filterLast).css('display', 'none');
-					return;
-				}
-			}
-
-			links.css('display', 'none');
-		}
-
-		phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
-
-		check();
-		$(window).resize(check);
-	});
-
 	/**
 	* Responsive tabs
 	*/

phpBB/styles/prosilver/template/index_body.html

@@ -1,27 +1,15 @@
 <!-- INCLUDE overall_header.html -->
 
-<p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
+<p class="{S_CONTENT_FLOW_END} responsive-center time<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}<!-- IF U_MCP or U_ACP --> <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]<!-- ENDIF --></p><!-- ENDIF -->
+<!-- IF S_USER_LOGGED_IN --><p class="responsive-center time">{CURRENT_TIME}</p><!-- ENDIF -->
 
-<!-- EVENT index_body_linklist_before -->
+<!-- EVENT index_body_markforums_before -->
-
+<!-- IF U_MARK_FORUMS -->
-<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
+	<div class="action-bar compact">
-<ul class="linklist bulletin">
+		<a href="{U_MARK_FORUMS}" class="mark-read rightside" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a>
-	<!-- IF S_DISPLAY_SEARCH -->
+	</div>
-		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></li>
-		<!-- IF S_LOAD_UNREADS --> 
-			<li><a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a></li>
-		<!-- ENDIF -->
-		<!-- IF S_USER_LOGGED_IN -->
-			<li><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></li>
-		<!-- ENDIF -->
-		<li><a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
-	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside mark-read"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
-</ul>
 <!-- ENDIF -->
-
+<!-- EVENT index_body_markforums_after -->
-<!-- EVENT index_body_linklist_after -->
 
 <!-- INCLUDE forumlist_body.html -->
 

phpBB/styles/prosilver/template/navbar_footer.html

@@ -1,23 +1,25 @@
 <div class="navbar">
 	<div class="inner">
 
-	<ul class="linklist bulletin">
+	<ul id="nav-footer" class="linklist bulletin" role="menubar">
-		<li class="small-icon icon-home breadcrumbs">
+		<li class="small-icon icon-home breadcrumbs" role="navigation">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
 			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- EVENT overall_footer_breadcrumb_append -->
 		</li>
 		<!-- IF not S_IS_BOT -->
-			<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
+			<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-last-responsive="true"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 		<!-- ENDIF -->
+
 		<!-- EVENT overall_footer_timezone_before -->
 		<li class="rightside">{S_TIMEZONE}</li>
 		<!-- EVENT overall_footer_timezone_after -->
-		<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
+		<!-- IF not S_IS_BOT --><li class="small-icon icon-delete-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
+		<!-- IF S_REGISTERED_USER and S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside" data-last-responsive="true"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 		<!-- EVENT overall_footer_teamlink_before -->
-		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF -->
+		<!-- IF S_REGISTERED_USER and U_TEAM --><li class="small-icon icon-team rightside" data-last-responsive="true"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF -->
-		<!-- IF U_CONTACT_US --><li class="rightside"><a href="{U_CONTACT_US}">{L_CONTACT_US}</a></li><!-- ENDIF -->
 		<!-- EVENT overall_footer_teamlink_after -->
+		<!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside" data-last-responsive="true"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF -->
 	</ul>
 
 	</div>

phpBB/styles/prosilver/template/navbar_header.html

@@ -1,9 +1,89 @@
-<div class="navbar">
+<div class="navbar" role="navigation">
 	<div class="inner">
 
-	<ul class="linklist navlinks">
+	<ul id="nav-main" class="linklist bulletin" role="menubar">
+
+		<li id="quick-links" class="small-icon responsive-menu dropdown-container<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true">
+			<a href="#" class="responsive-menu-link dropdown-trigger">{L_QUICK_LINKS}</a>
+			<div class="dropdown hidden">
+				<div class="pointer"><div class="pointer-inner"></div></div>
+				<ul class="dropdown-contents" role="menu">
+					<!-- EVENT navbar_header_quick_links_before -->
+
+					<!-- IF S_DISPLAY_SEARCH -->
+						<li class="separator"></li>
+						<!-- IF S_REGISTERED_USER -->
+							<li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}" role="menuitem">{L_SEARCH_SELF}</a></li>
+						<!-- ENDIF -->
+						<li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}" role="menuitem">{L_SEARCH_UNANSWERED}</a></li>
+						<!-- IF S_LOAD_UNREADS --> 
+							<li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}" role="menuitem">{L_SEARCH_UNREAD}</a></li>
+						<!-- ENDIF -->
+						<!-- IF S_USER_LOGGED_IN -->
+							<li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}" role="menuitem">{L_SEARCH_NEW}</a></li>
+						<!-- ENDIF -->
+						<li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">{L_SEARCH_ACTIVE_TOPICS}</a></li>
+					<!-- ENDIF -->
+					<li class="separator"></li>
+
+					<!-- EVENT navbar_header_quick_links_after -->
+				</ul>
+			</div>
+		</li>
+		<!-- IF U_ACP --><li class="small-icon icon-acp" data-skip-responsive="true"><a href="{U_ACP}" title="{L_ACP}" role="menuitem">{L_ACP_SHORT}</a></li><!-- ENDIF -->
+		<!-- IF U_MCP --><li class="small-icon icon-mcp" data-skip-responsive="true"><a href="{U_MCP}" title="{L_MCP}" role="menuitem">{L_MCP_SHORT}</a></li><!-- ENDIF -->
+
+		<!-- EVENT overall_header_navigation_prepend -->
+		<li class="small-icon icon-faq" <!-- IF not S_USER_LOGGED_IN -->data-skip-responsive="true"<!-- ELSE -->data-last-responsive="true"<!-- ENDIF -->><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}" role="menuitem">{L_FAQ}</a></li>
+		<!-- EVENT overall_header_navigation_append -->
+
+	<!-- IF S_REGISTERED_USER -->
+		<li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true">
+			<!-- EVENT navbar_header_username_prepend -->
+			<div class="header-profile dropdown-container">
+				<a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a>
+				<div class="dropdown hidden">
+					<div class="pointer"><div class="pointer-inner"></div></div>
+					<ul class="dropdown-contents" role="menu">
+						<!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF -->
+	
+						<!-- EVENT navbar_header_profile_list_before -->
+	
+						<li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">{L_PROFILE}</a></li>
+						<li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">{L_READ_PROFILE}</a></li>
+	
+						<!-- EVENT navbar_header_profile_list_after -->
+	
+						<li class="separator"></li>
+						<li class="small-icon icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li>
+					</ul>
+				</div>
+			</div>
+			<!-- EVENT navbar_header_username_append -->
+		</li>
+		<!-- IF S_DISPLAY_PM -->
+			<li class="small-icon icon-pm rightside" data-skip-responsive="true">
+				<a href="{U_PRIVATEMSGS}" role="menuitem"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
+			</li>
+		<!-- ENDIF -->
+		<!-- IF S_NOTIFICATIONS_DISPLAY -->
+			<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true">
+				<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+				<!-- INCLUDE notification_dropdown.html -->
+			</li>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		<li class="small-icon icon-logout rightside"  data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li>
+		<!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) -->
+			<li class="small-icon icon-register rightside" data-skip-responsive="true"><a href="{U_REGISTER}" role="menuitem">{L_REGISTER}</a></li>
+		<!-- ENDIF -->
+		<!-- EVENT navbar_header_logged_out_content -->
+	<!-- ENDIF -->
+	</ul>
+
+	<ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar">
 		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-		<li class="small-icon icon-home breadcrumbs">
+		<li class="small-icon icon-home breadcrumbs" role="navigation">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
 			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- BEGIN navlinks -->
@@ -14,55 +94,9 @@
 			<!-- EVENT overall_header_breadcrumb_append -->
 		</li>
 
-		<!-- IF S_REGISTERED_USER -->
+		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
-			<li id="username_logged_in" class="rightside">
+			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li>
-				<!-- EVENT navbar_header_username_prepend -->
-				<!-- IF CURRENT_USER_AVATAR -->
-					<a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a>
-				<!-- ENDIF -->
-				{CURRENT_USERNAME_FULL}
-				<!-- EVENT navbar_header_username_append -->
-			</li>
-		<!-- ELSE -->
-			<li id="logged_out" class="rightside">
-				<!-- EVENT navbar_header_logged_out_content -->
-			</li>
 		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF -->
-	</ul>
-
-	<ul class="linklist bulletin">
-	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-		<!-- IF S_NOTIFICATIONS_DISPLAY -->
-		<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END}" data-skip-responsive="true">
-			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
-			<!-- INCLUDE notification_dropdown.html -->
-		</li>
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_PM -->
-			<li class="small-icon icon-pm">
-				<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
-			</li>
-		<!-- ENDIF -->
-		<li class="small-icon icon-ucp">
-			<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-		</li>
-		<!-- IF S_DISPLAY_SEARCH -->
-			<li class="icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li>
-		<!-- ENDIF -->
-		<!-- IF U_RESTORE_PERMISSIONS -->
-			<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-
-		<!-- EVENT overall_header_navigation_append -->
-		<!-- IF not S_IS_BOT -->
-			<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
-			<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-			<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-		<!-- ENDIF -->
-		<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
-		<!-- EVENT overall_header_navigation_prepend -->
 	</ul>
 
 	</div>

phpBB/styles/prosilver/template/viewforum_body.html

@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+
 <h2 class="forum-title"><!-- EVENT viewforum_forum_name_prepend --><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- EVENT viewforum_forum_name_append --></h2>
 
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
@@ -27,9 +27,9 @@
 
 <!-- IF S_HAS_SUBFORUM -->
 <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
-<ul class="linklist">
+	<div class="action-bar compact">
-	<li class="rightside mark-read"><a href="{U_MARK_FORUMS}" data-ajax="mark_forums_read">{L_MARK_SUBFORUMS_READ}</a></li>
+		<a href="{U_MARK_FORUMS}" class="mark-read rightside" data-ajax="mark_forums_read">{L_MARK_SUBFORUMS_READ}</a>
-</ul>
+	</div>
 <!-- ENDIF -->
 	<!-- INCLUDE forumlist_body.html -->
 <!-- ENDIF -->

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+
 <h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->

phpBB/styles/prosilver/template/viewtopic_topic_tools.html

@@ -7,16 +7,12 @@
 				<!-- EVENT viewtopic_topic_tools_before -->
 				<!-- IF U_WATCH_TOPIC -->
 					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
-						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
+						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">{S_WATCH_TOPIC_TITLE}</a>
-							{S_WATCH_TOPIC_TITLE}
-						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li class="small-icon icon-bookmark">
-						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">
+						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">{S_BOOKMARK_TOPIC}</a>
-							{S_BOOKMARK_TOPIC}
-						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->

phpBB/styles/prosilver/theme/bidi.css

@@ -59,20 +59,20 @@
 
 /* Horizontal lists
 ----------------------------------------*/
-.rtl ul.linklist li {
+.rtl ul.linklist > li {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 }
 
-.rtl ul.linklist li.rightside, .rtl p.rightside {
+.rtl ul.linklist > li.rightside, .rtl p.rightside, .rtl a.rightside {
 	float: left;
-	margin-right: 5px;
+	margin-right: 7px;
 	margin-left: 0;
 	text-align: left;
 }
 
-.rtl ul.leftside li, .rtl ul.rightside li {
+.rtl ul.leftside > li, .rtl ul.rightside > li {
 	float: left;
 }
 
@@ -92,11 +92,16 @@
 
 /* Bulletin icons for list items
 ----------------------------------------*/
-.rtl ul.linklist.bulletin li:before {
+.rtl ul.linklist.bulletin > li:before {
 	padding-left: 4px;
 	padding-right: 0;
 }
 
+.rtl ul.linklist li.responsive-menu a.responsive-menu-link:before {
+	left: auto;
+	right: 0;
+}
+
 /* Dropdown menu
 ---------------------------------------- */
 .rtl .dropdown-container.topic-tools {
@@ -112,6 +117,10 @@
 	padding-right: 10px;
 }
 
+.rtl .dropdown-extended .header {
+	text-align: right;
+}
+
 .rtl .dropdown-extended .header .header_settings {
 	float: left;
 }
@@ -276,12 +285,15 @@
 	text-align: left;
 }
 
-.rtl .forabg {
+.rtl #quick-links {
-	width: 99%;	/* fix for IE6 */
+	margin-left: 7px;
+	margin-right: 0;
 }
 
-.rtl .forumbg {
+.rtl .header-avatar span:after {
-	width: 99%;	/* fix for IE6 */
+	float: left;
+	margin-left: 0;
+	margin-right: 2px;
 }
 
 .rtl .member-search {
@@ -436,7 +448,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	margin-right: 2px;
 }
 
-.rtl dd.lastpost span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span {
+.rtl dd.lastpost > span, .rtl ul.topiclist dd.info > span, .rtl ul.topiclist dd.time > span, .rtl dd.redirect > span, .rtl dd.moderation > span {
 	padding-left: 0;
 	padding-right: 5px;
 }
@@ -616,7 +628,8 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 ---------------------------------------- */
 .rtl .small-icon {
 	background-position: 100% 50%;
-	padding: 0 19px 0 0;
+	padding-left: 0;
+	padding-right: 19px;
 }
 
 .rtl ul.linklist li.small-icon {

phpBB/styles/prosilver/theme/buttons.css

@@ -96,7 +96,7 @@ ul.linklist li.small-icon {
 	padding-left: 0;
 }
 
-ul.linklist.bulletin li.small-icon:before {
+ul.linklist.bulletin > li.small-icon:before {
 	display: none;
 }
 
@@ -157,7 +157,7 @@ ul.linklist.bulletin li.small-icon:before {
 	margin-top: 2px;
 }
 
-.post-buttons li {
+.post-buttons > li {
 	float: left;
 	margin-right: 3px;
 }

phpBB/styles/prosilver/theme/colours.css

@@ -111,7 +111,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) {
 ----------------------------------------*/
 
 ul.navlinks {
-	border-bottom-color: #FFFFFF;
+	border-top-color: #FFFFFF;
 }
 
 /* Table styles
@@ -374,7 +374,6 @@ a.arrow-right:hover {
 	color: #368AD2;
 }
 
-
 /*
 --------------------------------------------------------------
 Colours and backgrounds for content.css
@@ -699,24 +698,37 @@ Colours and backgrounds for buttons.css
 
 /* Icon images
 ---------------------------------------- */
-.icon-faq						{ background-image: url("./images/icon_faq.gif"); }
+.icon-acp					{ background-image: url("./images/icon_acp.gif"); }
-.icon-members					{ background-image: url("./images/icon_members.gif"); }
+.icon-bookmark				{ background-image: url("./images/icon_bookmark.gif"); }
-.icon-home						{ background-image: url("./images/icon_home.gif"); }
+.icon-bump					{ background-image: url("./images/icon_bump.gif"); }
-.icon-ucp						{ background-image: url("./images/icon_ucp.gif"); }
+.icon-contact				{ background-image: url("./images/icon_pm.gif"); }
-.icon-register					{ background-image: url("./images/icon_register.gif"); }
+.icon-delete-cookies		{ background-image: url("./images/icon_delete_cookies.gif"); }
-.icon-logout					{ background-image: url("./images/icon_logout.gif"); }
+.icon-download				{ background-image: url("./images/icon_download.gif"); }
-.icon-bookmark					{ background-image: url("./images/icon_bookmark.gif"); }
+.icon-faq					{ background-image: url("./images/icon_faq.gif"); }
-.icon-bump						{ background-image: url("./images/icon_bump.gif"); }
+.icon-home					{ background-image: url("./images/icon_home.gif"); }
-.icon-subscribe					{ background-image: url("./images/icon_subscribe.gif"); }
+.icon-logout				{ background-image: url("./images/icon_logout.gif"); }
-.icon-unsubscribe				{ background-image: url("./images/icon_unsubscribe.gif"); }
+.icon-mark					{ background-image: url("./images/icon_mark.gif"); }
-.icon-pages						{ background-image: url("./images/icon_pages.gif"); }
+.icon-mcp					{ background-image: url("./images/icon_mcp.gif"); }
+.icon-members				{ background-image: url("./images/icon_members.gif"); }
+.icon-notification			{ background-image: url("./images/icon_notification.gif"); }
+.icon-pages					{ background-image: url("./images/icon_pages.gif"); }
+.icon-pm					{ background-image: url("./images/icon_pm.gif"); }
+.icon-print					{ background-image: url("./images/icon_print.gif"); }
+.icon-profile				{ background-image: url("./images/icon_profile.gif"); }
+.icon-quick-links			{ background-image: url("./images/icon_quick_links.gif"); }
+.icon-register				{ background-image: url("./images/icon_register.gif"); }
 .icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
-.icon-notification				{ background-image: url("./images/icon_notification.gif"); }
+.icon-search-active			{ background-image: url("./images/subforum_read.gif"); }
-.icon-pm						{ background-image: url("./images/icon_pm.gif"); }
+.icon-search-advanced		{ background-image: url("./images/icon_search_adv.gif"); }
-.icon-download					{ background-image: url("./images/icon_download.gif"); }
+.icon-search-new			{ background-image: url("./images/subforum_unread.gif"); }
-.icon-mark						{ background-image: url("./images/icon_mark.gif"); }
+.icon-search-self			{ background-image: url("./images/icon_topic_latest.gif"); }
-.icon-sendemail					{ background-image: url("./images/icon_sendemail.gif"); }
+.icon-search-unanswered		{ background-image: url("./images/icon_post_target.gif"); }
-.icon-print						{ background-image: url("./images/icon_print.gif"); }
+.icon-search-unread			{ background-image: url("./images/subforum_unread.gif"); }
+.icon-sendemail				{ background-image: url("./images/icon_sendemail.gif"); }
+.icon-subscribe				{ background-image: url("./images/icon_subscribe.gif"); }
+.icon-team					{ background-image: url("./images/icon_team.gif"); }
+.icon-ucp					{ background-image: url("./images/icon_ucp.gif"); }
+.icon-unsubscribe			{ background-image: url("./images/icon_unsubscribe.gif"); }
 
 /* Profile & navigation icons */
 .contact-icon													{ background-image: url("./images/icons_contact.png"); }
@@ -1127,7 +1139,7 @@ input.disabled {
 }
 
 .dropdown-extended ul li {
-	border-bottom-color: #B9B9B9;
+	border-top-color: #B9B9B9;
 }
 
 .dropdown-extended ul li:hover {
@@ -1189,6 +1201,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	border-color: #DCDCDC;
 }
 
+.dropdown li.separator {
+	border-color: #DCDCDC;
+}
+
 /* Notifications
 ---------------------------------------- */
 

phpBB/styles/prosilver/theme/common.css

@@ -271,7 +271,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 }
 
 .navbar {
-	padding: 5px 10px 5px 10px;
+	padding: 3px 10px;
 	border-radius: 7px;
 }
 
@@ -317,6 +317,10 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
 
 /* Horizontal lists
 ----------------------------------------*/
+.navbar ul.linklist {
+	padding: 2px 0;
+}
+
 ul.linklist {
 	display: block;
 	margin: 0;
@@ -332,29 +336,25 @@ ul.linklist:after {
 	padding: 5px 10px;
 }
 
-ul.linklist li {
+ul.linklist > li {
-	display: block;
-	list-style-type: none;
 	float: left;
-	width: auto;
-	margin-right: 5px;
 	font-size: 1.1em;
 	line-height: 2.2em;
+	list-style-type: none;
+	margin-right: 7px;
 	padding-top: 1px;
+	width: auto;
 }
 
-ul.linklist li.rightside, p.rightside {
+ul.linklist > li.rightside, p.rightside, a.rightside {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 	text-align: right;
 }
 
 ul.navlinks {
-	padding-bottom: 1px;
+	border-top: 1px solid transparent;
-	margin-bottom: 1px;
-	border-bottom: 1px solid transparent;
-	font-weight: bold;
 }
 
 ul.leftside {
@@ -382,7 +382,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
 	font-size: 16px;
 	position: relative;
 	width: 16px;
-	line-height: 16.5px;
+	line-height: 20px;
 	text-decoration: none;
 }
 
@@ -413,27 +413,18 @@ li.responsive-menu.dropdown-left .dropdown {
 	right: -6px;
 }
 
-li.responsive-menu .dropdown .dropdown-contents {
+ul.linklist .dropdown {
-	padding: 0 5px;
-}
-
-ul.linklist .dropdown-down .dropdown {
 	top: 22px;
 }
 
 ul.linklist .dropdown-up .dropdown {
 	bottom: 18px;
+	top: auto;
 }
 
-ul.linklist .dropdown li {
-	clear: both;
-}
-
-
-
 /* Bulletin icons for list items
 ----------------------------------------*/
-ul.linklist.bulletin li:before {
+ul.linklist.bulletin > li:before {
 	display: inline-block;
 	content: "\2022";
 	font-size: inherit;
@@ -441,11 +432,12 @@ ul.linklist.bulletin li:before {
 	padding-right: 4px;
 }
 
-ul.linklist.bulletin li:first-child:before, ul.linklist.bulletin li.rightside:last-child:before {
+ul.linklist.bulletin > li:first-child:before, 
+ul.linklist.bulletin > li.rightside:last-child:before {
 	content: none;
 }
 
-ul.linklist.bulletin li.no-bulletin:before {
+ul.linklist.bulletin > li.no-bulletin:before {
 	content: none;
 }
 
@@ -453,14 +445,32 @@ ul.linklist.bulletin li.no-bulletin:before {
 	display: none !important;
 }
 
-/* Avatar in overall_header.html */
+/* Profile in overall_header.html */
+.header-profile {
+	display: inline-block;
+	vertical-align: top;
+}
+
+.header-avatar:hover {
+	text-decoration: none;
+}
+
 .header-avatar img {
 	margin-bottom: 2px;
-	max-height: 25px;
+	max-height: 20px;
 	vertical-align: middle;
 	width: auto;
 }
 
+.header-avatar span:after {
+	content: '\25BC';
+	display: inline-block;
+	font-size: 9px;
+	float: right;
+	margin-left: 2px;
+	opacity: 0.7;
+}
+
 /* Dropdown menu
 ----------------------------------------*/
 .dropdown-container {
@@ -566,14 +576,14 @@ ul.linklist.bulletin li.no-bulletin:before {
 	padding: 5px;
 	position: relative;
 	min-width: 40px;
-	max-height: 200px;
+	max-height: 300px;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
 .dropdown li {
-	border-bottom: 1px dotted transparent;
+	border-top: 1px dotted transparent;
 	float: none !important;
 	line-height: normal !important;
 	font-size: 1em !important;
@@ -585,8 +595,8 @@ ul.linklist.bulletin li.no-bulletin:before {
 	text-align: left;
 }
 
-.dropdown li:last-child, .dropdown li li {
+.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
-	border-bottom: 0;
+	border-top: 0;
 }
 
 .dropdown li li:first-child {
@@ -606,7 +616,13 @@ ul.linklist.bulletin li.no-bulletin:before {
 	white-space: normal;
 }
 
-.dropdown li:before, .dropdown li:after {
+.dropdown li.separator {
+	border-top: 1px solid transparent;
+	margin: 4px 0;
+	padding: 0;
+}
+
+.dropdown li.separator:first-child, .dropdown li.separator:last-child {
 	display: none !important;
 }
 
@@ -614,6 +630,7 @@ ul.linklist.bulletin li.no-bulletin:before {
 ----------------------------------------*/
 .breadcrumbs .crumb {
 	float: left;
+	font-weight: bold;
 	word-wrap: normal;
 }
 
@@ -1109,11 +1126,7 @@ form > p.post-notice strong {
 
 .dropdown-extended {
 	display: none;
-	position: absolute;
-	left: 0;
-	width: 340px;
 	z-index: 1;
-	top: 22px;
 }
 
 .dropdown-extended ul {
@@ -1127,24 +1140,30 @@ form > p.post-notice strong {
 	padding: 0;
 	margin: 0 !important;
 	float: none;
-	border-bottom: 1px solid;
+	border-top: 1px solid;
 	list-style-type: none;
 	font-size: 0.95em;
 	clear: both;
 	position: relative;
 }
 
-.dropdown-extended ul li.no_notifications {
+.dropdown-extended ul li:first-child {
-	padding: 10px;
+	border-top: none;
 }
 
-.dropdown-extended ul li:before, .dropdown-extended ul li:after {
+.dropdown-extended ul li.no_notifications {
-	display: none;
+	padding: 10px;
 }
 
 .dropdown-extended .dropdown-contents {
 	max-height: none;
 	padding: 0;
+	position: absolute;
+	width: 340px;
+}
+
+.nojs .dropdown-extended .dropdown-contents {
+	position: relative;
 }
 
 .dropdown-extended .header {
@@ -1152,6 +1171,7 @@ form > p.post-notice strong {
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 11px;
 	font-weight: bold;
+	text-align: left;
 	text-shadow: 1px 1px 1px white;
 	text-transform: uppercase;	
 	line-height: 30px;
@@ -1243,6 +1263,30 @@ form > p.post-notice strong {
 	display: block;
 }
 
+/* Navbar specific list items
+----------------------------------------*/
+
+#quick-links {
+	margin: 0 7px 0 0;
+}
+
+#quick-links a.responsive-menu-link {
+	display: block;
+	font-size: inherit;
+	line-height: inherit;
+	margin: 0;
+	width: auto;
+}
+
+#quick-links a.responsive-menu-link:before {
+	font-size: 16px;
+	line-height: 16.5px;
+}
+
+.compact #quick-links a.responsive-menu-link {
+	font-size: 0;
+}
+
 .compact .icon-notification > a > span, .compact .icon-pm > a > span {
 	display: none;
 }
@@ -1262,3 +1306,19 @@ form > p.post-notice strong {
 .dropdown-page-jump input.tiny {
 	width: 50px;
 }
+
+.dropdown .clone {
+	display: none;
+}
+
+.responsive .dropdown .clone {
+	display: inherit;
+}
+
+.dropdown .clone + li.separator {
+	display: none;
+}
+
+.responsive .dropdown .clone + li.separator {
+	display: inherit;
+}

phpBB/styles/prosilver/theme/content.css

@@ -210,7 +210,7 @@ dd.time {
 	line-height: 200%;
 }
 
-dd.lastpost span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span {
+dd.lastpost > span, ul.topiclist dd.info > span, ul.topiclist dd.time > span, dd.redirect > span, dd.moderation > span {
 	display: block;
 	padding-left: 5px;
 }
@@ -351,10 +351,6 @@ dd.option {
 	line-height: 1.4em;
 }
 
-span.corners-top, span.corners-bottom {
-    display: none;
-}
-
 dl.faq {
 	font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
 	font-size: 1.1em;

phpBB/styles/prosilver/theme/responsive.css

@@ -72,7 +72,7 @@ html {
 .responsive-search a {
 	display: block;
 	width: 16px;
-	height: 18px;
+	height: 22px;
 	text-indent: 99px;
 	overflow: hidden;
 	background-position: 50% 50%;
@@ -189,8 +189,8 @@ ul.topiclist li.row dt a.subforum {
 ----------------------------------------*/
 @media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
 {
-	.dropdown-extended {
+	.dropdown-extended .dropdown-contents {
-		width: 250px;
+		width: auto;
 	}
 }
 

phpBB/styles/prosilver/theme/tweaks.css

@@ -69,5 +69,5 @@ dd.option {
 
 /* Fixes header-avatar aspect-ratio in IE8 */
 .header-avatar img {
-	height: 25px;
+	height: 20px;
 }

phpBB/styles/subsilver2/template/index_body.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<!-- EVENT index_body_linklist_before -->
+<!-- EVENT index_body_markforums_before -->
 
 <!-- IF U_MCP or U_ACP -->
 	<div id="pageheader">
@@ -10,7 +10,7 @@
 	<br clear="all" /><br />
 <!-- ENDIF -->
 
-<!-- EVENT index_body_linklist_after -->
+<!-- EVENT index_body_markforums_after -->
 
 <!-- INCLUDE forumlist_body.html -->
 

tests/functions/obtain_online_test.php

@@ -128,19 +128,19 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case
 	{
 		return array(
 			array(0, false, array(
-				'online_userlist'	=> 'REGISTERED_USERS 2, 3',
+				'online_userlist'	=> 'REGISTERED_USERS <span class="username">2</span>, <span class="username">3</span>',
 				'l_online_users'	=> 'ONLINE_USERS_TOTAL 5 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3',
 			)),
 			array(0, true, array(
-				'online_userlist'	=> 'REGISTERED_USERS 2, 3',
+				'online_userlist'	=> 'REGISTERED_USERS <span class="username">2</span>, <span class="username">3</span>',
 				'l_online_users'	=> 'ONLINE_USERS_TOTAL_GUESTS 7 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3 GUEST_USERS_TOTAL 2',
 			)),
 			array(1, false, array(
-				'online_userlist'	=> 'BROWSING_FORUM 3',
+				'online_userlist'	=> 'BROWSING_FORUM <span class="username">3</span>',
 				'l_online_users'	=> 'ONLINE_USERS_TOTAL 2 REG_USERS_TOTAL 1 HIDDEN_USERS_TOTAL 1',
 			)),
 			array(1, true, array(
-				'online_userlist'	=> 'BROWSING_FORUM_GUESTS 1 3',
+				'online_userlist'	=> 'BROWSING_FORUM_GUESTS 1 <span class="username">3</span>',
 				'l_online_users'	=> 'ONLINE_USERS_TOTAL_GUESTS 3 REG_USERS_TOTAL 1 HIDDEN_USERS_TOTAL 1 GUEST_USERS_TOTAL 1',
 			)),
 			array(2, false, array(

tests/functions_content/get_username_string_test.php

@@ -94,11 +94,11 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 		global $phpbb_root_path, $phpEx;
 
 		return array(
-			array(0, '', '', false, false, 'Guest'),
+			array(0, '', '', false, false, '<span class="username">Guest</span>'),
-			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
+			array(ANONYMOUS, 'Anonymous', '', false, false, '<span class="username">Anonymous</span>'),
 			array(2, 'Administrator', 'FF0000', false, false, '<a href="' . $phpbb_root_path . 'memberlist.' . $phpEx . '?mode=viewprofile&amp;u=2" style="color: #FF0000;" class="username-coloured">Administrator</a>'),
-			array(5, 'User5', '', false, 'http://www.example.org/user.php?mode=show', '<a href="http://www.example.org/user.php?mode=show&amp;u=5">User5</a>'),
+			array(5, 'User5', '', false, 'http://www.example.org/user.php?mode=show', '<a href="http://www.example.org/user.php?mode=show&amp;u=5" class="username">User5</a>'),
-			array(8, 'Eight', '', false, false, '<a href="' . $phpbb_root_path . 'memberlist.php?mode=viewprofile&amp;u=8">Eight</a>'),
+			array(8, 'Eight', '', false, false, '<a href="' . $phpbb_root_path . 'memberlist.php?mode=viewprofile&amp;u=8" class="username">Eight</a>'),
 		);
 	}
 
@@ -113,10 +113,10 @@ class phpbb_functions_content_get_username_string_test extends phpbb_test_case
 	public function get_username_string_no_profile_data()
 	{
 		return array(
-			array(ANONYMOUS, 'Anonymous', '', false, false, 'Anonymous'),
+			array(ANONYMOUS, 'Anonymous', '', false, false, '<span class="username">Anonymous</span>'),
-			array(ANONYMOUS, 'Anonymous', '', '', false, 'Guest'),
+			array(ANONYMOUS, 'Anonymous', '', '', false, '<span class="username">Guest</span>'),
 			array(2, 'Administrator', 'FF0000', false, false, '<span style="color: #FF0000;" class="username-coloured">Administrator</span>'),
-			array(8, 'Eight', '', false, false, 'Eight'),
+			array(8, 'Eight', '', false, false, '<span class="username">Eight</span>'),
 		);
 	}
 

tests/log/function_view_log_test.php

@@ -40,7 +40,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -59,7 +59,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -78,7 +78,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -97,7 +97,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -118,7 +118,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -139,7 +139,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -160,7 +160,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -177,11 +177,11 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'reportee_id'			=> 2,
 				'reportee_username'		=> 'admin',
-				'reportee_username_full'=> 'admin',
+				'reportee_username_full'=> '<span class="username">admin</span>',
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -196,11 +196,11 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'reportee_id'			=> 1,
 				'reportee_username'		=> 'Anonymous',
-				'reportee_username_full'=> 'Anonymous',
+				'reportee_username_full'=> '<span class="username">Anonymous</span>',
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -219,7 +219,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,
@@ -238,7 +238,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 				'user_id'			=> 1,
 				'username'			=> 'Anonymous',
-				'username_full'		=> 'Anonymous',
+				'username_full'		=> '<span class="username">Anonymous</span>',
 
 				'ip'				=> '127.0.0.1',
 				'time'				=> 1,

tests/notification/user_list_trim_test.php

@@ -86,7 +86,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 						array('username' => '', 'poster_id' => 3),
 					),			
 				),
-				'<strong>Reply</strong> from A and B in topic:',
+				'<strong>Reply</strong> from A and <span class="username">B</span> in topic:',
 			),
 			array(
 				array(
@@ -98,7 +98,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 						array('username' => '', 'poster_id' => 4),
 					),			
 				),
-				'<strong>Reply</strong> from A, B, and C in topic:',
+				'<strong>Reply</strong> from A, <span class="username">B</span>, and <span class="username">C</span> in topic:',
 			),
 			array(
 				array(
@@ -111,7 +111,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 						array('username' => '', 'poster_id' => 5),
 					),			
 				),
-				'<strong>Reply</strong> from A, B, C, and D in topic:',
+				'<strong>Reply</strong> from A, <span class="username">B</span>, <span class="username">C</span>, and <span class="username">D</span> in topic:',
 			),
 			array(
 				array(
@@ -125,7 +125,7 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 						array('username' => '', 'poster_id' => 6),
 					),			
 				),
-				'<strong>Reply</strong> from A, B, C, and 2 others in topic:',
+				'<strong>Reply</strong> from A, <span class="username">B</span>, <span class="username">C</span>, and 2 others in topic:',
 			),
 		);
 	}