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
@@ -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>