From 1b48a71062d3ed88e20969bcbe4963930f217572 Mon Sep 17 00:00:00 2001 From: jvyden Date: Thu, 14 Apr 2022 16:50:30 -0400 Subject: [PATCH] Add strings for entire baselayout --- .../BaseLayout.resx | 30 ++++++++++++++++--- .../StringLists/BaseLayoutStrings.cs | 6 ++++ .../Pages/Layouts/BaseLayout.cshtml | 12 ++++---- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/ProjectLighthouse.Localization/BaseLayout.resx b/ProjectLighthouse.Localization/BaseLayout.resx index 3734bd86..cdfeee78 100644 --- a/ProjectLighthouse.Localization/BaseLayout.resx +++ b/ProjectLighthouse.Localization/BaseLayout.resx @@ -25,22 +25,44 @@ - Home + Home A button on the header that takes you to the landing page. - Users + Users A button on the header that takes you to the user listing. - Photos + Photos A button on the header that takes you to a list of user-uploaded photos. - Levels + Levels A button on the header that takes you to a list of user-uploaded levels. Levels are internally referred to as "slots". + + + Authentication + A button on the header that takes you to a list of authentication attempts. + + + + Login / Register + A button on the header that lets you log in or register. + + + Profile + A quick shortcut on the header to take you to your profile if logged in. + + + Admin Panel + A header link that takes you to the admin panel if available. + + + Log out + A shortcut to log you out of your account. + \ No newline at end of file diff --git a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs index 2b396ce6..91e56acc 100644 --- a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs +++ b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs @@ -6,6 +6,12 @@ public static class BaseLayoutStrings public static readonly TranslatableString HeaderUsers = create("header_users"); public static readonly TranslatableString HeaderPhotos = create("header_photos"); public static readonly TranslatableString HeaderSlots = create("header_slots"); + public static readonly TranslatableString HeaderAuthentication = create("header_authentication"); + + public static readonly TranslatableString HeaderLoginRegister = create("header_loginRegister"); + public static readonly TranslatableString HeaderProfile = create("header_profile"); + public static readonly TranslatableString HeaderAdminPanel = create("header_adminPanel"); + public static readonly TranslatableString HeaderLogout = create("header_logout"); private static TranslatableString create(string key) => new(TranslationAreas.BaseLayout, key); } \ No newline at end of file diff --git a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml index ef121584..ebc4355c 100644 --- a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml +++ b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml @@ -1,6 +1,6 @@ @using LBPUnion.ProjectLighthouse.Helpers @using LBPUnion.ProjectLighthouse.Helpers.Extensions -@using LBPUnion.ProjectLighthouse.Localization +@using LBPUnion.ProjectLighthouse.Localization.StringLists @using LBPUnion.ProjectLighthouse.Types @using LBPUnion.ProjectLighthouse.Types.Settings @model LBPUnion.ProjectLighthouse.Pages.Layouts.BaseLayout @@ -8,21 +8,21 @@ @{ if (Model!.User == null) { - Model.NavigationItemsRight.Add(new PageNavigationItem(new TranslatableString(TranslationAreas.BaseLayout, "Login / Register"), "/login", "sign in")); + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLoginRegister, "/login", "sign in")); } else { if (ServerSettings.Instance.UseExternalAuth) { - Model.NavigationItems.Add(new PageNavigationItem(new TranslatableString(TranslationAreas.BaseLayout, "Authentication"), "/authentication", "key")); + Model.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderAuthentication, "/authentication", "key")); } - Model.NavigationItemsRight.Add(new PageNavigationItem(new TranslatableString(TranslationAreas.BaseLayout, "Profile"), "/user/" + Model.User.UserId, "user alternate")); + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderProfile, "/user/" + Model.User.UserId, "user alternate")); @if (Model.User.IsAdmin) { - Model.NavigationItemsRight.Add(new PageNavigationItem(new TranslatableString(TranslationAreas.BaseLayout, "Admin Panel"), "/admin", "cogs")); + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderAdminPanel, "/admin", "cogs")); } - Model.NavigationItemsRight.Add(new PageNavigationItem(new TranslatableString(TranslationAreas.BaseLayout, "Log out"), "/logout", "user alternate slash")); // should always be last + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLogout, "/logout", "user alternate slash")); // should always be last } Model.IsMobile = Model.Request.IsMobile();