From 7da8df332ffe16eed0c6d2eb2fd1721efdcfafa4 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 20 Dec 2024 15:34:06 +0100
Subject: [PATCH] Show last activity in user card

---
 com.woltlab.wcf/templates/userCard.tpl        | 21 +++++++++++++++++++
 wcfsetup/install/files/style/ui/userCard.scss |  6 ++++++
 wcfsetup/install/lang/de.xml                  |  2 +-
 wcfsetup/install/lang/en.xml                  |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/userCard.tpl b/com.woltlab.wcf/templates/userCard.tpl
index baa13e251f..deee068de1 100644
--- a/com.woltlab.wcf/templates/userCard.tpl
+++ b/com.woltlab.wcf/templates/userCard.tpl
@@ -101,6 +101,27 @@
 		{/hascontent}
 
 		{event name='afterButtons'}
+
+		{hascontent}
+			<div class="userCard__details">
+				<dl class="plain dataList">
+					{content}
+						{event name='beforeDetails'}
+
+						{if $user->canViewOnlineStatus() && $user->getLastActivityTime()}
+							<dt>{lang}wcf.user.usersOnline.lastActivity{/lang}</dt>
+							<dd>{time time=$user->getLastActivityTime()}</dd>
+							{if $user->getCurrentLocation()}
+								<dt>{lang}wcf.user.usersOnline.location{/lang}</dt>
+								<dd>{unsafe:$user->getCurrentLocation()}</dd>
+							{/if}
+						{/if}
+
+						{event name='afterDetails'}
+					{/content}
+				</dl>
+			</div>
+		{/hascontent}
 	</div>
 
 	{hascontent}
diff --git a/wcfsetup/install/files/style/ui/userCard.scss b/wcfsetup/install/files/style/ui/userCard.scss
index 92291c780f..70f3a3e367 100644
--- a/wcfsetup/install/files/style/ui/userCard.scss
+++ b/wcfsetup/install/files/style/ui/userCard.scss
@@ -138,6 +138,12 @@
 	}
 }
 
+.userCard__details {
+	@include wcfFontSmall;
+	margin-top: auto;
+	padding-top: 5px;
+}
+
 .popoverContainer[data-identifier="com.woltlab.wcf.user"] {
 	--padding: 0;
 	--maxHeight: none;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 13e4b84f09..710a8b76ef 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -5131,7 +5131,7 @@ Sobald {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Benutzerkonto freige
 		<item name="wcf.user.usersOnline.invisible"><![CDATA[ (unsichtbar)]]></item>
 		<item name="wcf.user.usersOnline.marking.legend"><![CDATA[Legende]]></item>
 		<item name="wcf.user.usersOnline.guests"><![CDATA[Gäste]]></item>
-		<item name="wcf.user.usersOnline.location"><![CDATA[Ort]]></item>
+		<item name="wcf.user.usersOnline.location"><![CDATA[Aufenthaltsort]]></item>
 		<item name="wcf.user.usersOnline.ipAddress"><![CDATA[IP-Adresse]]></item>
 		<item name="wcf.user.usersOnline.userAgent"><![CDATA[Browser]]></item>
 		<item name="wcf.user.usersOnline.lastActivity"><![CDATA[Letzte Aktivität]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 770ce9fd83..cfdcb026b5 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -5130,7 +5130,7 @@ You also received a list of backup codes to use when your second factor becomes
 		<item name="wcf.user.usersOnline.invisible"><![CDATA[ (invisible)]]></item>
 		<item name="wcf.user.usersOnline.marking.legend"><![CDATA[Legend]]></item>
 		<item name="wcf.user.usersOnline.guests"><![CDATA[Guests]]></item>
-		<item name="wcf.user.usersOnline.location"><![CDATA[Location]]></item>
+		<item name="wcf.user.usersOnline.location"><![CDATA[Page Viewing]]></item>
 		<item name="wcf.user.usersOnline.ipAddress"><![CDATA[IP Address]]></item>
 		<item name="wcf.user.usersOnline.userAgent"><![CDATA[Browser]]></item>
 		<item name="wcf.user.usersOnline.lastActivity"><![CDATA[Last Activity]]></item>
-- 
2.20.1