From bc71435856c157909dba872ba75426f68fd6e8d5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 8 Jun 2020 14:21:23 -0400
Subject: [PATCH] fix: companion commit to
 nodebb/nodebb@4d60eac60f9d9be4f76c27b78117762cad543efc

---
 templates/flags/detail.tpl          |  6 +++++-
 templates/partials/account/menu.tpl | 14 +++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index 0080822..5807d9d 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -136,6 +136,7 @@
 				{{{ end }}}
 				{{{ end }}}
 
+				{{{ if target.uid }}}
 				<div class="btn-group btn-block" data-uid="{target.uid}">
 					<button type="button" class="btn btn-default btn-block dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						<i class="fa fa-street-view"></i>
@@ -147,9 +148,12 @@
 						<li><a href="#" data-action="chat">[[flags:start-new-chat]]</a></li>
 						<li role="separator" class="divider"></li>
 						<li><a href="#" data-action="ban">[[user:ban_account]]</a></li>
-						<li><a href="#" data-action="delete-account">[[user:delete_account]]</a></li>
+						<li><a href="#" data-action="delete-account">[[user:delete_account_as_admin]]</a></li>
+						<li><a href="#" data-action="delete-content">[[user:delete_content]]</a></li>
+						<li><a href="#" data-action="delete-all">[[user:delete_all]]</a></li>
 					</ul>
 				</div>
+				{{{ end }}}
 
 				<div class="btn-group btn-block">
 					<button type="button" class="btn btn-default btn-block dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index 8275475..3e4171a 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -20,7 +20,7 @@
 		<li>
 			<a component="account/block" href="#"><!-- IF !../isBlocked -->[[user:block_user]]<!-- ELSE -->[[user:unblock_user]]<!-- END --></a>
 		</li>
-		<li class="divider"></li>
+		<li role="separator" class="divider"></li>
 		<!-- ENDIF !banned -->
 		<!-- ENDIF !isSelf -->
 		<!-- ENDIF loggedIn -->
@@ -34,6 +34,8 @@
 
 		<!-- IF !isSelf -->
 		<!-- IF canBan -->
+		<li role="separator" class="divider"></li>
+		<li class="dropdown-header">[[user:admin_actions_label]]</li>
 		<li class="<!-- IF banned -->hide<!-- ENDIF banned -->">
 			<a component="account/ban" href="#">[[user:ban_account]]</a>
 		</li>
@@ -43,18 +45,20 @@
 		<!-- ENDIF canBan -->
 		<!-- IF isAdmin -->
 		<li>
-			<a component="account/delete" href="#" class="">[[user:delete_account]]</a>
+			<a component="account/delete-account" href="#" class="">[[user:delete_account_as_admin]]</a>
+			<a component="account/delete-content" href="#" class="">[[user:delete_content]]</a>
+			<a component="account/delete-all" href="#" class="">[[user:delete_all]]</a>
 		</li>
 		<!-- ENDIF isAdmin -->
 		<!-- ENDIF !isSelf -->
 
-		<li class="divider"></li>
+		<li role="separator" class="divider"></li>
 		<li><a href="{config.relative_path}/user/{userslug}/following">[[user:following]]</a></li>
 		<li><a href="{config.relative_path}/user/{userslug}/followers">[[user:followers]]</a></li>
 		<!-- IF showHidden -->
 		<li><a href="{config.relative_path}/user/{userslug}/blocks">[[user:blocks]]</a></li>
 		<!-- ENDIF showHidden -->
-		<li class="divider"></li>
+		<li role="separator" class="divider"></li>
 		<li><a href="{config.relative_path}/user/{userslug}/topics">[[global:topics]]</a></li>
 		<li><a href="{config.relative_path}/user/{userslug}/posts">[[global:posts]]</a></li>
 		<!-- IF !reputation:disabled -->
@@ -78,7 +82,7 @@
 
 		{{{each profile_links}}}
 		<!-- IF @first -->
-		<li class="divider"></li>
+		<li role="separator" class="divider"></li>
 		<!-- ENDIF @first -->
 		<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a href="{config.relative_path}/user/{userslug}/{profile_links.route}"><!-- IF ../icon --><i class="fa fa-fw {profile_links.icon}"></i> <!-- END -->{profile_links.name}</a></li>
 		{{{end}}}