From b058051170caacc22d84e36fdba776723aee865a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 18 Feb 2020 11:29:09 +0100
Subject: [PATCH] Rearrange admin delete dialog

---
 admin/templates/default/account.delete.xet | 88 +++++++++++++---------
 admin/templates/default/app.css            |  6 --
 admin/templates/pixelegg/app.css           |  6 --
 3 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/admin/templates/default/account.delete.xet b/admin/templates/default/account.delete.xet
index 6e57aa503c..80288598c5 100644
--- a/admin/templates/default/account.delete.xet
+++ b/admin/templates/default/account.delete.xet
@@ -3,42 +3,58 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="admin.account.delete.delete" template="" lang="" group="0" version="18.1.001">
-		<vbox class="admin_account_delete">
-			<description value="Who would you like to transfer records owned by the deleted user to?" class="dialogHeader2"/>
-			<select-account id="new_owner" empty_label="Delete all records" class="dialogHeader3"/>
-			<description value="Automatically transfer entries owned by the user:"/>
-			<select id="delete_apps" rows="6" multiple="true" span="2"/>
-			<description value="Please manually deal with entries owned by the user:"/>
-			<grid id="counts" disabled="!@counts">
-				<columns>
-					<column width="150"/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<select-app id="${row}[app]" readonly="true"/>
-						<description id="${row}[count]"/>
-					</row>
-				</rows>
-			</grid>
-			<grid>
-				<columns>
-					<column width="150"/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<select-app value="filemanager" readonly="true"/>
-						<description value="Change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username."/>
-					</row>
-					<row>
-						<select-app value="mail" readonly="true"/>
-						<description value="Please check email.  It gets automatically deleted if email integration is used."/>
-					</row>
-				</rows>
-			</grid>
-			<description value="If you delete the user without selecting an account to move the data to, all entries get deleted!" font_style="b"/>
-		</vbox>
+		<grid width="100%" height="100%">
+			<columns>
+				<column width="60%"/>
+				<column/>
+			</columns>
+			<rows>
+				<row>
+					<description value="Who would you like to transfer records owned by the deleted user to?" class="dialogHeader2"/>
+					<select-account id="new_owner" empty_label="Delete all records" class="dialogHeader3"/>
+				</row>
+				<row>
+					<vbox>
+						<description value="Automatically transfer entries owned by the user:"/>
+						<select id="delete_apps" rows="6" multiple="true" span="2"/>
+					</vbox>
+				</row>
+				<row>
+					<vbox>
+						<description value="Please manually deal with entries owned by the user:"/>
+						<grid id="counts" disabled="!@counts">
+							<columns>
+								<column width="150"/>
+								<column/>
+							</columns>
+							<rows>
+								<row>
+									<select-app id="${row}[app]" readonly="true"/>
+									<description id="${row}[count]"/>
+								</row>
+							</rows>
+						</grid>
+						<grid>
+							<columns>
+								<column width="150"/>
+								<column/>
+							</columns>
+							<rows>
+								<row>
+									<select-app value="filemanager" readonly="true"/>
+									<description value="Change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username."/>
+								</row>
+								<row>
+									<select-app value="mail" readonly="true"/>
+									<description value="Please check email.  It gets automatically deleted if email integration is used."/>
+								</row>
+							</rows>
+						</grid>
+						<description value="If you delete the user without selecting an account to move the data to, all entries get deleted!" font_style="b"/>
+					</vbox>
+				</row>
+			</rows>
+		</grid>
 	</template>
 	<template id="admin.account.delete" template="" lang="" group="0" version="18.1.001">
 	    <grid width="100%">
diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index 96aa4e5263..09331f2591 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -58,12 +58,6 @@ td.admin_userAgent span {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.admin_account_delete > * {
-	padding: 8px;
-}
-form#admin-account-delete div.dialogHeader > label {
-	font-size: 120%;
-}
 /* Global Category classes*/
 .globalCat_confirmDelete {
   position: absolute;
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index c451326595..f55d09eda1 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -66,12 +66,6 @@ td.admin_userAgent span {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.admin_account_delete > * {
-  padding: 8px;
-}
-form#admin-account-delete div.dialogHeader > label {
-  font-size: 120%;
-}
 /* Global Category classes*/
 .globalCat_confirmDelete {
   position: absolute;