From b677e7c208fde56af7a815ac2b8da78e3d1dd0e0 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 30 Dec 2024 13:40:06 +0100
Subject: [PATCH] Fix the visuals of the box for users awaiting approval

Fixes #6141
---
 wcfsetup/install/files/acp/style/layout.scss  | 32 +++++++++++++++++++
 .../usersAwaitingApprovalAcpDashboardBox.tpl  | 31 +++++++++++++-----
 ...sAwaitingApprovalAcpDashboardBox.class.php |  3 +-
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss
index 271489b8bb..c00154d51b 100644
--- a/wcfsetup/install/files/acp/style/layout.scss
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@ -1040,3 +1040,35 @@ html[data-color-scheme="dark"] {
 	margin-top: 20px;
 	text-align: center;
 }
+
+.acpDashboardBox__usersAwaitingApproval {
+	display: flex;
+	flex-direction: column;
+	row-gap: 10px;
+}
+
+.acpDashboardBox__usersAwaitingApproval__user {
+	position: relative;
+}
+
+.acpDashboardBox__usersAwaitingApproval__avatar {
+	align-content: center;
+}
+
+.acpDashboardBox__usersAwaitingApproval__content {
+	display: flex;
+	flex-direction: column;
+}
+
+.acpDashboardBox__usersAwaitingApproval__link::after {
+	content: "";
+	inset: 0;
+	position: absolute;
+}
+
+.acpDashboardBox__usersAwaitingApproval__meta {
+	color: var(--wcfContentDimmedText);
+	margin-top: -5px;
+
+	@include wcfFontSmall;
+}
diff --git a/wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl b/wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl
index a2e51c4484..76e1ceea37 100644
--- a/wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl
+++ b/wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl
@@ -1,14 +1,29 @@
-<ul>
+<ul class="acpDashboardBox__usersAwaitingApproval">
 	{foreach from=$users item='user'}
-		<li>
-			<div>
-				{@$user->getAvatar()->getImageTag(24)}
-			</div>
-			<div>
-				<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>
+		<li class="acpDashboardBox__usersAwaitingApproval__user">
+			<div class="box24">
+				<div class="acpDashboardBox__usersAwaitingApproval__avatar">
+					{unsafe:$user->getAvatar()->getImageTag(24)}
+				</div>
+
+				<div>
+					<a href="{link controller='UserEdit' id=$user->userID}{/link}"
+						class="acpDashboardBox__usersAwaitingApproval__link" title="{lang}wcf.acp.user.edit{/lang}">
+						{$user->username}
+					</a>
+					<div class="acpDashboardBox__usersAwaitingApproval__meta">
+						{unsafe:$user->registrationDate|time}
+					</div>
+				</div>
 			</div>
 		</li>
 	{/foreach}
 </ul>
 
-<a href="{link controller='UserQuickSearch'}mode=pendingActivation{/link}" class="button small">More</a>
+{if $usersAwaitingApproval > $users|count}
+	<div class="acpDashboardBox__cta">
+		<a href="{link controller='UserQuickSearch' mode='pendingActivation'}{/link}" class="button small">
+			{lang}wcf.global.button.showAll{/lang}
+		</a>
+	</div>
+{/if}
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/system/acp/dashboard/box/UsersAwaitingApprovalAcpDashboardBox.class.php b/wcfsetup/install/files/lib/system/acp/dashboard/box/UsersAwaitingApprovalAcpDashboardBox.class.php
index b82ab73882..6e5228ce3d 100644
--- a/wcfsetup/install/files/lib/system/acp/dashboard/box/UsersAwaitingApprovalAcpDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/acp/dashboard/box/UsersAwaitingApprovalAcpDashboardBox.class.php
@@ -49,7 +49,7 @@ final class UsersAwaitingApprovalAcpDashboardBox extends AbstractAcpDashboardBox
         return WCF::getTPL()->fetch('usersAwaitingApprovalAcpDashboardBox', 'wcf', [
             'users' => $userList->getObjects(),
             'usersAwaitingApproval' => $this->getUsersAwaitingApproval(),
-        ]);
+        ], true);
     }
 
     #[\Override]
@@ -68,6 +68,7 @@ final class UsersAwaitingApprovalAcpDashboardBox extends AbstractAcpDashboardBox
             if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER) {
                 $this->userList->getConditionBuilder()->add('emailConfirmed IS NULL');
             }
+            $this->userList->sqlOrderBy = 'registrationDate DESC';
         }
 
         return $this->userList;
-- 
2.20.1