From 0dc4e12d614f33536b568f73657abdde8cb80d33 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Tue, 18 Aug 2020 20:11:41 -0500 Subject: [PATCH] another attempt to fix display of long client names/temporary t6 getinfo workaround --- Application/Application.csproj | 8 ++--- Plugins/ScriptPlugins/ParserPT6.js | 1 + SharedLibraryCore/SharedLibraryCore.csproj | 34 +++++++++---------- .../Views/Server/_ClientActivity.cshtml | 29 +++++++++------- WebfrontCore/WebfrontCore.csproj | 8 ++--- WebfrontCore/wwwroot/css/src/main.scss | 1 + 6 files changed, 44 insertions(+), 37 deletions(-) diff --git a/Application/Application.csproj b/Application/Application.csproj index 1951099e9..fb4ee6866 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -25,13 +25,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/Plugins/ScriptPlugins/ParserPT6.js b/Plugins/ScriptPlugins/ParserPT6.js index 51eb460c5..08026b211 100644 --- a/Plugins/ScriptPlugins/ParserPT6.js +++ b/Plugins/ScriptPlugins/ParserPT6.js @@ -20,6 +20,7 @@ var plugin = { rconParser.Configuration.CommandPrefixes.Ban = 'clientkick_for_reason {0} "{1}"'; rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick_for_reason {0} "{1}"'; rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xffrcon {0} get {1}'; + rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined; // adding this in here temporarily until getInfo is fixed in new T6 version rconParser.Configuration.Dvar.Pattern = '^(.+) is "(.+)?"$'; rconParser.Configuration.Dvar.AddMapping(106, 1); diff --git a/SharedLibraryCore/SharedLibraryCore.csproj b/SharedLibraryCore/SharedLibraryCore.csproj index dd2bfedc7..6174af809 100644 --- a/SharedLibraryCore/SharedLibraryCore.csproj +++ b/SharedLibraryCore/SharedLibraryCore.csproj @@ -6,7 +6,7 @@ RaidMax.IW4MAdmin.SharedLibraryCore - 2.4.3 + 2.4.6 RaidMax Forever None Debug;Release;Prerelease @@ -20,8 +20,8 @@ true MIT Shared Library for IW4MAdmin - 2.4.3.0 - 2.4.3.0 + 2.4.6.0 + 2.4.6.0 @@ -30,30 +30,30 @@ - + - - - + + + all runtime; build; native; contentfiles - - - - - - + + + + + + - - - + + + - + diff --git a/WebfrontCore/Views/Server/_ClientActivity.cshtml b/WebfrontCore/Views/Server/_ClientActivity.cshtml index 4dd613eb9..ccc486a2f 100644 --- a/WebfrontCore/Views/Server/_ClientActivity.cshtml +++ b/WebfrontCore/Views/Server/_ClientActivity.cshtml @@ -54,21 +54,26 @@ } string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}"; -
- - - +
+ @if (ViewBag.Authorized) + { + + } - @if (ViewBag.Authorized) - { - - } -
+ + + + + @if (ViewBag.Authorized) + { + + } +

} } -
+
@{ for (int i = half; i < Math.Min(Model.ClientCount, Model.Players.Count); i++) { @@ -79,13 +84,13 @@ string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].LevelInt}"; -
+
@if (ViewBag.Authorized) { - + }
diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index f26fc89c4..40c063523 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -64,14 +64,14 @@ - + - - + + - + diff --git a/WebfrontCore/wwwroot/css/src/main.scss b/WebfrontCore/wwwroot/css/src/main.scss index d7d5e2b0e..80837ff50 100644 --- a/WebfrontCore/wwwroot/css/src/main.scss +++ b/WebfrontCore/wwwroot/css/src/main.scss @@ -394,6 +394,7 @@ input:checked + .toggle-switch-slider:before { .action-kick-button { color: #492121; + margin-top: 0.25rem; } .action-kick-button:hover {