Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix misaligned kick button with long names on webfront

Browse Source
This commit is contained in:
RaidMax 2020-08-12 13:46:14 -05:00
parent d5789dac81
commit 1ef2ba5344
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Application/EventParsers/BaseEventParser.cs
View File

@ -130,7 +130,6 @@ namespace IW4MAdmin.Application.EventParsers
int clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]); int clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
// todo: these need to defined outside of here
if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix)) if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
{ {
return new GameEvent() return new GameEvent()

46
WebfrontCore/Views/Server/_ClientActivity.cshtml
View File

@ -4,7 +4,7 @@
Layout = null; Layout = null;
int half = Model.ClientCount == 0 || Model.Players.Count == 0 ? 0 : (int)Math.Ceiling(Model.ClientCount / 2.0); int half = Model.ClientCount == 0 || Model.Players.Count == 0 ? 0 : (int)Math.Ceiling(Model.ClientCount / 2.0);
} }
<div class="col-12 col-md-8 d-none d-md-block"> <div class="col-12 col-md-7 d-none d-md-block">
@{ @{
for (int i = 0; i < Model.ChatHistory.Count; i++) for (int i = 0; i < Model.ChatHistory.Count; i++)
{ {
@ -42,8 +42,8 @@
} }
} }
</div> </div>
<div class="col-md-4"> <div class="col-md-5">
<div class="row"> <div class="row" style="overflow-wrap: anywhere">
<div class="col-6 text-left text-md-right"> <div class="col-6 text-left text-md-right">
@{ @{
for (int i = 0; i < half; i++) for (int i = 0; i < half; i++)
@ -53,18 +53,17 @@
continue; continue;
} }
if (ViewBag.Authorized)
{
<div class="oi oi-circle-x mr-1 d-md-none profile-action align-baseline action-kick-button" data-action="kick" data-action-id="@Model.Players[i].ClientId" aria-hidden="true"></div>
}
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}"; string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}";
<a asp-controller="Client" asp-action="ProfileAsync" asp-route-id="@Model.Players[i].ClientId" class="@levelColorClass"> <div class="d-inline-flex">
<color-code value="@Model.Players[i].Name" allow="@ViewBag.EnableColorCodes"></color-code> <a asp-controller="Client" asp-action="ProfileAsync" asp-route-id="@Model.Players[i].ClientId" class="@levelColorClass">
</a> <color-code value="@Model.Players[i].Name" allow="@ViewBag.EnableColorCodes"></color-code>
if (ViewBag.Authorized) </a>
{
<div class="oi oi-circle-x ml-1 d-none d-md-inline-flex profile-action align-baseline action-kick-button" data-action="kick" data-action-id="@Model.Players[i].ClientId" aria-hidden="true"></div> @if (ViewBag.Authorized)
} {
<div class="oi oi-circle-x ml-1 profile-action align-baseline action-kick-button" data-action="kick" data-action-id="@Model.Players[i].ClientId" aria-hidden="true"></div>
}
</div>
<br /> <br />
} }
} }
@ -79,14 +78,17 @@
} }
string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}"; string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}";
<a asp-controller="Client" asp-action="ProfileAsync" asp-route-id="@Model.Players[i].ClientId" class="@levelColorClass">
<color-code value="@Model.Players[i].Name" allow="@ViewBag.EnableColorCodes"></color-code> <div class="d-inline-flex">
</a> <a asp-controller="Client" asp-action="ProfileAsync" asp-route-id="@Model.Players[i].ClientId" class="@levelColorClass">
if (ViewBag.Authorized) <color-code value="@Model.Players[i].Name" allow="@ViewBag.EnableColorCodes"></color-code>
{ </a>
<div class="oi oi-circle-x ml-1 profile-action align-baseline action-kick-button" data-action="kick" data-action-id="@Model.Players[i].ClientId" aria-hidden="true"></div> @if (ViewBag.Authorized)
} {
<br /> <div class="oi oi-circle-x ml-1 profile-action align-baseline action-kick-button" data-action="kick" data-action-id="@Model.Players[i].ClientId" aria-hidden="true"></div>
}
<br />
</div>
} }
} }
</div> </div>