v1.2.4.1

SaxoniteCoreWebAdmin/Admin/Controllers/RegionController-Ajax.cs

@@ -167,21 +167,27 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			if (!ValidUserSession)
 				return GetAjaxResult_InvalidSession(responseData);
 
-			// Identify item.
-			SysId regionId = model.RegionId.ToSysId();
-			if (!SysId.IsValid(regionId))
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"]));
-
-			// Retrieve item.
-			SaxRegion region = ReferenceMgr.GetRegionById(regionId);
-			if (region == null)
+			// Record disposable items as they are created so all can be disposed when needed.
+			using (DisposableCollection<SacsHierarchyItem> disposableItems = new DisposableCollection<SacsHierarchyItem>())
 			{
-				SaLogger.Warn(fn + " Failed to retrieve region for Id: '" + model.RegionId + "'");
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
-			}
 
-			// Construct response.
-			PopulateRegionResponseData(region, responseData.region);
+				// Identify item.
+				SysId regionId = model.RegionId.ToSysId();
+				if (!SysId.IsValid(regionId))
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"]));
+
+				// Retrieve item.
+				SaxRegion region = ReferenceMgr.GetRegionById(regionId);
+				disposableItems.Add(region);
+				if (region == null)
+				{
+					SaLogger.Warn(fn + " Failed to retrieve region for Id: '" + model.RegionId + "'");
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
+				}
+
+				// Construct response.
+				PopulateRegionResponseData(region, responseData.region);
+			}
 
 			// Complete response.
 			responseData.Success = true;
@@ -204,56 +210,65 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			if (!ValidUserSession)
 				return GetAjaxResult_InvalidSession(responseData);
 
-			// Validate item properties.
-			model.ValidateRegionData(responseData);
-			if (responseData.HasControlErrors())
-				return Json(responseData);
-
-			// Retrieve existing item.
-			SysId regionId = model.RegionId.ToSysId();
-			SaxRegion region = ReferenceMgr.GetRegionById(regionId);
-			if (region == null && SysId.IsValid(regionId))
+			// Record disposable items as they are created so all can be disposed when needed.
+			using (DisposableCollection<SacsHierarchyItem> disposableItems = new DisposableCollection<SacsHierarchyItem>())
 			{
-				SaLogger.Warn(fn + " Failed to retrieve region for Id: '" + model.RegionId + "'");
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
-			}
 
-			// Create new item if required.
-			if (region == null)
-				region = ReferenceMgr.CreateRegion();
+				// Validate item properties.
+				model.ValidateRegionData(responseData);
+				if (responseData.HasControlErrors())
+					return Json(responseData);
 
-			// Populate item properties.
-			if (model.RegionTypeCode != null)
-				region.RegionType = model.RegionType;
-			if (model.RegionCountryIso2Code != null)
-				region.CountryIso2Code = model.RegionCountryIso2Code;
-			if (model.RegionName != null)
-				region.Name = model.RegionName;
-			if (model.RegionIdParent != null)
-				region.RegionIdParent = model.RegionIdParent.ToSysId();
-			if (model.RegionStatusCode != null)
-				region.Status = model.RegionStatus;
-
-			// Store item.
-			if (!SysId.IsValid(region.Id))
-			{
-				if (!ReferenceMgr.InsertRegion(region, DbUpdateInfo))
+				// Retrieve existing item.
+				SysId regionId = model.RegionId.ToSysId();
+				SaxRegion region = ReferenceMgr.GetRegionById(regionId);
+				disposableItems.Add(region);
+				if (region == null && SysId.IsValid(regionId))
 				{
-					SaLogger.Warn(fn + " Failed to insert region: " + ReferenceMgr.ErrorStateMessage);
-					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					SaLogger.Warn(fn + " Failed to retrieve region for Id: '" + model.RegionId + "'");
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
 				}
-			}
-			else
-			{
-				if (!ReferenceMgr.UpdateRegion(region, DbUpdateInfo))
-				{
-					SaLogger.Warn(fn + " Failed to update region [Id:" + SysId.ToString(region.Id) + "]: " + ReferenceMgr.ErrorStateMessage);
-					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
-				}
-			}
 
-			// Construct response.
-			PopulateRegionResponseData(region, responseData.region);
+				// Create new item if required.
+				if (region == null)
+				{
+					region = ReferenceMgr.CreateRegion();
+					disposableItems.Add(region);
+				}
+
+				// Populate item properties.
+				if (model.RegionTypeCode != null)
+					region.RegionType = model.RegionType;
+				if (model.RegionCountryIso2Code != null)
+					region.CountryIso2Code = model.RegionCountryIso2Code;
+				if (model.RegionName != null)
+					region.Name = model.RegionName;
+				if (model.RegionIdParent != null)
+					region.RegionIdParent = model.RegionIdParent.ToSysId();
+				if (model.RegionStatusCode != null)
+					region.Status = model.RegionStatus;
+
+				// Store item.
+				if (!SysId.IsValid(region.Id))
+				{
+					if (!ReferenceMgr.InsertRegion(region, DbUpdateInfo))
+					{
+						SaLogger.Warn(fn + " Failed to insert region: " + ReferenceMgr.ErrorStateMessage);
+						return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					}
+				}
+				else
+				{
+					if (!ReferenceMgr.UpdateRegion(region, DbUpdateInfo))
+					{
+						SaLogger.Warn(fn + " Failed to update region [Id:" + SysId.ToString(region.Id) + "]: " + ReferenceMgr.ErrorStateMessage);
+						return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					}
+				}
+
+				// Construct response.
+				PopulateRegionResponseData(region, responseData.region);
+			}
 
 			// Complete response.
 			responseData.Success = true;

SaxoniteCoreWebAdmin/Admin/Controllers/SportController-Ajax.cs

@@ -22,24 +22,28 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 		private class SportData_List : AjaxResponse_Data.ItemData_Base
 		{
 			public String Name { get; set; }
+			public String SportIdParent { get; set; }
+			public String SportNameParent { get; set; }
 			public String SpecialityLabelCode { get; set; }
 			public String SpecialityLabelDesc { get; set; }
 		}
 		private class SportData_Full : SportData_List
 		{
 		}
-		private void PopulateSportResponseData(SaxSport sport, SportData_List data)
+		private void PopulateSportResponseData(SaxSport sport, SaxSport parentSport, SportData_List data)
 		{
 			data.Id = SysId.ToString(sport.Id);
+			data.SportNameParent = parentSport?.Name ?? null;
+			data.SportIdParent = parentSport?.Id.ToString() ?? null;
 			data.Name = sport.Name;
 			data.SpecialityLabelCode = SportSpecialityLabelCodes.GetCodeForType(sport.SpecialityLabel);
 			data.SpecialityLabelDesc = SportSpecialityLabelCodes.GetDescForType(sport.SpecialityLabel);
 			data.StatusCode = sport.StatusCode;
 			data.StatusDesc = sport.StatusDesc;
 		}
-		private void PopulateSportResponseData(SaxSport sport, SportData_Full data)
+		private void PopulateSportResponseData(SaxSport sport, SaxSport parentSport, SportData_Full data)
 		{
-			PopulateSportResponseData(sport, data as SportData_List);
+			PopulateSportResponseData(sport, parentSport, data as SportData_List);
 		}
 
 		//-------------------------------------------------------------------
@@ -82,14 +86,15 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 
 			// Item columns.
 			ColumnDfn colId = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.Id);
+			ColumnDfn colParentId = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.SportIdParent);
+			ColumnDfn colParentName = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.ParentSport_Name);
 			ColumnDfn colName = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.Name);
 			ColumnDfn colSpecialityLabel = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.SpecialityLabel);
 			ColumnDfn colStatus = ReferenceMgr.GetSportColumnDfn(SaxSport.Column.Status);
 			List<ColumnDfn> columns = new List<ColumnDfn>()
 			{
-				colId,
-				colName, colSpecialityLabel,
-				colStatus
+				colId, colParentId, colParentName,
+				colName, colSpecialityLabel, colStatus
 			};
 
 			// Sort order.
@@ -105,6 +110,8 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 					SportData_List sportData = new SportData_List()
 					{
 						Id = values.GetString(colId.DataName),
+						SportIdParent = values.GetString(colParentId.DataName),
+						SportNameParent = values.GetString(colParentName.DataName),
 						Name = values.GetString(colName.DataName),
 						SpecialityLabelCode = SportSpecialityLabelCodes.GetCodeForType(specialityLabel),
 						SpecialityLabelDesc = SportSpecialityLabelCodes.GetDescForType(specialityLabel),
@@ -146,21 +153,31 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			if (!ValidUserSession)
 				return GetAjaxResult_InvalidSession(responseData);
 
-			// Identify item.
-			SysId sportId = model.SportId.ToSysId();
-			if (!SysId.IsValid(sportId))
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"]));
-
-			// Retrieve item.
-			SaxSport sport = ReferenceMgr.GetSportById(sportId);
-			if (sport == null)
+			// Record disposable items as they are created so all can be disposed when needed.
+			using (DisposableCollection<SacsHierarchyItem> disposableItems = new DisposableCollection<SacsHierarchyItem>())
 			{
-				SaLogger.Warn(fn + " Failed to retrieve sport for Id: '" + model.SportId + "'");
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
-			}
 
-			// Construct response.
-			PopulateSportResponseData(sport, responseData.sport);
+				// Identify item.
+				SysId sportId = model.SportId.ToSysId();
+				if (!SysId.IsValid(sportId))
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.specified"]));
+
+				// Retrieve item.
+				SaxSport sport = ReferenceMgr.GetSportById(sportId);
+				disposableItems.Add(sport);
+				if (sport == null)
+				{
+					SaLogger.Warn(fn + " Failed to retrieve sport for Id: '" + model.SportId + "'");
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
+				}
+
+				// Parent sport.
+				SaxSport parentSport = ReferenceMgr.GetSportById(sport.SportIdParent);
+				disposableItems.Add(parentSport);
+
+				// Construct response.
+				PopulateSportResponseData(sport, parentSport, responseData.sport);
+			}
 
 			// Complete response.
 			responseData.Success = true;
@@ -183,52 +200,67 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			if (!ValidUserSession)
 				return GetAjaxResult_InvalidSession(responseData);
 
-			// Validate item properties.
-			model.ValidateSportData(responseData);
-			if (responseData.HasControlErrors())
-				return Json(responseData);
-
-			// Retrieve existing item.
-			SysId sportId = model.SportId.ToSysId();
-			SaxSport sport = ReferenceMgr.GetSportById(sportId);
-			if (sport == null && SysId.IsValid(sportId))
+			// Record disposable items as they are created so all can be disposed when needed.
+			using (DisposableCollection<SacsHierarchyItem> disposableItems = new DisposableCollection<SacsHierarchyItem>())
 			{
-				SaLogger.Warn(fn + " Failed to retrieve sport for Id: '" + model.SportId + "'");
-				return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
-			}
 
-			// Create new item if required.
-			if (sport == null)
-				sport = ReferenceMgr.CreateSport();
+				// Validate item properties.
+				model.ValidateSportData(responseData);
+				if (responseData.HasControlErrors())
+					return Json(responseData);
 
-			// Populate item properties.
-			if (model.SportName != null)
-				sport.Name = model.SportName;
-			if (model.SportSpecialityLabelCode != null)
-				sport.SpecialityLabel = model.SportSpecialityLabel;
-			if (model.SportStatusCode != null)
-				sport.Status = model.SportStatus;
-
-			// Store item.
-			if (!SysId.IsValid(sport.Id))
-			{
-				if (!ReferenceMgr.InsertSport(sport, DbUpdateInfo))
+				// Retrieve existing item.
+				SysId sportId = model.SportId.ToSysId();
+				SaxSport sport = ReferenceMgr.GetSportById(sportId);
+				disposableItems.Add(sport);
+				if (sport == null && SysId.IsValid(sportId))
 				{
-					SaLogger.Warn(fn + " Failed to insert sport: " + ReferenceMgr.ErrorStateMessage);
-					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					SaLogger.Warn(fn + " Failed to retrieve sport for Id: '" + model.SportId + "'");
+					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.id.not.found"]));
 				}
-			}
-			else
-			{
-				if (!ReferenceMgr.UpdateSport(sport, DbUpdateInfo))
-				{
-					SaLogger.Warn(fn + " Failed to update sport [Id:" + SysId.ToString(sport.Id) + "]: " + ReferenceMgr.ErrorStateMessage);
-					return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
-				}
-			}
 
-			// Construct response.
-			PopulateSportResponseData(sport, responseData.sport);
+				// Create new item if required.
+				if (sport == null)
+				{
+					sport = ReferenceMgr.CreateSport();
+					disposableItems.Add(sport);
+				}
+
+				// Populate item properties.
+				if (model.SportIdParent != null)
+					sport.SportIdParent = model.SportIdParent.ToSysId();
+				if (model.SportName != null)
+					sport.Name = model.SportName;
+				if (model.SportSpecialityLabelCode != null)
+					sport.SpecialityLabel = model.SportSpecialityLabel;
+				if (model.SportStatusCode != null)
+					sport.Status = model.SportStatus;
+
+				// Store item.
+				if (!SysId.IsValid(sport.Id))
+				{
+					if (!ReferenceMgr.InsertSport(sport, DbUpdateInfo))
+					{
+						SaLogger.Warn(fn + " Failed to insert sport: " + ReferenceMgr.ErrorStateMessage);
+						return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					}
+				}
+				else
+				{
+					if (!ReferenceMgr.UpdateSport(sport, DbUpdateInfo))
+					{
+						SaLogger.Warn(fn + " Failed to update sport [Id:" + SysId.ToString(sport.Id) + "]: " + ReferenceMgr.ErrorStateMessage);
+						return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ReferenceMgr.ErrorStateMessage));
+					}
+				}
+
+				// Parent sport.
+				SaxSport parentSport = ReferenceMgr.GetSportById(sport.SportIdParent);
+				disposableItems.Add(parentSport);
+
+				// Construct response.
+				PopulateSportResponseData(sport, parentSport, responseData.sport);
+			}
 
 			// Complete response.
 			responseData.Success = true;

SaxoniteCoreWebAdmin/Admin/Controllers/UsersOnlineController.cs

@@ -34,7 +34,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
 			// Paging.
 			Model_UsersOnline model = new Model_UsersOnline(Localiser);
 			model.Paging.PageNo = 1;
-			model.Paging.PageLength = 24;
+			model.Paging.PageLength = 12;
 
 			return View(model);
 		}

SaxoniteCoreWebAdmin/Admin/Models/Model_Organisation.cs

@@ -24,7 +24,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 		public Model_Organisation(SaxLocaliser localiser) :
 			base(localiser)
 		{
-			AdditionalFiles_JS.Add("js/sax-organisation.js");
+			AdditionalFiles_JS.Add("js/sax-org.js");
 		}
 
 		//-------------------------------------------------------------------

SaxoniteCoreWebAdmin/Admin/Models/Model_OrganisationMembers.cs

@@ -24,7 +24,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 		public Model_OrganisationMembers(SaxLocaliser localiser) :
 			base(localiser)
 		{
-			AdditionalFiles_JS.Add("js/sax-organisationMembers.js");
+			AdditionalFiles_JS.Add("js/sax-org-mbr.js");
 		}
 
 		//-------------------------------------------------------------------

SaxoniteCoreWebAdmin/Admin/Models/Model_Region.cs

@@ -23,7 +23,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 		public Model_Region(SaxLocaliser localiser) :
 			base(localiser)
 		{
-			AdditionalFiles_JS.Add("js/sax-region.js");
+			AdditionalFiles_JS.Add("js/sax-rgn.js");
 		}
 
 		//-------------------------------------------------------------------

SaxoniteCoreWebAdmin/Admin/Models/Model_Sport.cs

@@ -58,12 +58,13 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 				SysId sportIdParent = SportIdParent.ToSysId();
 				if (SportIdParent != null && SysId.IsValid(sportIdParent))
 				{
+					String controlName = "SportParent";
 					SaxSport sport = ReferenceMgr.GetSportById(SportIdParent.ToSysId());
 					disposableItems.Add(sport);
 					if (sport == null)
-						responseData.SetControlError(nameof(SportIdParent), Localiser["msg.validation.invalid.value"]);
+						responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]);
 					else if (SysId.IsValid(sport.SportIdParent))
-						responseData.SetControlError(nameof(SportIdParent), Localiser["msg.validation.invalid.value"]);
+						responseData.SetControlError(controlName, Localiser["msg.validation.invalid.value"]);
 				}
 
 				// Sport name.
@@ -81,7 +82,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 						SysId sportId = SportId.ToSysId();
 						if (SysId.IsValid(sportId))
 							prmSport.IdsExcluded.Add(sportId);
-						prmSport.NamePartial = SportName;
+						prmSport.NameFull = SportName;
 						prmSport.StatusCat = SaxSport.StatusCat.Any;
 						if (ReferenceMgr.GetSportCount(prmSport) > 0)
 							responseData.SetControlError(nameof(SportName), Localiser["msg.validation.duplicate.value"]);

SaxoniteCoreWebAdmin/Admin/Models/Model_User.cs

@@ -26,7 +26,7 @@ namespace Saxonite.Net.Core.Web.Admin.Models
 		public Model_User(SaxLocaliser localiser) :
 			base(localiser)
 		{
-			AdditionalFiles_JS.Add("js/sax-user.js");
+			AdditionalFiles_JS.Add("js/sax-usr.js");
 		}
 
 		//-------------------------------------------------------------------

SaxoniteCoreWebAdmin/Views/Common/ResultsPaging.cshtml

@@ -1,7 +1,7 @@
 @model SaxModel_Admin
 @inject SaxLocaliser Localiser
 
-<script src="~/js/sax-resultsPaging.js?@Model.HrefVersion"></script>
+<script src="~/js/sax-res-pag.js?@Model.HrefVersion"></script>
 <script type="text/javascript">
 	sax.resultsPaging.msg.pageInfo = '@Localiser.GetJavascriptText("label.page.info","{0}","{1}")';
 </script>

SaxoniteCoreWebAdmin/Views/Common/SelectCode.cshtml

@@ -2,7 +2,7 @@
 @inject SaxLocaliser Localiser
 
 <link rel="stylesheet" href="~/css/sax-selectCode.css?@Model.HrefVersion" />
-<script src="~/js/sax-selectCode.js?@Model.HrefVersion"></script>
+<script src="~/js/sax-sel-cod.js?@Model.HrefVersion"></script>
 <script type="text/javascript">
 </script>
 

SaxoniteCoreWebAdmin/Views/Common/SelectItem.cshtml

@@ -44,6 +44,6 @@
 		</div>
 	</div>
 
-	<script src="~/js/sax-selectItem.js?@Model.HrefVersion"></script>
+	<script src="~/js/sax-sel-itm.js?@Model.HrefVersion"></script>
 
 </div>

SaxoniteCoreWebAdmin/Views/Common/SelectOrganisation.cshtml

@@ -2,7 +2,7 @@
 @inject SaxLocaliser Localiser
 
 <link rel="stylesheet" href="~/css/sax-selectOrganisation.css?@Model.HrefVersion" />
-<script src="~/js/sax-selectOrganisation.js?@Model.HrefVersion"></script>
+<script src="~/js/sax-sel-org.js?@Model.HrefVersion"></script>
 <script type="text/javascript">
 	sax.selectOrganisation.dlgTitleSelectOrganisation = '@Localiser.GetJavascriptText("organisation.caption.select.organisation")';
 </script>

SaxoniteCoreWebAdmin/Views/Organisation/Index.cshtml

@@ -8,6 +8,8 @@
 <div class="sax-panel Organisations">
 
 	<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.activate = '@(Localiser.GetJavascriptText("label.activate"))';
 	</script>
@@ -21,74 +23,88 @@
 				@* Filter Panel *@
 				@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmOrganisationFilter", @class = "sax-form", @onSubmit = "return false;" }))
 				{
-					<div class="sax-panel-filter">
-						@* Header - Page caption, paging controls, actions. *@
-						<div class="sax-header">
-							<div class="row">
-								<div class="col"><div class="sax-caption">@Localiser["organisation.caption.organisations"]</div></div>
-								<div class="fixed row">
-									<div class="col">
-										<partial name="~/Views/Common/ResultsPaging.cshtml" />
-									</div>
-									<div class="fixed row">
-										<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>
+				<div class="sax-panel-filter">
+					@* Header - Page caption, paging controls, actions. *@
+					<div class="sax-header">
+						<div class="row">
+							<div class="col"><div class="sax-caption">@Localiser["organisation.caption.organisations"]</div></div>
+							<div class="fixed row">
+								<div class="col">
+									<partial name="~/Views/Common/ResultsPaging.cshtml" />
 								</div>
-							</div>
-						</div>
-						<div class="sax-content">
-							@* Organisation filter - name etc. *@
-							<div class="row pb4">
-								<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.search"]</div>
-								<div class="col-sm-7">
-									@Html.TextBoxFor(model => model.Filter.Organisation, new { @id = "", @class = "FilterOrganisation", @maxlength = "32" })
-								</div>
-							</div>
-							@* Organisation Category *@
-							<div class="row pb4">
-								<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.category"]</div>
-								<div class="col-sm-7">
-									@Html.DropDownListFor(model => model.Filter.OrganisationCategoryCode, Model.AdminOrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
-								</div>
-							</div>
-							@* Organisation sport *@
-							<div class="row pb4">
-								<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.sport"]</div>
-								<div class="col-sm-7">
-									<div class="row">
-										@Html.HiddenFor(model => model.Filter.OrganisationSportId, new { @id = "", @class = "FilterOrganisationSportId" })
-										<div class="col"><input type="text" class="FilterOrganisationSportCaption sax-input" readonly="readonly" /> </div>
-										<div class="fixed row">
-											<div class="sax-action FilterSportSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
-											<div class="sax-action FilterSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
-										</div>
-									</div>
-								</div>
-							</div>
-							@* Organisation region *@
-							<div class="row pb4">
-								<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.region"]</div>
-								<div class="col-sm-7">
-									<div class="row">
-										@Html.HiddenFor(model => model.Filter.OrganisationRegionId, new { @id = "", @class = "FilterOrganisationRegionId" })
-										<div class="col"><input type="text" class="FilterOrganisationRegionCaption sax-input" readonly="readonly" /> </div>
-										<div class="fixed row">
-											<div class="sax-action FilterRegionSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
-											<div class="sax-action FilterRegionClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
-										</div>
-									</div>
-								</div>
-							</div>
-							@* Organisation Status *@
-							<div class="row pb4">
-								<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.status"]</div>
-								<div class="col-sm-7">
-									@Html.DropDownListFor(model => model.Filter.OrganisationStatusCategoryCode, Model.OrganisationFilterStatusCategoriesForSelect, new { @id = "", @class = "FilterOrganisationStatusCategory sax-select" })
+								<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>
+					<div class="sax-content">
+						@* Organisation filter - name etc. *@
+						<div class="row pb4">
+							<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.search"]</div>
+							<div class="col-sm-7">
+								@Html.TextBoxFor(model => model.Filter.Organisation, new { @id = "", @class = "FilterOrganisation", @maxlength = "32" })
+							</div>
+						</div>
+						@* Organisation Category *@
+						<div class="row pb4">
+							<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.category"]</div>
+							<div class="col-sm-7">
+								@Html.DropDownListFor(model => model.Filter.OrganisationCategoryCode, Model.AdminOrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
+							</div>
+						</div>
+						@* Organisation sport *@
+						<div class="row pb4">
+							<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.sport"]</div>
+							<div class="col-sm-7">
+								<div class="row">
+									@Html.HiddenFor(model => model.Filter.OrganisationSportId, new { @id = "", @class = "FilterOrganisationSportId" })
+									<div class="col"><input type="text" class="FilterOrganisationSportCaption sax-input" readonly="readonly" /> </div>
+									<div class="fixed row">
+										<div class="sax-action FilterSportSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
+										<div class="sax-action FilterSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
+									</div>
+								</div>
+							</div>
+						</div>
+						@* Organisation region *@
+						<div class="row pb4">
+							<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.region"]</div>
+							<div class="col-sm-7">
+								<div class="row">
+									@Html.HiddenFor(model => model.Filter.OrganisationRegionId, new { @id = "", @class = "FilterOrganisationRegionId" })
+									<div class="col"><input type="text" class="FilterOrganisationRegionCaption sax-input" readonly="readonly" /> </div>
+									<div class="fixed row">
+										<div class="sax-action FilterRegionSelect"><img src="~/img/action/search24.png" alt="@(Localiser["label.search"])" title="@(Localiser["label.search"])" /></div>
+										<div class="sax-action FilterRegionClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div>
+									</div>
+								</div>
+							</div>
+						</div>
+						@* Organisation Status *@
+						<div class="row pb4">
+							<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.status"]</div>
+							<div class="col-sm-7">
+								@Html.DropDownListFor(model => model.Filter.OrganisationStatusCategoryCode, Model.OrganisationFilterStatusCategoriesForSelect, new { @id = "", @class = "FilterOrganisationStatusCategory sax-select" })
+							</div>
+						</div>
+					</div>
+
+					@* Filter element templates *@
+					<div class="sax-panel-item-template">
+						@* Burger dropdown item template - ul is ignored *@
+						<ul class="sax-dropdown-menu OrganisationFilter">
+							<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
+						</ul>
+					</div>
+
+				</div>
 				}
 
 			</div>

SaxoniteCoreWebAdmin/Views/Region/Index.cshtml

@@ -5,7 +5,7 @@
 	ViewData["Title"] = "Regions";
 }
 
-<div class="">
+<div class="sax-panel Regions">
 
 	<div class="sax-panel-filter">
 		@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmRegionFilter", @class = "sax-form", @onSubmit = "return false;" }))
@@ -52,7 +52,7 @@
 					<div class="row">
 						<div class="col-sm-4"><div class="RegionTypeDesc"></div></div>
 						<div class="col-sm-4"><div class="RegionParentName"></div></div>
-						<div class="col-sm-4 right"><div class="RegionStatusDesc"></div></div>
+						<div class="col-sm-4 right"><div class="sax-note RegionStatusDesc"></div></div>
 					</div>
 					<div class="row">
 						<div class="col-sm-4"></div>

SaxoniteCoreWebAdmin/Views/Sport/Index.cshtml

@@ -13,12 +13,13 @@
 		sax.lbl.edit = '@(Localiser.GetJavascriptText("label.edit"))';
 	</script>
 
-	@* Filter Form *@
-	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportFilter", @class = "sax-form", @onSubmit = "return false;" }))
-	{
+	@* Filter Panel *@
+	<div class="sax-panel-filter">
+
+		@* Filter Form *@
+		@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportFilter", @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["sport.caption.sports"]</div></div>
@@ -51,9 +52,8 @@
 					<li class="sax-dropdown-item sax-action"><div class="sax-label">XXX</div></li>
 				</ul>
 			</div>
-
-		</div>
-	}
+		}
+	</div>
 
 	@* Results Panel *@
 	<div class="sax-panel-results">
@@ -81,8 +81,8 @@
 				</div>
 				<div class="sax-content">
 					<div class="row">
-						<div class="col-sm-4"><div class="sax-note SportSpeciality">@Localiser["label.speciality"]:&nbsp;<span class="SportSpecialityLabel"></span></div></div>
-						<div class="col-sm-4"><div class="sax-note "></div></div>
+						<div class="col-sm-4"><div class="SportSpeciality">@Localiser["label.speciality"]:&nbsp;<span class="SportSpecialityLabel"></span></div></div>
+						<div class="col-sm-4"><div class="SportParent">@Localiser["label.parent"]:&nbsp;<span class="SportNameParent"></span></div></div>
 						<div class="col-sm-4 right"><div class="sax-note StatusDesc"></div></div>
 					</div>
 					<div class="row">
@@ -101,6 +101,7 @@
 	</div>
 
 	<partial name="Panel-SportDialog.cshtml" />
+	<partial name="~/Views/Common/SelectItem.cshtml" />
 
 </div>
 

SaxoniteCoreWebAdmin/Views/Sport/Panel-SportDialog.cshtml

@@ -7,14 +7,20 @@
 <script type="text/javascript">
 	sax.dlg.title.createSport = '@Localiser.GetJavascriptText("sport.caption.sport.create")';
 	sax.dlg.title.updateSport = '@Localiser.GetJavascriptText("sport.caption.sport.update")';
+	sax.dlg.title.selectSport = '@Localiser.GetJavascriptText("sport.caption.sport.select")';
 </script>
+
+@* Sport Id form. *@
 @using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSportId", @class = "sax-form" }))
 {
 	@Html.HiddenFor(model => model.SportId, new { @class = "SportId" })
 }
-<div id="dlgSport" class="sax-dialog" title="">
 
-	<div class="spacer2"></div>
+@* Sport dialog *@
+<div id="dlgSport" class="sax-dialog" title="">
+	<div class="spacer4"></div>
+
+	@* Sport form *@
 	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmSport", @class = "sax-form", @onSubmit = "return false;" }))
 	{
 		@Html.HiddenFor(model => model.SportId, new { @class = "SportId" })
@@ -36,6 +42,26 @@
 			</div>
 		</div>
 
+		@* Sport Parent *@
+		<div class="sax-form-control SportParent">
+			<div class="row">
+				<div class="col-sm-3">
+					<div class="sax-label">
+						<label for="ifSportNameParent"><span>@Localiser["label.parent"]</span></label>
+					</div>
+				</div>
+				<div class="col-sm-9">
+					<div class="sax-control row">
+						@Html.HiddenFor(model => model.SportIdParent, new { @id = "ifSportIdParent", @class = "SportIdParent" })
+						<div class="col"><input type="text" class="SportNameParent sax-input" readonly="readonly" /></div>
+						<div class="fixed"><div class="sax-action ParentSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div></div>
+						<div class="fixed"><button type="button" id="pbSelectParentSport" 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>
+			</div>
+		</div>
+
 		@* Sport Speciality Label *@
 		<div class="sax-form-control SportSpecialityLabel">
 			<div class="row">

SaxoniteCoreWebAdmin/Views/System/Database.cshtml

@@ -60,7 +60,9 @@
 <style>
 	#dlgDbTable tr.sax-heading td
 	{
-		color:#808080;
+		color: #606060;
+		background-color: #f0f0f0;
+		border-top: 1px solid #808080;
 		border-bottom: 1px solid #808080;
 	}
 </style>
@@ -74,14 +76,14 @@
 			<tr>
 				<td class="right pt2 pr8">Properties:</td>
 				<td>
-					<table class="TableProperties">
+					<table class="sax-striped TableProperties">
 					</table>
 				</td>
 			</tr>
 			<tr>
 				<td class="right pt2 pr8">Columns:</td>
 				<td>
-					<table class="TableColumns">
+					<table class="sax-striped TableColumns">
 						<tr class="sax-heading">
 							<td class="right pl8 pr8">Pos</td>
 							<td class="pl8 pr8">Name</td>
@@ -93,7 +95,7 @@
 			<tr>
 				<td class="right pt2 pr8">Indices:</td>
 				<td>
-					<table class="TableIndices">
+					<table class="sax-striped TableIndices">
 						<tr class="sax-heading">
 							<td class="pl8 pr8">Name</td>
 							<td class="center pl8 pr8">Unique</td>

SaxoniteCoreWebAdmin/wwwroot/css/sax-base.css

@@ -102,6 +102,21 @@ table
 	empty-cells: inherit;
 }
 
+table.sax-striped
+{
+	border-spacing: 0 2px;
+}
+
+table.sax-striped tr.sax-odd
+{
+	background-color:#fff;
+}
+
+table.sax-striped tr.sax-even
+{
+	background-color:#f8f8f8;
+}
+
 th, td
 {
 	vertical-align: top;

SaxoniteCoreWebAdmin/wwwroot/css/sax-data.css

@@ -100,6 +100,105 @@
 	background-color: #c0c0c0;
 }
 
+/* Panel header - Burger */
+
+.sax-header ul.nav.sax-burger
+{
+	margin: 0;
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu
+{
+	padding: 4px 8px 4px 4px;
+	box-shadow: 0 0 8px 2px #80808080;
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item
+{
+	margin: 2px 4px 2px 0;
+	padding: 2px 4px 2px 30px;
+	background-repeat: no-repeat;
+	background-position: left center;
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-refresh
+{
+	background-image: url('../img/action/refresh24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-add
+{
+	background-image: url('../img/action/add24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-edit
+{
+	background-image: url('../img/action/edit24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-remove
+{
+	background-image: url('../img/action/delete24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-experience
+{
+	background-image: url('../img/action/trophy24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-user
+{
+	background-image: url('../img/action/user24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-users
+{
+	background-image: url('../img/action/users24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-mail
+{
+	background-image: url('../img/action/mail24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-process
+{
+	background-image: url('../img/action/process24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-close
+{
+	background-image: url('../img/action/prev24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-itemlock
+{
+	background-image: url('../img/action/lock24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item.sax-unlock
+{
+	background-image: url('../img/action/unlock24.png');
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item:hover
+{
+	background-color: #f8f8f8;
+	box-shadow: none;
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item .sax-label
+{
+	margin: 0;
+	padding: 0 0 0 4px;
+}
+
+.sax-header ul.nav.sax-burger ul.sax-dropdown-menu li.sax-action.sax-dropdown-item:hover .sax-label
+{
+	background-color: #f8f8f8;
+	box-shadow: 0 0 2px 1px #80808080;
+}
+
 /* Data Items panel */
 
 .sax-panel-results

SaxoniteCoreWebAdmin/wwwroot/js/sax-org.js

@@ -10,7 +10,7 @@
 	sax.itemIdPrefix = 'Itm_';
 
 	//--------------------------------------------------------------
-	sax.refreshResults = function (delay)
+	op.refreshResults = function (delay)
 	{
 		if (!op.awaitingRefreshResponse)
 		{
@@ -21,14 +21,6 @@
 		sax.doAjaxRequest(op.ajax.refreshResults, delay || 50);
 		op.awaitingRefreshResponse = true;
 	}
-	op.getItemTemplate = function ()
-	{
-		return $('.sax-panel-item-template .sax-panel-item.Organisation', $pnl.results).clone();
-	}
-	op.getDropdownItemTemplate = function ()
-	{
-		return $('.sax-panel-item-template .sax-dropdown-menu.Organisation li.sax-dropdown-item', $pnl.results);
-	}
 	op.doRefreshResults = function (response)
 	{
 		//sax.debug('doRefreshResults', response);
@@ -36,12 +28,18 @@
 		sax.refreshControlValues(response.controlValues);
 		var $msgs = $('.sax-panel-messages', $pnl.results).hide().empty();
 		var $items = $('.sax-panel-item-list', $pnl.results).hide().empty();
-		sax.refreshPaging(response, '#frmOrganisationFilter', sax.refreshResults);
+		sax.refreshPaging(response, '#frmOrganisationFilter', op.refreshResults);
 		if (!response.success) return;
 		// Reference data - Statuses.
 		if (response.defaultStatusCode) sax.data.defaultStatusCode = response.defaultStatusCode;
 		if (response.statuses)
 			sax.populateSelectCodeDesc('#cbOrganisationStatus', response.statuses);
+		// Menu.
+		var $bgr = $('.sax-burger', $pnl.filter).hide();
+		var $mnu = $('ul.sax-dropdown-menu', $bgr).empty();
+		$mnu.append(op.getFilterMenuOption(sax.lbl.refresh, function () { op.refreshResults(); }, 'sax-refresh'));
+		$mnu.append(op.getFilterMenuOption(sax.lbl.create, function () { op.createItem(); }, 'sax-add'));
+		$bgr.toggle(!!$('.sax-dropdown-item', $mnu).length);
 		// Items.
 		var items = response.organisations;
 		if (!items.length)
@@ -62,20 +60,46 @@
 		$('.OrganisationMemberCount', $item).on('click', function () { op.onClickMemberCount(item.id); }).find('.MemberCount').text(item.memberCount);
 		$('.StatusDesc', $item).text(item.statusDesc).addClass('sax-status-' + item.statusCode.toLowerCase());
 		$('.sax-caption .sax-action').toggleClass('sax-action', !item.deleted);
+		let $mnu = $('ul.sax-dropdown-menu', $item).empty();
 		if (!item.deleted)
 		{
-			let $mnu = $('ul.sax-dropdown-menu', $item);
-			$mnu.append(op.getDropdownItemTemplate().clone().find('div.sax-label').text(sax.lbl.edit).end().on('click', function () { op.updateItem(item, $item) }));
+			$mnu.append(op.getItemMenuOption(sax.lbl.edit, function () { op.updateItem(item, $item) }, 'sax-edit'));
 			if (item.awaiting)
-				$mnu.append(op.getDropdownItemTemplate().clone().find('div.sax-label').text(sax.lbl.activate).end().on('click', function () { op.activateItem(item) }));
+				$mnu.append(op.getItemMenuOption(sax.lbl.activate, function () { op.activateItem(item) }, 'sax-unlock'));
 			$('.sax-header .sax-action.sax-item-update', $item).off('click').on('click', function () { op.updateItem(item, $item) });
 			$item.off('dblclick').on('dblclick', function () { op.updateItem(item, $item) });
 		}
-		$('.sax-burger', $item).toggle(!!$('.sax-burger .sax-dropdown-menu .sax-dropdown-item', $item).length);
+		$('.sax-burger', $item).toggle(!!$('.sax-dropdown-item', $mnu).length);
 		$('.sax-panel-messages', $pnl.results).hide().empty();
 		return $item;
 	}
 
+	//--------------------------------------------------------------
+	op.getFilterDropdownTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-dropdown-menu.OrganisationFilter li.sax-dropdown-item', $pnl.filter).clone();
+	}
+	op.getItemTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-panel-item.Organisation', $pnl.results).clone();
+	}
+	op.getItemDropdownTemplate = function ()
+	{
+		return $('.sax-panel-item-template .sax-dropdown-menu.Organisation li.sax-dropdown-item', $pnl.results).clone();
+	}
+	op.getFilterMenuOption = function (lbl, fn, cls)
+	{
+		return op.getMenuOption(op.getFilterDropdownTemplate(), lbl, fn, cls);
+	}
+	op.getItemMenuOption = function (lbl, fn, cls)
+	{
+		return op.getMenuOption(op.getItemDropdownTemplate(), lbl, fn, cls);
+	}
+	op.getMenuOption = function ($opt, lbl, fn, cls)
+	{
+		return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls);
+	}
+
 	//--------------------------------------------------------------
 	op.selectFilterSport = function ()
 	{
@@ -92,12 +116,12 @@
 		let frm = $frm.filter;
 		$('.FilterOrganisationSportId', frm).val(spt.id);
 		$('.FilterOrganisationSportCaption', frm).val(spt.name);
-		sax.refreshResults();
+		op.refreshResults();
 	}
 	op.clearFilterSport = function ()
 	{
 		$('.FilterOrganisationSportId,.FilterOrganisationSportCaption', $frm.filter).val('');
-		sax.refreshResults();
+		op.refreshResults();
 	}
 	op.populateSports = function (nextFn)
 	{
@@ -151,12 +175,12 @@
 		let frm = $frm.filter;
 		$('.FilterOrganisationRegionId', frm).val(rgn.id);
 		$('.FilterOrganisationRegionCaption', frm).val(rgn.name);
-		sax.refreshResults();
+		op.refreshResults();
 	}
 	op.clearFilterRegion = function ()
 	{
 		$('.FilterOrganisationRegionId,.FilterOrganisationRegionCaption', $frm.filter).val('');
-		sax.refreshResults();
+		op.refreshResults();
 	}
 	op.populateRegions = function (nextFn)
 	{
@@ -252,10 +276,10 @@
 		var $item = $('#' + sax.itemIdPrefix + item.id);
 		if (!$item.length)
 		{
-			$item = $('.sax-panel-item-template .sax-panel-item.Organisation', $pnl.results).clone();
+			$item = op.getItemTemplate();
 			$('.sax-panel-item-list', $pnl.results).prepend($item).show();
 		}
-		$item.replaceWith(op.populateItem(op.getItemTemplate(), item));
+		op.populateItem($item, item);
 	}
 
 	//--------------------------------------------------------------
@@ -331,12 +355,9 @@
 		$pnl.filter = $('.sax-panel-filter', $pnl.orgs);
 		$pnl.results = $('.sax-panel-results', $pnl.orgs);
 
-		$('.sax-action.sax-item-create', $pnl.filter).on('click', function () { op.createItem(); });
-		$('.sax-action.sax-results-refresh', $pnl.filter).on('click', function () { sax.refreshResults(); });
-
 		$frm.filter = $('#frmOrganisationFilter');
-		$('.FilterOrganisation', $frm.filter).on('input', function () { sax.refreshResults(250); });
-		$('.FilterOrganisationCategory,.FilterOrganisationStatusCategory', $frm.filter).on('change', function () { sax.refreshResults(50); });
+		$('.FilterOrganisation', $frm.filter).on('input', function () { op.refreshResults(250); });
+		$('.FilterOrganisationCategory,.FilterOrganisationStatusCategory', $frm.filter).on('change', function () { op.refreshResults(50); });
 		$frm.filter.on('dblclick', '.FilterOrganisationSportCaption', op.selectFilterSport).on('click', '.FilterSportSelect', op.selectFilterSport).on('click', '.FilterSportClear', op.clearFilterSport);
 		$frm.filter.on('dblclick', '.FilterOrganisationRegionCaption', op.selectFilterRegion).on('click', '.FilterRegionSelect', op.selectFilterRegion).on('click', '.FilterRegionClear', op.clearFilterRegion);
 		$frm.orgId = $('#frmOrganisationId');
@@ -355,7 +376,7 @@
 		opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
 		$dlg.activate = $('#dlgOrganisationActivation').dialog(opt);
 
-		setTimeout(sax.refreshResults, 250);
+		setTimeout(op.refreshResults, 250);
 	});
 
 }(window, window.document));

SaxoniteCoreWebAdmin/wwwroot/js/sax-rgn.js

@@ -56,7 +56,7 @@
 		$('.RegionCountryIso2Code', $item).text(item.countryIso2Code);
 		$('.RegionTypeDesc', $item).text(item.regionTypeDesc);
 		$('.RegionParentName', $item).text(item.parentName);
-		$('.RegionStatusDesc', $item).text(item.statusDesc);
+		$('.RegionStatusDesc', $item).text(item.statusDesc).addClass('sax-status-' + item.statusCode.toLowerCase());
 		$('.sax-caption .sax-action, .sax-actions .sax-action.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();

SaxoniteCoreWebAdmin/wwwroot/js/sax-sport.js

@@ -5,30 +5,33 @@
 (function (win, doc, undef)
 {
 	"use strict";
-	let $pnl = sax.$pnl, $frm = sax.$frm, $dlg = sax.$dlg;
+	let sm = sax.sportMgt = {
+		$pnl: {}, $frm: {}, $dlg: {}, ajax: {}, data: {}
+	};
+	let $pnl = sm.$pnl, $frm = sm.$frm, $dlg = sm.$dlg;
 	sax.itemIdPrefix = 'Itm_';
 
 	//--------------------------------------------------------------
-	sax.refreshResults = function (delay)
+	sm.refreshResults = function (delay)
 	{
-		if (!sax.awaitingRefreshResponse)
+		if (!sm.awaitingRefreshResponse)
 		{
 			$('.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.ajax.refreshResults = sax.ajax.refreshResults || { url: sax.url.base + 'Sport/Ajax/GetList', formId: 'frmSportFilter', callbackFn: sax.doRefreshResults };
+		sax.ajax.refreshResults = sax.ajax.refreshResults || { url: sax.url.base + 'Sport/Ajax/GetList', formId: 'frmSportFilter', callbackFn: sm.doRefreshResults };
 		sax.doAjaxRequest(sax.ajax.refreshResults, delay || 50);
-		sax.awaitingRefreshResponse = true;
+		sm.awaitingRefreshResponse = true;
 	}
-	sax.doRefreshResults = function (response)
+	sm.doRefreshResults = function (response)
 	{
 		//sax.debug('doRefreshResults', response);
-		delete sax.awaitingRefreshResponse;
+		delete sm.awaitingRefreshResponse;
 		sax.refreshControlValues(response.controlValues);
 		var $msgs = $('.sax-panel-messages', $pnl.results).hide().empty();
 		var $items = $('.sax-panel-item-list', $pnl.results).hide().empty();
-		sax.refreshPaging(response, '#frmSportFilter', sax.refreshResults);
+		sax.refreshPaging(response, '#frmSportFilter', sm.refreshResults);
 		if (!response.success) return;
 		// Reference data - Statuses.
 		if (response.defaultStatusCode) sax.data.defaultStatusCode = response.defaultStatusCode;
@@ -37,32 +40,34 @@
 		// 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(); }));
+		$mnu.append(sm.getFilterMenuOption(sax.lbl.refresh, function () { sm.refreshResults(); }, 'sax-refresh'));
+		$mnu.append(sm.getFilterMenuOption(sax.lbl.create, function () { sm.createItem(); }, 'sax-add'));
 		$bgr.toggle(!!$('.sax-dropdown-item', $mnu).length);
 		// Items.
 		var items = response.sports;
 		if (!items.length)
 			return $msgs.append($('<div class="sax-message">' + sax.msg.dataNoneFound + '</div>')).fadeIn(500);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++)
-			$items.append(sax.populateItem(sax.getItemTemplate(), items[itemIdx]));
+			$items.append(sm.populateItem(sm.getItemTemplate(), items[itemIdx]));
 		$items.fadeIn(50);
 	}
-	sax.populateItem = function ($item, item)
+	sm.populateItem = function ($item, item)
 	{
 		if (!item) return;
 		$item.prop('id', sax.itemIdPrefix + item.id);
 		$('.SportName', $item).text(item.name);
+		$('.SportNameParent', $item).text(item.sportNameParent);
+		$('.SportParent', $item).toggle(!!item.sportNameParent);
 		$('.SportSpecialityLabel', $item).text(item.specialityLabelDesc);
 		$('.SportSpeciality', $item).toggle(!!item.specialityLabelCode);
-		$('.StatusDesc', $item).text(item.statusDesc);
+		$('.StatusDesc', $item).text(item.statusDesc).addClass('sax-status-' + item.statusCode.toLowerCase());
 		$('.sax-caption .sax-action').toggleClass('sax-action', !item.deleted);
-		let $mnu = $('ul.sax-dropdown-menu', $item);
+		let $mnu = $('ul.sax-dropdown-menu', $item).empty();
 		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(sm.getItemMenuOption(sax.lbl.edit, function () { sm.updateItem(item) }, 'sax-edit'));
+			$('.sax-header .sax-action.sax-item-update', $item).off('click').on('click', function () { sm.updateItem(item) });
+			$item.off('dblclick').on('dblclick', function () { sm.updateItem(item) });
 		}
 		$('.sax-burger', $item).toggle(!!$('.sax-dropdown-item', $mnu).length);
 		$('.sax-panel-messages', $pnl.results).hide().empty();
@@ -70,50 +75,55 @@
 	}
 
 	//--------------------------------------------------------------
-	sax.getFilterDropdownTemplate = function ()
+	sm.getFilterDropdownTemplate = function ()
 	{
 		return $('.sax-panel-item-template .sax-dropdown-menu.SportFilter li.sax-dropdown-item', $pnl.filter).clone();
 	}
-	sax.getItemTemplate = function ()
+	sm.getItemTemplate = function ()
 	{
 		return $('.sax-panel-item-template .sax-panel-item.Sport', $pnl.results).clone();
 	}
-	sax.getItemDropdownTemplate = function ()
+	sm.getItemDropdownTemplate = function ()
 	{
 		return $('.sax-panel-item-template .sax-dropdown-menu.Sport li.sax-dropdown-item', $pnl.results).clone();
 	}
-	sax.getFilterMenuOption = function (lbl, fn)
+	sm.getFilterMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn);
+		return sm.getMenuOption(sm.getFilterDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getItemMenuOption = function (lbl, fn)
+	sm.getItemMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn);
+		return sm.getMenuOption(sm.getItemDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getMenuOption = function ($opt, lbl, fn)
+	sm.getMenuOption = function ($opt, lbl, fn, cls)
 	{
-		return $opt.find('div.sax-label').text(lbl).end().on('click', fn);
+		return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls);
 	}
 
 	//--------------------------------------------------------------
-	sax.createItem = function ()
+	sm.createItem = function ()
+	{
+		sm.clearItem();
+		$dlg.sport.dialog('option', 'title', sax.dlg.title.createSport);
+		sax.openDialog($dlg.sport, 600, 600);
+	}
+	sm.clearItem = function ()
 	{
 		let frm = $frm.sport;
 		$('.SportId,input[type="text"],textarea,select', frm).val('');
 		$('.SportStatus', frm).val(sax.data.defaultStatusCode);
 		sax.clearControlErrors();
-		$dlg.sport.dialog('option', 'title', sax.dlg.title.createSport);
-		sax.openDialog($dlg.sport, 600, 600);
 	}
 
 	//--------------------------------------------------------------
-	sax.updateItem = function (item)
+	sm.updateItem = function (item)
 	{
+		sm.clearItem();
 		$('.SportId', $frm.sportId).val(item.id);
-		sax.ajax.updateItem = sax.ajax.updateItem || { url: sax.url.base + 'Sport/Ajax/GetItem', formId: 'frmSportId', callbackFn: sax.onUpdateItem };
+		sax.ajax.updateItem = sax.ajax.updateItem || { url: sax.url.base + 'Sport/Ajax/GetItem', formId: 'frmSportId', callbackFn: sm.onUpdateItem };
 		sax.doAjaxRequest(sax.ajax.updateItem, 50);
 	}
-	sax.onUpdateItem = function (response)
+	sm.onUpdateItem = function (response)
 	{
 		//sax.debug('onUpdateItem', response);
 		let frm = $frm.sport;
@@ -121,6 +131,8 @@
 		if (!response.success) return;
 		let item = response.sport;
 		$('.SportId', frm).val(item.id);
+		$('.SportIdParent', frm).val(item.sportIdParent);
+		$('.SportNameParent', frm).val(item.sportNameParent);
 		$('.SportName', frm).val(item.name);
 		$('.SportSpecialityLabel', frm).val(item.specialityLabelCode);
 		$('.SportStatus', frm).val(item.statusCode);
@@ -130,12 +142,52 @@
 	}
 
 	//--------------------------------------------------------------
-	sax.storeItem = function ()
+	sm.populateSports = function (nextFn)
 	{
-		sax.ajax.storeItem = sax.ajax.storeItem || { url: sax.url.base + 'Sport/Ajax/StoreItem', formId: 'frmSport', callbackFn: sax.onStoreItem };
+		let handleResponse = function (response)
+		{
+			if (response && response.success && response.sports)
+				sm.data.sports = response.sports;
+			if (nextFn) nextFn();
+		}
+		sm.ajax.sports = sm.ajax.sports || { url: sax.url.base + 'Sport/Ajax/GetList', formId: 'frmNavigate', callbackFn: handleResponse };
+		sax.doAjaxRequest(sm.ajax.sports, 50);
+	}
+	sm.selectParentSport = function ()
+	{
+		if (!sm.data.sports)
+			sm.populateSports(sm.showSelectParentSport);
+		else sm.showSelectParentSport();
+	}
+	sm.showSelectParentSport = function ()
+	{
+		let sports = [];
+		for (const spt of sm.data.sports || [])
+		{
+			if (spt.sportIdParent * 1 || 'a' * 1 || spt.id == $('.SportId', $frm.org).val()) continue;
+			sports.push(spt);
+		}
+		sax.data.selectItem.fn.selectItem({ caption: sax.dlg.title.selectSport, items: sports, itemId: $('.SportIdParent', $frm.sport).val(), fnCallback: sm.onParentSportSelected });
+	}
+	sm.onParentSportSelected = function (spt)
+	{
+		let frm = $frm.org;
+		$('.SportIdParent', frm).val(spt.id);
+		$('.SportNameParent', frm).val(spt.name);
+		sax.clearControlError($('.SportParent', frm));
+	}
+	sm.clearParentSport = function ()
+	{
+		$('.SportIdParent,.SportNameParent', $frm.org).val('');
+	}
+
+	//--------------------------------------------------------------
+	sm.storeItem = function ()
+	{
+		sax.ajax.storeItem = sax.ajax.storeItem || { url: sax.url.base + 'Sport/Ajax/StoreItem', formId: 'frmSport', callbackFn: sm.onStoreItem };
 		sax.doAjaxRequest(sax.ajax.storeItem, 50);
 	}
-	sax.onStoreItem = function (response)
+	sm.onStoreItem = function (response)
 	{
 		//sax.debug('onStoreItem', response);
 		sax.refreshControlValues(response.controlValues);
@@ -146,32 +198,35 @@
 		var $item = $('#' + sax.itemIdPrefix + item.id);
 		if (!$item.length)
 		{
-			$item = sax.getItemTemplate();
+			$item = sm.getItemTemplate();
 			$('.sax-panel-item-list', $pnl.results).prepend($item).show();
 		}
-		sax.populateItem($item, item)
+		sm.populateItem($item, item);
+		// Force repopulation of sprts.
+		delete sm.data.sports;
 	}
 
 	//--------------------------------------------------------------
 	$(function ()
 	{
 		$pnl.sports = $('.sax-panel.Sports');
+
 		$pnl.filter = $('.sax-panel-filter', $pnl.sports);
+		$frm.filter = $('#frmSportFilter', $pnl.filter);
+		$('.FilterSport', $frm.filter).on('input', function () { sm.refreshResults(250); });
 		$pnl.results = $('.sax-panel-results', $pnl.sports);
 
-		sax.$frm.filter = $('#frmSportFilter');
-		$('.FilterSport', sax.$frm.filter).on('input', function () { sax.refreshResults(250); });
-		sax.$frm.sportId = $('#frmSportId');
-		sax.$frm.sport = $('#frmSport');
-		$('.sax-input', sax.$frm.sport).on('input', function () { sax.clearControlError(this); });
-		$('.sax-select', sax.$frm.sport).on('change', function () { sax.clearControlError(this); });
+		$frm.sportId = $('#frmSportId');
+		$frm.sport = $('#frmSport');
+		$frm.sport.on('input', '.sax-input', function () { sax.clearControlError(this); }).on('change', '.sax-select', function () { sax.clearControlError(this); });
+		$frm.sport.on('dblclick', '.SportNameParent', sm.selectParentSport).on('click', '#pbSelectParentSport', sm.selectParentSport).on('click', '.ParentSportClear', sm.clearParentSport);
 
 		var opt = sax.dlgOpts();
-		opt.buttons[sax.dlg.btn.ok] = function () { sax.storeItem(); };
+		opt.buttons[sax.dlg.btn.ok] = function () { sm.storeItem(); };
 		opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
 		$dlg.sport = $('#dlgSport').dialog(opt);
 
-		setTimeout(sax.refreshResults, 250);
+		setTimeout(sm.refreshResults, 250);
 	});
 
 }(window, window.document));

SaxoniteCoreWebAdmin/wwwroot/js/sax-sys-db.js

@@ -78,7 +78,7 @@
 		for (let prtIdx = 0; prtIdx < prts.length; prtIdx++)
 		{
 			let prt = prts[prtIdx];
-			let $prt = sd.getTablePropertyTemplate();
+			let $prt = sd.getTablePropertyTemplate().addClass('sax-' + (prtIdx % 2 ? 'even' : 'odd'));
 			$('.Label', $prt).text(prt.label);
 			$('.Value', $prt).text(prt.value);
 			$prts.append($prt);
@@ -90,7 +90,7 @@
 		for (let colIdx = 0; colIdx < cols.length; colIdx++)
 		{
 			let col = cols[colIdx];
-			let $col = sd.getTableColumnTemplate();
+			let $col = sd.getTableColumnTemplate().addClass('sax-' + (colIdx % 2 ? 'even' : 'odd'));
 			$('.Pos', $col).text(col.pos);
 			$('.Name', $col).text(col.name);
 			$('.Format', $col).text(col.format);
@@ -103,11 +103,11 @@
 		for (let idxIdx = 0; idxIdx < idxs.length; idxIdx++)
 		{
 			let idx = idxs[idxIdx];
-			let $idx = sd.getTableIndexTemplate();
+			let $idx = sd.getTableIndexTemplate().addClass('sax-' + (idxIdx % 2 ? 'even' : 'odd'));
 			$('.Name', $idx).text(idx.name);
 			for (const col of idx.columns)
 				$('.Columns', $idx).append($('<div>').text(col.name));
-			$('.Unique', $idx).text(idx.unique?'Yes':'');
+			$('.Unique', $idx).text(idx.unique ? 'Yes' : '');
 			$idxs.append($idx);
 		}
 		// Display table details.
@@ -134,7 +134,7 @@
 	}
 	sd.getTableRowTemplate = function (name)
 	{
-		return $('.sax-panel-item-template .'+name, $dlg.table).clone();
+		return $('.sax-panel-item-template .' + name, $dlg.table).clone();
 	}
 
 	//--------------------------------------------------------------

SaxoniteCoreWebAdmin/wwwroot/js/sax-usr-onl.js

@@ -41,7 +41,7 @@
 		// 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.refresh, function () { sax.refreshResults(); }, 'sax-refresh'));
 		$bgr.toggle(!!$('.sax-dropdown-item', $mnu).length);
 		// Items.
 		var items = response.users;
@@ -85,17 +85,17 @@
 	{
 		return $('.sax-panel-item-template .sax-dropdown-menu.User li.sax-dropdown-item', $pnl.results).clone();
 	}
-	sax.getFilterMenuOption = function (lbl, fn)
+	sax.getFilterMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn);
+		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getItemMenuOption = function (lbl, fn)
+	sax.getItemMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn);
+		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getMenuOption = function ($opt, lbl, fn)
+	sax.getMenuOption = function ($opt, lbl, fn, cls)
 	{
-		return $opt.find('div.sax-label').text(lbl).end().on('click', fn);
+		return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls);
 	}
 
 	//--------------------------------------------------------------

SaxoniteCoreWebAdmin/wwwroot/js/sax-usr.js

@@ -41,8 +41,8 @@
 		// 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(); }));
+		$mnu.append(sax.getFilterMenuOption(sax.lbl.refresh, function () { sax.refreshResults(); }, 'sax-refresh'));
+		$mnu.append(sax.getFilterMenuOption(sax.lbl.create, function () { sax.createItem(); }, 'sax-add'));
 		$bgr.toggle(!!$('.sax-dropdown-item', $mnu).length);
 		// Items.
 		var items = response.users;
@@ -72,10 +72,10 @@
 		let $mnu = $('ul.sax-dropdown-menu', $item);
 		if (!item.deleted)
 		{
-			$mnu.append(sax.getItemMenuOption(sax.lbl.edit, function () { sax.updateItem(item) }));
+			$mnu.append(sax.getItemMenuOption(sax.lbl.edit, function () { sax.updateItem(item) }, 'sax-edit'));
 			$('.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) }));
+			$mnu.append(sax.getItemMenuOption(sax.lbl.emails, function () { sax.userEmails(item) }, 'sax-mail'));
 		}
 		$('.sax-burger', $item).toggle(!!$('.sax-dropdown-item', $mnu).length);
 		$('.sax-panel-messages', $pnl.results).hide().empty();
@@ -95,17 +95,17 @@
 	{
 		return $('.sax-panel-item-template .sax-dropdown-menu.User li.sax-dropdown-item', $pnl.results).clone();
 	}
-	sax.getFilterMenuOption = function (lbl, fn)
+	sax.getFilterMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn);
+		return sax.getMenuOption(sax.getFilterDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getItemMenuOption = function (lbl, fn)
+	sax.getItemMenuOption = function (lbl, fn, cls)
 	{
-		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn);
+		return sax.getMenuOption(sax.getItemDropdownTemplate(), lbl, fn, cls);
 	}
-	sax.getMenuOption = function ($opt, lbl, fn)
+	sax.getMenuOption = function ($opt, lbl, fn, cls)
 	{
-		return $opt.find('div.sax-label').text(lbl).end().on('click', fn);
+		return $opt.find('div.sax-label').text(lbl).end().on('click', fn).addClass(cls);
 	}
 
 	//--------------------------------------------------------------