From 6d5a9e7a8641517a25b16d5b3069997c686a65fd Mon Sep 17 00:00:00 2001
From: joshuaruesweg <ruesweg@woltlab.com>
Date: Mon, 2 Nov 2020 10:57:48 +0100
Subject: [PATCH] Add more compact view for sessions

---
 com.woltlab.wcf/templates/accountSecurity.tpl | 18 +++++++++---------
 wcfsetup/install/lang/de.xml                  |  3 ++-
 wcfsetup/install/lang/en.xml                  |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/templates/accountSecurity.tpl b/com.woltlab.wcf/templates/accountSecurity.tpl
index 3965c1d0b4..d93e540c9b 100644
--- a/com.woltlab.wcf/templates/accountSecurity.tpl
+++ b/com.woltlab.wcf/templates/accountSecurity.tpl
@@ -14,15 +14,15 @@
 				
 				<div class="accountSecurityContainer">
 					<div class="containerHeadline accountSecurityInformation">
-						<h3>{$session->getUserAgent()->getBrowser()}</h3>
-						<small>
-							{$session->getIpAddress()}<br />
-							{if $session->isCurrentSession()}
-								{lang}wcf.user.security.currentSession{/lang}
-							{else}
-								{lang}wcf.user.security.sessionLastActive{/lang}
-							{/if}
-						</small>
+						<h3>{lang}wcf.user.security.sessionName{/lang}</h3>
+						
+						<dl class="plain inlineDataList small">
+							<dt>{lang}wcf.user.security.lastActivity{/lang}</dt>
+							<dd>{if $session->isCurrentSession()}{lang}wcf.user.security.currentSession{/lang}{else}{@$session->getLastActivityTime()|time}{/if}</dd>
+							
+							<dt>{lang}wcf.user.security.ipAddress{/lang}</dt>
+							<dd>{$session->getIpAddress()}</dd>
+						</dl>
 					</div>
 					
 					{if !$session->isCurrentSession()}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b4ff111b8f..2dd83fc19b 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4825,10 +4825,11 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
 	<category name="wcf.user.security">
 		<item name="wcf.user.security.activeSessions"><![CDATA[Aktive Sitzungen]]></item>
 		<item name="wcf.user.security.currentSession"><![CDATA[Aktuelle Sitzung]]></item>
-		<item name="wcf.user.security.sessionLastActive"><![CDATA[Sitzung zuletzt aktiv: {@$session->getLastActivityTime()|time}]]></item>
 		<item name="wcf.user.security.deleteSession"><![CDATA[Sitzung beenden]]></item>
 		<item name="wcf.user.security.deleteSession.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} die Sitzung wirklich beenden?]]></item>
 		<item name="wcf.user.security.sessionName"><![CDATA[{if $session->getUserAgent()->getBrowser()}{$session->getUserAgent()->getBrowser()}{if $session->getUserAgent()->getOS()} auf {$session->getUserAgent()->getOS()}{/if}{else}Unbekanntes Gerät{/if}]]></item>
+		<item name="wcf.user.security.ipAddress"><![CDATA[IP-Adresse]]></item>
+		<item name="wcf.user.security.lastActivity"><![CDATA[Sitzung zuletzt aktiv]]></item>
 	</category>
 	<category name="wcf.user.trophy">
 		<item name="wcf.user.trophy.trophyPoints"><![CDATA[Trophäen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1f3c93ce7b..c0bc1add7e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4822,10 +4822,11 @@ Open the link below to access the user profile:
 	<category name="wcf.user.security">
 		<item name="wcf.user.security.activeSessions"><![CDATA[Active Sessions]]></item>
 		<item name="wcf.user.security.currentSession"><![CDATA[Current Session]]></item>
-		<item name="wcf.user.security.sessionLastActive"><![CDATA[Last active: {@$session->getLastActivityTime()|time}]]></item>
 		<item name="wcf.user.security.deleteSession"><![CDATA[Revoke Session]]></item>
 		<item name="wcf.user.security.deleteSession.confirmMessage"><![CDATA[Do you really want to revoke the session?]]></item>
 		<item name="wcf.user.security.sessionName"><![CDATA[{if $session->getUserAgent()->getBrowser()}{$session->getUserAgent()->getBrowser()}{if $session->getUserAgent()->getOS()} on {$session->getUserAgent()->getOS()}{/if}{else}Unknown Device{/if}]]></item>
+		<item name="wcf.user.security.ipAddress"><![CDATA[IP Address]]></item>
+		<item name="wcf.user.security.lastActivity"><![CDATA[Last active]]></item>
 	</category>
 	<category name="wcf.user.trophy">
 		<item name="wcf.user.trophy.trophyPoints"><![CDATA[Trophies]]></item>
-- 
2.20.1