diff --git a/WebfrontCore/Views/Client/Profile/Index.cshtml b/WebfrontCore/Views/Client/Profile/Index.cshtml index a23e83ac..fdfd7943 100644 --- a/WebfrontCore/Views/Client/Profile/Index.cshtml +++ b/WebfrontCore/Views/Client/Profile/Index.cshtml @@ -6,30 +6,27 @@ string gravatarUrl = Model.Meta.FirstOrDefault(m => m.Key == "GravatarEmail")?.Value; bool isTempBanned = Model.ActivePenaltyType == "TempBan"; } -
-
+
-
+
@if (string.IsNullOrEmpty(gravatarUrl)) { @shortCode }
-
-
-
@Model.Name
-
-
+
+
+
@Model.Name
@if (ViewBag.Authorized) { -
+
}
@if (ViewBag.Authorized) { -
+
@foreach (var linked in Model.LinkedAccounts) { @Html.ActionLink(linked.Value.ToString("X"), "ProfileAsync", "Client", new { id = linked.Key }, new { @class = "link-inverse" })
@@ -45,22 +42,13 @@ }
} -
-

- - @Model.Level @(isTempBanned ? $"({loc["WEBFRONT_PROFILE_TEMPBAN"]})" : "") - -

+
+ @Model.Level @(isTempBanned ? $"({loc["WEBFRONT_PROFILE_TEMPBAN"]})" : "")
@if (ViewBag.Authorized) { -
- - @if (Model.LevelInt != -1) - { - - } +
@if (Model.LevelInt < (int)ViewBag.User.Level && !Model.HasActivePenalty) { @@ -78,28 +66,33 @@ } } -
+ @if (Model.LevelInt != -1) + { + + } +
} +
- @*
- -
- @loc["WEBFRONT_PROFILE_PLAYER"] @Model.TimePlayed @loc["GLOBAL_TIME_HOURS"] -
-
- @loc["WEBFRONT_PROFILE_FSEEN"] @Model.FirstSeen @loc["WEBFRONT_PENALTY_TEMPLATE_AGO"] -
-
- @loc["WEBFRONT_PROFILE_LSEEN"] @Model.LastSeen @loc["WEBFRONT_PENALTY_TEMPLATE_AGO"] -
-
+
+
+
+ @loc["WEBFRONT_PROFILE_PLAYER"] @Model.TimePlayed @loc["GLOBAL_TIME_HOURS"]
-
+
+ @loc["WEBFRONT_PROFILE_FSEEN"] @Model.FirstSeen @loc["WEBFRONT_PENALTY_TEMPLATE_AGO"]
+
+ @loc["WEBFRONT_PROFILE_LSEEN"] @Model.LastSeen @loc["WEBFRONT_PENALTY_TEMPLATE_AGO"] +
+
-
-
*@ +
+
+ +
+
diff --git a/WebfrontCore/wwwroot/css/profile.css b/WebfrontCore/wwwroot/css/profile.css index 0beab182..afcb7ae5 100644 --- a/WebfrontCore/wwwroot/css/profile.css +++ b/WebfrontCore/wwwroot/css/profile.css @@ -146,12 +146,12 @@ } #profile_avatar { - + min-width: 8rem; + min-height: 8rem; } .profile-shortcode { font-size: 5rem; - line-height: 5rem; color: white; } @@ -173,10 +173,6 @@ font-weight: bold; } -#profile_wrapper { - border-bottom: 2px rgb(0, 122, 204) solid; -} - .profile-action { cursor: pointer; } diff --git a/WebfrontCore/wwwroot/js/profile.js b/WebfrontCore/wwwroot/js/profile.js index e9f7cbfc..591c6c6e 100644 --- a/WebfrontCore/wwwroot/js/profile.js +++ b/WebfrontCore/wwwroot/js/profile.js @@ -52,14 +52,14 @@ $(document).ready(function () { $.each(clientInfo.Meta, function (index, meta) { if (!meta.key.includes("Event")) { let metaString = `
${meta.value} ${meta.key}
`; - if (metaIndex < 10) { - let selector = '#profile_meta_' + ((metaIndex % 2) + 1); - $(selector).append(metaString); - } - else { - let selector = '#profile_meta_' + (metaIndex % 3); - $(selector).append(metaString); + + // todo: fix the view so we don't have the 3 hardcoded meta + if (metaIndex % 3 == 0 && metaIndex < 7) { + metaIndex++; } + let selector = '#profile_meta_' + (metaIndex % 3); + $(selector).append(metaString); + metaIndex++; } }); @@ -74,14 +74,14 @@ $(document).ready(function () { 'serverId': $(this).data('serverid'), 'when': $(this).data('when') }) - .done(function (response) { - $('.client-message-context').remove(); - location.after(response); - hideLoader(); - }) - .fail(function (jqxhr, textStatus, error) { - errorLoader(); - }); + .done(function (response) { + $('.client-message-context').remove(); + location.after(response); + hideLoader(); + }) + .fail(function (jqxhr, textStatus, error) { + errorLoader(); + }); }); /*