From 071007ed1c0d42b209236be4538471232047de82 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 8 Mar 2015 14:09:04 +0100
Subject: [PATCH] Fixed missing rank image

---
 .../templates/dashboardBoxStaffOnlineSidebar.tpl      | 11 ++++++++++-
 com.woltlab.wcf/templates/userPanel.tpl               | 11 ++++++++++-
 wcfsetup/install/files/acp/templates/userList.tpl     |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/templates/dashboardBoxStaffOnlineSidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxStaffOnlineSidebar.tpl
index ecaa9c76fb..745c9be486 100644
--- a/com.woltlab.wcf/templates/dashboardBoxStaffOnlineSidebar.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxStaffOnlineSidebar.tpl
@@ -5,7 +5,16 @@
 			
 			<div class="sidebarBoxHeadline">
 				<h3><a href="{link controller='User' object=$userOnline}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{$userOnline->username}</a></h3>
-				<small>{if MODULE_USER_RANK && $userOnline->getUserTitle()} <span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span>{/if}</small>
+				{if MODULE_USER_RANK}
+					<small>
+						{if $userOnline->getUserTitle()}
+							<span class="badge userTitleBadge{if $userOnline->getRank() && $userOnline->getRank()->cssClassName} {@$userOnline->getRank()->cssClassName}{/if}">{$userOnline->getUserTitle()}</span>
+						{/if}
+						{if $userOnline->getRank() && $userOnline->getRank()->rankImage}
+							<span class="userRankImage">{@$userOnline->getRank()->getImage()}</span>
+						{/if}
+					</small>
+				{/if}
 			</div>
 		</li>
 	{/foreach}
diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl
index 96bfb5811a..08cf1497b2 100644
--- a/com.woltlab.wcf/templates/userPanel.tpl
+++ b/com.woltlab.wcf/templates/userPanel.tpl
@@ -22,7 +22,16 @@
 							
 							<div class="containerHeadline">
 								<h3><a href="{link controller='User' object=$__wcf->user}{/link}">{$__wcf->user->username}</a></h3>
-								{if MODULE_USER_RANK && $__wcf->getUserProfileHandler()->getUserTitle()}<p><span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span></p>{/if}
+								{if MODULE_USER_RANK}
+									<p>
+										{if $__wcf->getUserProfileHandler()->getUserTitle()}
+											<span class="badge userTitleBadge{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->cssClassName} {@$__wcf->getUserProfileHandler()->getRank()->cssClassName}{/if}">{$__wcf->getUserProfileHandler()->getUserTitle()}</span>
+										{/if}
+										{if $__wcf->getUserProfileHandler()->getRank() && $__wcf->getUserProfileHandler()->getRank()->rankImage}
+											<span class="userRankImage">{@$__wcf->getUserProfileHandler()->getRank()->getImage()}</span>
+										{/if}
+									</p>
+								{/if}
 								
 								<ul class="interactiveDropdownUserMenuLinkList">
 									<li><a href="{link controller='User' object=$__wcf->user}{/link}">{lang}wcf.user.myProfile{/lang}</a></li>
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index c91867ee7f..b829436717 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -119,7 +119,7 @@
 						</td>
 						<td class="columnID columnUserID">{@$user->userID}</td>
 						<td class="columnIcon"><p class="framed">{@$user->getAvatar()->getImageTag(24)}</p></td>
-						<td class="columnTitle columnUsername">{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>{else}{$user->username}{/if}{if MODULE_USER_RANK && $user->getUserTitle()} <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>{/if}</td>
+						<td class="columnTitle columnUsername">{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>{else}{$user->username}{/if}{if MODULE_USER_RANK}{if $user->getUserTitle()} <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>{/if}{if $user->getRank() && $user->getRank()->rankImage} <span class="userRankImage">{@$user->getRank()->getImage()}</span>{/if}{/if}</td>
 						
 						{foreach from=$columnHeads key=column item=columnLanguageVariable}
 							<td class="column{$column|ucfirst}{if $columnStyling[$column]|isset} {$columnStyling[$column]}{/if}">{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</td>
-- 
2.20.1