v1.2.6.1

2022-05-19 13:41:22 +01:00
parent d17cce340e
commit 56f6b0bb7e
48 changed files with 850 additions and 319 deletions
@@ -142,14 +142,12 @@
 						</div>
 						<div class="sax-content">
 							<div class="row">
-								<div class="col-sm-4"><div class="OrganisationCategory"></div></div>
-								<div class="col-sm-4"><div class="OrganisationType"></div></div>
-								<div class="col-sm-4 text-left text-sm-right"><div class="OrganisationRegion"></div></div>
-							</div>
-							<div class="row">
-								<div class="col-sm-4"><div class="OrganisationSport"></div></div>
-								<div class="col-sm-4"><div class="OrganisationMemberCount sax-action-text">@Localiser["label.members"]:&nbsp;<span class="MemberCount"></span></div></div>
-								<div class="col-sm-4 text-left text-sm-right"><div class="StatusDesc"></div></div>
+								<div class="col-6 col-sm-4"><div class="OrganisationCategory"></div></div>
+								<div class="col-6 col-sm-4"><div class="OrganisationType"></div></div>
+								<div class="col-6 col-sm-4 text-left text-sm-right"><div class="OrganisationRegion"></div></div>
+								<div class="col-6 col-sm-4"><div class="OrganisationSport"></div></div>
+								<div class="col-6 col-sm-4"><div class="OrganisationMemberCount sax-action-text">@Localiser["label.members"]:&nbsp;<span class="MemberCount"></span></div></div>
+								<div class="col-6 col-sm-4 text-left text-sm-right"><div class="StatusDesc"></div></div>
 							</div>
 						</div>
 					</div>
@@ -5,22 +5,41 @@
 	ViewData["Title"] = "Organisation Members";
 }

-<div class="">
+<div class="sax-panel OrganisationMembers">

+	<script type="text/javascript">
+		sax.lbl.refresh = '@(Localiser.GetJavascriptText("label.refresh"))';
+		sax.lbl.add = '@(Localiser.GetJavascriptText("label.add"))';
+		sax.lbl.create = '@(Localiser.GetJavascriptText("label.create"))';
+		sax.lbl.edit = '@(Localiser.GetJavascriptText("label.edit"))';
+		sax.lbl.remove = '@(Localiser.GetJavascriptText("label.remove"))';
+	</script>
+
+	@* Filter Panel *@
 	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmMemberFilter", @class = "sax-form", @onSubmit = "return false;" }))
 	{
-		<div class="sax-panel-filter OrganisationMembers">
+		<div class="sax-panel-filter">
+
+			@* Header - Page caption, paging controls, actions. *@
 			<div class="sax-header row">
 				<div class="col"><div class="sax-caption">@Localiser["organisation.caption.members"]</div></div>
 				<div class="fixed row">
 					<div>
 						<partial name="~/Views/Common/ResultsPaging.cshtml" />
 					</div>
-					<div class="fixed sax-action sax-results-refresh"><img src="~/img/action/refresh24.png" alt="@(Localiser["label.refresh"])" title="@(Localiser["label.refresh"])" /></div>
-					<div class="fixed 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">
+				@* Organisation Member filter - Organisation etc. *@
 				<div class="row">
 					<div class="col-sm-3 sax-label text-left text-sm-right">@Localiser["organisation.caption.organisation"]</div>
 					<div class="col-sm-9">
@@ -29,39 +48,65 @@
 								@Html.HiddenFor(model => model.Filter.OrganisationId, new { @id = "ifFilterOrganisationId" })
 								<input type="text" id="ifFilterOrganisation" class="sax-input" readonly="readonly" value="@(Model.MemberOrganisationName)" />
 							</div>
-							<div class="fixed"><button id="" class="sax-button" onclick="sax.selectFilterOrganisation()">@Localiser["label.select"]</button></div>
+							<div class="fixed"><button id="pbFilterOrganisationSelect" class="sax-button">@Localiser["label.select"]</button></div>
 						</div>
 					</div>
 				</div>
 			</div>
+
+			@* Filter element templates *@
+			<div class="sax-panel-item-template">
+				@* Burger dropdown item template - ul is ignored *@
+				<ul class="sax-dropdown-menu MemberFilter">
+					<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">
+			@* Organisation Member item template *@
 			<div class="sax-panel-item Member">
 				<div class="sax-header row">
 					<div class="col">
-						<div class="sax-caption"><div class="sax-action UserDisplayName"></div></div>
+						@* User name *@
+						<div class="sax-caption sax-action"><div class="UserDisplayName"></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">
 					<div class="row">
-						<div class="col-sm-6"><div class="UserEmailAddress"></div></div>
+						@* User email address and status (if not active) *@
+						<div class="col-sm-6"><span class="UserEmailAddress"></span><span class="UserStatus" style="color:#a0a0a0;">&nbsp;[<span class="UserStatusDesc"></span>]</span></div>
+						@* Role count *@
 						<div class="col-sm-6 right"><div class="MemberRoleCount">@Localiser["label.roles"]:&nbsp;<span class="RoleCount"></span></div></div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4"></div>
 						<div class="col-sm-4"><div class=""></div></div>
-						<div class="col-sm-4 right"><div class="StatusDesc"></div></div>
+						@* Member status *@
+						<div class="col-sm-4 sax-note right"><span class="StatusDesc"></span></div>
 					</div>
 				</div>
 			</div>
+			@* Burger dropdown item template - ul is ignored *@
+			<ul class="sax-dropdown-menu Member">
+				<li class="sax-dropdown-item sax-action"><div class="sax-label">...</div></li>
+			</ul>
 		</div>
 	</div>

@@ -14,6 +14,7 @@
 </script>
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmMemberId" }))
 {
+	@Html.HiddenFor(model => model.OrganisationId, new { @id = "", @class = "OrganisationId" })
 	@Html.HiddenFor(model => model.UserOrganisationId, new { @id = "", @class = "UserOrganisationId" })
 }
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserEmail" }))
@@ -73,8 +74,8 @@
 				<div class="col-sm">
 					<div class="sax-control row">
 						@Html.HiddenFor(model => model.MemberRoleCodes, new { @id = "ifMemberRoleCodes", @class = "MemberRoleCodes sax-input" })
-						<div class="col"><textarea id="ifMemberRoles" class="MemberRoles sax-input" rows="6" readonly="readonly" ondblclick="sax.selectMemberRoles()"></textarea></div>
-						<div class="fixed"><button id="" class="sax-button" style="min-width:auto;margin-left:4px;padding:4px 6px" onclick="sax.selectMemberRoles()">@Localiser["label.select"]</button></div>
+						<div class="col"><textarea id="ifMemberRoles" class="MemberRoles sax-input" rows="6" readonly="readonly"></textarea></div>
+						<div class="fixed"><button id="pbMemberRolesSelect" class="sax-button" style="min-width:auto;margin-left:4px;padding:4px 6px">@Localiser["label.select"]</button></div>
 					</div>
 					<div class="sax-message"></div>
 				</div>
@@ -24,7 +24,7 @@
 		@* Organisation name *@
 		<div class="sax-form-control OrganisationName">
 			<div class="row">
-				<div class="col-sm-4">
+				<div class="col-sm-3">
 					<div class="sax-label">
 						<label for="ifOrganisationName"><span>@Localiser["label.name"]</span>&nbsp;<span class="required">*</span></label>
 					</div>
@@ -39,44 +39,45 @@
 		</div>

 		<div class="row">
-			<div class="col-sm-4"></div>
+			<div class="col-sm-3"></div>

-			<div class="col-sm-4">
+			<div class="col-sm row">
+				<div class="col-sm-6">

-				@* Organisation category *@
-				<div class="sax-form-control OrganisationCategory pr4">
-					<div class="sax-label">
-						<label for="cbOrganisationCategory"><span>@Localiser["label.category"]</span>&nbsp;<span class="required">*</span></label>
+					@* Organisation category *@
+					<div class="sax-form-control OrganisationCategory pr4">
+						<div class="sax-label">
+							<label for="cbOrganisationCategory"><span>@Localiser["label.category"]</span>&nbsp;<span class="required">*</span></label>
+						</div>
+						<div class="sax-control">
+							@Html.DropDownListFor(model => model.OrganisationCategoryValue, Model.AdminOrganisationCategoriesForSelect, Localiser["label.select"], new { @id = "cbOrganisationCategory", @class = "OrganisationCategory sax-select" })
+						</div>
+						<div class="sax-message"></div>
 					</div>
-					<div class="sax-control">
-						@Html.DropDownListFor(model => model.OrganisationCategoryValue, Model.AdminOrganisationCategoriesForSelect, Localiser["label.select"], new { @id = "cbOrganisationCategory", @class = "OrganisationCategory sax-select" })
-					</div>
-					<div class="sax-message"></div>
+
 				</div>

-			</div>
+				<div class="col-sm-6">

-			<div class="col-sm-4">
+					@* Organisation type *@
+					<div class="sax-form-control OrganisationType">
+						<div class="sax-label">
+							<label for="cbOrganisationType"><span>@Localiser["label.type"]</span>&nbsp;<span class="required">*</span></label>
+						</div>
+						<div class="sax-control">
+							@Html.DropDownListFor(model => model.OrganisationTypeValue, Model.OrganisationTypesForSelect, Localiser["label.select"], new { @id = "cbOrganisationType", @class = "OrganisationType sax-select" })
+						</div>
+						<div class="sax-message"></div>
+					</div>

-				@* Organisation type *@
-				<div class="sax-form-control OrganisationType">
-					<div class="sax-label">
-						<label for="cbOrganisationType"><span>@Localiser["label.type"]</span>&nbsp;<span class="required">*</span></label>
-					</div>
-					<div class="sax-control">
-						@Html.DropDownListFor(model => model.OrganisationTypeValue, Model.OrganisationTypesForSelect, Localiser["label.select"], new { @id = "cbOrganisationType", @class = "OrganisationType sax-select" })
-					</div>
-					<div class="sax-message"></div>
 				</div>
-
 			</div>
-
 		</div>

 		@* Organisation sport *@
 		<div class="sax-form-control OrganisationSportId">
 			<div class="row">
-				<div class="col-sm-4">
+				<div class="col-sm-3">
 					<div class="sax-label">
 						<label for="ifOrganisationSportCaption"><span>@Localiser["label.sport"]</span>&nbsp;<span class="required">(*)</span></label>
 					</div>
@@ -96,7 +97,7 @@
 		@* Organisation country *@
 		<div class="sax-form-control OrganisationRegionIdCountry">
 			<div class="row">
-				<div class="col-sm-4">
+				<div class="col-sm-3">
 					<div class="sax-label">
 						<label for="ifOrganisationRegionCaptionCountry"><span>@Localiser["label.country"]</span>&nbsp;<span class="required">*</span></label>
 					</div>
@@ -112,10 +113,61 @@
 			</div>
 		</div>

+		@* Organisation About *@
+		<div class="sax-form-control OrganisationAbout">
+			<div class="row">
+				<div class="col-sm-3">
+					<div class="sax-label">
+						<label for="ifOrganisationAbout"><span>@Localiser["label.about"]</span></label>
+					</div>
+				</div>
+				<div class="col-sm">
+					<div class="sax-control">
+						@Html.TextAreaFor(model => model.OrganisationAbout, new { @id = "ifOrganisationAbout", @class = "OrganisationAbout sax-input", @rows = 6, @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.Organisation_About) })
+					</div>
+					<div class="sax-message"></div>
+				</div>
+			</div>
+		</div>
+
+		@* Organisation Facilities *@
+		<div class="sax-form-control OrganisationFacilities">
+			<div class="row">
+				<div class="col-sm-3">
+					<div class="sax-label">
+						<label for="ifOrganisationFacilities"><span>@Localiser["label.facilities"]</span></label>
+					</div>
+				</div>
+				<div class="col-sm">
+					<div class="sax-control">
+						@Html.TextAreaFor(model => model.OrganisationFacilities, new { @id = "ifOrganisationFacilities", @class = "OrganisationFacilities sax-input", @rows = 6, @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.Organisation_Facilities) })
+					</div>
+					<div class="sax-message"></div>
+				</div>
+			</div>
+		</div>
+
+		@* Organisation Notes *@
+		<div class="sax-form-control OrganisationNotes">
+			<div class="row">
+				<div class="col-sm-3">
+					<div class="sax-label">
+						<label for="ifOrganisationNotes"><span>@Localiser["label.notes"]</span></label>
+					</div>
+				</div>
+				<div class="col-sm">
+					<div class="sax-control">
+						@Html.TextAreaFor(model => model.OrganisationNotes, new { @id = "ifOrganisationNotes", @class = "OrganisationNotes sax-input", @rows = 3, @maxlength = @Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.Organisation_Notes) })
+					</div>
+					<div class="sax-message"></div>
+				</div>
+			</div>
+		</div>
+
 		@* Organisation status *@
 		<div class="sax-form-control OrganisationStatus">
 			<div class="row">
-				<div class="col-sm-4">
+				<div class="col-sm-3">
 					<div class="sax-label">
 						<label for="cbOrganisationStatus"><span>@Localiser["label.status"]</span>&nbsp;<span class="required">*</span></label>
 					</div>