v1.1.4.0

2021-08-09 14:18:08 +01:00
parent 0d7be69e1e
commit 5e5ef7190b
84 changed files with 2449 additions and 1717 deletions
@@ -191,12 +191,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 							if (AccountMgr.UpdateUserAccount(organisationMember.UserAccount, DbUpdateInfo))
 							{
 								// Send activation email.
-								SaEmailData emailData = new SaEmailData();
-								emailData.Config = EmailConfig;
-								emailData.AddressesTo.Add(organisationMember.UserAccount.EmailAddress);
-								emailData.Subject = Localiser["user.activate.email.subject"];
-								PopulateAccountActivatedEmailBody(emailData, organisationMember.UserAccount);
-								if (EmailConsole.SendEmail(emailData))
+								if (SendAccountActivatedEmail(this, organisationMember.UserAccount))
 									SaLogger.Info(fn + " User Activation email sent to " + organisationMember.UserAccount.EmailAddress, true);
 								else SaLogger.Warn(fn + " Failed to send User Activation email to " + organisationMember.UserAccount.EmailAddress);
 							}
@@ -218,18 +213,33 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 		}

 		//-------------------------------------------------------------------
-		private void PopulateAccountActivatedEmailBody(SaEmailData emailData, SaxUserAccount userAccount)
+		/// <summary>
+		/// Generate the User Activation email.
+		/// <para>NB URL must be to the Online application.</para>
+		/// <para>NB Encryption must be done with the Online logic.</para>
+		/// </summary>
+		public static bool SendAccountActivatedEmail (SaxController_Admin controller, SaxUserAccount userAccount)
+		{
+			SaEmailData emailData = new SaEmailData();
+			emailData.Config = controller.EmailConfig;
+			emailData.AddressesTo.Add(userAccount.EmailAddress);
+			emailData.Subject = controller.Localiser["user.activate.email.subject"];
+			PopulateAccountActivatedEmailBody(controller, emailData, userAccount);
+			return controller.EmailConsole.SendEmail(emailData);
+		}
+		private static void PopulateAccountActivatedEmailBody(SaxController_Admin controller, SaEmailData emailData, SaxUserAccount userAccount)
 		{
 			// Will need to handle culture (language/country) as and when introduced.
 			emailData.MessageBody = SaxResourceHelper.GetTextResource(SaxResourceHelper.TextResource.Email_Security_AccountActivated_Html);
 			emailData.HtmlBody = true;

 			// Replace dynamic tags.
-			EmailConsole.ReplaceDynamicEmailBodyTags(emailData, null, userAccount);
+			controller.EmailConsole.ReplaceDynamicEmailBodyTags(emailData, null, userAccount);

 			// Replace dynamic tag for link back to change password page.
-			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.RequestPassword]", SecurityController.GenerateRequestPasswordLink(this, userAccount.Id, userAccount.EmailAddress, "", AppConfig.URL.Online.Root));
-			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.ExpiresMinutes]", SecurityController.GetRequestPasswordEmailLinkExpiresMinutes(this).ToString());
+			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.RequestPassword]", SecurityController.GenerateRequestPasswordLink(controller, userAccount.Id, userAccount.EmailAddress, "", true));
+			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.SignIn]", controller.AppConfig.URL.Online.Root + "Security/SignIn");
+			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.ExpiresMinutes]", SecurityController.GetRequestPasswordEmailLinkExpiresMinutes(controller).ToString());
 		}

 		//-------------------------------------------------------------------
@@ -146,7 +146,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 					NamedValue.Map values = resultSet.GetRecordValues();
 					OrganisationData_List organisationData = new OrganisationData_List()
 					{
-						Id = values.GetString(colId.DataName),
+						Id = values.GetLong(colId.DataName).ToString(),
 						Name = values.GetString(colName.DataName),
 						TypeCode = values.GetString(colOrganisationType.DataName),
 						TypeDesc = OrganisationTypeCodes.GetDescForCode(values.GetString(colOrganisationType.DataName)),
@@ -337,13 +337,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 				SaLogger.Warn(fn + " Unable to send password request email to " + model.EmailAddress + " - account is not 'Admin'");
 			else
 			{
-				// Send password request email.
-				SaEmailData emailData = new SaEmailData();
-				emailData.Config = EmailConfig;
-				emailData.AddressesTo.Add(model.EmailAddress);
-				emailData.Subject = Localiser["security.caption.request.password"];
-				PopulateRequestPasswordEmailBody(emailData, userAccount);
-				if (EmailConsole.SendEmail(emailData))
+				if (SendRequestPasswordEmail(this, userAccount, false))
 					SaLogger.Info(fn + " Password request email sent to " + model.EmailAddress, true);
 				else SaLogger.Warn(fn + " Failed to send password request email to " + model.EmailAddress);
 			}
@@ -354,18 +348,28 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers

 			return Json(responseData);
 		}
-		private void PopulateRequestPasswordEmailBody(SaEmailData emailData, SaxUserAccount userAccount)
+		public static bool SendRequestPasswordEmail(SaxController_Admin controller, SaxUserAccount userAccount, bool onlineContext)
+		{
+			// Send password request email.
+			SaEmailData emailData = new SaEmailData();
+			emailData.Config = controller.EmailConfig;
+			emailData.AddressesTo.Add(userAccount.EmailAddress);
+			emailData.Subject = controller.Localiser["security.caption.request.password"];
+			PopulateRequestPasswordEmailBody(controller, emailData, userAccount, onlineContext);
+			return controller.EmailConsole.SendEmail(emailData);
+		}
+		private static void PopulateRequestPasswordEmailBody(SaxController_Admin controller, SaEmailData emailData, SaxUserAccount userAccount, bool onlineContext)
 		{
 			// Will need to handle culture (language/country) as and when introduced.
 			emailData.MessageBody = SaxResourceHelper.GetTextResource(SaxResourceHelper.TextResource.Email_Security_RequestPassword_Html);
 			emailData.HtmlBody = true;

 			// Replace dynamic tags.
-			EmailConsole.ReplaceDynamicEmailBodyTags(emailData, null, userAccount);
+			controller.EmailConsole.ReplaceDynamicEmailBodyTags(emailData, null, userAccount);

 			// Replace dynamic tag for link back to change password page.
-			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.RequestPassword]", GenerateRequestPasswordLink(this, userAccount.Id, userAccount.EmailAddress, "", GetRedirectLocation(RedirectLocation.WebAppBase)));
-			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.ExpiresMinutes]", GetRequestPasswordEmailLinkExpiresMinutes(this).ToString());
+			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.RequestPassword]", GenerateRequestPasswordLink(controller, userAccount.Id, userAccount.EmailAddress, "", onlineContext));
+			SaEmailConsole.ReplaceDynamicEmailTag(emailData, "[#Link.ExpiresMinutes]", GetRequestPasswordEmailLinkExpiresMinutes(controller).ToString());
 		}

 		//-------------------------------------------------------------------
@@ -377,11 +381,20 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 		private static String ParamName_Token { get; } = "tok";
 		// NB IV value is generated from the key and fixed so that it doesn't change when the application restarts.
 		// IV Must be regenerated if key is changed.
-		private static String Base64Key_RequestPassword { get; } = SacsEncryptionHelper.EncodePlainKey("{~Saxonite@@Request^Password=}", SacsEncryptionHelper.KeyLength);
-		private static String Base64IV_RequestPassword_Generated { get; } = SacsEncryptionHelper.InitSymmetricEncryptionIV(Base64Key_RequestPassword);
-		private static String Base64IV_RequestPassword { get; } = "1VAWYTW6d72n/6HDNhbqow==";
-		internal static String GenerateRequestPasswordLink(SaxController_Admin controller, SysId userAccountId, String emailAddress, String requestPasswordToken, String baseUrl)
+		private static String Base64Key_RequestPassword_Admin { get; } = SacsEncryptionHelper.EncodePlainKey("{~Saxonite@@Request^Password=}", SacsEncryptionHelper.KeyLength);
+		//private static String Base64IV_RequestPassword_Generated { get; } = SacsEncryptionHelper.InitSymmetricEncryptionIV(Base64Key_RequestPassword);
+		private static String Base64IV_RequestPassword_Admin { get; } = "1VAWYTW6d72n/6HDNhbqow==";
+		/// <summary>
+		/// Generate Request Password link.
+		/// <para>NB For an Online application request (from teh ASdmin system), must ensure that the URL and encryption parameters are switched.</para>
+		/// </summary>
+		internal static String GenerateRequestPasswordLink(SaxController_Admin controller, SysId userAccountId, String emailAddress, String requestPasswordToken, bool onlineContext)
 		{
+			// Base URL.
+			String baseUrl = onlineContext ? controller.AppConfig.URL.Online.Root : controller.GetRedirectLocation(RedirectLocation.WebAppBase);
+			String requestPassword_Base64Key = onlineContext ? Base64Key_RequestPassword_Online : Base64Key_RequestPassword_Admin;
+			String requestPassword_ase64IV = onlineContext ? Base64IV_RequestPassword_Online : Base64IV_RequestPassword_Admin;
+
 			NameValueCollection parameters = new NameValueCollection();
 			parameters.Add(ParamName_UserAccountId, SysId.ToString(userAccountId));
 			parameters.Add(ParamName_EmailAddress, emailAddress);
@@ -389,7 +402,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			parameters.Add(ParamName_Token, requestPasswordToken);
 			String link =
 				baseUrl + "Security/ChangePassword?" +
-				ParamName_RequestPasswordEncrypted + "=" + HttpUtility.UrlEncode(controller.EncryptParameters(parameters, Base64IV_RequestPassword, Base64Key_RequestPassword));
+				ParamName_RequestPasswordEncrypted + "=" + HttpUtility.UrlEncode(EncryptParameters(parameters, requestPassword_ase64IV, requestPassword_Base64Key));
 			return link;
 		}
 		internal static int GetRequestPasswordEmailLinkExpiresMinutes(SaxController_Admin controller)
@@ -442,7 +455,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			RequestPasswordParams requestPasswordParams = new RequestPasswordParams();
 			if (!StringUtil.IsEmpty(encryptedParams))
 			{
-				NameValueCollection linkParams = DecryptParameters(encryptedParams, Base64IV_RequestPassword, Base64Key_RequestPassword);
+				NameValueCollection linkParams = DecryptParameters(encryptedParams, Base64IV_RequestPassword_Admin, Base64Key_RequestPassword_Admin);
 				requestPasswordParams.UserAccountId = new SysId(StringUtil.ToInt(linkParams.Get(ParamName_UserAccountId)));
 				requestPasswordParams.EmailAddress = linkParams.Get(ParamName_EmailAddress);
 				requestPasswordParams.ExpiresAt = DateUtil.ParseXmlDateTime(linkParams.Get(ParamName_ExpiresAt));
@@ -19,18 +19,15 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 	{
 		//-------------------------------------------------------------------
 		// User data.
-		private class UserData_List
+		private class UserData_List : AjaxResponse_Data.ItemData_Base
 		{
-			public String Id { get; set; }
 			public String EmailAddress { get; set; }
 			public String DisplayName { get; set; }
 			public String Title { get; set; }
 			public String FirstName { get; set; }
 			public String LastName { get; set; }
 			public int UserRoleCount { get; set; }
-			public bool SystemAdmin { get; set; }
-			public String StatusCode { get; set; }
-			public String StatusDesc { get; set; }
+			public bool? SystemAdmin { get; set; } = null;
 		}
 		private class UserData_Full : UserData_List
 		{
@@ -45,6 +42,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			data.FirstName = user.FirstName;
 			data.LastName = user.LastName;
 			data.UserRoleCount = userRoles?.GetUserRolesByStatus(SaStatus.Active).Count ?? 0;
+			data.SystemAdmin = (userRoles != null && userRoles.Exists(item => item.UserRole == Sax.UserRole.SystemAdmin) ? true : (bool?)null);
 			data.StatusCode = user.StatusCode;
 			data.StatusDesc = user.StatusDesc;
 		}
@@ -95,9 +93,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			String messageTitle = Localiser["user.caption.users"];
 			AjaxResponse_UserList responseData = new AjaxResponse_UserList(model);

-			// Validate session.
-			if (!ValidUserSession)
-				return GetAjaxResult_InvalidSession(responseData);
+			// Validate session and referrer.
+			if (!ValidReferer) return Forbid();
+			if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
+			RefreshModel(model);

 			// Reference data - user roles.
 			foreach (TypeCodeDesc userRole in UserRoleCodes)
@@ -187,9 +186,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			String messageTitle = Localiser["user.caption.user"];
 			AjaxResponse_User responseData = new AjaxResponse_User(model);

-			// Validate session.
-			if (!ValidUserSession)
-				return GetAjaxResult_InvalidSession(responseData);
+			// Validate session and referrer.
+			if (!ValidReferer) return Forbid();
+			if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
+			RefreshModel(model);

 			// Identify item.
 			SysId userAccountId = model.UserAccountId.ToSysId();
@@ -222,9 +222,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			AjaxResponse_User responseData = new AjaxResponse_User(model);
 			StoreSessionData = false;

-			// Validate session.
-			if (!ValidUserSession)
-				return GetAjaxResult_InvalidSession(responseData);
+			// Validate session and referrer.
+			if (!ValidReferer) return Forbid();
+			if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
+			RefreshModel(model);

 			// Identify user.
 			if (StringUtil.IsEmpty(model.UserEmailAddress))
@@ -259,9 +260,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			String messageTitle = Localiser["user.caption.user"];
 			AjaxResponse_User responseData = new AjaxResponse_User(model);

-			// Validate session.
-			if (!ValidUserSession)
-				return GetAjaxResult_InvalidSession(responseData);
+			// Validate session and referrer.
+			if (!ValidReferer) return Forbid();
+			if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
+			RefreshModel(model);

 			// Validate item properties.
 			model.ValidateUserData(responseData);
@@ -367,6 +369,72 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			return Json(responseData);
 		}

+		//-------------------------------------------------------------------
+		// Send User Emails ajax request.
+		//-------------------------------------------------------------------
+		[HttpPost]
+		[Route("User/Ajax/SendEmails")]
+		public IActionResult Ajax_SendEmails(Model_User model)
+		{
+			String fn = GetType().Name + ".Ajax_SendEmails";
+			String messageTitle = Localiser["label.emails"];
+			AjaxResponse_User responseData = new AjaxResponse_User(model);
+
+			// Validate session and referrer.
+			if (!ValidReferer) return Forbid();
+			if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
+			RefreshModel(model);
+
+			// Retrieve user.
+			SysId userAccountId = model.UserAccountId.ToSysId();
+			SaxUserAccount userAccount = AccountMgr.GetUserAccountById(userAccountId);
+			if (userAccount == null)
+			{
+				SaLogger.Warn(fn + " Failed to retrieve user for Id: '" + model.UserAccountId + "'");
+				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
+			}
+
+			// User roles.
+			List<SaxUserRole> userRoles = GetUserRoles(userAccount.Id, SaxUserRole.StatusCat.Any);
+			bool systemAdmin = userRoles.Exists(item => item.UserRole == Sax.UserRole.SystemAdmin);
+
+			// Email types to send.
+			bool sendAcountActivationOnline = StringUtil.ToBool(model.UserEmailAcountActivationOnline);
+			bool sendRequestPasswordOnline = StringUtil.ToBool(model.UserEmailRequestPasswordOnline);
+			bool sendRequestPasswordAdmin = StringUtil.ToBool(model.UserEmailRequestPasswordAdmin);
+			if (!sendAcountActivationOnline && !sendRequestPasswordOnline && !sendRequestPasswordAdmin)
+				return Json(responseData.SetMessage(messageTitle, Localiser["msg.validation.select.option"]));
+			if (sendRequestPasswordAdmin && !systemAdmin)
+				return Json(responseData.SetMessage(messageTitle, Localiser["user.msg.not.system.admin"]));
+
+			// Send emails.
+			int emailsSentCount = 0;
+			if (sendAcountActivationOnline)
+			{
+				if (!OrganisationController.SendAccountActivatedEmail(this, userAccount))
+					return Json(responseData.SetMessage(messageTitle, "Failed to send Online Accoutn Activation email."));
+				emailsSentCount++;
+			}
+			if (sendRequestPasswordOnline)
+			{
+				if (!SecurityController.SendRequestPasswordEmail(this, userAccount, true))
+					return Json(responseData.SetMessage(messageTitle, "Failed to send Online Request Password email."));
+				emailsSentCount++;
+			}
+			if (sendRequestPasswordAdmin)
+			{
+				if (!SecurityController.SendRequestPasswordEmail(this, userAccount, false))
+					return Json(responseData.SetMessage(messageTitle, "Failed to send Admin Request Password email."));
+				emailsSentCount++;
+			}
+
+			// Construct response.
+			PopulateUserResponseData(responseData.user, userAccount, userRoles.GetUserRolesByStatus(SaStatus.Active));
+			responseData.SetNotification(messageTitle, "Emails sent: " + emailsSentCount);
+			responseData.Success = true;
+			return Json(responseData);
+		}
+
 		//-------------------------------------------------------------------
 	}
 	//=======================================================================
@@ -1,6 +1,7 @@
 using Sarand.Net.Standard.Base.App;
 using Sarand.Net.Standard.Base.Bus;
 using Sarand.Net.Standard.Base.Core;
+using Sarand.Net.Standard.Base.Helpers;
 using Sarand.Net.Standard.Base.Utils;
 using Saxonite.Base.App;
 using Saxonite.Net.Core.Web.Base.App;
@@ -57,6 +58,10 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 		}
 		public String UserStatusCode { get; set; }
 		public SaStatus UserStatus { get { return SacsSystem.GetStatusForCode(UserStatusCode); } }
+		// User emails.
+		public String UserEmailAcountActivationOnline { get; set; }
+		public String UserEmailRequestPasswordOnline { get; set; }
+		public String UserEmailRequestPasswordAdmin { get; set; }

 		//-------------------------------------------------------------------
 		// Validation.
@@ -73,6 +78,8 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 					responseData.SetControlError(nameof(UserEmailAddress), Localiser["msg.validation.mandatory.value"]);
 				else if (StringUtil.GetLength(UserEmailAddress) > GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserAccount_EmailAddress))
 					responseData.SetControlError(nameof(UserEmailAddress), Localiser["msg.validation.maximum.length", GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserAccount_EmailAddress)]);
+				else if (!SacsDataValidationHelper.IsValidEmailAddress(UserEmailAddress))
+					responseData.SetControlError(nameof(UserEmailAddress), Localiser["msg.validation.invalid.value"]);
 				else
 				{
 					// Check for duplicate email address.
@@ -201,6 +201,12 @@
  <data name="label.email.address" xml:space="preserve">
    <value>Email address</value>
  </data>
+  <data name="label.email.types" xml:space="preserve">
+    <value>Email types</value>
+  </data>
+  <data name="label.emails" xml:space="preserve">
+    <value>Emails</value>
+  </data>
  <data name="label.filename" xml:space="preserve">
    <value>Filename</value>
  </data>
@@ -390,6 +396,9 @@
  <data name="msg.validation.maximum.length" xml:space="preserve">
    <value>Value must not exceed {0} characters</value>
  </data>
+  <data name="msg.validation.select.option" xml:space="preserve">
+    <value>At least one option must be selected.</value>
+  </data>
  <data name="organisation.activate.intro" xml:space="preserve">
    <value>On activation, the Organisation will become visible on the platform and authorised members will be able to post content associated with the organisation.</value>
  </data>
@@ -522,6 +531,9 @@
  <data name="user.activate.email.subject" xml:space="preserve">
    <value>Account Activation</value>
  </data>
+  <data name="user.caption.select.user.emails" xml:space="preserve">
+    <value>Select User Emails</value>
+  </data>
  <data name="user.caption.select.user.roles" xml:space="preserve">
    <value>Select User Roles</value>
  </data>
@@ -537,4 +549,19 @@
  <data name="user.caption.users" xml:space="preserve">
    <value>Users</value>
  </data>
+  <data name="user.email.account.activation.online" xml:space="preserve">
+    <value>Account activation - Online</value>
+  </data>
+  <data name="user.email.request.password.admin" xml:space="preserve">
+    <value>Request password - Admin</value>
+  </data>
+  <data name="user.email.request.password.online" xml:space="preserve">
+    <value>Request password - Online</value>
+  </data>
+  <data name="user.emails.intro" xml:space="preserve">
+    <value>Select the types of email to be sent.</value>
+  </data>
+  <data name="user.msg.not.system.admin" xml:space="preserve">
+    <value>User is not system admin.</value>
+  </data>
 </root>
@@ -181,7 +181,7 @@
 	@* Footer *@
 	<footer id="sax-page-footer" class="border-top footer text-muted">
 		<div class="container">
-			@(Model.CopyrightNotice) - @Localiser["company.name"] @(Model.InstanceVersion) - <a asp-area="" asp-controller="Home" asp-action="">Home</a>
+			@(Model.CopyrightNotice) - @Localiser["company.name"] @(Model.InstanceVersion)
 		</div>
 	</footer>

@@ -5,41 +5,80 @@
 	ViewData["Title"] = "Users";
 }

-<div class="">
+<div class="sax-panel Users">
+
+	<script type="text/javascript">
+		sax.lbl.refresh = '@(Localiser.GetJavascriptText("label.refresh"))';
+		sax.lbl.create = '@(Localiser.GetJavascriptText("label.create"))';
+		sax.lbl.edit = '@(Localiser.GetJavascriptText("label.edit"))';
+		sax.lbl.emails= '@(Localiser.GetJavascriptText("label.emails"))';
+	</script>

 	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserFilter", @class = "sax-form", @onSubmit = "return false;" }))
 	{
+
+		@* Filter Panel *@
 		<div class="sax-panel-filter">
+			@* Header - Page caption, paging controls, actions. *@
 			<div class="sax-header row">
 				<div class="col"><div class="sax-caption">@Localiser["user.caption.users"]</div></div>
 				<div class="fixed row">
-					<div>
+					<div class="col">
 						<partial name="~/Views/Common/ResultsPaging.cshtml" />
 					</div>
-					<div class="sax-action sax-results-refresh"><img src="~/img/action/refresh24.png" alt="@(Localiser["label.refresh"])" title="@(Localiser["label.refresh"])" /></div>
-					<div class="sax-action sax-item-create"><img src="~/img/action/add24.png" alt="@(Localiser["label.create"])" title="@(Localiser["label.create"])" /></div>
+					<div class="fixed">
+						@* Burger menu *@
+						<ul class="nav navbar-nav navbar-dark navbar-right sax-burger">
+							<li class="dropdown-toggle caret-off">
+								<a href="#" class="dropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="navbar-toggler-icon"></span></a>
+								<ul class="dropdown-menu dropdown-menu-right sax-dropdown-menu">@* Menu items will be inserted here. *@</ul>
+							</li>
+						</ul>
+					</div>
 				</div>
 			</div>
 			<div class="sax-content">
 				<div class="row">
+					@* User filter - email, name etc. *@
 					<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["user.caption.user"]</div>
 					<div class="col-sm-7">@Html.TextBoxFor(model => model.Filter.User, new { @id = "ifFilterUser", @class = "FilterUser", @maxlength = "32" })</div>
 				</div>
 			</div>
+
+			@* Filter element templates *@
+			<div class="sax-panel-item-template">
+				@* Burger dropdown item template - ul is ignored *@
+				<ul class="sax-dropdown-menu UserFilter">
+					<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
+				</ul>
+			</div>
+
 		</div>
 	}

+	@* Results Panel *@
 	<div class="sax-panel-results">
 		<div class="sax-panel-messages"></div>
 		<div class="sax-panel-item-list"></div>
+
+		@* Element templates *@
 		<div class="sax-panel-item-template">
+
+			@* User item template *@
 			<div class="sax-panel-item User">
 				<div class="sax-header row">
 					<div class="col">
+						@* User email *@
 						<div class="sax-caption"><div class="sax-action UserEmailAddress"></div></div>
 					</div>
 					<div class="fixed sax-actions">
-						<div class="sax-action sax-item-update"><img src="~/img/action/edit24.png" alt="@(Localiser["label.update"])" title="@(Localiser["label.update"])" /></div>
+						@* Burger menu *@
+						<ul class="nav navbar-nav navbar-light navbar-right sax-burger">
+							<li class="dropdown-toggle caret-off">
+								<a href="#" class="dropdown" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="navbar-toggler-icon"></span></a>
+								<ul class="dropdown-menu dropdown-menu-right sax-dropdown-menu">@* Menu items will be inserted here. *@</ul>
+							</li>
+						</ul>
 					</div>
 				</div>
 				<div class="sax-content">
@@ -54,6 +93,12 @@
 					</div>
 				</div>
 			</div>
+
+			@* Burger dropdown item template - ul is ignored *@
+			<ul class="sax-dropdown-menu User">
+				<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
+			</ul>
+
 		</div>
 	</div>

@@ -8,6 +8,7 @@
 	sax.dlg.title.createUser = '@Localiser.GetJavascriptText("user.caption.user.create")';
 	sax.dlg.title.updateUser = '@Localiser.GetJavascriptText("user.caption.user.update")';
 	sax.dlg.title.selectUserRoles = '@Localiser.GetJavascriptText("user.caption.select.user.roles")';
+	sax.dlg.title.selectUserEmails = '@Localiser.GetJavascriptText("user.caption.select.user.emails")';
 	sax.data.userRoleCodeDelim = '@Model.UserRoleCodeDelim';
 </script>
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserId", @class = "sax-form" }))
@@ -31,6 +32,7 @@
 			<div class="sax-message"></div>
 		</div>

+		/* Title */
 		<div class="sax-form-control UserTitle">
 			<div class="sax-label">
 				<label for="cbUserTitle"><span><span class="required"></span> @Localiser["label.title"]</span></label>
@@ -89,6 +91,57 @@

 	}

-	<partial name="~/Views/Common/SelectCode.cshtml" />
-
+</div>
+
+<partial name="~/Views/Common/SelectCode.cshtml" />
+
+<div id="dlgUserEmails" class="sax-dialog" title="">
+	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserEmails", @class = "sax-form", @onSubmit = "return false;" }))
+	{
+		@Html.HiddenFor(model => model.UserAccountId, new { @class = "UserAccountId" })
+
+		<div class="sax-para">@Localiser["user.emails.intro"]</div>
+
+		@* User email *@
+		<div class="sax-form-control UserEmailAddress">
+			<div class="sax-label">
+				<label><span>@Localiser["label.email.address"]</span></label>
+			</div>
+			<div class="sax-control">
+				<input type="text" class="UserEmailAddress sax-input" readonly="readonly" />
+			</div>
+			<div class="sax-message"></div>
+		</div>
+
+		@* User display name *@
+		<div class="sax-form-control UserDisplayName">
+			<div class="sax-label">
+				<label ><span>@Localiser["label.name"]</span></label>
+			</div>
+			<div class="sax-control">
+				<input type="text" class="UserDisplayName sax-input" readonly="readonly" />
+			</div>
+			<div class="sax-message"></div>
+		</div>
+
+		@* User emails *@
+		<div class="sax-form-control UserEmailTypes">
+			<div class="sax-label">
+				<label for="chkUserEmailRequestPasswordAdmin"><span>@Localiser["label.email.types"]</span></label>
+			</div>
+			<div class="sax-control">
+				<div class="AcountActivationOnlineOption">
+					<input type="checkbox" id="chkUserEmailAcountActivationOnline" class="UserEmailAcountActivationOnline" name="UserEmailAcountActivationOnline" value="1" />&nbsp;<span onclick="$('#chkUserEmailAcountActivationOnline').click()">@Localiser["user.email.account.activation.online"]</span>
+				</div>
+				<div class="RequestPasswordOnlineOption">
+					<input type="checkbox" id="chkUserEmailRequestPasswordOnline" class="UserEmailRequestPasswordOnline" name="UserEmailRequestPasswordOnline" value="1" />&nbsp;<span onclick="$('#chkUserEmailRequestPasswordOnline').click()">@Localiser["user.email.request.password.online"]</span>
+				</div>
+				<div class="RequestPasswordAdminOption">
+					<input type="checkbox" id="chkUserEmailRequestPasswordAdmin" class="UserEmailRequestPasswordAdmin" name="UserEmailRequestPasswordAdmin" value="1" />&nbsp;<span onclick="$('#chkUserEmailRequestPasswordAdmin').click()">@Localiser["user.email.request.password.admin"]</span>
+				</div>
+			</div>
+			<div class="sax-message"></div>
+		</div>
+
+	}
 </div>
@@ -77,7 +77,7 @@ html
 body
 {
 	/* Margin bottom by footer height */
-	margin-bottom: 60px;
+	margin-bottom: 40px;
 }

 .footer
@@ -88,8 +88,8 @@ body
 	padding: 0 2%;
 	white-space: nowrap;
 	/* Set the fixed height of the footer here */
-	height: 60px;
-	line-height: 60px; /* Vertically center the text there */
+	height: 40px;
+	line-height: 38px; /* Vertically center the text there */
 }

 /* Header */
@@ -122,6 +122,14 @@ button.accept-policy
 	line-height: inherit;
 }

+/* Footer */
+
+#sax-page-footer div,
+#sax-page-footer a
+{
+	font-size:0.75rem;
+}
+
 /* Information */

 .sax-para
@@ -23,7 +23,7 @@
 	}
 	sax.handleDbSchemaResponse = function (response)
 	{
-		sax.debug('handleDbSchemaResponse', response);
+		//sax.debug('handleDbSchemaResponse', response);
 		delete sax.awaitingRefreshResponse;
 		var $results = $('.sax-panel-results.DbSchema');
 		var $msgs = $('.sax-panel-messages', $results).hide().empty();
@@ -263,16 +263,16 @@
 		var $hdr = $('.heading', $not).css({ 'background-color': 'rgba(247,217,0,0.7)' });
 		$('.title', $not).html(title);
 		$('.message', $not).html(msg);
-		var $bdy = $('.sax-page-body');
-		sax.debug(sax.topMargin($bdy));
+		var $bdy = $('#sax-page-body');
+		//sax.debug(sax.topMargin($bdy));
 		var fbr = $bdy[0].getBoundingClientRect();
-		var fn = function () { $hdr.delay(2000).animate({ backgroundColor: '#f0f0f0' }, 1000); };
+		var fn = function () { $hdr.delay(1500).animate({ backgroundColor: '#f0f0f0' }, 500); };
 		$not.css({ 'top': Math.max(0, fbr.top - sax.topMargin($bdy)), 'right': $win.width() - fbr.right }).slideDown(500, fn);
-		sax.toNotification = setTimeout(sax.hideNotification, 6000);
+		sax.toNotification = setTimeout(sax.hideNotification, 4000);
 	}
 	sax.hideNotification = function ()
 	{
-		wwin.clearTimeout(sax.toNotification);
+		win.clearTimeout(sax.toNotification);
 		$('#sax-notification').slideUp(500);
 	}
 	sax.doPleaseWait = function ()
@@ -360,7 +360,7 @@
 	}
 	sax.doKeepLoggedIn = function ()
 	{
-		sax.debug('KeepLoggedIn Calling');
+		//sax.debug('KeepLoggedIn Calling');
 		var onKeepLoggedIn = function (response)
 		{
 			sax.debug('KeepLoggedIn Responded', response);
@@ -370,19 +370,19 @@
 	}
 	sax.configureSessionRefresh = function ()
 	{
-		sax.debug('SessionRefresh Configuring');
+		//sax.debug('SessionRefresh Configuring');
 		$(document).on('mousedown mousemove touchstart scroll keydown', sax.triggeRefreshSession);
 	}
 	sax.triggeRefreshSession = function ()
 	{
-		sax.session = sax.session || { refresh: {} };
+		//sax.session = sax.session || { refresh: {} };
 		let ssr = sax.session.refresh;
 		win.clearTimeout(ssr.timeout);
 		ssr.timeout = setTimeout(function () { sax.refreshSession(); }, 150000);
 	}
 	sax.refreshSession = function ()
 	{
-		sax.debug('sax.refreshSession');
+		//sax.debug('sax.refreshSession');
 		sax.doKeepLoggedIn();
 	}

@@ -400,7 +400,7 @@
 	}
 	sax.setControlError = function (sel, error)
 	{
-		sax.debug(sel, error);
+		//sax.debug(sel, error);
 		var $ctrl = $(sel).closest('.sax-form-control').addClass('sax-error');
 		$('.sax-message', $ctrl).text(error);
 	}
@@ -151,7 +151,7 @@
 	}
 	sax.onUpdateItem = function (response)
 	{
-		sax.debug('onUpdateItem', response);
+		//sax.debug('onUpdateItem', response);
 		let $frm = sax.$frm.member;
 		$('.UserOrganisationId,input[type="text"],textarea,select', $frm).val('');
 		if (!response.success) return;
@@ -85,7 +85,7 @@
 	}
 	sax.onParentRegionSelected = function (rgn)
 	{
-		sax.debug('onParentRegionSelected', rgn);
+		//sax.debug('onParentRegionSelected', rgn);
 		let $frm = sax.$frm.region;
 		$('.RegionIdParent', $frm).val(rgn.id);
 		$('.ParentRegion', $frm).val(rgn.name);
@@ -115,7 +115,7 @@
 	}
 	sax.onUpdateItem = function (response)
 	{
-		sax.debug('onUpdateItem', response);
+		//sax.debug('onUpdateItem', response);
 		let $frm = sax.$frm.region;
 		$('.RegionId,input[type="text"],textarea,select', $frm).val('');
 		if (!response.success) return;
@@ -15,7 +15,7 @@
 	}
 	sax.onSignin = function (response)
 	{
-		sax.debug(response);
+		//sax.debug(response);
 		sax.refreshControlValues(response.controlValues);
 		if (!response.success) return;
 		sax.goToPage('');
@@ -31,7 +31,7 @@
 	}
 	so.fn.doRefreshResults = function (response)
 	{
-		sax.debug('so.doRefreshResults', response);
+		//sax.debug('so.doRefreshResults', response);
 		sax.refreshPaging(response, '#frmSelectOrganisationFilter', so.fn.refreshOrganisations);
 		if (!response.success) return;
 		let $results = $('.sax-selection-results.Organisations', so.$dlg).empty().hide();
@@ -22,7 +22,7 @@
 	}
 	sax.doRefreshResults = function (response)
 	{
-		sax.debug('doRefreshResults', response);
+		//sax.debug('doRefreshResults', response);
 		delete sax.awaitingRefreshResponse;
 		sax.refreshControlValues(response.controlValues);
 		var $results = $('.sax-panel-results');
@@ -0,0 +1,19 @@
+/*
+ * Admin - System Logs page scripts.
+ */
+
+(function (win, doc, undef)
+{
+	"use strict";
+	sax.itemIdPrefix = 'Itm_';
+
+	//--------------------------------------------------------------
+
+	//--------------------------------------------------------------
+	$(function ()
+	{
+	});
+
+}(window, window.document));
+
+/* The End */
@@ -5,20 +5,21 @@
 (function (win, doc, undef)
 {
 	"use strict";
+	let $pnl = sax.$pnl, $frm = sax.$frm, $dlg = sax.$dlg;
 	sax.itemIdPrefix = 'Itm_';
 	sax.userAccount = {};

 	//--------------------------------------------------------------
 	sax.refreshResults = function (delay)
 	{
-		var $results = $('.sax-panel-results');
 		if (!sax.awaitingRefreshResponse)
 		{
-			var $items = $('.sax-panel-item-list', $results).fadeOut(200).empty();
-			var $msgs = $('.sax-panel-messages', $results).hide().empty().append($('<div class="sax-message">' + sax.msg.dataQuerying + '</div>')).fadeIn(200);
+			$('.sax-burger', $pnl.filter).hide();
+			var $items = $('.sax-panel-item-list', $pnl.results).fadeOut(200).empty();
+			var $msgs = $('.sax-panel-messages', $pnl.results).hide().empty().append($('<div class="sax-message">' + sax.msg.dataQuerying + '</div>')).fadeIn(200);
 		}
-		sax.ajaxRefreshResults = sax.ajaxRefreshResults || { url: sax.url.base + 'User/Ajax/GetList', formId: 'frmUserFilter', callbackFn: sax.doRefreshResults };
-		sax.doAjaxRequest(sax.ajaxRefreshResults, delay || 50);
+		sax.ajax.refreshResults = sax.ajax.refreshResults || { url: sax.url.base + 'User/Ajax/GetList', formId: 'frmUserFilter', callbackFn: sax.doRefreshResults };
+		sax.doAjaxRequest(sax.ajax.refreshResults, delay || 50);
 		sax.awaitingRefreshResponse = true;
 	}
 	sax.doRefreshResults = function (response)
@@ -26,10 +27,8 @@
 		//sax.debug('doRefreshResults', response);
 		delete sax.awaitingRefreshResponse;
 		sax.refreshControlValues(response.controlValues);
-		var $results = $('.sax-panel-results');
-		var $msgs = $('.sax-panel-messages', $results).hide().empty();
-		var $items = $('.sax-panel-item-list', $results).hide().empty();
-		var $tmpl = $('.sax-panel-item-template .sax-panel-item.User', $results);
+		var $msgs = $('.sax-panel-messages', $pnl.results).hide().empty();
+		var $items = $('.sax-panel-item-list', $pnl.results).hide().empty();
 		sax.refreshPaging(response, '#frmUserFilter', sax.refreshResults);
 		if (!response.success) return;
 		// Reference data - Roles.
@@ -39,21 +38,19 @@
 		if (response.defaultStatusCode) sax.data.defaultStatusCode = response.defaultStatusCode;
 		if (response.statuses)
 			sax.populateSelectCodeDesc('#cbUserStatus', response.statuses);
+		// Menu.
+		var $bgr = $('.sax-burger', $pnl.filter).hide();
+		var $mnu = $('ul.sax-dropdown-menu', $bgr).empty();
+		$mnu.append(sax.getFilterMenuOption(sax.lbl.refresh, function () { sax.refreshResults(); }));
+		$mnu.append(sax.getFilterMenuOption(sax.lbl.create, function () { sax.createItem(); }));
+		$bgr.toggle(!!$('.sax-dropdown-item', $mnu).length);
 		// Items.
 		var items = response.users;
 		if (!items.length)
 			return $msgs.append($('<div class="sax-message">' + sax.msg.dataNoneFound + '</div>')).fadeIn(500);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-		{
-			let item = items[itemIdx];
-			let $item = $tmpl.clone();
-			sax.populateItem($item, item);
-			$items.append($item);
-		}
+			$items.append(sax.populateItem(sax.getItemTemplate(), items[itemIdx]));
 		$items.fadeIn(50);
-		// Reference data.
-		if (response.userRoles && response.userRoles.length)
-			sax.data.userRoles = response.userRoles;
 	}
 	sax.populateItem = function ($item, item)
 	{
@@ -66,9 +63,44 @@
 		$('.UserLastName', $item).text(item.lastName);
 		$('.UserRoleCount', $item).text(item.userRoleCount);
 		$('.StatusDesc', $item).text(item.statusDesc);
-		$('.sax-caption .sax-action, .sax-actions .sax-item-update', $item).off('click').on('click', function () { sax.updateItem(item.id) })
-		$item.off('dblclick').on('dblclick', function () { sax.updateItem(item.id) })
-		$('.sax-panel-results .sax-panel-messages').hide().empty();
+		$('.sax-caption .sax-action').toggleClass('sax-action', !item.deleted);
+		let $mnu = $('ul.sax-dropdown-menu', $item);
+		if (!item.deleted)
+		{
+			$mnu.append(sax.getItemMenuOption(sax.lbl.edit, function () { sax.updateItem(item) }));
+			$('.sax-header .sax-action.sax-item-update', $item).off('click').on('click', function () { sax.updateItem(item) });
+			$item.off('dblclick').on('dblclick', function () { sax.updateItem(item) });
+			$mnu.append(sax.getItemMenuOption(sax.lbl.emails, function () { sax.userEmails(item) }));
+		}
+		$('.sax-burger', $item).toggle(!!$('.sax-dropdown-item', $mnu).length);
+		$('.sax-panel-messages', $pnl.results).hide().empty();
+		return $item;
+	}
+
+	//--------------------------------------------------------------
+	sax.getFilterDropdownTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-dropdown-menu.UserFilter li.sax-dropdown-item', $pnl.filter).clone();
+	}
+	sax.getItemTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-panel-item.User', $pnl.results).clone();
+	}
+	sax.getItemDropdownTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-dropdown-menu.User li.sax-dropdown-item', $pnl.results).clone();
+	}
+	sax.getFilterMenuOption = function (lbl, fn)
+	{
+		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn);
+	}
+	sax.getItemMenuOption = function (lbl, fn)
+	{
+		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn);
+	}
+	sax.getMenuOption = function ($opt, lbl, fn)
+	{
+		return $opt.find('div.sax-label').text(lbl).end().on('click', fn);
 	}

 	//--------------------------------------------------------------
@@ -104,91 +136,112 @@
 	//--------------------------------------------------------------
 	sax.createItem = function ()
 	{
-		let $frm = sax.$frm.user;
-		$('.UserAccountId,.UserRoleCodes,input[type="text"],textarea,select', $frm).val('');
-		$('.UserStatus', $frm).val(sax.data.defaultStatusCode);
+		let frm = $frm.user;
+		$('.UserAccountId,.UserRoleCodes,input[type="text"],textarea,select', frm).val('');
+		$('.UserStatus', frm).val(sax.data.defaultStatusCode);
 		sax.clearControlErrors();
 		sax.userAccount = { userRoleCodes: [] };
-		sax.$dlg.user.dialog('option', 'title', sax.dlg.title.createUser);
-		sax.openDialog(sax.$dlg.user, 600, 600);
-	}
-	sax.doCreateItem = function ()
-	{
-		sax.storeItem();
+		$dlg.user.dialog('option', 'title', sax.dlg.title.createUser);
+		sax.openDialog($dlg.user, 600, 600);
 	}

 	//--------------------------------------------------------------
-	sax.updateItem = function (id)
+	sax.updateItem = function (item)
 	{
-		$('.UserAccountId', sax.$frm.userId).val(id);
-		sax.ajaxUpdateItem = sax.ajaxUpdateItem || { url: sax.url.base + 'User/Ajax/GetItem', formId: 'frmUserId', callbackFn: sax.onUpdateItem };
-		sax.doAjaxRequest(sax.ajaxUpdateItem, 50);
+		$('.UserAccountId', $frm.userId).val(item.id);
+		sax.ajax.updateItem = sax.ajax.updateItem || { url: sax.url.base + 'User/Ajax/GetItem', formId: 'frmUserId', callbackFn: sax.onUpdateItem };
+		sax.doAjaxRequest(sax.ajax.updateItem, 50);
 	}
 	sax.onUpdateItem = function (response)
 	{
 		//sax.debug('onUpdateItem', response);
-		let $frm = sax.$frm.user;
-		$('.UserAccountId,input[type="text"],textarea,select', $frm).val('');
+		let frm = $frm.user;
+		$('.UserAccountId,input[type="text"],textarea,select', frm).val('');
 		sax.clearControlErrors();
 		if (!response.success) return;
 		let item = sax.userAccount = response.user;
-		$('.UserAccountId', $frm).val(item.id);
-		$('.UserEmailAddress', $frm).val(item.emailAddress);
-		$('.UserTitle', $frm).val(item.title);
-		$('.UserFirstName', $frm).val(item.firstName);
-		$('.UserLastName', $frm).val(item.lastName);
-		$('.UserRoles', $frm).val(sax.getSelectedUserRoleDescs().join('\n'));
+		$('.UserAccountId', frm).val(item.id);
+		$('.UserEmailAddress', frm).val(item.emailAddress);
+		$('.UserTitle', frm).val(item.title);
+		$('.UserFirstName', frm).val(item.firstName);
+		$('.UserLastName', frm).val(item.lastName);
+		$('.UserRoles', frm).val(sax.getSelectedUserRoleDescs().join('\n'));
 		$('#ifUserRoleCodes').val(item.userRoleCodes.join(sax.data.userRoleCodeDelim));
-		$('.UserStatus', $frm).val(item.statusCode);
-		sax.$dlg.user.dialog('option', 'title', sax.dlg.title.updateUser);
-		sax.openDialog(sax.$dlg.user, 600, 600);
-	}
-	sax.doUpdateItem = function ()
-	{
-		sax.storeItem();
+		$('.UserStatus', frm).val(item.statusCode);
+		$dlg.user.dialog('option', 'title', sax.dlg.title.updateUser);
+		sax.openDialog($dlg.user, 600, 600);
 	}

 	//--------------------------------------------------------------
 	sax.storeItem = function ()
 	{
-		sax.ajaxStoreItem = sax.ajaxStoreItem || { url: sax.url.base + 'User/Ajax/StoreItem', formId: 'frmUser', callbackFn: sax.onStoreItem };
-		sax.doAjaxRequest(sax.ajaxStoreItem, 50);
+		sax.ajax.storeItem = sax.ajax.storeItem || { url: sax.url.base + 'User/Ajax/StoreItem', formId: 'frmUser', callbackFn: sax.onStoreItem };
+		sax.doAjaxRequest(sax.ajax.storeItem, 50);
 	}
 	sax.onStoreItem = function (response)
 	{
 		//sax.debug('onStoreItem', response);
 		sax.refreshControlValues(response.controlValues);
 		if (!response.success) return;
-		sax.$dlg.user.dialog('close');
+		$dlg.user.dialog('close');

 		var item = response.user;
 		var $item = $('#' + sax.itemIdPrefix + item.id);
 		if (!$item.length)
 		{
-			var $results = $('.sax-panel-results');
-			$item = $('.sax-panel-item-template .sax-panel-item.User', $results).clone();
-			$('.sax-panel-item-list', $results).prepend($item).show();
+			$item = sax.getItemTemplate();
+			$('.sax-panel-item-list', $pnl.results).prepend($item).show();
 		}
-		sax.populateItem($item, item)
+		$item.replaceWith(sax.populateItem(sax.getItemTemplate(), item));
+	}
+
+	//--------------------------------------------------------------
+	sax.userEmails = function (item)
+	{
+		sax.debug('userEmails', item);
+		let frm = $frm.emailsl
+		$('.UserAccountId', frm).val(item.id);
+		$('.UserEmailAddress', frm).val(item.emailAddress);
+		$('.UserDisplayName', frm).val(item.displayName);
+		$('.RequestPasswordAdminOption', frm).toggle(item.systemAdmin);
+		$('input[type="checkbox"]', frm).prop('checked', false);
+		$dlg.emails.dialog('option', { 'title': sax.dlg.title.selectUserEmails });
+		sax.openDialog($dlg.emails, 600, 600);
+	}
+	sax.sendUserEmails = function ()
+	{
+		sax.ajax.sendEmails = sax.ajax.sendEmails || { url: sax.url.base + 'User/Ajax/SendEmails', formId: 'frmUserEmails', callbackFn: sax.onUserEmails };
+		sax.doAjaxRequest(sax.ajax.sendEmails, 50);
+	}
+	sax.onUserEmails = function (response)
+	{
+		if (!response || !response.success) return;
+		$dlg.emails.dialog('close');
 	}

 	//--------------------------------------------------------------
 	$(function ()
 	{
-		$('.sax-action.sax-item-create').on('click', function () { sax.createItem(); });
-		$('.sax-action.sax-results-refresh').on('click', function () { sax.refreshResults(); });
-		$('.sax-input').on('input', function () { sax.clearControlError(this); });
-		$('.sax-select').on('click', function () { sax.clearControlError(this); });
+		$pnl.filter = $('.sax-panel-filter');
+		$pnl.results = $('.sax-panel-results');

-		sax.$frm.filter = $('#frmUserFilter');
-		$('.FilterUser', sax.$frm.filter).on('input', function () { sax.refreshResults(250); });
-		sax.$frm.userId = $('#frmUserId');
-		sax.$frm.user = $('#frmUser');
+		$frm.filter = $('#frmUserFilter');
+		$('.FilterUser', $frm.filter).on('input', function () { sax.refreshResults(250); });
+		$frm.userId = $('#frmUserId');
+		$frm.user = $('#frmUser');
+		$('.sax-input, .sax-textarea', $frm.user).on('input', function () { sax.clearControlError(this); });
+		$('.sax-select', $frm.user).on('change', function () { sax.clearControlError(this); });
+		$frm.emails = $('#frmUserEmails');

 		var opt = sax.dlgOpts();
-		opt.buttons[sax.dlg.btn.ok] = function () { sax.doCreateItem(); };
+		opt.buttons[sax.dlg.btn.ok] = function () { sax.storeItem(); };
 		opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
-		sax.$dlg.user = $('#dlgUser').dialog(opt);
+		$dlg.user = $('#dlgUser').dialog(opt);
+
+		opt = sax.dlgOpts();
+		opt.buttons[sax.dlg.btn.ok] = function () { sax.sendUserEmails(); };
+		opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
+		$dlg.emails = $('#dlgUserEmails').dialog(opt);

 		setTimeout(sax.refreshResults, 250);
 	});