v1.2.3.2

2022-02-22 18:12:37 +00:00
parent 4a394d3ff7
commit 1ac4c7f51a
34 changed files with 949 additions and 671 deletions
@@ -7,27 +7,46 @@
 	sax.msg.noItemsAwaitAct = '@Localiser.GetJavascriptText("home.msg.no.items.awaiting.activation")';
 	sax.msg.dbSchemaValid = '@Localiser.GetJavascriptText("system.msg.database.schema.valid")';
 </script>
+<style>
+	table.sax-item-stats .sax-value
+	{
+		min-width: 80px;
+		text-align: right;
+	}
+	table.sax-item-stats tr:hover .sax-value
+	{
+		text-decoration: underline;
+	}
+</style>

@* Items Awaiting Activation *@
-<div class="sax-panel-info sax-panel-results AwaitActivate">
+<div class="sax-panel-info sax-panel-results ApplicationStats">

 	<div class="sax-header">
-		<div class="sax-caption">@Localiser["home.caption.awaiting.activation"]</div>
+		<div class="sax-caption">@Localiser["home.caption.application.status"]</div>
 	</div>
 	<div class="sax-content">
 		<div class="sax-panel-messages"></div>
 		<div class="sax-panel-item-list"></div>
 		@* Items awaiting activation templates *@
 		<div class="sax-panel-item-template">
-			<div class="sax-panel-item AwaitActivateItem">
+			<div class="sax-panel-item sax-item-stats">
 				<div class="sax-header">
-					<div class="sax-caption sax-action sax-view AwaitActivateItemType"></div>
+					<div class="sax-caption sax-view "></div>
 				</div>
 				<div class="sax-content">
-					<div class="SchemaIndex">@(Localiser["label.items.awaiting.activation"]): <span class="AwaitActivateItemCount"></span></div>
+					<table class="sax-item-stats"></table>
 				</div>
 			</div>
 		</div>
+		<table>
+			<tbody class="sax-panel-item-template">
+				<tr class="sax-item-stat sax-action">
+					<td class="sax-label"></td>
+					<td class="sax-value"></td>
+				</tr>
+			</tbody>
+		</table>
 	</div>

 </div>
@@ -49,7 +49,7 @@
 							<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.OrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
+									@Html.DropDownListFor(model => model.Filter.OrganisationCategoryCode, Model.AdminOrganisationCategoriesForSelect, Localiser["label.any"], new { @id = "", @class = "FilterOrganisationCategory sax-select" })
 								</div>
 							</div>
 							@* Organisation sport *@
@@ -68,19 +68,21 @@
 			</tr>
 		</table>

-		<div>Members awaiting activation.</div>
-		<table class="OrganisationMembers"></table>
-		<div class="sax-panel-item-template">
-			<table>
-				<tr class="sax-item Member">
-					<td>
-						<input type="hidden" name="OrganisationMemberIds" class="MemberId" />
-						<input type="checkbox" class="MemberActivate" checked="checked" />
-					</td>
-					<td class="MemberEmail center"></td>
-					<td class="MemberName"></td>
-				</tr>
-			</table>
+		<div class="MembersAwaitingActivation">
+			<div>@Localiser["label.members.awaiting.activation"]:</div>
+			<table class="OrganisationMembers"></table>
+			<div class="sax-panel-item-template">
+				<table>
+					<tr class="sax-item Member">
+						<td>
+							<input type="hidden" name="OrganisationMemberIds" class="MemberId" />
+							<input type="checkbox" class="MemberActivate" checked="checked" />
+						</td>
+						<td class="MemberEmail center"></td>
+						<td class="MemberName"></td>
+					</tr>
+				</table>
+			</div>
 		</div>

 	}
@@ -49,7 +49,7 @@
 						<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.OrganisationCategoriesForSelect, Localiser["label.select"], new { @id = "cbOrganisationCategory", @class = "OrganisationCategory sax-select" })
+						@Html.DropDownListFor(model => model.OrganisationCategoryValue, Model.AdminOrganisationCategoriesForSelect, Localiser["label.select"], new { @id = "cbOrganisationCategory", @class = "OrganisationCategory sax-select" })
 					</div>
 					<div class="sax-message"></div>
 				</div>
@@ -78,14 +78,15 @@
 			<div class="row">
 				<div class="col-sm-4">
 					<div class="sax-label">
-						<label for="ifOrganisationSportCaption"><span>@Localiser["label.sport"]</span>&nbsp;<span class="required">*</span></label>
+						<label for="ifOrganisationSportCaption"><span>@Localiser["label.sport"]</span>&nbsp;<span class="required">(*)</span></label>
 					</div>
 				</div>
 				<div class="col-sm">
 					<div class="sax-control row">
 						@Html.HiddenFor(model => model.OrganisationSportId, new { @id = "ifOrganisationSportId", @class = "OrganisationSportId" })
-						<div class="col"><input type="text" id="ifOrganisationSportCaption" class="OrganisationSportCaption sax-input" readonly="readonly" ondblclick="sax.selectSport()" /> </div>
-						<div class="fixed"><button id="pbSelectSport" class="sax-button" style="min-width:auto;margin-left:4px;padding:4px 6px" onclick="sax.selectSport()">@Localiser["label.select"]</button></div>
+						<div class="col"><input type="text" id="ifOrganisationSportCaption" class="OrganisationSportCaption sax-input" readonly="readonly" /> </div>
+						<div class="fixed"><div class="sax-action OrganisationSportClear"><img src="~/img/action/delete24.png" alt="@(Localiser["label.clear"])" title="@(Localiser["label.clear"])" /></div></div>
+						<div class="fixed"><button id="pbSelectSport" 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>
@@ -103,8 +104,8 @@
 				<div class="col-sm">
 					<div class="sax-control row">
 						@Html.HiddenFor(model => model.OrganisationRegionIdCountry, new { @id = "ifOrganisationRegionIdCountry", @class = "OrganisationRegionIdCountry" })
-						<div class="col"><input type="text" id="ifOrganisationRegionCaptionCountry" class="OrganisationRegionCaptionCountry sax-input" readonly="readonly" ondblclick="sax.selectRegion()" /> </div>
-						<div class="fixed"><button id="pbSelectRegion" class="sax-button" style="min-width:auto;margin-left:4px;padding:4px 6px" onclick="sax.selectRegion()">@Localiser["label.select"]</button></div>
+						<div class="col"><input type="text" id="ifOrganisationRegionCaptionCountry" class="OrganisationRegionCaptionCountry sax-input" readonly="readonly" /> </div>
+						<div class="fixed"><button id="pbSelectRegion" 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>
@@ -17,7 +17,7 @@
 			@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmDatabaseFilter", @class = "sax-form", @onSubmit = "return false;" }))
 			{
 				<div class="row">
-					<div class="col-sm-5 sax-label text-left text-sm-right">@Localiser["label.database.table"]</div>
+					<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.DatabaseFilter.Table, new { @id = "ifFilterDatabaseTable", @class = "FilterDatabaseTable", @maxlength = "32" })</div>
 				</div>
 			}
@@ -15,14 +15,14 @@
 </script>
@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserId", @class = "sax-form" }))
 {
-	@Html.HiddenFor(model => model.UserAccountId, new { @class = "UserAccountId" })
+	@Html.HiddenFor(model => model.UserId, new { @class = "UserId" })
 }
 <div id="dlgUser" class="sax-dialog" title="">
 	<div class="spacer"></div>

 	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUser", @class = "sax-form", @onSubmit = "return false;" }))
 	{
-		@Html.HiddenFor(model => model.UserAccountId, new { @class = "UserAccountId" })
+		@Html.HiddenFor(model => model.UserId, new { @class = "UserId" })

 		@* User email *@
 		<div class="sax-form-control UserEmailAddress">
@@ -181,7 +181,7 @@
 	<div class="spacer"></div>
 	@using (@Html.BeginForm(FormMethod.Post, new { @id = "frmUserEmails", @class = "sax-form", @onSubmit = "return false;" }))
 	{
-		@Html.HiddenFor(model => model.UserAccountId, new { @class = "UserAccountId" })
+		@Html.HiddenFor(model => model.UserId, new { @class = "UserId" })

 		<div class="sax-para">@Localiser["user.emails.intro"]</div>
 		<div class="spacer2"></div>