From 586c161c71a826f9a23aa377e063ebc574422794 Mon Sep 17 00:00:00 2001 From: koko Date: Fri, 28 Apr 2023 23:44:33 -0400 Subject: [PATCH] String fix with login/register button (#755) * Display "Login" only when registration is off, remove unused BaseLayoutStrings * Remove un-used strings from BaseLayout --- ProjectLighthouse.Localization/BaseLayout.resx | 13 ++++--------- .../StringLists/BaseLayoutStrings.cs | 3 +-- .../Pages/Layouts/BaseLayout.cshtml | 9 ++++++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ProjectLighthouse.Localization/BaseLayout.resx b/ProjectLighthouse.Localization/BaseLayout.resx index f2b8515d..6cd9c681 100644 --- a/ProjectLighthouse.Localization/BaseLayout.resx +++ b/ProjectLighthouse.Localization/BaseLayout.resx @@ -24,11 +24,6 @@ - - Home - A button on the header that takes you to the landing page. - - Users A button on the header that takes you to the user listing. @@ -49,14 +44,14 @@ A button on the header that takes you to a list of authentication attempts. + + Login + A button on the header that lets you log in. + 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 A header link that takes you to the admin panel if available. diff --git a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs index f6f2b9e8..64f39021 100644 --- a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs +++ b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs @@ -2,14 +2,13 @@ namespace LBPUnion.ProjectLighthouse.Localization.StringLists; public static class BaseLayoutStrings { - public static readonly TranslatableString HeaderHome = create("header_home"); 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 HeaderLogin = create("header_login"); 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 HeaderModPanel = create("header_modPanel"); public static readonly TranslatableString HeaderLogout = create("header_logout"); diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml index 69be7b40..9e4edbbc 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml @@ -8,7 +8,14 @@ @{ if (Model.User == null) { - Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLoginRegister, "/login", "sign in")); + if (ServerConfiguration.Instance.Authentication.RegistrationEnabled) + { + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLoginRegister, "/login", "sign in")); + } + else + { + Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLogin, "/login", "sign in")); + } } else {