From 2ee5392c976cf1615768375442388c3465ce696a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 14 Feb 2021 13:29:58 +0100
Subject: [PATCH] Adjusted/unified html attributes for avatars

---
 com.woltlab.wcf/templates/boxFollowingsOnline.tpl         | 2 +-
 com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl    | 2 +-
 com.woltlab.wcf/templates/boxStaffOnline.tpl              | 2 +-
 com.woltlab.wcf/templates/boxTodaysBirthdays.tpl          | 2 +-
 com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl | 2 +-
 com.woltlab.wcf/templates/boxUserList.tpl                 | 2 +-
 com.woltlab.wcf/templates/commentList.tpl                 | 2 +-
 com.woltlab.wcf/templates/commentResponseList.tpl         | 2 +-
 com.woltlab.wcf/templates/following.tpl                   | 2 +-
 com.woltlab.wcf/templates/ignoredUsers.tpl                | 2 +-
 com.woltlab.wcf/templates/messageQuoteList.tpl            | 2 +-
 com.woltlab.wcf/templates/messageSidebar.tpl              | 2 +-
 com.woltlab.wcf/templates/moderationArticle.tpl           | 2 +-
 com.woltlab.wcf/templates/moderationComment.tpl           | 2 +-
 com.woltlab.wcf/templates/moderationReport.tpl            | 2 +-
 com.woltlab.wcf/templates/pageHeaderUser.tpl              | 2 +-
 com.woltlab.wcf/templates/recentActivityListItem.tpl      | 2 +-
 com.woltlab.wcf/templates/searchResultList.tpl            | 2 +-
 com.woltlab.wcf/templates/userBirthdayList.tpl            | 2 +-
 com.woltlab.wcf/templates/userListItem.tpl                | 2 +-
 com.woltlab.wcf/templates/userProfileLikeItem.tpl         | 2 +-
 com.woltlab.wcf/templates/usersOnlineList.tpl             | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
index f92609a2cf..d8c748b2f4 100644
--- a/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
+++ b/com.woltlab.wcf/templates/boxFollowingsOnline.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$usersOnlineList item=userOnline}
 		<li class="box32">
-			{user object=$userOnline type='avatar32' ariaHidden='true'}
+			{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$userOnline}</h3>
diff --git a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
index e9ba482580..8efd42805f 100644
--- a/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivitySidebar.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$eventList item=event}
 		<li class="box24{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID)} ignoredUserContent{/if}">
-			{user object=$event->getUserProfile() type='avatar24'}
+			{user object=$event->getUserProfile() type='avatar24' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>
diff --git a/com.woltlab.wcf/templates/boxStaffOnline.tpl b/com.woltlab.wcf/templates/boxStaffOnline.tpl
index 99d6cf9ac6..df6debddf5 100644
--- a/com.woltlab.wcf/templates/boxStaffOnline.tpl
+++ b/com.woltlab.wcf/templates/boxStaffOnline.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$usersOnlineList item=userOnline}
 		<li class="box32">
-			{user object=$userOnline type='avatar32' ariaHidden='true'}
+			{user object=$userOnline type='avatar32' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>
diff --git a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
index 93a37da6f6..867749979a 100644
--- a/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysBirthdays.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
 		<li class="box32">
-			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true'}
+			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$birthdayUserProfile}</h3>
diff --git a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
index 5e5be36819..c93626adeb 100644
--- a/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
+++ b/com.woltlab.wcf/templates/boxTodaysFollowingBirthdays.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$birthdayUserProfiles item=birthdayUserProfile}
 		<li class="box32">
-			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true'}
+			{user object=$birthdayUserProfile type='avatar32' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$birthdayUserProfile}</h3>
diff --git a/com.woltlab.wcf/templates/boxUserList.tpl b/com.woltlab.wcf/templates/boxUserList.tpl
index 68b66c197f..4c00b3b586 100644
--- a/com.woltlab.wcf/templates/boxUserList.tpl
+++ b/com.woltlab.wcf/templates/boxUserList.tpl
@@ -1,7 +1,7 @@
 <ul class="sidebarItemList">
 	{foreach from=$boxUsers item=boxUser}
 		<li class="box24">
-			{user object=$boxUser type='avatar24' ariaHidden='true'}
+			{user object=$boxUser type='avatar24' ariaHidden='true' tabindex='-1'}
 			
 			<div class="sidebarItemTitle">
 				<h3>{user object=$boxUser}</h3>
diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl
index 41117aca15..1ee58c12ab 100644
--- a/com.woltlab.wcf/templates/commentList.tpl
+++ b/com.woltlab.wcf/templates/commentList.tpl
@@ -13,7 +13,7 @@
 			data-responses="{@$comment->responses}" data-last-response-time="{if $commentLastResponseTime|empty}{@$comment->getLastResponseTime()}{else}{@$commentLastResponseTime}{/if}" data-is-disabled="{@$comment->isDisabled}"
 		>
 			<div class="box48{if $__wcf->getUserProfileHandler()->isIgnoredUser($comment->userID)} ignoredUserContent{/if}">
-				{user object=$comment->getUserProfile() type='avatar48'}
+				{user object=$comment->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 				
 				<div class="commentContentContainer" itemprop="comment" itemscope itemtype="http://schema.org/Comment">
 					<div class="commentContent">
diff --git a/com.woltlab.wcf/templates/commentResponseList.tpl b/com.woltlab.wcf/templates/commentResponseList.tpl
index a55bc3c486..eea492013a 100644
--- a/com.woltlab.wcf/templates/commentResponseList.tpl
+++ b/com.woltlab.wcf/templates/commentResponseList.tpl
@@ -6,7 +6,7 @@
 	{else}
 		<li class="commentResponse jsCommentResponse" data-response-id="{@$response->responseID}" {@$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.comment.response', $response->responseID)} data-can-edit="{if $response->isEditable()}true{else}false{/if}" data-can-delete="{if $response->isDeletable()}true{else}false{/if}" data-user-id="{@$response->userID}">
 			<div class="box32{if $__wcf->getUserProfileHandler()->isIgnoredUser($response->userID)} ignoredUserContent{/if}">
-				{user object=$response->getUserProfile() type='avatar48'}
+				{user object=$response->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 				
 				<div class="commentContent commentResponseContent" itemprop="comment" itemscope itemtype="http://schema.org/Comment">
 					<meta itemprop="dateCreated" content="{@$response->time|date:'c'}">
diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl
index 9693ce6b1b..1fa0954128 100644
--- a/com.woltlab.wcf/templates/following.tpl
+++ b/com.woltlab.wcf/templates/following.tpl
@@ -16,7 +16,7 @@
 			{foreach from=$objects item=user}
 				<li class="jsFollowing">
 					<div class="box48">
-						{user object=$user type='avatar48' title=$user->username}
+						{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 						
 						<div class="details userInformation">
 							{include file='userInformationHeadline'}
diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl
index 9987b329a4..11f552f431 100644
--- a/com.woltlab.wcf/templates/ignoredUsers.tpl
+++ b/com.woltlab.wcf/templates/ignoredUsers.tpl
@@ -16,7 +16,7 @@
 			{foreach from=$objects item=user}
 				<li class="jsIgnoredUser">
 					<div class="box48">
-						{user object=$user type='avatar48' title=$user->username}
+						{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 						
 						<div class="details userInformation">
 							{include file='userInformationHeadline'}
diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl
index fcff3a42f5..cd9f8c14b3 100644
--- a/com.woltlab.wcf/templates/messageQuoteList.tpl
+++ b/com.woltlab.wcf/templates/messageQuoteList.tpl
@@ -5,7 +5,7 @@
 			<header class="messageHeader">
 				<div class="box32 messageHeaderWrapper">
 					{if $userProfiles[$message->getUserID()]|isset}
-						{user object=$userProfiles[$message->getUserID()] type='avatar32' ariaHidden='true'}
+						{user object=$userProfiles[$message->getUserID()] type='avatar32' ariaHidden='true' tabindex='-1'}
 					{else}
 						<span><img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage" style="width: 32px; height: 32px"></span>
 					{/if}
diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 4362e984f8..9cc04c6a7d 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -17,7 +17,7 @@
 			
 			{if $userProfile->getAvatar()}
 				<div class="userAvatar">
-					{user object=$userProfile type='avatar128' ariaHidden='true'}
+					{user object=$userProfile type='avatar128' ariaHidden='true' tabindex='-1'}
 					
 					{if MESSAGE_SIDEBAR_ENABLE_ONLINE_STATUS && !$isReply && $userProfile->isOnline()}<span class="badge green badgeOnline" title="{lang}wcf.user.online.title{/lang}">{lang}wcf.user.online{/lang}</span>{/if}
 				</div>
diff --git a/com.woltlab.wcf/templates/moderationArticle.tpl b/com.woltlab.wcf/templates/moderationArticle.tpl
index 8a87f6d15a..e0fab10307 100644
--- a/com.woltlab.wcf/templates/moderationArticle.tpl
+++ b/com.woltlab.wcf/templates/moderationArticle.tpl
@@ -2,7 +2,7 @@
 	<section class="messageContent">
 		<header class="messageHeader">
 			<div class="box32 messageHeaderWrapper">
-				{user object=$article->getUserProfile() type='avatar32' ariaHidden='true'}
+				{user object=$article->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
 				
 				<div class="messageHeaderBox">
 					<h2 class="messageTitle">
diff --git a/com.woltlab.wcf/templates/moderationComment.tpl b/com.woltlab.wcf/templates/moderationComment.tpl
index 981c13ef32..4bd295699f 100644
--- a/com.woltlab.wcf/templates/moderationComment.tpl
+++ b/com.woltlab.wcf/templates/moderationComment.tpl
@@ -2,7 +2,7 @@
 	<section class="messageContent">
 		<header class="messageHeader">
 			<div class="box32 messageHeaderWrapper">
-				{user object=$message->getUserProfile() type='avatar32' ariaHidden='true'}
+				{user object=$message->getUserProfile() type='avatar32' ariaHidden='true' tabindex='-1'}
 				
 				<div class="messageHeaderBox">
 					<h2 class="messageTitle">
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index e7de90e93c..6e5c21c3c6 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -61,7 +61,7 @@
 	<h2 class="sectionTitle">{lang}wcf.moderation.report.reportedBy{/lang}</h2>
 	
 	<div class="box32">
-		{user object=$reportUser type='avatar32'}
+		{user object=$reportUser type='avatar32' ariaHidden='true' tabindex='-1'}
 		
 		<div>
 			<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index d2aaabfc62..2374399141 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -24,7 +24,7 @@
 						<ul class="interactiveDropdownItems interactiveDropdownItemsUserMenu">
 							<li>
 								<div class="box48">
-									{user object=$__wcf->getUserProfileHandler()->getUserProfile() type='avatar48' ariaHidden='true'}
+									{user object=$__wcf->getUserProfileHandler()->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 									
 									<div class="containerHeadline">
 										<h3>
diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index 005264a7a6..abd15e3c62 100644
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -1,7 +1,7 @@
 {foreach from=$eventList item=event}
 	<li>
 		<div class="box48{if $__wcf->getUserProfileHandler()->isIgnoredUser($event->getUserProfile()->userID)} ignoredUserContent{/if}">
-			{user object=$event->getUserProfile() type='avatar48' ariaHidden='true'}
+			{user object=$event->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 			
 			<div>
 				<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl
index 943090b2f9..15faaef7ca 100644
--- a/com.woltlab.wcf/templates/searchResultList.tpl
+++ b/com.woltlab.wcf/templates/searchResultList.tpl
@@ -7,7 +7,7 @@
 					{assign var=_messageCustomIcon value=$customIcons[$_messageObjectHash]}
 					{if $_messageCustomIcon === ''}
 						{if $message->getUserProfile()}
-							{user object=$message->getUserProfile() type='avatar48' ariaHidden='true'}
+							{user object=$message->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 						{else}
 							<p><span class="icon icon48 fa-file-o"></span></p>
 						{/if}
diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index 0b4bf74ef4..6951a1b657 100644
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -4,7 +4,7 @@
 			{foreach from=$users item=user}
 				<li data-object-id="{@$user->userID}">
 					<div class="box48">
-						{user object=$user type='avatar48' ariaHidden='true'}
+						{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 						
 						<div class="details userInformation">
 							<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/userListItem.tpl b/com.woltlab.wcf/templates/userListItem.tpl
index d7d79ef83a..dd5b277623 100644
--- a/com.woltlab.wcf/templates/userListItem.tpl
+++ b/com.woltlab.wcf/templates/userListItem.tpl
@@ -1,6 +1,6 @@
 <li data-object-id="{@$user->userID}">
 	<div class="box48">
-		{user object=$user type='avatar48' ariaHidden='true'}
+		{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 		
 		<div class="details userInformation">
 			{include file='userInformation'}
diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index fd11ee9108..5bdb5b9020 100644
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -1,7 +1,7 @@
 {foreach from=$likeList item=like}
 	<li>
 		<div class="box48">
-			{user object=$like->getUserProfile() type='avatar48' ariaHidden='true'}
+			{user object=$like->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 			
 			<div>
 				<div class="containerHeadline">
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 513ef58d08..943e39f42a 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -109,7 +109,7 @@
 		{capture append=usersOnlineList}
 			<li>
 				<div class="box48">
-					{user object=$user type='avatar48' title=$user->username ariaHidden='true'}
+					{user object=$user type='avatar48' ariaHidden='true' tabindex='-1'}
 					
 					<div class="details userInformation">
 						<div class="containerHeadline">
-- 
2.20.1