improve ban management display and additional translations

This commit is contained in:
RaidMax 2022-07-09 16:32:23 -05:00
parent 4b33b33d01
commit 9e17bcc38f
5 changed files with 35 additions and 21 deletions

View File

@ -10,12 +10,16 @@
<div class="card p-10 m-0 mt-15 mb-15"> <div class="card p-10 m-0 mt-15 mb-15">
<div class="d-flex flex-row flex-wrap"> <div class="d-flex flex-row flex-wrap">
<div class="d-flex p-15 mr-md-10 w-full w-md-200 bg-very-dark-dm bg-light-ex-lm rounded"> <div class="d-flex p-15 mr-md-10 w-full w-md-200 bg-very-dark-dm bg-light-ex-lm rounded">
<div class="align-self-center "> <div class="align-self-center w-full">
<a asp-controller="Client" asp-action="Profile" asp-route-id="@ban.ClientId" class="font-size-18 no-decoration">@ban.ClientName</a> <div class="d-flex font-size-16">
<br/> <a asp-controller="Client" asp-action="Profile" asp-route-id="@ban.ClientId" class="no-decoration flex-fill text-force-break mr-5">
<color-code value="@ban.ClientName"></color-code>
</a>
<div data-toggle="tooltip" data-title="@ViewBag.Localization[$"GAME_{ban.Game}"]"> <div data-toggle="tooltip" data-title="@ViewBag.Localization[$"GAME_{ban.Game}"]">
<div class="badge">@Utilities.MakeAbbreviation(ViewBag.Localization[$"GAME_{ban.Game}"])</div> <div class="badge align-self-center">@Utilities.MakeAbbreviation(ViewBag.Localization[$"GAME_{ban.Game}"])</div>
</div> </div>
</div>
<has-permission entity="ClientGuid" required-permission="Read"> <has-permission entity="ClientGuid" required-permission="Read">
<div class="text-muted">@ban.NetworkId.ToString("X")</div> <div class="text-muted">@ban.NetworkId.ToString("X")</div>
</has-permission> </has-permission>
@ -25,8 +29,11 @@
<br/> <br/>
@if (ban.AttachedPenalty is not null) @if (ban.AttachedPenalty is not null)
{ {
<div class="text-muted font-weight-light">@ban.AttachedPenalty.Offense.CapClientName(30)</div> <div class="text-muted font-weight-light">
<color-code value="@ban.AttachedPenalty.Offense.CapClientName(30)"></color-code>
</div>
<div class="text-danger font-weight-light">@ban.AttachedPenalty.DateTime.ToStandardFormat()</div> <div class="text-danger font-weight-light">@ban.AttachedPenalty.DateTime.ToStandardFormat()</div>
<br/>
<div class="btn profile-action w-100" data-action="unban" data-action-id="@ban.ClientId">@ViewBag.Localization["WEBFRONT_BAN_MGMT_ACTION_UNBAN"]</div> <div class="btn profile-action w-100" data-action="unban" data-action-id="@ban.ClientId">@ViewBag.Localization["WEBFRONT_BAN_MGMT_ACTION_UNBAN"]</div>
} }
else else
@ -42,16 +49,21 @@
@foreach (var associatedEntity in ban.AssociatedPenalties) @foreach (var associatedEntity in ban.AssociatedPenalties)
{ {
<div class="d-flex flex-wrap flex-column w-full w-md-200 p-10"> <div class="d-flex flex-wrap flex-column w-full w-md-200 p-10 border rounded mt-10 mt-md-0" style="border-style: dashed !important;">
<div class="d-flex font-size-16">
<div data-toggle="tooltip" data-title="@ViewBag.Localization["WEBFRONT_BAN_MGMT_TOOLTIP_LINKED"]" class="d-flex"> <div data-toggle="tooltip" data-title="@ViewBag.Localization["WEBFRONT_BAN_MGMT_TOOLTIP_LINKED"]" class="d-flex">
<i class="oi oi-link-intact align-self-center"></i> <i class="oi oi-link-intact align-self-center"></i>
<div class="text-truncate ml-5 mr-5"> <div class="text-truncate ml-5 mr-5">
<a asp-controller="Client" asp-action="Profile" asp-route-id="@associatedEntity.OffenderInfo.ClientId" class="font-size-18 no-decoration">@associatedEntity.OffenderInfo.ClientName</a> <a asp-controller="Client" asp-action="Profile" asp-route-id="@associatedEntity.OffenderInfo.ClientId" class="no-decoration text-force-break">
<color-code value="@associatedEntity.OffenderInfo.ClientName"></color-code>
</a>
</div> </div>
</div> </div>
<div data-toggle="tooltip" data-title="@ViewBag.Localization[$"GAME_{ban.Game}"]"> <div data-toggle="tooltip" data-title="@ViewBag.Localization[$"GAME_{ban.Game}"]">
<div class="badge">@Utilities.MakeAbbreviation(ViewBag.Localization[$"GAME_{ban.Game}"])</div> <div class="badge">@Utilities.MakeAbbreviation(ViewBag.Localization[$"GAME_{ban.Game}"])</div>
</div> </div>
</div>
<br/> <br/>
<has-permission entity="ClientGuid" required-permission="Read"> <has-permission entity="ClientGuid" required-permission="Read">
<div class="text-muted">@associatedEntity.OffenderInfo.NetworkId?.ToString("X")</div> <div class="text-muted">@associatedEntity.OffenderInfo.NetworkId?.ToString("X")</div>
@ -60,7 +72,9 @@
<div class="text-muted">@associatedEntity.OffenderInfo.IPAddress.ConvertIPtoString()</div> <div class="text-muted">@associatedEntity.OffenderInfo.IPAddress.ConvertIPtoString()</div>
</has-permission> </has-permission>
<br/> <br/>
<div class="text-muted font-weight-light">@associatedEntity.Offense.CapClientName(30)</div> <div class="text-muted font-weight-light">
<color-code value="@associatedEntity.Offense.CapClientName(30)"></color-code>
</div>
<div class="text-danger font-weight-light">@associatedEntity.DateTime.ToStandardFormat()</div> <div class="text-danger font-weight-light">@associatedEntity.DateTime.ToStandardFormat()</div>
<div class="btn profile-action mt-10 w-100" data-action="unban" data-action-id="@associatedEntity.OffenderInfo.ClientId">@ViewBag.Localization["WEBFRONT_BAN_MGMT_ACTION_UNBAN"]</div> <div class="btn profile-action mt-10 w-100" data-action="unban" data-action-id="@associatedEntity.OffenderInfo.ClientId">@ViewBag.Localization["WEBFRONT_BAN_MGMT_ACTION_UNBAN"]</div>
</div> </div>

View File

@ -82,7 +82,7 @@
<div class="d-flex flex-column align-self-center ml-20 mr-20 mt-10 mb-10 mt-md-0 mb-md-0 text-center text-md-left"> <div class="d-flex flex-column align-self-center ml-20 mr-20 mt-10 mb-10 mt-md-0 mb-md-0 text-center text-md-left">
<!-- name --> <!-- name -->
<div id="profile_name"> <div id="profile_name">
<span class="font-size-20 font-weight-medium"> <span class="font-size-20 font-weight-medium text-force-break">
<color-code value="@Model.Name"></color-code> <color-code value="@Model.Name"></color-code>
</span> </span>
<has-permission entity="MetaAliasUpdate" required-permission="Read"> <has-permission entity="MetaAliasUpdate" required-permission="Read">
@ -115,7 +115,7 @@
<has-permission entity="ClientLevel" required-permission="Read"> <has-permission entity="ClientLevel" required-permission="Read">
<div class="align-self-center align-self-md-start font-weight-bold font-size-16 level-color-@Model.LevelInt"> <div class="align-self-center align-self-md-start font-weight-bold font-size-16 level-color-@Model.LevelInt">
<div class="d-flex flex-row"> <div class="d-flex flex-row">
<span>@Model.Level</span> <color-code value="@Model.Level"></color-code>
</div> </div>
</div> </div>
</has-permission> </has-permission>
@ -164,7 +164,7 @@
@if (Model.IPs.Count > 15) @if (Model.IPs.Count > 15)
{ {
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<span class="dropdown-item bg-dark-dm bg-light-lm">@((ViewBag.Localization["WEBFRONT_PROFILE_ALIAS_COUNT_MORE_FORMAT"] as string).FormatExt(Model.Aliases.Count - 15))</span> <span class="dropdown-item bg-dark-dm bg-light-lm">@((ViewBag.Localization["WEBFRONT_PROFILE_ALIAS_COUNT_MORE_FORMAT"] as string).FormatExt(Model.IPs.Count - 15))</span>
} }
</div> </div>
</div> </div>

View File

@ -55,7 +55,7 @@
</a> </a>
</div> </div>
<div class="mt-5 mb-5 penalties-color-@Model.PenaltyTypeText.ToLower()"> <div class="mt-5 mb-5 penalties-color-@Model.PenaltyTypeText.ToLower()">
@Model.PenaltyType @ViewBag.Localization[$"WEBFRONT_PENALTY_{Model.PenaltyType.ToString().ToUpper()}"]
</div> </div>
<div class="mt-5 mb-5"> <div class="mt-5 mb-5">
<color-code value="@($"{Model.Offense}{(ViewBag.Authorized ? Model.AdditionalPenaltyInformation : "")}")"></color-code> <color-code value="@($"{Model.Offense}{(ViewBag.Authorized ? Model.AdditionalPenaltyInformation : "")}")"></color-code>

View File

@ -30,7 +30,7 @@
} }
<h4 class="content-title mb-0"> <h4 class="content-title mb-0">
Scoreboard @ViewBag.Localization["WEBFRONT_TITLE_SCOREBOARD"]
</h4> </h4>
<span class="text-muted"> <span class="text-muted">
<color-code value="@Model.ServerName"></color-code> <color-code value="@Model.ServerName"></color-code>

View File

@ -26,7 +26,7 @@ function getUrlParameter(sParam) {
sParameterName = sURLVariables[i].split('='); sParameterName = sURLVariables[i].split('=');
if (sParameterName[0] === sParam) { if (sParameterName[0] === sParam) {
return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); return sParameterName[1] === undefined ? true : decodeURIComponent(unescape(sParameterName[1]));
} }
} }
return false; return false;