[ticket/12662] Initial setup

PHPBB3-12662

phpBB/docs/events.md

@@ -515,6 +515,34 @@ overall_header_page_body_before
 * Since: 3.1.0-b3
 * Purpose: Add content after the page-header, but before the page-body
 
+overall_header_profile_list_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the profile drop-down menu in the page-header
+
+overall_header_profile_list_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the profile drop-down menu in the page-header
+
+overall_header_quick_links_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the bottom of the quick-links drop-down menu in the header
+
+overall_header_quick_links_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b5
+* Purpose: Add links to the top of the quick-links drop-down menu in the header
+
 posting_editor_buttons_after
 ===
 * Locations:

phpBB/includes/functions.php

@@ -4881,6 +4881,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_CLEAN'		=> 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/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',
@@ -594,6 +594,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',
@@ -660,15 +662,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_UNREAD'				=> 'View unread posts',
+	'SEARCH_UNANSWERED'			=> 'Unanswered 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

@@ -673,20 +673,24 @@ function parse_document(container)
 		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',
+			filterLast = '.pagination, .icon-acp, .icon-mcp, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
+			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);
 
+		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'),
@@ -706,7 +710,7 @@ function parse_document(container)
 				responsive = false;
 				$this.removeClass('responsive');
 				links.css('display', '');
-				item.css('display', 'none');
+				if (!persist) item.css('display', 'none');
 			}
 
 			if (compact) {
@@ -752,9 +756,16 @@ function parse_document(container)
 			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');
 
@@ -771,7 +782,7 @@ function parse_document(container)
 			item.css('display', '');
 			$this.addClass('responsive');
 
-			// Try to not hide filtered items
+			// Try to not hide filtered items #TODO: this does not work!
 			if (filterLastList.length) {
 				links.not(filterLast).css('display', 'none');
 
@@ -787,10 +798,14 @@ function parse_document(container)
 				}
 			}
 
+			// If even responsive isn't enough, use both responsive and compact at same time
+			compact = true;
+			$this.addClass('compact');
+
 			links.css('display', 'none');
 		}
 
-		phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
+		if (!persist) phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
 
 		check();
 		$(window).resize(check);

phpBB/styles/prosilver/template/index_body.html

@@ -1,23 +1,13 @@
 <!-- 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>
-<!-- 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 -->
+<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 time">{CURRENT_TIME}</p><!-- ENDIF -->
 
 <!-- EVENT index_body_linklist_before -->
 
-<!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
+<!-- IF not S_IS_BOT and U_MARK_FORUMS -->
 <ul class="linklist bulletin">
-	<!-- IF S_DISPLAY_SEARCH -->
-		<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 -->
+	<li class="rightside mark-read"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a></li>
 </ul>
 <!-- ENDIF -->
 

phpBB/styles/prosilver/template/navbar_footer.html

@@ -10,13 +10,25 @@
 		<!-- 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 -->
 		<!-- 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-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</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 U_CONTACT_US --><li class="rightside"><a href="{U_CONTACT_US}">{L_CONTACT_US}</a></li><!-- ENDIF -->
+
+		<!-- IF S_USER_LOGGED_IN and not S_IS_BOT -->
+			<!-- IF U_TEAM -->
+				<li class="small-icon icon-members rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li>
+			<!-- ENDIF -->
+			<!-- IF S_DISPLAY_MEMBERLIST -->
+				<li class="small-icon icon-members rightside">
+					<a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a>
+				</li>
+			<!-- ENDIF -->
+		<!-- ENDIF -->
+		<!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside"><a href="{U_CONTACT_US}">{L_CONTACT_US}</a></li><!-- ENDIF -->
+
 		<!-- EVENT overall_footer_teamlink_after -->
 	</ul>
 

phpBB/styles/prosilver/template/navbar_header.html

@@ -1,68 +1,107 @@
 <div class="navbar">
 	<div class="inner">
 
-	<ul class="linklist navlinks">
+	<ul id="nav-main" class="linklist bulletin">
+
+		<li id="quick-links" class="small-icon responsive-menu dropdown-container" 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">
+					<!-- EVENT overall_header_quick_links_before -->
+
+					<!-- <!-- IF S_USER_LOGGED_IN and not S_IS_BOT -->
+						<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
+						<!-- IF U_TEAM --><li class="small-icon icon-team"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF -->
+					<!-- ENDIF --> -->
+
+					<li class="separator"></li>
+
+					<!-- IF S_USER_LOGGED_IN and not S_IS_BOT -->
+						<li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a></li>
+					<!-- ENDIF -->
+					<li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a></li>
+					<!-- IF S_LOAD_UNREADS --> 
+						<li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a></li>
+					<!-- ENDIF -->
+					<!-- IF S_USER_LOGGED_IN -->
+						<li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></li>
+					<!-- ENDIF -->
+					<li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
+
+					<li class="separator"></li>
+					<!-- EVENT overall_header_quick_links_after -->
+				</ul>
+			</div>
+		</li>
+		<!-- IF S_REGISTERED_USER and U_ACP -->
+			<li class="small-icon icon-acp" data-skip-responsive="true"><a href="{U_ACP}" title="{L_ACP}">{L_ACP_SHORT}</a></li>
+		<!-- ENDIF -->
+		<!-- IF S_REGISTERED_USER and U_MCP -->
+			<li class="small-icon icon-mcp" data-skip-responsive="true"><a href="{U_MCP}" title="{L_MCP}">{L_MCP_SHORT}</a></li>
+		<!-- ENDIF -->
+
+		<!-- EVENT overall_header_navigation_prepend -->
+		<li class="small-icon icon-faq"<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> data-skip-responsive="true"<!-- ENDIF -->><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
+		<!-- EVENT overall_header_navigation_append -->
+
+	<!-- IF S_USER_LOGGED_IN and not S_IS_BOT -->
+		<li id="username_logged_in" class="rightside dropdown-container<!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true">
+			<a href="{U_PROFILE}" class="header-avatar dropdown-trigger icon-dropdown"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_CLEAN}</a>
+			<div class="dropdown hidden">
+				<div class="pointer"><div class="pointer-inner"></div></div>
+				<ul class="dropdown-contents">
+					<!-- IF U_RESTORE_PERMISSIONS --><li class="small-icon icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li><!-- ENDIF -->
+
+					<!-- EVENT overall_header_profile_list_before -->
+
+					<li class="small-icon icon-ucp"><a href="{U_PROFILE}" title="{L_PROFILE}">{L_PROFILE}</a></li>
+					<li class="small-icon icon-profile"><a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}">{L_READ_PROFILE}</a></li>
+
+					<!-- EVENT overall_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">{L_LOGIN_LOGOUT}</a></li>
+				</ul>
+			</div>
+		</li>
+		<!-- IF S_DISPLAY_PM -->
+			<li class="small-icon icon-pm rightside" data-skip-responsive="true">
+				<a href="{U_PRIVATEMSGS}"><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 rightside" data-skip-responsive="true">
+				<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+				<!-- INCLUDE notification_dropdown.html -->
+			</li>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+
+	<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
+		<li class="small-icon icon-logout rightside"  data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{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}">{L_REGISTER}</a></li>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+	</ul>
+
+	<ul id="nav-breadcrumbs" class="linklist navlinks">
 		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
 		<li class="small-icon icon-home breadcrumbs">
-			<!-- 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>
+			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span>
 			<!-- BEGIN navlinks -->
 				<!-- EVENT overall_header_navlink_prepend -->
-				<span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a></span>
+				<span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span>
 				<!-- EVENT overall_header_navlink_append -->
 			<!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append -->
 		</li>
 
-		<!-- IF S_REGISTERED_USER -->
-			<li id="username_logged_in" class="rightside">
-				<!-- EVENT navbar_header_username_prepend -->
-				<!-- IF CURRENT_USER_AVATAR -->
-					<a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a>
+		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
+			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li>
 		<!-- 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 -->

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/theme/bidi.css

@@ -62,12 +62,12 @@
 .rtl ul.linklist li {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 }
 
 .rtl ul.linklist li.rightside, .rtl p.rightside {
 	float: left;
-	margin-right: 5px;
+	margin-right: 7px;
 	margin-left: 0;
 	text-align: left;
 }

phpBB/styles/prosilver/theme/colours.css

@@ -106,7 +106,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
@@ -369,6 +369,10 @@ a.arrow-right:hover {
 	color: #368AD2;
 }
 
+a.icon-dropdown:after {
+	background-image: url("./images/icon_dropdown.png");
+}
+
 
 /*
 --------------------------------------------------------------
@@ -696,22 +700,34 @@ Colours and backgrounds for buttons.css
 ---------------------------------------- */
 .icon-faq						{ background-image: url("./images/icon_faq.gif"); }
 .icon-members					{ background-image: url("./images/icon_members.gif"); }
+.icon-team						{ background-image: url("./images/icon_team.gif"); }
+.icon-cookies					{ background-image: url("./images/icon_cookies.gif"); }
 .icon-home						{ background-image: url("./images/icon_home.gif"); }
+.icon-acp						{ background-image: url("./images/icon_acp.gif"); }
+.icon-mcp						{ background-image: url("./images/icon_mcp.gif"); }
 .icon-ucp						{ background-image: url("./images/icon_ucp.gif"); }
+.icon-profile					{ background-image: url("./images/icon_profile.gif"); }
 .icon-register					{ background-image: url("./images/icon_register.gif"); }
+.icon-quick-links				{ background-image: url("./images/icon_quick_links.gif"); }
 .icon-logout					{ background-image: url("./images/icon_logout.gif"); }
 .icon-bookmark					{ background-image: url("./images/icon_bookmark.gif"); }
 .icon-bump						{ background-image: url("./images/icon_bump.gif"); }
 .icon-subscribe					{ background-image: url("./images/icon_subscribe.gif"); }
 .icon-unsubscribe				{ background-image: url("./images/icon_unsubscribe.gif"); }
 .icon-pages						{ background-image: url("./images/icon_pages.gif"); }
-.icon-search, .responsive-search a	{ 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"); }
 .icon-download					{ background-image: url("./images/icon_download.gif"); }
 .icon-mark						{ background-image: url("./images/icon_mark.gif"); }
 .icon-sendemail					{ background-image: url("./images/icon_sendemail.gif"); }
 .icon-print						{ background-image: url("./images/icon_print.gif"); }
+.icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
+.icon-search-advanced			{ background-image: url("./images/icon_search_adv.gif"); }
+.icon-search-self				{ background-image: url("./images/icon_topic_latest.gif"); }
+.icon-search-unanswered			{ background-image: url("./images/icon_post_target.gif"); }
+.icon-search-unread				{ background-image: url("./images/subforum_unread.gif"); }
+.icon-search-new				{ background-image: url("./images/subforum_unread.gif"); }
+.icon-search-active				{ background-image: url("./images/subforum_read.gif"); }
 
 /* Profile & navigation icons */
 .contact-icon													{ background-image: url("./images/icons_contact.png"); }
@@ -1184,6 +1200,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

@@ -261,7 +261,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;
 }
 
@@ -307,6 +307,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;
@@ -327,7 +331,7 @@ ul.linklist li {
 	list-style-type: none;
 	float: left;
 	width: auto;
-	margin-right: 5px;
+	margin-right: 7px;
 	font-size: 1.1em;
 	line-height: 2.2em;
 	padding-top: 1px;
@@ -336,15 +340,12 @@ ul.linklist li {
 ul.linklist li.rightside, p.rightside {
 	float: right;
 	margin-right: 0;
-	margin-left: 5px;
+	margin-left: 7px;
 	text-align: right;
 }
 
 ul.navlinks {
-	padding-bottom: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid transparent;
-	font-weight: bold;
+	border-top: 1px solid transparent;
 }
 
 ul.leftside {
@@ -372,7 +373,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;
 }
 
@@ -403,10 +404,6 @@ li.responsive-menu.dropdown-left .dropdown {
 	right: -6px;
 }
 
-li.responsive-menu .dropdown .dropdown-contents {
-	padding: 0 5px;
-}
-
 ul.linklist .dropdown-down .dropdown {
 	top: 22px;
 }
@@ -417,10 +414,10 @@ ul.linklist .dropdown-up .dropdown {
 
 ul.linklist .dropdown li {
 	clear: both;
+	margin: 0;
+	padding: 4px 4px 4px 0;
 }
 
-
-
 /* Bulletin icons for list items
 ----------------------------------------*/
 ul.linklist.bulletin li:before {
@@ -444,9 +441,13 @@ ul.linklist.bulletin li.no-bulletin:before {
 }
 
 /* Avatar in overall_header.html */
+.header-avatar:hover {
+	text-decoration: none;
+}
+
 .header-avatar img {
 	margin-bottom: 2px;
-	max-height: 25px;
+	max-height: 20px;
 	vertical-align: middle;
 	width: auto;
 }
@@ -556,14 +557,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;
@@ -575,8 +576,8 @@ ul.linklist.bulletin li.no-bulletin:before {
 	text-align: left;
 }
 
-.dropdown li:last-child, .dropdown li li {
-	border-bottom: 0;
+.dropdown li:first-child, .dropdown li.separator + li, .dropdown li li {
+	border-top: 0;
 }
 
 .dropdown li li:first-child {
@@ -600,10 +601,33 @@ ul.linklist.bulletin li.no-bulletin:before {
 	display: none !important;
 }
 
+.dropdown li.separator {
+	border-top: 1px solid transparent;
+}
+
+.dropdown li.separator, ul.linklist .dropdown li.separator {
+	margin: 3px 0;
+	padding: 0;
+}
+
+.dropdown li.separator:first-child, .dropdown li.separator:last-child {
+	display: none !important;
+}
+
+.dropdown .clone + li.separator {
+	display: none;
+}
+
+.responsive .dropdown .clone + li.separator {
+	display: inherit;
+}
+
+
 /* Responsive breadcrumbs
 ----------------------------------------*/
 .breadcrumbs .crumb {
 	float: left;
+	font-weight: bold;
 	word-wrap: normal;
 }
 
@@ -1233,6 +1257,30 @@ form > p.post-notice strong {
 	display: block;
 }
 
+/* Main navigation 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;
 }
@@ -1252,3 +1300,11 @@ form > p.post-notice strong {
 .dropdown-page-jump input.tiny {
 	width: 50px;
 }
+
+.dropdown .clone {
+	display: none;
+}
+
+.responsive .dropdown .clone {
+	display: inherit;
+}

phpBB/styles/prosilver/theme/links.css

@@ -75,6 +75,22 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	width: 40px;
 }
 
+/* Dropdown links (inline) */
+a.icon-dropdown:after {
+	background-position: 0 0;
+	background-repeat: no-repeat;
+	content: '';
+	display: inline-block;
+	float: right;
+	height: 8px;
+	width: 11px;
+	margin: 9px 0 0 2px;
+}
+
+a.icon-dropdown:hover:after, .dropdown-visible a.icon-dropdown:after {
+	background-position: 0 -22px;
+}
+
 /* Links for forum/topic lists */
 a.forumtitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;

phpBB/styles/prosilver/theme/responsive.css

@@ -73,7 +73,7 @@ body {
 .responsive-search a {
 	display: block;
 	width: 16px;
-	height: 18px;
+	height: 22px;
 	text-indent: 99px;
 	overflow: hidden;
 	background-position: 50% 50%;