Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/templates/user.tpl
	com.woltlab.wcf/templates/userInformationHeadline.tpl
	com.woltlab.wcf/templates/usersOnlineList.tpl

diff --cc com.woltlab.wcf/templates/authorSidebarBox.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/user.tpl
index 5235ad10e20951b4a03283c419c90bfed86a78d0,9b34fd4d5bbbdc1af4f944447bafcf2f34445bc0..5ae5ab07874c27e686037a2bc8c36d5ac95cd3f1
--- 1/com.woltlab.wcf/templates/user.tpl
--- 2/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@@ -138,28 -102,22 +138,35 @@@
  
  {include file='header' sidebarOrientation='left'}
  
 -<header class="boxHeadline userHeadline">
 +<header class="boxHeadline userHeadline"
 +      {if $isAccessible}
 +              data-object-id="{@$user->userID}"
 +              {if $__wcf->session->getPermission('admin.user.canBanUser')}
 +                      data-banned="{@$user->banned}"
 +              {/if}
 +              {if $__wcf->session->getPermission('admin.user.canDisableAvatar')}
 +                      data-disable-avatar="{@$user->disableAvatar}"
 +              {/if}
 +              {if $__wcf->session->getPermission('admin.user.canDisableSignature')}
 +                      data-disable-signature="{@$user->disableSignature}"
 +              {/if}
 +      {/if}
 +>
        <span class="framed invisible">{@$user->getAvatar()->getImageTag(48)}</span>
        
-       <h1>{$user->username}{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/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}</h1>
 -      <h1>{$user->username}{if MODULE_USER_RANK}
++      <h1>{$user->username}{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/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}</h1>
        
        <ul class="dataList">
 -              {if $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}
 -              {if $user->getAge()}<li>{@$user->getAge()}</li>{/if}
 -              {if $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}
 +              {if $user->isVisibleOption('gender') && $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}
 +              {if $user->isVisibleOption('birthday') && $user->getAge()}<li>{@$user->getAge()}</li>{/if}
 +              {if $user->isVisibleOption('location') && $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}
                {if $user->getOldUsername()}<li>{lang}wcf.user.profile.oldUsername{/lang}</li>{/if}
                <li>{lang}wcf.user.membersList.registrationDate{/lang}</li>
                {event name='userDataRow1'}

diff --cc com.woltlab.wcf/templates/userBirthdayList.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/userInformationHeadline.tpl
index 3d7dd3b17535c2e4f35dc029daac80dd20877a3a,2069973eae9ff5a256f274123e02cd110b0ff272..e7368102e3f74154f0c33064e8800d06f5816af8
--- 1/com.woltlab.wcf/templates/userInformationHeadline.tpl
--- 2/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@@ -1,5 -1,12 +1,12 @@@
  <div class="containerHeadline">
-       <h3><a href="{link controller='User' object=$user}{/link}">{$user->username}</a>{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/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}</h3> 
 -      <h3><a href="{link controller='User' object=$user}{/link}">{$user->username}</a>{if MODULE_USER_RANK}
++      <h3><a href="{link controller='User' object=$user}{/link}">{$user->username}</a>{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/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}</h3>
  </div>
  <ul class="dataList userFacts">
        {if $user->isAccessible('canViewProfile')}

diff --cc com.woltlab.wcf/templates/usersOnlineList.tpl
index dde3f8e689019b0fabd6f1e6d6f6d6befff260af,deb834ca2b37fd412b8852562cfe2eb4d4db9caa..0e36d161836c8f7d5a1155ea9022a002e20c4159
--- 1/com.woltlab.wcf/templates/usersOnlineList.tpl
--- 2/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@@ -125,8 -125,16 +125,16 @@@
                                        
                                        <div class="details userInformation">
                                                <div class="containerHeadline">
-                                                       <h3><a href="{link controller='User' object=$user}{/link}">{@$user->getFormattedUsername()}</a>{if MODULE_USER_RANK && $user->getUserTitle()} <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>{/if}</h3>
+                                                       <h3><a href="{link controller='User' object=$user}{/link}">{@$user->getFormattedUsername()}</a>{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}</h3>
+                                                       
 -                                                      {@$locationData} 
 +                                                      {@$locationData}
                                                </div>
                                                
                                                {@$sessionData}