From 175d83146e1485b4fcb92cd82bc9fc6cbf2ed4d1 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 23 Mar 2014 15:39:09 +0100
Subject: [PATCH] [ticket/9758] Adding impr. for overall_header display of
 avatar and username

PHPBB3-9758
---
 phpBB/includes/functions.php                        | 3 ++-
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 phpBB/styles/prosilver/theme/common.css             | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c6ae3828f5..c805a9fe67 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4772,7 +4772,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 	if ($user->data['user_id'] != ANONYMOUS)
 	{
 		$u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout', true, $user->session_id);
-		$l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']);
+		$l_login_logout = sprintf($user->lang['LOGOUT'], $user->data['username']);
 	}
 	else
 	{
@@ -4946,6 +4946,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		'SESSION_ID'		=> $user->session_id,
 		'ROOT_PATH'			=> $web_path,
 		'BOARD_URL'			=> $board_url,
+		'USERNAME_FULL'		=> get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']),
 
 		'L_LOGIN_LOGOUT'	=> $l_login_logout,
 		'L_INDEX'			=> ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'],
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 84449efc14..c9daccb4ff 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -89,6 +89,7 @@
 					<!-- EVENT overall_header_breadcrumb_append -->
 				</li>
 
+				<!-- IF S_REGISTERED_USER --><li class="rightside"><!-- IF CURRENT_USER_AVATAR --><span class="avatar-overall-header">{CURRENT_USER_AVATAR}</span> <!-- ENDIF --> {USERNAME_FULL}</li><!-- ENDIF -->
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
 				<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
@@ -163,7 +164,7 @@
 
 				<!-- 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>  <!-- IF CURRENT_USER_AVATAR --><span class="avatar-overall-header">{CURRENT_USER_AVATAR}</span><!-- ENDIF --></li>
+					<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 -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 6665e605f3..3fbd6659d4 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -446,8 +446,9 @@ ul.linklist.bulletin li.no-bulletin:before {
 
 /* Avatar in overall_header.html */
 span.avatar-overall-header img {
+	margin-bottom: 2px;
 	max-height: 25px;
-	vertical-align: top;
+	vertical-align: middle;
 	width: auto;
 }