From 2767680bedecebd920c09fd710ded861ece90f92 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh.pointer@outlook.com>
Date: Thu, 5 May 2022 13:25:35 +0200
Subject: [PATCH 1/2] Added the User Email field to the List

Added the formatted email address of the user to the list view.
---
 Oqtane.Client/Modules/Admin/Users/Index.razor | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index c39888b1..11726982 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -38,6 +38,7 @@ else
 				<th style="width: 1px;">&nbsp;</th>
 				<th>@SharedLocalizer["Name"]</th>
 				<th>@SharedLocalizer["Username"]</th>
+				<th>@SharedLocalizer["Email"]</th>
 				<th>@Localizer["LastLoginOn"]</th>
 				<th>@Localizer["LastIPAddress"]</th>
 				<th>@Localizer["CreatedOn"]</th>
@@ -54,6 +55,7 @@ else
 					</td>
 					<td>@context.User.DisplayName</td>
 					<td>@context.User.Username</td>
+					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{0}</a>", @context.User.Email))</td>
 					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.LastLoginOn)</td>
                     <td>@context.User.LastIPAddress</td>
                     <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.CreatedOn)</td>

From a21a53662b5fdc8278d2e1157ba1e7d8c884263c Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh.pointer@outlook.com>
Date: Thu, 5 May 2022 16:35:43 +0200
Subject: [PATCH 2/2] Update for real-estate

Removed Name
Removed Seconds from DateTime fields
Added Name to the Email link
---
 Oqtane.Client/Modules/Admin/Users/Index.razor | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 11726982..094b8866 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -36,7 +36,6 @@ else
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
 				<th style="width: 1px;">&nbsp;</th>
-				<th>@SharedLocalizer["Name"]</th>
 				<th>@SharedLocalizer["Username"]</th>
 				<th>@SharedLocalizer["Email"]</th>
 				<th>@Localizer["LastLoginOn"]</th>
@@ -53,12 +52,11 @@ else
 					<td>
 						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
 					</td>
-					<td>@context.User.DisplayName</td>
 					<td>@context.User.Username</td>
-					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{0}</a>", @context.User.Email))</td>
-					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.LastLoginOn)</td>
+					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.DisplayName, @context.User.Email))</td>
+					<td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.LastLoginOn)</td>
                     <td>@context.User.LastIPAddress</td>
-                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}",context.User.CreatedOn)</td>
+                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.CreatedOn)</td>
 
 				</Row>
 			</Pager>