From 803216e8d2d0c834c765cbc0aa4ea9520d90151c Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 3 Dec 2024 13:59:13 -0800 Subject: [PATCH 01/19] Move all settings under "Settings" menu item and add "Tools" in place of "Configuration" --- .../OrchardCore.Admin/AdminMenu.cs | 14 ++- .../OrchardCore.AdminMenu/AdminMenu.cs | 2 +- .../OrchardCore.Apis.GraphQL/AdminMenu.cs | 2 +- .../Navigation/AuditTrailAdminMenu.cs | 30 +++++-- .../Navigation/AuditTrailSettingsAdminMenu.cs | 40 --------- .../OrchardCore.AuditTrail/Startup.cs | 1 - .../OrchardCore.BackgroundTasks/AdminMenu.cs | 2 +- .../AdminMenu.cs | 32 ++++--- .../OrchardCore.Contents/AdminMenu.cs | 2 +- ...xportContentToDeploymentTargetAdminMenu.cs | 14 ++- .../OrchardCore.Cors/AdminMenu.cs | 4 +- .../OrchardCore.CustomSettings/AdminMenu.cs | 18 ++-- .../AdminMenu.cs | 2 +- .../OrchardCore.Deployment/AdminMenu.cs | 2 +- .../OrchardCore.Email/AdminMenu.cs | 32 +++---- .../OrchardCore.Facebook/AdminMenu.cs | 16 ++-- .../OrchardCore.Facebook/AdminMenuLogin.cs | 2 +- .../OrchardCore.Facebook/AdminMenuPixel.cs | 16 ++-- .../OrchardCore.Features/AdminMenu.cs | 2 +- .../AdminMenuGitHubLogin.cs | 2 +- .../GoogleAnalyticsAdminMenu.cs | 14 ++- .../GoogleAuthenticationAdminMenu.cs | 2 +- .../GoogleTagManagerAdminMenu.cs | 16 ++-- .../OrchardCore.Https/AdminMenu.cs | 4 +- .../OrchardCore.Layers/AdminMenu.cs | 14 +-- .../OrchardCore.Localization/AdminMenu.cs | 22 +++-- .../OrchardCore.Media.AmazonS3/AdminMenu.cs | 2 +- .../OrchardCore.Media.Azure/AdminMenu.cs | 2 +- .../OrchardCore.Media/AdminMenu.cs | 2 +- .../OrchardCore.Media/MediaCacheAdminMenu.cs | 2 +- .../AdminMenuAAD.cs | 2 +- .../AdminMenuMicrosoftAccount.cs | 2 +- .../OrchardCore.OpenId/AdminMenu.cs | 90 ------------------- .../OrchardCore.OpenId/ClientAdminMenu.cs | 38 ++++++++ .../OrchardCore.OpenId/ManagementAdminMenu.cs | 37 ++++++++ .../OrchardCore.OpenId/ServerAdminMenu.cs | 32 +++++++ .../OrchardCore.OpenId/Startup.cs | 8 +- .../OrchardCore.OpenId/ValidationAdminMenu.cs | 30 +++++++ .../OrchardCore.Queries/Sql/AdminMenu.cs | 2 +- .../OrchardCore.ReCaptcha/AdminMenu.cs | 4 +- .../OrchardCore.Recipes/AdminMenu.cs | 2 +- .../OrchardCore.ReverseProxy/AdminMenu.cs | 12 ++- .../OrchardCore.Search.AzureAI/AdminMenu.cs | 23 +++-- .../OrchardCore.Search/AdminMenu.cs | 6 +- .../OrchardCore.Security/AdminMenu.cs | 7 +- .../OrchardCore.Seo/AdminMenu.cs | 16 ++-- .../OrchardCore.Settings/AdminMenu.cs | 30 ++++--- ...NavigationItemText-configuration.Id.cshtml | 1 - .../NavigationItemText-settings.Id.cshtml | 4 + .../Views/NavigationItemText-tools.Id.cshtml | 4 + .../OrchardCore.Sitemaps/AdminMenu.cs | 2 +- .../OrchardCore.Sms/AdminMenu.cs | 34 +++---- .../OrchardCore.Taxonomies/AdminMenu.cs | 16 ++-- .../OrchardCore.Themes/AdminMenu.cs | 5 +- .../Views/NavigationItemText-design.Id.cshtml | 4 + .../Views/NavigationItemText-themes.Id.cshtml | 1 - .../OrchardCore.Twitter/AdminMenu.cs | 14 ++- .../OrchardCore.Twitter/AdminMenuSignin.cs | 15 ++-- .../OrchardCore.UrlRewriting/AdminMenu.cs | 2 +- .../OrchardCore.Users/AdminMenu.cs | 6 +- .../OrchardCore.Users/ChangeEmailAdminMenu.cs | 4 +- .../RegistrationAdminMenu.cs | 4 +- .../ResetPasswordAdminMenu.cs | 12 ++- .../OrchardCore.Workflows/AdminMenu.cs | 14 +-- .../Trimming/AdminMenu.cs | 12 ++- .../NavigationConstants.cs | 6 +- 66 files changed, 418 insertions(+), 398 deletions(-) delete mode 100644 src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs delete mode 100644 src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs create mode 100644 src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs create mode 100644 src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs create mode 100644 src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs create mode 100644 src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs delete mode 100644 src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml create mode 100644 src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml create mode 100644 src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml create mode 100644 src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml delete mode 100644 src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-themes.Id.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs index cdf8270f5e8..2662b8beb0e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs @@ -23,14 +23,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin - .AddClass("admin").Id("admin") - .Action("Index", "Admin", _routeValues) - .Permission(PermissionsAdminSettings.ManageAdminSettings) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin + .AddClass("admin").Id("admin") + .Action("Index", "Admin", _routeValues) + .Permission(PermissionsAdminSettings.ManageAdminSettings) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs index 9a60dc21942..93228f8f345 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs @@ -22,7 +22,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { // Configuration and settings menus for the AdminMenu module. builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu .Permission(Permissions.ManageAdminMenu) .Action("List", "Menu", "OrchardCore.AdminMenu") diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs index 02c371cda73..0f6886ccb73 100644 --- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL .Action("Index", "Admin", "OrchardCore.Apis.GraphQL") .Permission(CommonPermissions.ExecuteGraphQL) diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs index 95dcb31301d..fbfb21abeeb 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Localization; using OrchardCore.AuditTrail.Controllers; +using OrchardCore.AuditTrail.Settings; using OrchardCore.Navigation; namespace OrchardCore.AuditTrail.Navigation; @@ -13,6 +14,12 @@ public sealed class AuditTrailAdminMenu : AdminNavigationProvider { "correlationId", string.Empty }, }; + private static readonly RouteValueDictionary _settingsRouteValues = new() + { + { "area", "OrchardCore.Settings" }, + { "groupId", AuditTrailSettingsGroup.Id }, + }; + internal readonly IStringLocalizer S; public AuditTrailAdminMenu(IStringLocalizer stringLocalizer) @@ -23,12 +30,23 @@ public AuditTrailAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration - .AddClass("audittrail") - .Id("audittrail") - .Action(nameof(AdminController.Index), "Admin", _routeValues) - .Permission(AuditTrailPermissions.ViewAuditTrail) - .LocalNav() + .Add(S["Tools"], tools => tools + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), configuration => configuration + .AddClass("audittrail") + .Id("audittrail") + .Action(nameof(AdminController.Index), "Admin", _routeValues) + .Permission(AuditTrailPermissions.ViewAuditTrail) + .LocalNav() + ) + ) + .Add(S["Settings"], settings => settings + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail + .AddClass("audittrail") + .Id("audittrailSettings") + .Action("Index", "Admin", _settingsRouteValues) + .Permission(AuditTrailPermissions.ManageAuditTrailSettings) + .LocalNav() + ) ); return ValueTask.CompletedTask; diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs deleted file mode 100644 index 6f9ddd25673..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.Localization; -using OrchardCore.AuditTrail.Settings; -using OrchardCore.Navigation; - -namespace OrchardCore.AuditTrail.Navigation; - -public sealed class AuditTrailSettingsAdminMenu : AdminNavigationProvider -{ - private static readonly RouteValueDictionary _routeValues = new() - { - { "area", "OrchardCore.Settings" }, - { "groupId", AuditTrailSettingsGroup.Id }, - }; - - internal readonly IStringLocalizer S; - - public AuditTrailSettingsAdminMenu(IStringLocalizer stringLocalizer) - { - S = stringLocalizer; - } - - protected override ValueTask BuildAsync(NavigationBuilder builder) - { - builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail - .AddClass("audittrail") - .Id("audittrailSettings") - .Action("Index", "Admin", _routeValues) - .Permission(AuditTrailPermissions.ManageAuditTrailSettings) - .LocalNav() - ) - ) - ); - - return ValueTask.CompletedTask; - } -} diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs index e2364354f75..3ca6623e86c 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs @@ -43,7 +43,6 @@ public override void ConfigureServices(IServiceCollection services) services.AddPermissionProvider(); services.AddNavigationProvider(); - services.AddNavigationProvider(); services.AddSiteDisplayDriver(); services.AddSiteDisplayDriver(); diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs index 08f64b7ce73..1ed0534df5c 100644 --- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs index d13935970c3..4d18d0e2331 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs @@ -29,23 +29,21 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Localization"], localization => localization - .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider - .AddClass("contentrequestcultureprovider") - .Id("contentrequestcultureprovider") - .Action("Index", "Admin", _providersRouteValues) - .Permission(Permissions.ManageContentCulturePicker) - .LocalNav() - ) - .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker - .AddClass("contentculturepicker") - .Id("contentculturepicker") - .Action("Index", "Admin", _pickerRouteValues) - .Permission(Permissions.ManageContentCulturePicker) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Localization"], localization => localization + .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider + .AddClass("contentrequestcultureprovider") + .Id("contentrequestcultureprovider") + .Action("Index", "Admin", _providersRouteValues) + .Permission(Permissions.ManageContentCulturePicker) + .LocalNav() + ) + .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker + .AddClass("contentculturepicker") + .Id("contentculturepicker") + .Action("Index", "Admin", _pickerRouteValues) + .Permission(Permissions.ManageContentCulturePicker) + .LocalNav() ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs index 8c0b556131f..211977d496d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs @@ -75,7 +75,7 @@ await content.AddAsync(S["Content Items"], S["Content Items"].PrefixPosition(), contentItems.Action(nameof(AdminController.List), typeof(AdminController).ControllerName(), _routeValues); contentItems.LocalNav(); }); - }); + }, priority: 1); var adminSettings = await _siteService.GetSettingsAsync(); diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs index ea771404b90..02188f019c4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs @@ -22,15 +22,11 @@ public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer stri protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import - .Add(S["Settings"], settings => settings - .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings - .Action("Index", "Admin", _routeValues) - .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) - .LocalNav() - ) - ) + .Add(S["Settings"], settings => settings + .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings + .Action("Index", "Admin", _routeValues) + .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs index 2d606abb6ef..c29549dc63e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs @@ -15,8 +15,8 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["CORS"], S["CORS"].PrefixPosition(), entry => entry .AddClass("cors") .Id("cors") diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs index f49eaef5c30..0221567b12e 100644 --- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs @@ -41,16 +41,14 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) var htmlName = type.Name.HtmlClassify(); builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers - .Action("Index", "Admin", routeValues) - .AddClass(htmlName) - .Id(htmlName) - .Permission(Permissions.CreatePermissionForType(type)) - .Resource(type.Name) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers + .Action("Index", "Admin", routeValues) + .AddClass(htmlName) + .Id(htmlName) + .Permission(Permissions.CreatePermissionForType(type)) + .Resource(type.Name) + .LocalNav() ) ); } diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs index d69bf633a52..091d389d29e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Import/Export"], import => import .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs index 649a5793928..a64e4cd77fd 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs index d580f9096ec..9627118550e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs @@ -25,22 +25,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry - .AddClass("email") - .Id("email") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageEmailSettings) - .LocalNav() - ) - .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry - .AddClass("emailtest") - .Id("emailtest") - .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") - .Permission(Permissions.ManageEmailSettings) - .LocalNav() - ) + .Add(S["Tools"], tools => tools + .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry + .AddClass("emailtest") + .Id("emailtest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") + .Permission(Permissions.ManageEmailSettings) + .LocalNav() + ) + ) + .Add(S["Settings"], settings => settings + .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry + .AddClass("email") + .Id("email") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageEmailSettings) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs index d4e59228029..188a4398b56 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs @@ -22,15 +22,13 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp - .AddClass("facebookApp") - .Id("facebookApp") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageFacebookApp) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp + .AddClass("facebookApp") + .Id("facebookApp") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageFacebookApp) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs index c4ad313080b..ff8c58602d1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs @@ -22,7 +22,7 @@ public AdminMenuLogin(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta .AddClass("facebook") diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs index 9494dd75d46..720b5d9aa57 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs @@ -23,15 +23,13 @@ public AdminMenuPixel( protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel - .AddClass("facebookPixel") - .Id("facebookPixel") - .Action("Index", "Admin", _routeValues) - .Permission(FacebookConstants.ManageFacebookPixelPermission) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel + .AddClass("facebookPixel") + .Id("facebookPixel") + .Action("Index", "Admin", _routeValues) + .Permission(FacebookConstants.ManageFacebookPixelPermission) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs index e4dbd3e2345..0ec40dda79c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs @@ -23,7 +23,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Features"], S["Features"].PrefixPosition(), deployment => deployment .Action("Features", "Admin", _routeValues) .Permission(Permissions.ManageFeatures) diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs index 06be42e1584..6400a652535 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs @@ -22,7 +22,7 @@ public AdminMenuGitHubLogin(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings .AddClass("github") diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs index 5e5ffdbc0e0..00bb3f122ab 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs @@ -22,14 +22,12 @@ public GoogleAnalyticsAdminMenu(IStringLocalizer strin protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google - .AddClass("googleAnalytics").Id("googleAnalytics") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGoogleAnalytics) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google + .AddClass("googleAnalytics").Id("googleAnalytics") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleAnalytics) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs index 9392cd6d583..898f3c97eb5 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs @@ -22,7 +22,7 @@ public GoogleAuthenticationAdminMenu(IStringLocalizer security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication .Add(S["Google"], S["Google"].PrefixPosition(), google => google .AddClass("google") diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs index bb5fe072b1c..e672b57a7d6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs @@ -22,15 +22,13 @@ public GoogleTagManagerAdminMenu(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google - .AddClass("googleTagManager") - .Id("googleTagManager") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGoogleTagManager) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google + .AddClass("googleTagManager") + .Id("googleTagManager") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleTagManager) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs index 9df8c2e3f9f..deec6fb32af 100644 --- a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs @@ -23,8 +23,8 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["HTTPS"], S["HTTPS"].PrefixPosition(), https => https .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageHttps) diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs index 732952081a6..1eacd979dee 100644 --- a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs @@ -24,18 +24,18 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Design"], design => design - .Add(S["Settings"], settings => settings - .Add(S["Zones"], S["Zones"].PrefixPosition(), zones => zones - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageLayers) - .LocalNav() - ) - ) .Add(S["Widgets"], S["Widgets"].PrefixPosition(), widgets => widgets .Permission(Permissions.ManageLayers) .Action("Index", "Admin", "OrchardCore.Layers") .LocalNav() ) + ) + .Add(S["Settings"], settings => settings + .Add(S["Zones"], S["Zones"].PrefixPosition(), zones => zones + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageLayers) + .LocalNav() + ) ); return ValueTask.CompletedTask; diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs index 42078f84b10..6ab0c66bbe8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs @@ -31,18 +31,16 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Localization"], localization => localization - .AddClass("localization") - .Id("localization") - .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures - .AddClass("cultures") - .Id("cultures") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageCultures) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Localization"], localization => localization + .AddClass("localization") + .Id("localization") + .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures + .AddClass("cultures") + .Id("cultures") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageCultures) + .LocalNav() ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs index a32fe8bebf5..fa966811a48 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - builder.Add(S["Configuration"], configuration => configuration + builder.Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs index 34cd3558ab2..6526ac79298 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index 46191f3aabb..0897fce057d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -26,7 +26,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ); builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") diff --git a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs index 1781878da51..527cb7f206c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs @@ -15,7 +15,7 @@ public MediaCacheAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media") diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs index 3a54ebefd0c..0b64ac85f54 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs @@ -22,7 +22,7 @@ public AdminMenuAAD(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId .AddClass("microsoft-entra-id") diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs index 5cbbcbe0558..6c3329ff0a4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs @@ -22,7 +22,7 @@ public AdminMenuMicrosoftAccount(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft .AddClass("microsoft") diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs deleted file mode 100644 index 3f76c85c186..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/AdminMenu.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System.Collections.Immutable; -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.Localization; -using OrchardCore.Environment.Shell.Descriptor.Models; -using OrchardCore.Navigation; - -namespace OrchardCore.OpenId; - -public sealed class AdminMenu : AdminNavigationProvider -{ - private static readonly RouteValueDictionary _clientRouteValues = new() - { - { "area", "OrchardCore.Settings" }, - { "groupId", "OrchardCore.OpenId.Client" }, - }; - - private readonly ShellDescriptor _shellDescriptor; - - internal readonly IStringLocalizer S; - - public AdminMenu( - IStringLocalizer stringLocalizer, - ShellDescriptor shellDescriptor) - { - S = stringLocalizer; - _shellDescriptor = shellDescriptor; - } - - protected override ValueTask BuildAsync(NavigationBuilder builder) - { - builder - .Add(S["Security"], security => security - .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), category => - { - category.AddClass("openid").Id("openid"); - - var features = _shellDescriptor.Features.Select(feature => feature.Id).ToImmutableArray(); - if (features.Contains(OpenIdConstants.Features.Client) || - features.Contains(OpenIdConstants.Features.Server) || - features.Contains(OpenIdConstants.Features.Validation)) - { - category.Add(S["Settings"], "1", settings => - { - if (features.Contains(OpenIdConstants.Features.Client)) - { - settings.Add(S["Authentication client"], "1", client => client - .Action("Index", "Admin", _clientRouteValues) - .Permission(Permissions.ManageClientSettings) - .LocalNav()); - } - - if (features.Contains(OpenIdConstants.Features.Server)) - { - settings.Add(S["Authorization server"], "2", server => server - .Action("Index", "ServerConfiguration", "OrchardCore.OpenId") - .Permission(Permissions.ManageServerSettings) - .LocalNav()); - } - - if (features.Contains(OpenIdConstants.Features.Validation)) - { - settings.Add(S["Token validation"], "3", validation => validation - .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") - .Permission(Permissions.ManageValidationSettings) - .LocalNav()); - } - }); - } - - if (features.Contains(OpenIdConstants.Features.Management)) - { - category.Add(S["Management"], "2", management => - { - management.Add(S["Applications"], "1", applications => applications - .Action("Index", "Application", "OrchardCore.OpenId") - .Permission(Permissions.ManageApplications) - .LocalNav()); - - management.Add(S["Scopes"], "2", applications => applications - .Action("Index", "Scope", "OrchardCore.OpenId") - .Permission(Permissions.ManageScopes) - .LocalNav()); - }); - } - }) - ); - - return ValueTask.CompletedTask; - } -} diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs new file mode 100644 index 00000000000..6c39883ce24 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs @@ -0,0 +1,38 @@ +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.Localization; +using OrchardCore.Navigation; + +namespace OrchardCore.OpenId; + +public sealed class ClientAdminMenu : AdminNavigationProvider +{ + private static readonly RouteValueDictionary _clientRouteValues = new() + { + { "area", "OrchardCore.Settings" }, + { "groupId", "OrchardCore.OpenId.Client" }, + }; + + + internal readonly IStringLocalizer S; + + public ClientAdminMenu(IStringLocalizer stringLocalizer) + { + S = stringLocalizer; + } + + protected override ValueTask BuildAsync(NavigationBuilder builder) + { + builder + .Add(S["Settings"], settings => settings + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .Add(S["Authentication client"], client => client + .Action("Index", "Admin", _clientRouteValues) + .Permission(Permissions.ManageClientSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } +} diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs new file mode 100644 index 00000000000..d562243fb3c --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs @@ -0,0 +1,37 @@ +using Microsoft.Extensions.Localization; +using OrchardCore.Navigation; + +namespace OrchardCore.OpenId; + +public sealed class ManagementAdminMenu : AdminNavigationProvider +{ + internal readonly IStringLocalizer S; + + public ManagementAdminMenu(IStringLocalizer stringLocalizer) + { + S = stringLocalizer; + } + + protected override ValueTask BuildAsync(NavigationBuilder builder) + { + builder + .Add(S["Security"], security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Applications"], applications => applications + .Action("Index", "Application", "OrchardCore.OpenId") + .Permission(Permissions.ManageApplications) + .LocalNav() + ) + .Add(S["Scopes"], applications => applications + .Action("Index", "Scope", "OrchardCore.OpenId") + .Permission(Permissions.ManageScopes) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } +} diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs new file mode 100644 index 00000000000..a504c677397 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs @@ -0,0 +1,32 @@ +using Microsoft.Extensions.Localization; +using OrchardCore.Navigation; + +namespace OrchardCore.OpenId; + +public sealed class ServerAdminMenu : AdminNavigationProvider +{ + internal readonly IStringLocalizer S; + + public ServerAdminMenu(IStringLocalizer stringLocalizer) + { + S = stringLocalizer; + } + + protected override ValueTask BuildAsync(NavigationBuilder builder) + { + builder + .Add(S["Settings"], settings => settings + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Authorization server"], server => server + .Action("Index", "ServerConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageServerSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } +} diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs index 0a3e41050d5..2dfe4a6954f 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs @@ -52,7 +52,7 @@ public override void ConfigureServices(IServiceCollection services) }); services.AddPermissionProvider(); - services.AddNavigationProvider(); + services.AddNavigationProvider(); } } @@ -61,6 +61,8 @@ public sealed class ClientStartup : StartupBase { public override void ConfigureServices(IServiceCollection services) { + services.AddNavigationProvider(); + services.TryAddSingleton(); // Note: the following services are registered using TryAddEnumerable to prevent duplicate registrations. @@ -88,6 +90,8 @@ public sealed class ServerStartup : StartupBase { public override void ConfigureServices(IServiceCollection services) { + services.AddNavigationProvider(); + services.AddOpenIddict() .AddServer(options => { @@ -206,6 +210,8 @@ public sealed class ValidationStartup : StartupBase { public override void ConfigureServices(IServiceCollection services) { + services.AddNavigationProvider(); + services.AddOpenIddict() .AddValidation(options => { diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs new file mode 100644 index 00000000000..d7348325f12 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs @@ -0,0 +1,30 @@ +using Microsoft.Extensions.Localization; +using OrchardCore.Navigation; + +namespace OrchardCore.OpenId; + +public sealed class ValidationAdminMenu : AdminNavigationProvider +{ + internal readonly IStringLocalizer S; + + public ValidationAdminMenu(IStringLocalizer stringLocalizer) + { + S = stringLocalizer; + } + + protected override ValueTask BuildAsync(NavigationBuilder builder) + { + builder + .Add(S["Settings"], settings => settings + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .Add(S["Token validation"], validation => validation + .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageValidationSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } +} diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs index bd02f352d8e..fb4c50fd271 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Search"], search => search + .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries .Add(S["Run SQL Query"], S["Run SQL Query"].PrefixPosition(), sql => sql .Action("Query", "Admin", "OrchardCore.Queries") diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs index 0e02386740d..fcd28219ab2 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs @@ -23,8 +23,8 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["reCaptcha"], S["reCaptcha"].PrefixPosition(), reCaptcha => reCaptcha .Permission(Permissions.ManageReCaptchaSettings) .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs index 447e726db00..e8a9eca7cf7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes .AddClass("recipes") .Id("recipes") diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs index 7d305565eab..8a57ea5aa18 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs @@ -23,15 +23,13 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry + .Add(S["Settings"], settings => settings + .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), proxy => proxy .AddClass("reverseproxy") .Id("reverseproxy") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageReverseProxySettings) - .LocalNav() - ) + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageReverseProxySettings) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs index f83d396465e..ee29fd78bb4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using OrchardCore.Navigation; @@ -8,6 +9,12 @@ namespace OrchardCore.Search.AzureAI; public sealed class AdminMenu : AdminNavigationProvider { + private static readonly RouteValueDictionary _routeValues = new() + { + { "area", "OrchardCore.Settings" }, + { "groupId", AzureAISearchDefaultSettingsDisplayDriver.GroupId}, + }; + private readonly AzureAISearchDefaultOptions _azureAISearchSettings; internal readonly IStringLocalizer S; @@ -40,15 +47,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) if (!_azureAISearchSettings.DisableUIConfiguration) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch - .AddClass("azure-ai-search") - .Id("azureaisearch") - .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = AzureAISearchDefaultSettingsDisplayDriver.GroupId }) - .Permission(AzureAISearchIndexPermissionHelper.ManageAzureAISearchIndexes) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch + .AddClass("azure-ai-search") + .Id("azureaisearch") + .Action("Index", "Admin", _routeValues) + .Permission(AzureAISearchIndexPermissionHelper.ManageAzureAISearchIndexes) + .LocalNav() ) ); } diff --git a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs index f3176267655..374dea18d0a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs @@ -22,10 +22,8 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search - .AddClass("search") - .Id("search") - .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Search"], S["Search"].PrefixPosition(), search => search .Action("Index", "Admin", _routeValues) .AddClass("searchsettings") .Id("searchsettings") diff --git a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs index 2bc24e8b352..8e3515787f9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs @@ -11,7 +11,6 @@ public sealed class AdminMenu : AdminNavigationProvider { { "area", "OrchardCore.Settings" }, { "groupId", SecuritySettingsDisplayDriver.GroupId }, - }; internal readonly IStringLocalizer S; @@ -24,10 +23,8 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security - .AddClass("security") - .Id("security") - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers .Permission(SecurityPermissions.ManageSecurityHeadersSettings) .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs index 15e06e663da..0698b67dc59 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs @@ -22,15 +22,13 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo - .AddClass("seo") - .Id("seo") - .Action("Index", "Admin", _routeValues) - .Permission(SeoConstants.ManageSeoSettings) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo + .AddClass("seo") + .Id("seo") + .Action("Index", "Admin", _routeValues) + .Permission(SeoConstants.ManageSeoSettings) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index aefaaf97b2a..59668e32bae 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -23,19 +23,23 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration - .AddClass("menu-configuration") - .Id("configuration") - .Add(S["Settings"], "1", settings => settings - .Add(S["General"], "1", entry => entry - .AddClass("general") - .Id("general") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGroupSettings) - .LocalNav() - ), - priority: 1) - ); + .Add(S["Tools"], NavigationConstants.AdminMenuToolsPosition, tools => tools + .Id("tools") + .AddClass("tools") + , priority: 1); + + builder + .Add(S["Settings"], NavigationConstants.AdminMenuSettingsPosition, settings => settings + .Id("settings") + .AddClass("settings") + .Add(S["General"], "before", general => general + .AddClass("general") + .Id("general") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGroupSettings) + .LocalNav() + ) + , priority: 1); return ValueTask.CompletedTask; } diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml deleted file mode 100644 index 098ebd66a52..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml +++ /dev/null @@ -1 +0,0 @@ -@T["Configuration"] diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml new file mode 100644 index 00000000000..9bf672ffb24 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Settings"] diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml new file mode 100644 index 00000000000..f6cd025fb7f --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Tools"] diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs index aa152c86415..ee5a3cc1893 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo .Permission(Permissions.ManageSitemaps) .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs index da32ab0d607..811f660c983 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs @@ -24,22 +24,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms - .AddClass("sms") - .Id("sms") - .Action("Index", "Admin", _routeValues) - .Permission(SmsPermissions.ManageSmsSettings) - .LocalNav() - ) - .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms - .AddClass("smstest") - .Id("smstest") - .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") - .Permission(SmsPermissions.ManageSmsSettings) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms + .AddClass("sms") + .Id("sms") + .Action("Index", "Admin", _routeValues) + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() + ) + ); + + builder + .Add(S["Tools"], tools => tools + .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms + .AddClass("smstest") + .Id("smstest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs index d66fccb078f..8cbbd449e0b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs @@ -23,15 +23,13 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], "1", settings => settings - .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters - .AddClass("taxonomyfilters") - .Id("taxonomyfilters") - .Permission(Permissions.ManageTaxonomies) - .Action("Index", "Admin", _routeValues) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters + .AddClass("taxonomyfilters") + .Id("taxonomyfilters") + .Permission(Permissions.ManageTaxonomies) + .Action("Index", "Admin", _routeValues) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs index a792d6924c5..3e8338ac4f0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Themes/AdminMenu.cs @@ -16,13 +16,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Design"], NavigationConstants.AdminMenuDesignPosition, design => design - .AddClass("themes").Id("themes") + .AddClass("design") + .Id("design") .Add(S["Themes"], S["Themes"].PrefixPosition(), themes => themes .Action("Index", "Admin", "OrchardCore.Themes") .Permission(Permissions.ApplyTheme) .LocalNav() ) - ); + , priority: 1); return ValueTask.CompletedTask; } diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml new file mode 100644 index 00000000000..c66bc7411d0 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Design"] diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-themes.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-themes.Id.cshtml deleted file mode 100644 index 6d96141b7d4..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-themes.Id.cshtml +++ /dev/null @@ -1 +0,0 @@ -@T["Design"] diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs index abbd61cc8b2..e3199cd53ef 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs @@ -22,14 +22,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter - .AddClass("twitter").Id("twitter") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageTwitter) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter").Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitter) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 071074d46e4..60687c26981 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -22,14 +22,15 @@ public AdminMenuSignin(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings .Add(S["Authentication"], authentication => authentication - .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter - .AddClass("twitter") - .Id("twitter") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageTwitterSignin) - .LocalNav()) + .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter") + .Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitterSignin) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs index 36a784eb8ac..794d6c36915 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration + .Add(S["Tools"], tools => tools .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting .AddClass("url-rewriting") .Id("urlRewriting") diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs index a32f0b0bdaf..879c0068ba9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs @@ -35,7 +35,11 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Resource(new User()) .LocalNav() ) - .Add(S["Settings"], settings => settings + , priority: 1); + + builder + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs index 44682388897..9cd4cbfb9fa 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs @@ -23,8 +23,8 @@ public ChangeEmailAdminMenu(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs index a568fe9d980..77b2fe9f871 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs @@ -23,8 +23,8 @@ public RegistrationAdminMenu(IStringLocalizer stringLocal protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security - .Add(S["Settings"], settings => settings + .Add(S["Settings"], settings => settings + .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs index eeea745cb99..0b81e088843 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs @@ -23,13 +23,11 @@ public ResetPasswordAdminMenu(IStringLocalizer stringLoc protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security - .Add(S["Settings"], settings => settings - .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password - .Permission(CommonPermissions.ManageUsers) - .Action("Index", "Admin", _routeValues) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs index 53c45ec6651..aab4617022b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs @@ -15,12 +15,14 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Workflows"], NavigationConstants.AdminMenuWorkflowsPosition, workflow => workflow - .AddClass("workflows") - .Id("workflows") - .Action("Index", "WorkflowType", "OrchardCore.Workflows") - .Permission(Permissions.ManageWorkflows) - .LocalNav() + .Add(S["Tools"], tools => tools + .Add(S["Workflows"], S["Workflows"].PrefixPosition(), workflow => workflow + .AddClass("workflows") + .Id("workflows") + .Action("Index", "WorkflowType", "OrchardCore.Workflows") + .Permission(Permissions.ManageWorkflows) + .LocalNav() + ) ); return ValueTask.CompletedTask; diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs index 9be8ceef695..2bb12484669 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs @@ -23,13 +23,11 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["Settings"], settings => settings - .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageWorkflowSettings) - .LocalNav() - ) + .Add(S["Settings"], settings => settings + .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageWorkflowSettings) + .LocalNav() ) ); diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index 70e19561e20..965b73e1f9f 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -12,11 +12,9 @@ public static class NavigationConstants public const string AdminMenuSecurityPosition = "7"; - public const string AdminMenuAuditTrailPosition = "7.5"; + public const string AdminMenuToolsPosition = "100"; - public const string AdminMenuWorkflowsPosition = "8"; - - public const string AdminMenuConfigurationPosition = "100"; + public const string AdminMenuSettingsPosition = "after"; public const string AdminId = "admin"; From d505ad1758d0ad65bbac07e994c2bd050ccc6bf7 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Wed, 4 Dec 2024 08:06:54 -0800 Subject: [PATCH 02/19] more organization --- .../OrchardCore.BackgroundTasks/AdminMenu.cs | 10 ++++------ .../OrchardCore.Email/AdminMenu.cs | 14 +++++++------ .../OrchardCore.Facebook/AdminMenuLogin.cs | 16 ++++++++------- .../AdminMenuGitHubLogin.cs | 16 ++++++++------- .../GoogleAuthenticationAdminMenu.cs | 20 ++++++++++--------- .../AdminMenuAAD.cs | 19 ++++++++++-------- .../AdminMenuMicrosoftAccount.cs | 16 ++++++++------- .../OrchardCore.OpenId/ClientAdminMenu.cs | 12 ++++++----- .../OrchardCore.OpenId/ManagementAdminMenu.cs | 6 +++--- .../OrchardCore.OpenId/ServerAdminMenu.cs | 18 +++++++++-------- .../OrchardCore.OpenId/ValidationAdminMenu.cs | 14 +++++++------ .../OrchardCore.Roles/AdminMenu.cs | 2 +- .../OrchardCore.Sms/AdminMenu.cs | 14 +++++++------ .../OrchardCore.Twitter/AdminMenuSignin.cs | 16 ++++++++------- .../OrchardCore.Users/AdminMenu.cs | 6 +++--- ...NavigationItemText-accessControl.Id.cshtml | 4 ++++ .../NavigationItemText-security.Id.cshtml | 1 - .../NavigationConstants.cs | 2 +- 18 files changed, 115 insertions(+), 91 deletions(-) create mode 100644 src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml delete mode 100644 src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs index 1ed0534df5c..4ee68b5ed97 100644 --- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs @@ -16,12 +16,10 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Tools"], tools => tools - .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks - .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks - .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") - .Permission(Permissions.ManageBackgroundTasks) - .LocalNav() - ) + .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") + .Permission(Permissions.ManageBackgroundTasks) + .LocalNav() ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs index 9627118550e..2489461a8e7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs @@ -26,12 +26,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Tools"], tools => tools - .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry - .AddClass("emailtest") - .Id("emailtest") - .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") - .Permission(Permissions.ManageEmailSettings) - .LocalNav() + .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing + .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry + .AddClass("emailtest") + .Id("emailtest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") + .Permission(Permissions.ManageEmailSettings) + .LocalNav() + ) ) ) .Add(S["Settings"], settings => settings diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs index ff8c58602d1..0264ef5df24 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs @@ -23,13 +23,15 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta - .AddClass("facebook") - .Id("facebook") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageFacebookApp) - .LocalNav() + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta + .AddClass("facebook") + .Id("facebook") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageFacebookApp) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs index 6400a652535..406dfdaf2f1 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs @@ -23,13 +23,15 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings - .AddClass("github") - .Id("github") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGitHubAuthentication) - .LocalNav() + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings + .AddClass("github") + .Id("github") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGitHubAuthentication) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs index 898f3c97eb5..5e76ec7ea36 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs @@ -23,16 +23,18 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["Google"], S["Google"].PrefixPosition(), google => google - .AddClass("google") - .Id("google") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGoogleAuthentication) - .LocalNav() + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Google"], S["Google"].PrefixPosition(), google => google + .AddClass("google") + .Id("google") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleAuthentication) + .LocalNav() + ) + ) ) - ) - ); + ); return ValueTask.CompletedTask; } diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs index 0b64ac85f54..57159549d7c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs @@ -23,15 +23,18 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId - .AddClass("microsoft-entra-id") - .Id("microsoft-entra-id") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageMicrosoftAuthentication) - .LocalNav()) + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId + .AddClass("microsoft-entra-id") + .Id("microsoft-entra-id") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageMicrosoftAuthentication) + .LocalNav() + ) ) - ); + ) + ); return ValueTask.CompletedTask; } diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs index 6c3329ff0a4..e2338677075 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs @@ -23,13 +23,15 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft - .AddClass("microsoft") - .Id("microsoft") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageMicrosoftAuthentication) - .LocalNav() + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft + .AddClass("microsoft") + .Id("microsoft") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageMicrosoftAuthentication) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs index 6c39883ce24..c49aca540a7 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs @@ -24,11 +24,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId - .Add(S["Authentication client"], client => client - .Action("Index", "Admin", _clientRouteValues) - .Permission(Permissions.ManageClientSettings) - .LocalNav() + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .Add(S["Authentication client"], S["Authentication client"].PrefixPosition(), client => client + .Action("Index", "Admin", _clientRouteValues) + .Permission(Permissions.ManageClientSettings) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs index d562243fb3c..9e69b6c9351 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs @@ -15,16 +15,16 @@ public ManagementAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Access Control"], accessControl => accessControl .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId .AddClass("openid") .Id("openid") - .Add(S["Applications"], applications => applications + .Add(S["Applications"], S["Applications"].PrefixPosition(), applications => applications .Action("Index", "Application", "OrchardCore.OpenId") .Permission(Permissions.ManageApplications) .LocalNav() ) - .Add(S["Scopes"], applications => applications + .Add(S["Scopes"], S["Scopes"].PrefixPosition(), applications => applications .Action("Index", "Scope", "OrchardCore.OpenId") .Permission(Permissions.ManageScopes) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs index a504c677397..15b05e99943 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Localization; using OrchardCore.Navigation; namespace OrchardCore.OpenId; @@ -16,13 +16,15 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId - .AddClass("openid") - .Id("openid") - .Add(S["Authorization server"], server => server - .Action("Index", "ServerConfiguration", "OrchardCore.OpenId") - .Permission(Permissions.ManageServerSettings) - .LocalNav() + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Authorization server"], S["Authorization server"].PrefixPosition(), server => server + .Action("Index", "ServerConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageServerSettings) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs index d7348325f12..7a8c58c52b5 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Localization; using OrchardCore.Navigation; namespace OrchardCore.OpenId; @@ -16,11 +16,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId - .Add(S["Token validation"], validation => validation - .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") - .Permission(Permissions.ManageValidationSettings) - .LocalNav() + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .Add(S["Token validation"], S["Token validation"].PrefixPosition(), validation => validation + .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageValidationSettings) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs index 607369ab16f..4b46668f11f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs @@ -15,7 +15,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], security => security + .Add(S["Access Control"], accessControl => accessControl .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles .AddClass("roles").Id("roles") .Action("Index", "Admin", "OrchardCore.Roles") diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs index 811f660c983..bbf3cf2419e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs @@ -36,12 +36,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools - .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms - .AddClass("smstest") - .Id("smstest") - .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") - .Permission(SmsPermissions.ManageSmsSettings) - .LocalNav() + .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing + .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms + .AddClass("smstest") + .Id("smstest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 60687c26981..18799c3dc30 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -23,13 +23,15 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Authentication"], authentication => authentication - .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter - .AddClass("twitter") - .Id("twitter") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageTwitterSignin) - .LocalNav() + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter") + .Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitterSignin) + .LocalNav() + ) ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs index 879c0068ba9..68e7ff3d463 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs @@ -24,9 +24,9 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security - .AddClass("security") - .Id("security") + .Add(S["Access Control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl + .AddClass("accessControl") + .Id("accessControl") .Add(S["Users"], S["Users"].PrefixPosition(), users => users .AddClass("users") .Id("users") diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml new file mode 100644 index 00000000000..4abb0482ec5 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Access Control"] diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml deleted file mode 100644 index 7e67db721b9..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml +++ /dev/null @@ -1 +0,0 @@ -@T["Security"] diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index 965b73e1f9f..e2074e788d8 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -10,7 +10,7 @@ public static class NavigationConstants public const string AdminMenuSearchPosition = "6"; - public const string AdminMenuSecurityPosition = "7"; + public const string AdminMenuAccessControlPosition = "7"; public const string AdminMenuToolsPosition = "100"; From 70f7cce373a717a2d2a4c01fece1a5722277f1aa Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Wed, 4 Dec 2024 09:41:47 -0800 Subject: [PATCH 03/19] use PrefixPosition --- .../OrchardCore.ContentLocalization/AdminMenu.cs | 2 +- .../OrchardCore.Facebook/AdminMenuLogin.cs | 4 ++-- .../OrchardCore.GitHub/AdminMenuGitHubLogin.cs | 4 ++-- .../OrchardCore.Google/GoogleAuthenticationAdminMenu.cs | 4 ++-- src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs | 2 +- .../OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs | 4 ++-- .../AdminMenuMicrosoftAccount.cs | 4 ++-- .../OrchardCore.Twitter/AdminMenuSignin.cs | 4 ++-- .../OrchardCore.Workflows/Trimming/AdminMenu.cs | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs index 4d18d0e2331..654cb32fead 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs @@ -30,7 +30,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Localization"], localization => localization + .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider .AddClass("contentrequestcultureprovider") .Id("contentrequestcultureprovider") diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs index 0264ef5df24..4be48ebd52f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta .AddClass("facebook") .Id("facebook") diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs index 406dfdaf2f1..5a417f8ce56 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings .AddClass("github") .Id("github") diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs index 5e76ec7ea36..d53495a8c23 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Google"], S["Google"].PrefixPosition(), google => google .AddClass("google") .Id("google") diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs index 6ab0c66bbe8..9a96eb07dce 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs @@ -32,7 +32,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Localization"], localization => localization + .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization .AddClass("localization") .Id("localization") .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs index 57159549d7c..87de8b12a3d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId .AddClass("microsoft-entra-id") .Id("microsoft-entra-id") diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs index e2338677075..5460cf5b1ab 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft .AddClass("microsoft") .Id("microsoft") diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 18799c3dc30..71e944d0651 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -23,8 +23,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter .AddClass("twitter") .Id("twitter") diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs index 2bb12484669..17cb233a527 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs @@ -24,7 +24,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Settings"], settings => settings - .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming + .Add(S["Workflow Trimming"], S["Workflow Trimming"].PrefixPosition(), trimming => trimming .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageWorkflowSettings) .LocalNav() From 779e7fcdcbf6080baa0f26d186d4e89dd48c0189 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Wed, 4 Dec 2024 09:43:31 -0800 Subject: [PATCH 04/19] update NavigationConstants --- src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs | 2 +- .../OrchardCore.Navigation.Core/NavigationConstants.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index 59668e32bae..477c848b1e5 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -29,7 +29,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) , priority: 1); builder - .Add(S["Settings"], NavigationConstants.AdminMenuSettingsPosition, settings => settings + .Add(S["Settings"], "after", settings => settings .Id("settings") .AddClass("settings") .Add(S["General"], "before", general => general diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index e2074e788d8..a41d89136d6 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -14,8 +14,6 @@ public static class NavigationConstants public const string AdminMenuToolsPosition = "100"; - public const string AdminMenuSettingsPosition = "after"; - public const string AdminId = "admin"; public const string AdminMenuId = "adminMenu"; From 77dc43469d0e96623bc152c6f2d7acb790c3a937 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Wed, 4 Dec 2024 11:18:49 -0800 Subject: [PATCH 05/19] ensure tools come before settings at the end of the menu --- src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index 477c848b1e5..ce8f206fa1d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -23,7 +23,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Tools"], NavigationConstants.AdminMenuToolsPosition, tools => tools + .Add(S["Tools"], "after.101", tools => tools .Id("tools") .AddClass("tools") , priority: 1); From f27202d6d9657e853ce6ce22b48febcecbf9c906 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Wed, 4 Dec 2024 11:19:04 -0800 Subject: [PATCH 06/19] placement --- src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs | 4 ++-- .../OrchardCore.Navigation.Core/NavigationConstants.cs | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index ce8f206fa1d..7b8c0462706 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -23,13 +23,13 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { builder - .Add(S["Tools"], "after.101", tools => tools + .Add(S["Tools"], "after.50", tools => tools .Id("tools") .AddClass("tools") , priority: 1); builder - .Add(S["Settings"], "after", settings => settings + .Add(S["Settings"], "after.100", settings => settings .Id("settings") .AddClass("settings") .Add(S["General"], "before", general => general diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index a41d89136d6..c703d62ae26 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -12,8 +12,6 @@ public static class NavigationConstants public const string AdminMenuAccessControlPosition = "7"; - public const string AdminMenuToolsPosition = "100"; - public const string AdminId = "admin"; public const string AdminMenuId = "adminMenu"; From 042d83bc6c86c211abb7dcf03622fef0a7773b9c Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 5 Dec 2024 10:34:53 -0800 Subject: [PATCH 07/19] Add a swich for legacy format --- .../OrchardCore.Admin/AdminMenu.cs | 18 +++++++++ .../OrchardCore.AdminMenu/AdminMenu.cs | 33 ++++++++++----- .../OrchardCore.Apis.GraphQL/AdminMenu.cs | 14 +++++++ .../Navigation/AuditTrailAdminMenu.cs | 24 +++++++++++ .../OrchardCore.BackgroundTasks/AdminMenu.cs | 16 ++++++++ .../AdminMenu.cs | 27 +++++++++++++ ...xportContentToDeploymentTargetAdminMenu.cs | 18 +++++++++ .../OrchardCore.Cors/AdminMenu.cs | 17 ++++++++ .../OrchardCore.CustomSettings/AdminMenu.cs | 19 +++++++++ .../AdminMenu.cs | 23 ++++++++++- .../OrchardCore.Deployment/AdminMenu.cs | 30 +++++++++++++- .../OrchardCore.Email/AdminMenu.cs | 25 ++++++++++++ .../OrchardCore.Facebook/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Facebook/AdminMenuLogin.cs | 18 +++++++++ .../OrchardCore.Facebook/AdminMenuPixel.cs | 18 +++++++++ .../OrchardCore.Features/AdminMenu.cs | 14 +++++++ .../AdminMenuGitHubLogin.cs | 18 +++++++++ .../GoogleAnalyticsAdminMenu.cs | 17 ++++++++ .../GoogleAuthenticationAdminMenu.cs | 18 +++++++++ .../GoogleTagManagerAdminMenu.cs | 18 +++++++++ .../OrchardCore.Https/AdminMenu.cs | 16 ++++++++ .../OrchardCore.Layers/AdminMenu.cs | 21 ++++++++++ .../OrchardCore.Localization/AdminMenu.cs | 22 ++++++++++ .../OrchardCore.Media.AmazonS3/AdminMenu.cs | 15 +++++++ .../OrchardCore.Media.Azure/AdminMenu.cs | 16 ++++++++ .../OrchardCore.Media/AdminMenu.cs | 21 ++++++++++ .../OrchardCore.Media/MediaCacheAdminMenu.cs | 16 ++++++++ .../AdminMenuAAD.cs | 18 +++++++++ .../AdminMenuMicrosoftAccount.cs | 18 +++++++++ .../OrchardCore.OpenId/ClientAdminMenu.cs | 20 ++++++++++ .../OrchardCore.OpenId/ManagementAdminMenu.cs | 25 ++++++++++++ .../OrchardCore.OpenId/ServerAdminMenu.cs | 20 ++++++++++ .../OrchardCore.OpenId/ValidationAdminMenu.cs | 20 ++++++++++ .../OrchardCore.ReCaptcha/AdminMenu.cs | 16 ++++++++ .../OrchardCore.Recipes/AdminMenu.cs | 16 ++++++++ .../OrchardCore.ReverseProxy/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Roles/AdminMenu.cs | 15 +++++++ .../OrchardCore.Search.AzureAI/AdminMenu.cs | 40 ++++++++++++++----- .../OrchardCore.Search/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Security/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Seo/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Settings/AdminMenu.cs | 25 ++++++++++-- ...NavigationItemText-configuration.Id.cshtml | 4 ++ .../OrchardCore.Sitemaps/AdminMenu.cs | 24 +++++++++++ .../OrchardCore.Sms/AdminMenu.cs | 29 ++++++++++++-- .../OrchardCore.Taxonomies/AdminMenu.cs | 18 +++++++++ .../OrchardCore.Twitter/AdminMenu.cs | 17 ++++++++ .../OrchardCore.Twitter/AdminMenuSignin.cs | 21 +++++++++- .../OrchardCore.Twitter/Startup.cs | 2 +- .../OrchardCore.UrlRewriting/AdminMenu.cs | 16 ++++++++ .../OrchardCore.Users/AdminMenu.cs | 29 +++++++++++++- .../OrchardCore.Users/ChangeEmailAdminMenu.cs | 16 ++++++++ .../RegistrationAdminMenu.cs | 16 ++++++++ .../ResetPasswordAdminMenu.cs | 16 ++++++++ .../NavigationItemText-security.Id.cshtml | 4 ++ .../OrchardCore.Workflows/AdminMenu.cs | 14 +++++++ .../AdminNavigationProvider.cs | 3 ++ .../NavigationConstants.cs | 10 +++++ 58 files changed, 1041 insertions(+), 33 deletions(-) create mode 100644 src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml create mode 100644 src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs index 2662b8beb0e..8d849889d44 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs @@ -22,6 +22,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin + .AddClass("admin") + .Id("admin") + .Action("Index", "Admin", _routeValues) + .Permission(PermissionsAdminSettings.ManageAdminSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs index 93228f8f345..1a954a59926 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs @@ -20,15 +20,30 @@ public AdminMenu( protected override ValueTask BuildAsync(NavigationBuilder builder) { - // Configuration and settings menus for the AdminMenu module. - builder - .Add(S["Tools"], tools => tools - .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu - .Permission(Permissions.ManageAdminMenu) - .Action("List", "Menu", "OrchardCore.AdminMenu") - .LocalNav() - ) - ); + if (UseLegacyFormat) + { + // Configuration and settings menus for the AdminMenu module. + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu + .Permission(Permissions.ManageAdminMenu) + .Action("List", "Menu", "OrchardCore.AdminMenu") + .LocalNav() + ) + ); + } + else + { + // Configuration and settings menus for the AdminMenu module. + builder + .Add(S["Tools"], tools => tools + .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu + .Permission(Permissions.ManageAdminMenu) + .Action("List", "Menu", "OrchardCore.AdminMenu") + .LocalNav() + ) + ); + } // This is the entry point for the adminMenu: dynamically generated custom admin menus. return _adminMenuNavigationProviderCoordinator.BuildNavigationAsync(NavigationConstants.AdminMenuId, builder); diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs index 0f6886ccb73..90a0757f10e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs @@ -14,6 +14,20 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL + .Action("Index", "Admin", "OrchardCore.Apis.GraphQL") + .Permission(CommonPermissions.ExecuteGraphQL) + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), graphiQL => graphiQL diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs index fbfb21abeeb..a02b8f3da41 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs @@ -29,6 +29,30 @@ public AuditTrailAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration + .AddClass("audittrail") + .Id("audittrail") + .Action(nameof(AdminController.Index), "Admin", _routeValues) + .Permission(AuditTrailPermissions.ViewAuditTrail) + .LocalNav() + ) + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail + .AddClass("audittrail") + .Id("audittrailSettings") + .Action("Index", "Admin", _routeValues) + .Permission(AuditTrailPermissions.ManageAuditTrailSettings) + .LocalNav() + ) + ) + ); + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs index 4ee68b5ed97..8170c830c10 100644 --- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs @@ -14,6 +14,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks + .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") + .Permission(Permissions.ManageBackgroundTasks) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs index 654cb32fead..a356d96a01b 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs @@ -28,6 +28,33 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Localization"], localization => localization + .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider + .AddClass("contentrequestcultureprovider") + .Id("contentrequestcultureprovider") + .Action("Index", "Admin", _providersRouteValues) + .Permission(Permissions.ManageContentCulturePicker) + .LocalNav() + ) + .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker + .AddClass("contentculturepicker") + .Id("contentculturepicker") + .Action("Index", "Admin", _pickerRouteValues) + .Permission(Permissions.ManageContentCulturePicker) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs index 02188f019c4..7fb6287ca53 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs @@ -21,6 +21,24 @@ public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer stri protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import + .Add(S["Settings"], settings => settings + .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings + .Action("Index", "Admin", _routeValues) + .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs index c29549dc63e..3a6efa77efe 100644 --- a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs @@ -14,6 +14,23 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["CORS"], S["CORS"].PrefixPosition(), entry => entry + .AddClass("cors") + .Id("cors") + .Action("Index", "Admin", "OrchardCore.Cors") + .Permission(Permissions.ManageCorsSettings) + .LocalNav() + ) + ) + ); + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs index 0221567b12e..a33ca8b5628 100644 --- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs @@ -40,6 +40,25 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) var htmlName = type.Name.HtmlClassify(); + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers + .Action("Index", "Admin", routeValues) + .AddClass(htmlName) + .Id(htmlName) + .Permission(Permissions.CreatePermissionForType(type)) + .Resource(type.Name) + .LocalNav() + ) + ) + ); + + continue; + } + builder .Add(S["Settings"], settings => settings .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs index 091d389d29e..b911dc2ada3 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs @@ -14,9 +14,30 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Import/Export"], import => import + .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote + .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") + .Permission(Permissions.ManageRemoteInstances) + .LocalNav() + ) + .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote + .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote") + .Permission(Permissions.ManageRemoteClients) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools - .Add(S["Import/Export"], import => import + .Add(S["Deployments"], import => import .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteInstances) diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs index a64e4cd77fd..f47c07c739a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs @@ -14,10 +14,36 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import + .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment + .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") + .Permission(CommonPermissions.Export) + .LocalNav() + ) + .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment + .Action("Index", "Import", "OrchardCore.Deployment") + .Permission(CommonPermissions.Import) + .LocalNav() + ) + .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment + .Action("Json", "Import", "OrchardCore.Deployment") + .Permission(CommonPermissions.Import) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools - .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import - .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment + .Add(S["Deployments"], S["Deployments"].PrefixPosition(), import => import + .Add(S["Plans"], "1", deployment => deployment .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") .Permission(CommonPermissions.Export) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs index 2489461a8e7..2c92a345d2d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs @@ -24,6 +24,31 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry + .AddClass("email") + .Id("email") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageEmailSettings) + .LocalNav() + ) + .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry + .AddClass("emailtest") + .Id("emailtest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") + .Permission(Permissions.ManageEmailSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs index 188a4398b56..0d6f3b297b6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs @@ -21,6 +21,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp + .AddClass("facebookApp") + .Id("facebookApp") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageFacebookApp) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs index 4be48ebd52f..999e0e6c735 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs @@ -21,6 +21,24 @@ public AdminMenuLogin(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta + .AddClass("facebook") + .Id("facebook") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageFacebookApp) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs index 720b5d9aa57..0e9fb5c85aa 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs @@ -22,6 +22,24 @@ public AdminMenuPixel( protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel + .AddClass("facebookPixel") + .Id("facebookPixel") + .Action("Index", "Admin", _routeValues) + .Permission(FacebookConstants.ManageFacebookPixelPermission) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel diff --git a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs index 0ec40dda79c..3aeb40266b9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs @@ -22,6 +22,20 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Features"], S["Features"].PrefixPosition(), deployment => deployment + .Action("Features", "Admin", _routeValues) + .Permission(Permissions.ManageFeatures) + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Features"], S["Features"].PrefixPosition(), deployment => deployment diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs index 5a417f8ce56..eec52b72dab 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs @@ -21,6 +21,24 @@ public AdminMenuGitHubLogin(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["GitHub"], S["GitHub"].PrefixPosition(), settings => settings + .AddClass("github") + .Id("github") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGitHubAuthentication) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs index 00bb3f122ab..e3f8347986c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs @@ -21,6 +21,23 @@ public GoogleAnalyticsAdminMenu(IStringLocalizer strin protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google + .AddClass("googleAnalytics").Id("googleAnalytics") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleAnalytics) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs index d53495a8c23..af00fcc672d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs @@ -21,6 +21,24 @@ public GoogleAuthenticationAdminMenu(IStringLocalizer security + .Add(S["Authentication"], authentication => authentication + .Add(S["Google"], S["Google"].PrefixPosition(), google => google + .AddClass("google") + .Id("google") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleAuthentication) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs index e672b57a7d6..950b017db56 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs @@ -21,6 +21,24 @@ public GoogleTagManagerAdminMenu(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google + .AddClass("googleTagManager") + .Id("googleTagManager") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleTagManager) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google diff --git a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs index deec6fb32af..d2b87cd8305 100644 --- a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs @@ -22,6 +22,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["HTTPS"], S["HTTPS"].PrefixPosition(), https => https + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageHttps) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs index 1eacd979dee..523589a9e93 100644 --- a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs @@ -22,6 +22,27 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Design"], design => design + .Add(S["Settings"], settings => settings + .Add(S["Zones"], S["Zones"].PrefixPosition(), zones => zones + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageLayers) + .LocalNav() + ) + ) + .Add(S["Widgets"], S["Widgets"].PrefixPosition(), widgets => widgets + .Permission(Permissions.ManageLayers) + .Action("Index", "Admin", "OrchardCore.Layers") + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Design"], design => design .Add(S["Widgets"], S["Widgets"].PrefixPosition(), widgets => widgets diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs index 9a96eb07dce..5cb266fd82f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs @@ -30,6 +30,28 @@ public AdminMenu(IStringLocalizer stringLocalizer) /// protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Localization"], localization => localization + .AddClass("localization") + .Id("localization") + .Add(S["Cultures"], S["Cultures"].PrefixPosition(), cultures => cultures + .AddClass("cultures") + .Id("cultures") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageCultures) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs index fa966811a48..11d941c077b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs @@ -14,6 +14,21 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder.Add(S["Configuration"], configuration => configuration + .Add(S["Media"], S["Media"].PrefixPosition(), media => media + .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options + .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") + .Permission(Permissions.ViewAmazonS3MediaOptions) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder.Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs index 6526ac79298..4a89f787035 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs @@ -14,6 +14,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Media"], S["Media"].PrefixPosition(), media => media + .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options + .Action("Options", "Admin", "OrchardCore.Media.Azure") + .Permission(Permissions.ViewAzureMediaOptions) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index 0897fce057d..a2510643c1b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -25,6 +25,27 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ); + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Media"], S["Media"].PrefixPosition(), media => media + .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options + .Action("Options", "Admin", "OrchardCore.Media") + .Permission(Permissions.ViewMediaOptions) + .LocalNav() + ) + .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles + .Action("Index", "MediaProfiles", "OrchardCore.Media") + .Permission(Permissions.ManageMediaProfiles) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media diff --git a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs index 527cb7f206c..c99f1292f0a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs @@ -14,6 +14,22 @@ public MediaCacheAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Media"], S["Media"].PrefixPosition(), media => media + .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache + .Action("Index", "MediaCache", "OrchardCore.Media") + .Permission(MediaCachePermissions.ManageAssetCache) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs index 87de8b12a3d..d42a39fd78c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs @@ -21,6 +21,24 @@ public AdminMenuAAD(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId + .AddClass("microsoft-entra-id") + .Id("microsoft-entra-id") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageMicrosoftAuthentication) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs index 5460cf5b1ab..80e3e7002be 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs @@ -21,6 +21,24 @@ public AdminMenuMicrosoftAccount(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Microsoft"], S["Microsoft"].PrefixPosition(), microsoft => microsoft + .AddClass("microsoft") + .Id("microsoft") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageMicrosoftAuthentication) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs index c49aca540a7..990d25e9f19 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs @@ -22,6 +22,26 @@ public ClientAdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["Authentication client"], S["Authentication client"].PrefixPosition(), client => client + .Action("Index", "Admin", _clientRouteValues) + .Permission(Permissions.ManageClientSettings) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs index 9e69b6c9351..bda54bada6e 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs @@ -14,6 +14,31 @@ public ManagementAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Management"], S["Management"].PrefixPosition(), management => management + .Add(S["Applications"], S["Applications"].PrefixPosition(), applications => applications + .Action("Index", "Application", "OrchardCore.OpenId") + .Permission(Permissions.ManageApplications) + .LocalNav() + ) + .Add(S["Scopes"], S["Scopes"].PrefixPosition(), applications => applications + .Action("Index", "Scope", "OrchardCore.OpenId") + .Permission(Permissions.ManageScopes) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Access Control"], accessControl => accessControl .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs index 15b05e99943..30bbfb716b3 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs @@ -14,6 +14,26 @@ public ServerAdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["Authorization server"], S["Authorization server"].PrefixPosition(), server => server + .Action("Index", "ServerConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageServerSettings) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs index 7a8c58c52b5..4623b987ac9 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs @@ -14,6 +14,26 @@ public ValidationAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId + .AddClass("openid") + .Id("openid") + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["Token validation"], S["Token validation"].PrefixPosition(), validation => validation + .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") + .Permission(Permissions.ManageValidationSettings) + .LocalNav() + ) + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs index fcd28219ab2..24624234911 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs @@ -22,6 +22,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["reCaptcha"], S["reCaptcha"].PrefixPosition(), reCaptcha => reCaptcha + .Permission(Permissions.ManageReCaptchaSettings) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs index e8a9eca7cf7..e3422aada61 100644 --- a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs @@ -14,6 +14,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes + .AddClass("recipes") + .Id("recipes") + .Permission(RecipePermissions.ManageRecipes) + .Action("Index", "Admin", "OrchardCore.Recipes") + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs index 8a57ea5aa18..8f85bcd77b2 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs @@ -22,6 +22,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry + .AddClass("reverseproxy") + .Id("reverseproxy") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageReverseProxySettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), proxy => proxy diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs index 4b46668f11f..8b492ba7548 100644 --- a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs @@ -14,6 +14,21 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles + .AddClass("roles").Id("roles") + .Action("Index", "Admin", "OrchardCore.Roles") + .Permission(CommonPermissions.ManageRoles) + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Access Control"], accessControl => accessControl .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs index ee29fd78bb4..8a319937e7b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs @@ -44,20 +44,40 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ); - if (!_azureAISearchSettings.DisableUIConfiguration) + if (_azureAISearchSettings.DisableUIConfiguration) + { + return ValueTask.CompletedTask; + } + + if (UseLegacyFormat) { builder - .Add(S["Settings"], settings => settings - .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch - .AddClass("azure-ai-search") - .Id("azureaisearch") - .Action("Index", "Admin", _routeValues) - .Permission(AzureAISearchIndexPermissionHelper.ManageAzureAISearchIndexes) - .LocalNav() - ) - ); + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch + .AddClass("azure-ai-search") + .Id("azureaisearch") + .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = AzureAISearchDefaultSettingsDisplayDriver.GroupId }) + .Permission(AzureAISearchIndexPermissionHelper.ManageAzureAISearchIndexes) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; } + builder + .Add(S["Settings"], settings => settings + .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch + .AddClass("azure-ai-search") + .Id("azureaisearch") + .Action("Index", "Admin", _routeValues) + .Permission(AzureAISearchIndexPermissionHelper.ManageAzureAISearchIndexes) + .LocalNav() + ) + ); + return ValueTask.CompletedTask; } } diff --git a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs index 374dea18d0a..45d138a8493 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs @@ -21,6 +21,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search + .AddClass("search") + .Id("search") + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Action("Index", "Admin", _routeValues) + .AddClass("searchsettings") + .Id("searchsettings") + .Permission(Permissions.ManageSearchSettings) + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Search"], S["Search"].PrefixPosition(), search => search diff --git a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs index 8e3515787f9..685b4c92064 100644 --- a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs @@ -22,6 +22,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security + .AddClass("security") + .Id("security") + .Add(S["Settings"], settings => settings + .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers + .Permission(SecurityPermissions.ManageSecurityHeadersSettings) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs index 0698b67dc59..295366fa541 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs @@ -21,6 +21,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo + .AddClass("seo") + .Id("seo") + .Action("Index", "Admin", _routeValues) + .Permission(SeoConstants.ManageSeoSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index 7b8c0462706..307b40c01cb 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -22,13 +22,32 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration + .AddClass("menu-configuration") + .Id("configuration") + .Add(S["Settings"], "1", settings => settings + .Add(S["General"], "1", entry => entry + .AddClass("general") + .Id("general") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGroupSettings) + .LocalNav() + ), + priority: 1) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], "after.50", tools => tools .Id("tools") .AddClass("tools") - , priority: 1); - - builder + , priority: 1) .Add(S["Settings"], "after.100", settings => settings .Id("settings") .AddClass("settings") diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml new file mode 100644 index 00000000000..056ca36a2c8 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Configuration"] diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs index ee5a3cc1893..2150335b6d3 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs @@ -14,6 +14,30 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo + .Permission(Permissions.ManageSitemaps) + .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps + .Action("List", "Admin", "OrchardCore.Sitemaps") + .LocalNav() + ) + .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes + .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") + .LocalNav() + ) + .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache + .Action("List", "SitemapCache", "OrchardCore.Sitemaps") + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs index bbf3cf2419e..1d01a399701 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs @@ -23,6 +23,31 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms + .AddClass("sms") + .Id("sms") + .Action("Index", "Admin", _routeValues) + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() + ) + .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms + .AddClass("smstest") + .Id("smstest") + .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms @@ -32,9 +57,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(SmsPermissions.ManageSmsSettings) .LocalNav() ) - ); - - builder + ) .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs index 8cbbd449e0b..54bbf3a087c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs @@ -22,6 +22,24 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], "1", settings => settings + .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters + .AddClass("taxonomyfilters") + .Id("taxonomyfilters") + .Permission(Permissions.ManageTaxonomies) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs index e3199cd53ef..1ed745779ad 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs @@ -21,6 +21,23 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter").Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitter) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 71e944d0651..3fccb00fdea 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -4,7 +4,7 @@ namespace OrchardCore.Twitter; -public sealed class AdminMenuSignin : AdminNavigationProvider +public sealed class AdminMenuSignIn : AdminNavigationProvider { private static readonly RouteValueDictionary _routeValues = new() { @@ -14,13 +14,30 @@ public sealed class AdminMenuSignin : AdminNavigationProvider internal readonly IStringLocalizer S; - public AdminMenuSignin(IStringLocalizer stringLocalizer) + public AdminMenuSignIn(IStringLocalizer stringLocalizer) { S = stringLocalizer; } protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Authentication"], authentication => authentication + .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter") + .Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitterSignin) + .LocalNav()) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs index 1b4d4664f03..362b1ad7c9b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Startup.cs @@ -64,7 +64,7 @@ public sealed class TwitterSigninStartup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddNavigationProvider(); + services.AddNavigationProvider(); services.AddSingleton(); services.AddSiteDisplayDriver(); diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs index 794d6c36915..1a9f1b8d218 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs @@ -14,6 +14,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Tools"], tools => tools + .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting + .AddClass("url-rewriting") + .Id("urlRewriting") + .Permission(UrlRewritingPermissions.ManageUrlRewritingRules) + .Action("Index", "Admin", "OrchardCore.UrlRewriting") + .LocalNav() + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs index 68e7ff3d463..126da8dcb2f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs @@ -23,6 +23,32 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security + .AddClass("security") + .Id("security") + .Add(S["Users"], S["Users"].PrefixPosition(), users => users + .AddClass("users") + .Id("users") + .Action("Index", "Admin", UserConstants.Features.Users) + .Permission(CommonPermissions.ListUsers) + .Resource(new User()) + .LocalNav() + ) + .Add(S["Settings"], settings => settings + .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Access Control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl .AddClass("accessControl") @@ -35,9 +61,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Resource(new User()) .LocalNav() ) - , priority: 1); + , priority: 1) - builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs index 9cd4cbfb9fa..50ddc2c7992 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs @@ -22,6 +22,22 @@ public ChangeEmailAdminMenu(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings + .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs index 77b2fe9f871..27879336e97 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs @@ -22,6 +22,22 @@ public RegistrationAdminMenu(IStringLocalizer stringLocal protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings + .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs index 0b81e088843..455d6ae8482 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs @@ -22,6 +22,22 @@ public ResetPasswordAdminMenu(IStringLocalizer stringLoc protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Security"], security => security + .Add(S["Settings"], settings => settings + .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml new file mode 100644 index 00000000000..612de51fd90 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Security"] diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs index aab4617022b..26577206f25 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs @@ -14,6 +14,20 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Workflows"], NavigationConstants.AdminMenuWorkflowsPosition, workflow => workflow + .AddClass("workflows") + .Id("workflows") + .Action("Index", "WorkflowType", "OrchardCore.Workflows") + .Permission(Permissions.ManageWorkflows) + .LocalNav() + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Tools"], tools => tools .Add(S["Workflows"], S["Workflows"].PrefixPosition(), workflow => workflow diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs b/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs index c9a90ef5916..c0b2af8c4a4 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs @@ -2,6 +2,9 @@ namespace OrchardCore.Navigation; public abstract class AdminNavigationProvider : NamedNavigationProvider { + protected readonly bool UseLegacyFormat + = AppContext.TryGetSwitch(NavigationConstants.LegacyAdminMenuNavigationSwitchKey, out var enable) && enable; + public AdminNavigationProvider() : base(NavigationConstants.AdminId) { diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index c703d62ae26..a94f6fa988f 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -12,7 +12,17 @@ public static class NavigationConstants public const string AdminMenuAccessControlPosition = "7"; + public const string AdminMenuSecurityPosition = AdminMenuAccessControlPosition; + + public const string AdminMenuAuditTrailPosition = "7.5"; + + public const string AdminMenuWorkflowsPosition = "8"; + + public const string AdminMenuConfigurationPosition = "100"; + public const string AdminId = "admin"; public const string AdminMenuId = "adminMenu"; + + public const string LegacyAdminMenuNavigationSwitchKey = "LegacyAdminMenuNavigationSwitch"; } From 94fbe43942f68a28cf424a9845604f1028b1fc3c Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 5 Dec 2024 10:48:49 -0800 Subject: [PATCH 08/19] fix missed menus --- .../OrchardCore.UrlRewriting/AdminMenu.cs | 2 +- .../OrchardCore.Workflows/Trimming/AdminMenu.cs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs index 1a9f1b8d218..16cddae555d 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs @@ -17,7 +17,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) if (UseLegacyFormat) { builder - .Add(S["Tools"], tools => tools + .Add(S["Configuration"], configuration => configuration .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting .AddClass("url-rewriting") .Id("urlRewriting") diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs index 17cb233a527..8c1799e9aa0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs @@ -22,6 +22,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (UseLegacyFormat) + { + builder + .Add(S["Configuration"], configuration => configuration + .Add(S["Settings"], settings => settings + .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageWorkflowSettings) + .LocalNav() + ) + ) + ); + + return ValueTask.CompletedTask; + } + builder .Add(S["Settings"], settings => settings .Add(S["Workflow Trimming"], S["Workflow Trimming"].PrefixPosition(), trimming => trimming From a0d79626dbcd32d7f71c911aebd4fa0499b47c17 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 5 Dec 2024 16:01:58 -0800 Subject: [PATCH 09/19] group settings --- .../OrchardCore.Admin/AdminMenu.cs | 2 +- .../Views/NavigationItemText-admin.Id.cshtml | 15 ++++++- .../OrchardCore.AdminMenu/AdminMenu.cs | 6 +-- .../OrchardCore.Apis.GraphQL/AdminMenu.cs | 2 +- .../Navigation/AuditTrailAdminMenu.cs | 10 ++--- .../OrchardCore.BackgroundTasks/AdminMenu.cs | 6 +-- .../AdminMenu.cs | 10 ++--- .../OrchardCore.ContentTypes/AdminMenu.cs | 6 +-- ...gationItemText-contentdefinition.Id.cshtml | 2 +- .../OrchardCore.Contents/AdminMenu.cs | 2 +- ...xportContentToDeploymentTargetAdminMenu.cs | 6 +-- .../OrchardCore.Cors/AdminMenu.cs | 2 +- .../OrchardCore.CustomSettings/AdminMenu.cs | 2 +- .../AdminMenu.cs | 10 ++--- .../OrchardCore.Deployment/AdminMenu.cs | 12 +++--- .../OrchardCore.Email/AdminMenu.cs | 20 +++++---- .../OrchardCore.Facebook/AdminMenu.cs | 18 ++++---- .../OrchardCore.Facebook/AdminMenuLogin.cs | 4 +- .../OrchardCore.Facebook/AdminMenuPixel.cs | 16 ++++--- .../NavigationItemText-facebookApp.Id.cshtml | 2 +- ...NavigationItemText-facebookPixel.Id.cshtml | 2 +- .../OrchardCore.Features/AdminMenu.cs | 2 +- .../AdminMenuGitHubLogin.cs | 2 +- .../GoogleAnalyticsAdminMenu.cs | 14 +++--- .../GoogleAuthenticationAdminMenu.cs | 2 +- .../GoogleTagManagerAdminMenu.cs | 16 ++++--- .../OrchardCore.Https/AdminMenu.cs | 2 +- .../OrchardCore.Layers/AdminMenu.cs | 2 +- .../OrchardCore.Localization/AdminMenu.cs | 2 +- .../OrchardCore.Media.AmazonS3/AdminMenu.cs | 6 +-- .../OrchardCore.Media.Azure/AdminMenu.cs | 6 +-- .../OrchardCore.Media/AdminMenu.cs | 12 +++--- .../OrchardCore.Media/MediaCacheAdminMenu.cs | 6 +-- .../AdminMenuAAD.cs | 6 +-- .../AdminMenuMicrosoftAccount.cs | 2 +- ...ationItemText-microsoft-entra-id.Id.cshtml | 1 - ...igationItemText-microsoftentraid.Id.cshtml | 4 ++ .../OrchardCore.OpenId/ClientAdminMenu.cs | 2 +- .../OrchardCore.OpenId/ManagementAdminMenu.cs | 4 +- .../OrchardCore.OpenId/ServerAdminMenu.cs | 2 +- .../OrchardCore.OpenId/ValidationAdminMenu.cs | 2 +- .../OrchardCore.Queries/Sql/AdminMenu.cs | 2 +- .../OrchardCore.ReCaptcha/AdminMenu.cs | 2 +- .../OrchardCore.Recipes/AdminMenu.cs | 2 +- .../OrchardCore.ReverseProxy/AdminMenu.cs | 18 ++++---- .../NavigationItemText-reverseproxy.Id.cshtml | 15 ++++++- .../OrchardCore.Roles/AdminMenu.cs | 4 +- .../OrchardCore.Search.AzureAI/AdminMenu.cs | 8 ++-- ...NavigationItemText-azureaisearch.Id.cshtml | 2 +- .../AdminMenu.cs | 4 +- .../OrchardCore.Search.Lucene/AdminMenu.cs | 4 +- .../OrchardCore.Search/AdminMenu.cs | 14 +++--- .../OrchardCore.Security/AdminMenu.cs | 6 +-- .../OrchardCore.Seo/AdminMenu.cs | 18 +++++--- .../OrchardCore.Settings/AdminMenu.cs | 2 +- .../NavigationItemText-general.Id.cshtml | 16 ++++++- .../OrchardCore.Sitemaps/AdminMenu.cs | 43 +++++++++---------- .../OrchardCore.Sms/AdminMenu.cs | 20 +++++---- .../OrchardCore.Taxonomies/AdminMenu.cs | 6 +-- ...vigationItemText-taxonomyfilters.Id.cshtml | 16 ++++++- .../AdminTemplatesAdminMenu.cs | 2 +- .../FeatureProfilesAdminMenu.cs | 2 +- .../OrchardCore.Twitter/AdminMenu.cs | 14 +++--- .../OrchardCore.Twitter/AdminMenuSignin.cs | 2 +- .../OrchardCore.UrlRewriting/AdminMenu.cs | 6 +-- .../NavigationItemText-urlrewriting.Id.cshtml | 2 +- .../OrchardCore.Users/AdminMenu.cs | 8 ++-- .../OrchardCore.Users/ChangeEmailAdminMenu.cs | 6 +-- .../RegistrationAdminMenu.cs | 6 +-- .../ResetPasswordAdminMenu.cs | 14 +++--- ...tionItemText-UserProfileSettings.Id.cshtml | 2 +- ...NavigationItemText-accessControl.Id.cshtml | 2 +- .../OrchardCore.Workflows/AdminMenu.cs | 2 +- .../Trimming/AdminMenu.cs | 6 +-- .../AdminNavigationProvider.cs | 3 -- .../NavigationHelper.cs | 5 +++ 76 files changed, 307 insertions(+), 227 deletions(-) delete mode 100644 src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft-entra-id.Id.cshtml create mode 100644 src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs index 8d849889d44..5852e0e6713 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs @@ -22,7 +22,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml index d05005838d2..f17a5c55fa4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml @@ -1,4 +1,15 @@ - - +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @T["Admin"] + + return; +} + + @T["Admin"] diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs index 1a954a59926..f1e6896a380 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs @@ -20,12 +20,12 @@ public AdminMenu( protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { // Configuration and settings menus for the AdminMenu module. builder .Add(S["Configuration"], configuration => configuration - .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu + .Add(S["Admin menus"], S["Admin menus"].PrefixPosition(), adminMenu => adminMenu .Permission(Permissions.ManageAdminMenu) .Action("List", "Menu", "OrchardCore.AdminMenu") .LocalNav() @@ -37,7 +37,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) // Configuration and settings menus for the AdminMenu module. builder .Add(S["Tools"], tools => tools - .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu + .Add(S["Admin menus"], S["Admin menus"].PrefixPosition(), adminMenu => adminMenu .Permission(Permissions.ManageAdminMenu) .Action("List", "Menu", "OrchardCore.AdminMenu") .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs index 90a0757f10e..0a37a616426 100644 --- a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs index a02b8f3da41..67f0bf386ed 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs @@ -29,10 +29,10 @@ public AuditTrailAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder - .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration + .Add(S["Audit trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration .AddClass("audittrail") .Id("audittrail") .Action(nameof(AdminController.Index), "Admin", _routeValues) @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail + .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), auditTrail => auditTrail .AddClass("audittrail") .Id("audittrailSettings") .Action("Index", "Admin", _routeValues) @@ -55,7 +55,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools - .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), configuration => configuration + .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), configuration => configuration .AddClass("audittrail") .Id("audittrail") .Action(nameof(AdminController.Index), "Admin", _routeValues) @@ -64,7 +64,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Settings"], settings => settings - .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail + .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), auditTrail => auditTrail .AddClass("audittrail") .Id("audittrailSettings") .Action("Index", "Admin", _settingsRouteValues) diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs index 8170c830c10..b85c22fda91 100644 --- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs @@ -14,12 +14,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks - .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Add(S["Background tasks"], S["Background tasks"].PrefixPosition(), backgroundTasks => backgroundTasks .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") .Permission(Permissions.ManageBackgroundTasks) .LocalNav() @@ -32,7 +32,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools - .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Add(S["Background tasks"], S["Background tasks"].PrefixPosition(), backgroundTasks => backgroundTasks .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") .Permission(Permissions.ManageBackgroundTasks) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs index a356d96a01b..70d118da65a 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs @@ -28,20 +28,20 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings .Add(S["Localization"], localization => localization - .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider + .Add(S["Content request culture provider"], S["Content request culture provider"].PrefixPosition(), provider => provider .AddClass("contentrequestcultureprovider") .Id("contentrequestcultureprovider") .Action("Index", "Admin", _providersRouteValues) .Permission(Permissions.ManageContentCulturePicker) .LocalNav() ) - .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker + .Add(S["Content culture picker"], S["Content culture picker"].PrefixPosition(), picker => picker .AddClass("contentculturepicker") .Id("contentculturepicker") .Action("Index", "Admin", _pickerRouteValues) @@ -58,14 +58,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization - .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider + .Add(S["Content culture"], S["Content culture"].PrefixPosition(), provider => provider .AddClass("contentrequestcultureprovider") .Id("contentrequestcultureprovider") .Action("Index", "Admin", _providersRouteValues) .Permission(Permissions.ManageContentCulturePicker) .LocalNav() ) - .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker + .Add(S["Content culture picker"], S["Content culture picker"].PrefixPosition(), picker => picker .AddClass("contentculturepicker") .Id("contentculturepicker") .Action("Index", "Admin", _pickerRouteValues) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index 02eec290c50..25dcb26958b 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -20,13 +20,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Content"], content => content - .Add(S["Content Definition"], S["Content Definition"].PrefixPosition("9"), contentDefinition => contentDefinition - .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes + .Add(S["Content definition"], S["Content definition"].PrefixPosition("9"), contentDefinition => contentDefinition + .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() ) - .Add(S["Content Parts"], S["Content Parts"].PrefixPosition("2"), contentParts => contentParts + .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml index edf5ba38efd..a43c770944b 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml @@ -1 +1 @@ -@T["Content Definition"] +@T["Content definition"] diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs index 211977d496d..f3721c246b1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs @@ -65,7 +65,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content => { content.AddClass("content").Id("content"); - await content.AddAsync(S["Content Items"], S["Content Items"].PrefixPosition(), async contentItems => + await content.AddAsync(S["Content items"], S["Content items"].PrefixPosition(), async contentItems => { if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs index 7fb6287ca53..651ab7efa7b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs @@ -21,13 +21,13 @@ public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer stri protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import .Add(S["Settings"], settings => settings - .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings + .Add(S["Export target"], S["Export target"].PrefixPosition(), targetSettings => targetSettings .Action("Index", "Admin", _routeValues) .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) .LocalNav() @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Export Target Settings"], S["Export Target Settings"].PrefixPosition(), targetSettings => targetSettings + .Add(S["Deployment targets"], S["Deployment targets"].PrefixPosition(), targetSettings => targetSettings .Action("Index", "Admin", _routeValues) .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs index 3a6efa77efe..75619b4ebbd 100644 --- a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs index a33ca8b5628..6c206adf7e0 100644 --- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs @@ -40,7 +40,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) var htmlName = type.Name.HtmlClassify(); - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs index b911dc2ada3..7475d78de67 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs @@ -14,17 +14,17 @@ public AdminMenu(IStringLocalizer localizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Import/Export"], import => import - .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote + .Add(S["Remote instances"], S["Remote instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteInstances) .LocalNav() ) - .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote + .Add(S["Remote clients"], S["Remote clients"].PrefixPosition(), remote => remote .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteClients) .LocalNav() @@ -38,12 +38,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Deployments"], import => import - .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote + .Add(S["Remote instances"], S["Remote instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteInstances) .LocalNav() ) - .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote + .Add(S["Remote clients"], S["Remote clients"].PrefixPosition(), remote => remote .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteClients) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs index f47c07c739a..420cf2dfbc8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs @@ -14,22 +14,22 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import - .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment + .Add(S["Deployment plans"], S["Deployment plans"].PrefixPosition(), deployment => deployment .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") .Permission(CommonPermissions.Export) .LocalNav() ) - .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment + .Add(S["Package import"], S["Package import"].PrefixPosition(), deployment => deployment .Action("Index", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() ) - .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment + .Add(S["JSON import"], S["JSON import"].PrefixPosition(), deployment => deployment .Action("Json", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() @@ -48,12 +48,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(CommonPermissions.Export) .LocalNav() ) - .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment + .Add(S["Package import"], S["Package import"].PrefixPosition(), deployment => deployment .Action("Index", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() ) - .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment + .Add(S["JSON import"], S["JSON import"].PrefixPosition(), deployment => deployment .Action("Json", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs index 2c92a345d2d..d71a8c2d792 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs @@ -24,7 +24,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -36,7 +36,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(Permissions.ManageEmailSettings) .LocalNav() ) - .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry + .Add(S["Email test"], S["Email test"].PrefixPosition(), entry => entry .AddClass("emailtest") .Id("emailtest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") @@ -52,7 +52,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing - .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry + .Add(S["Email test"], S["Email test"].PrefixPosition(), entry => entry .AddClass("emailtest") .Id("emailtest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") @@ -62,12 +62,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Settings"], settings => settings - .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry - .AddClass("email") - .Id("email") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageEmailSettings) - .LocalNav() + .Add(S["Communication"], S["Communication"].PrefixPosition(), communication => communication + .Add(S["Email"], S["Email"].PrefixPosition(), entry => entry + .AddClass("email") + .Id("email") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageEmailSettings) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs index 0d6f3b297b6..fd010ac677e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs @@ -21,12 +21,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp + .Add(S["Meta app"], S["Meta app"].PrefixPosition(), metaApp => metaApp .AddClass("facebookApp") .Id("facebookApp") .Action("Index", "Admin", _routeValues) @@ -41,12 +41,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp - .AddClass("facebookApp") - .Id("facebookApp") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageFacebookApp) - .LocalNav() + .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations + .Add(S["Meta app"], S["Meta app"].PrefixPosition(), metaApp => metaApp + .AddClass("facebookApp") + .Id("facebookApp") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageFacebookApp) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs index 999e0e6c735..aa1277d28e0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuLogin.cs @@ -21,11 +21,11 @@ public AdminMenuLogin(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security - .Add(S["Authentication"], authentication => authentication + .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Meta"], S["Meta"].PrefixPosition(), meta => meta .AddClass("facebook") .Id("facebook") diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs index 0e9fb5c85aa..ba6e586f878 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenuPixel.cs @@ -22,7 +22,7 @@ public AdminMenuPixel( protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -42,12 +42,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel - .AddClass("facebookPixel") - .Id("facebookPixel") - .Action("Index", "Admin", _routeValues) - .Permission(FacebookConstants.ManageFacebookPixelPermission) - .LocalNav() + .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations + .Add(S["Meta Pixel"], S["Meta Pixel"].PrefixPosition(), pixel => pixel + .AddClass("facebookPixel") + .Id("facebookPixel") + .Action("Index", "Admin", _routeValues) + .Permission(FacebookConstants.ManageFacebookPixelPermission) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml index 8daad823e35..e620358386e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml @@ -1 +1 @@ -@T["Meta App"] +@T["Meta app"] diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml index fd6e992b4e7..dc063a23e43 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml @@ -1 +1 @@ -@T["Meta Pixel"] +@T["Meta pixel"] diff --git a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs index 3aeb40266b9..e5004babf1f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Features/AdminMenu.cs @@ -22,7 +22,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs index eec52b72dab..1d01205996d 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs @@ -21,7 +21,7 @@ public AdminMenuGitHubLogin(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs index e3f8347986c..0d2f4eeb1ae 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAnalyticsAdminMenu.cs @@ -21,7 +21,7 @@ public GoogleAnalyticsAdminMenu(IStringLocalizer strin protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -40,11 +40,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google - .AddClass("googleAnalytics").Id("googleAnalytics") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGoogleAnalytics) - .LocalNav() + .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations + .Add(S["Google Analytics"], S["Google Analytics"].PrefixPosition(), google => google + .AddClass("googleAnalytics").Id("googleAnalytics") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleAnalytics) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs index af00fcc672d..bab4fd5af04 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs @@ -21,7 +21,7 @@ public GoogleAuthenticationAdminMenu(IStringLocalizer security diff --git a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs index 950b017db56..a2c929b0764 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/GoogleTagManagerAdminMenu.cs @@ -21,7 +21,7 @@ public GoogleTagManagerAdminMenu(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -41,12 +41,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google - .AddClass("googleTagManager") - .Id("googleTagManager") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageGoogleTagManager) - .LocalNav() + .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations + .Add(S["Google Tag Manager"], S["Google Tag Manager"].PrefixPosition(), google => google + .AddClass("googleTagManager") + .Id("googleTagManager") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageGoogleTagManager) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs index d2b87cd8305..3ebbccf0246 100644 --- a/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Https/AdminMenu.cs @@ -22,7 +22,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs index 523589a9e93..bdd017ef99e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Layers/AdminMenu.cs @@ -22,7 +22,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Design"], design => design diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs index 5cb266fd82f..b20949ea84f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs @@ -30,7 +30,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) /// protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs index 11d941c077b..5bef1e5da43 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs @@ -14,11 +14,11 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder.Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options + .Add(S["Amazon S3 options"], S["Amazon S3 options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") .Permission(Permissions.ViewAmazonS3MediaOptions) .LocalNav() @@ -31,7 +31,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder.Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options + .Add(S["Amazon S3 options"], S["Amazon S3 options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") .Permission(Permissions.ViewAmazonS3MediaOptions) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs index 4a89f787035..59a38260932 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs @@ -14,12 +14,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options + .Add(S["Azure Blob options"], S["Azure Blob options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") .Permission(Permissions.ViewAzureMediaOptions) .LocalNav() @@ -33,7 +33,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options + .Add(S["Azure Blob options"], S["Azure Blob options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") .Permission(Permissions.ViewAzureMediaOptions) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index a2510643c1b..d414bb0ed26 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -18,24 +18,24 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Content"], content => content .AddClass("media") .Id("media") - .Add(S["Media Library"], S["Media Library"].PrefixPosition(), media => media + .Add(S["Media library"], S["Media library"].PrefixPosition(), media => media .Permission(Permissions.ManageMedia) .Action("Index", "Admin", "OrchardCore.Media") .LocalNav() ) ); - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options + .Add(S["Media options"], S["Media options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") .Permission(Permissions.ViewMediaOptions) .LocalNav() ) - .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles + .Add(S["Media profiles"], S["Media profiles"].PrefixPosition(), mediaProfiles => mediaProfiles .Action("Index", "MediaProfiles", "OrchardCore.Media") .Permission(Permissions.ManageMediaProfiles) .LocalNav() @@ -49,12 +49,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options + .Add(S["Media options"], S["Media options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") .Permission(Permissions.ViewMediaOptions) .LocalNav() ) - .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles + .Add(S["Media profiles"], S["Media profiles"].PrefixPosition(), mediaProfiles => mediaProfiles .Action("Index", "MediaProfiles", "OrchardCore.Media") .Permission(Permissions.ManageMediaProfiles) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs index c99f1292f0a..6cca2aa0eb4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs @@ -14,12 +14,12 @@ public MediaCacheAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache + .Add(S["Media cache"], S["Media cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media") .Permission(MediaCachePermissions.ManageAssetCache) .LocalNav() @@ -33,7 +33,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache + .Add(S["Media cache"], S["Media cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media") .Permission(MediaCachePermissions.ManageAssetCache) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs index d42a39fd78c..44492f0fdfa 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuAAD.cs @@ -21,14 +21,14 @@ public AdminMenuAAD(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security .Add(S["Authentication"], authentication => authentication .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId .AddClass("microsoft-entra-id") - .Id("microsoft-entra-id") + .Id("microsoftentraid") .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageMicrosoftAuthentication) .LocalNav() @@ -45,7 +45,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication .Add(S["Microsoft Entra ID"], S["Microsoft Entra ID"].PrefixPosition(), entraId => entraId .AddClass("microsoft-entra-id") - .Id("microsoft-entra-id") + .Id("microsoftentraid") .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageMicrosoftAuthentication) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs index 80e3e7002be..781168c3f32 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs @@ -21,7 +21,7 @@ public AdminMenuMicrosoftAccount(IStringLocalizer str protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft-entra-id.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft-entra-id.Id.cshtml deleted file mode 100644 index 5ad2d1c2c35..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft-entra-id.Id.cshtml +++ /dev/null @@ -1 +0,0 @@ -@T["Microsoft Entra ID"] diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml new file mode 100644 index 00000000000..a5e6671dc71 --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml @@ -0,0 +1,4 @@ + + + +@T["Microsoft Entra ID"] diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs index 990d25e9f19..53eb1e5e4ab 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs @@ -22,7 +22,7 @@ public ClientAdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs index bda54bada6e..3e48ab93481 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ManagementAdminMenu.cs @@ -14,7 +14,7 @@ public ManagementAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security @@ -40,7 +40,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Access Control"], accessControl => accessControl + .Add(S["Access control"], accessControl => accessControl .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId .AddClass("openid") .Id("openid") diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs index 30bbfb716b3..7338f657f27 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ServerAdminMenu.cs @@ -14,7 +14,7 @@ public ServerAdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs index 4623b987ac9..6d0d5da077d 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs @@ -14,7 +14,7 @@ public ValidationAdminMenu(IStringLocalizer stringLocalizer protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs index fb4c50fd271..11cf18ecbbf 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs @@ -17,7 +17,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries - .Add(S["Run SQL Query"], S["Run SQL Query"].PrefixPosition(), sql => sql + .Add(S["Run SQL query"], S["Run SQL query"].PrefixPosition(), sql => sql .Action("Query", "Admin", "OrchardCore.Queries") .Permission(Permissions.ManageSqlQueries) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs index 24624234911..483e1c911ef 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReCaptcha/AdminMenu.cs @@ -22,7 +22,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs index e3422aada61..0e69cedd702 100644 --- a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs index 8f85bcd77b2..029f70fbd73 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs @@ -22,12 +22,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry + .Add(S["Reverse proxy"], S["Reverse proxy"].PrefixPosition(), entry => entry .AddClass("reverseproxy") .Id("reverseproxy") .Action("Index", "Admin", _routeValues) @@ -42,12 +42,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), proxy => proxy - .AddClass("reverseproxy") - .Id("reverseproxy") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageReverseProxySettings) - .LocalNav() + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Reverse proxy"], S["Reverse proxy"].PrefixPosition(), proxy => proxy + .AddClass("reverseproxy") + .Id("reverseproxy") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageReverseProxySettings) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml index 0f8bb2b96e9..919e84ee841 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml @@ -1 +1,14 @@ -@T["Reverse Proxy"] +@using OrchardCore.Navigation +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @T["Reverse proxy"] + + return; +} + + + +@T["Reverse proxy"] diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs index 8b492ba7548..a85f5f3680f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Roles/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security @@ -30,7 +30,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Access Control"], accessControl => accessControl + .Add(S["Access control"], accessControl => accessControl .Add(S["Roles"], S["Roles"].PrefixPosition(), roles => roles .AddClass("roles").Id("roles") .Action("Index", "Admin", "OrchardCore.Roles") diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs index 8a319937e7b..27d0c1b0667 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs @@ -34,7 +34,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), indexing => indexing - .Add(S["Azure AI Indices"], S["Azure AI Indices"].PrefixPosition(), indexes => indexes + .Add(S["Azure AI indices"], S["Azure AI indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.AzureAI") .AddClass("azureaiindices") .Id("azureaiindices") @@ -49,12 +49,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) return ValueTask.CompletedTask; } - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch + .Add(S["Azure AI search"], S["Azure AI search"].PrefixPosition(), azureAISearch => azureAISearch .AddClass("azure-ai-search") .Id("azureaisearch") .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = AzureAISearchDefaultSettingsDisplayDriver.GroupId }) @@ -69,7 +69,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch + .Add(S["Azure AI search"], S["Azure AI search"].PrefixPosition(), azureAISearch => azureAISearch .AddClass("azure-ai-search") .Id("azureaisearch") .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml index 499d5e578cb..188f7fe5019 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml @@ -1,4 +1,4 @@ -@T["Azure AI Search"] +@T["Azure AI search"] diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs index 6f3159ef762..89caa025672 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), import => import - .Add(S["Elasticsearch Indices"], S["Elasticsearch Indices"].PrefixPosition(), indexes => indexes + .Add(S["Elasticsearch indices"], S["Elasticsearch indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.Elasticsearch") .AddClass("elasticsearchindices") .Id("elasticsearchindices") @@ -28,7 +28,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Queries"], S["Queries"].PrefixPosition(), import => import - .Add(S["Run Elasticsearch Query"], S["Run Elasticsearch Query"].PrefixPosition(), queries => queries + .Add(S["Run Elasticsearch query"], S["Run Elasticsearch query"].PrefixPosition(), queries => queries .Action("Query", "Admin", "OrchardCore.Search.Elasticsearch") .AddClass("elasticsearchquery") .Id("elasticsearchquery") diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs index cff75fd6424..3a16450eafa 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), import => import - .Add(S["Lucene Indices"], S["Lucene Indices"].PrefixPosition(), indexes => indexes + .Add(S["Lucene indices"], S["Lucene indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.Lucene") .AddClass("luceneindices") .Id("luceneindices") @@ -28,7 +28,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Queries"], S["Queries"].PrefixPosition(), import => import - .Add(S["Run Lucene Query"], S["Run Lucene Query"].PrefixPosition(), queries => queries + .Add(S["Run Lucene query"], S["Run Lucene query"].PrefixPosition(), queries => queries .Action("Query", "Admin", "OrchardCore.Search.Lucene") .AddClass("lucenequery") .Id("lucenequery") diff --git a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs index 45d138a8493..acae45509cc 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs @@ -21,7 +21,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search @@ -42,11 +42,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Search"], S["Search"].PrefixPosition(), search => search - .Action("Index", "Admin", _routeValues) - .AddClass("searchsettings") - .Id("searchsettings") - .Permission(Permissions.ManageSearchSettings) - .LocalNav() + .Add(S["Site search"], S["Site search"].PrefixPosition(), search => search + .Action("Index", "Admin", _routeValues) + .AddClass("searchsettings") + .Id("searchsettings") + .Permission(Permissions.ManageSearchSettings) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs index 685b4c92064..93d89b69b78 100644 --- a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs @@ -22,14 +22,14 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security .AddClass("security") .Id("security") .Add(S["Settings"], settings => settings - .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers + .Add(S["Security headers"], S["Security headers"].PrefixPosition(), headers => headers .Permission(SecurityPermissions.ManageSecurityHeadersSettings) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -43,7 +43,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers + .Add(S["Security headers"], S["Security headers"].PrefixPosition(), headers => headers .Permission(SecurityPermissions.ManageSecurityHeadersSettings) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs index 295366fa541..f3fb287d850 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs @@ -21,7 +21,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -41,12 +41,16 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo - .AddClass("seo") - .Id("seo") - .Action("Index", "Admin", _routeValues) - .Permission(SeoConstants.ManageSeoSettings) - .LocalNav() + .Add(S["Search"], S["Search"].PrefixPosition(), search => search + .Add(S["Search engine optimization"], S["Search engine optimization"].PrefixPosition(), seo => seo + .AddClass("seo") + .Id("seo") + .Add(S["Robots"], S["Robots"].PrefixPosition(), robots => robots + .Action("Index", "Admin", _routeValues) + .Permission(SeoConstants.ManageSeoSettings) + .LocalNav() + ) + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs index 307b40c01cb..800ba3944ba 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Settings/AdminMenu.cs @@ -23,7 +23,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, configuration => configuration diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml index 353d4a92a75..15081b0572b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml @@ -1 +1,15 @@ -@T["General"] +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @T["General"] + + return; +} + + + +@T["General"] diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs index 2150335b6d3..427cf61c21f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs @@ -14,43 +14,42 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder - .Add(S["Configuration"], configuration => configuration - .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo - .Permission(Permissions.ManageSitemaps) - .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps - .Action("List", "Admin", "OrchardCore.Sitemaps") - .LocalNav() - ) - .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes - .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") - .LocalNav() - ) - .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache - .Action("List", "SitemapCache", "OrchardCore.Sitemaps") - .LocalNav() - ) - ) - ); + .Add(S["Configuration"], configuration => configuration + .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo + .Permission(Permissions.ManageSitemaps) + .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps + .Action("List", "Admin", "OrchardCore.Sitemaps") + .LocalNav() + ) + .Add(S["Sitemap indexes"], S["Sitemap indexes"].PrefixPosition("2"), indexes => indexes + .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") + .LocalNav() + ) + .Add(S["Sitemaps cache"], S["Sitemaps cache"].PrefixPosition("3"), cache => cache + .Action("List", "SitemapCache", "OrchardCore.Sitemaps") + .LocalNav() + ) + ) + ); return ValueTask.CompletedTask; } - builder .Add(S["Tools"], tools => tools - .Add(S["SEO"], S["SEO"].PrefixPosition(), seo => seo + .Add(S["Search engine optimization"], S["Search engine optimization"].PrefixPosition(), seo => seo .Permission(Permissions.ManageSitemaps) .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps .Action("List", "Admin", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes + .Add(S["Sitemap indexes"], S["Sitemap indexes"].PrefixPosition("2"), indexes => indexes .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache + .Add(S["Sitemaps cache"], S["Sitemaps cache"].PrefixPosition("3"), cache => cache .Action("List", "SitemapCache", "OrchardCore.Sitemaps") .LocalNav() ) diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs index 1d01a399701..4740000fc41 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs @@ -23,7 +23,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -35,7 +35,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(SmsPermissions.ManageSmsSettings) .LocalNav() ) - .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms + .Add(S["SMS test"], S["SMS test"].PrefixPosition(), sms => sms .AddClass("smstest") .Id("smstest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") @@ -50,17 +50,19 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms - .AddClass("sms") - .Id("sms") - .Action("Index", "Admin", _routeValues) - .Permission(SmsPermissions.ManageSmsSettings) - .LocalNav() + .Add(S["Communication"], S["Communication"].PrefixPosition(), communication => communication + .Add(S["SMS"], S["SMS"].PrefixPosition(), sms => sms + .AddClass("sms") + .Id("sms") + .Action("Index", "Admin", _routeValues) + .Permission(SmsPermissions.ManageSmsSettings) + .LocalNav() + ) ) ) .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing - .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms + .Add(S["SMS test"], S["SMS test"].PrefixPosition(), sms => sms .AddClass("smstest") .Id("smstest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs index 54bbf3a087c..a58408e3dc6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs @@ -22,12 +22,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], "1", settings => settings - .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters + .Add(S["Taxonomy filters"], S["Taxonomy filters"].PrefixPosition(), filters => filters .AddClass("taxonomyfilters") .Id("taxonomyfilters") .Permission(Permissions.ManageTaxonomies) @@ -42,7 +42,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters + .Add(S["Taxonomy filters"], S["Taxonomy filters"].PrefixPosition(), filters => filters .AddClass("taxonomyfilters") .Id("taxonomyfilters") .Permission(Permissions.ManageTaxonomies) diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml index ef090278a99..2acb126d90c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml @@ -1 +1,15 @@ -@T["Taxonomy Filters"] +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @T["Taxonomy filters"] + + return; +} + + + +@T["Taxonomy filters"] diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs index 5d2a236357f..ccf41c4a077 100644 --- a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs @@ -16,7 +16,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Design"], design => design - .Add(S["Admin Templates"], S["Admin Templates"].PrefixPosition(), import => import + .Add(S["Admin templates"], S["Admin templates"].PrefixPosition(), import => import .Action("Admin", "Template", "OrchardCore.Templates") .Permission(AdminTemplatesPermissions.ManageAdminTemplates) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs index e675610dc72..780c21ae860 100644 --- a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs @@ -30,7 +30,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Multi-Tenancy"], tenancy => tenancy .AddClass("menu-multitenancy") - .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles + .Add(S["Feature profiles"], S["Feature profiles"].PrefixPosition(), featureProfiles => featureProfiles .Action("Index", "FeatureProfiles", "OrchardCore.Tenants") .Permission(Permissions.ManageTenantFeatureProfiles) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs index 1ed745779ad..c22a4d90d27 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenu.cs @@ -21,7 +21,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration @@ -40,11 +40,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter - .AddClass("twitter").Id("twitter") - .Action("Index", "Admin", _routeValues) - .Permission(Permissions.ManageTwitter) - .LocalNav() + .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations + .Add(S["X (Twitter)"], S["X (Twitter)"].PrefixPosition(), twitter => twitter + .AddClass("twitter").Id("twitter") + .Action("Index", "Admin", _routeValues) + .Permission(Permissions.ManageTwitter) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 3fccb00fdea..2244ec15694 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -21,7 +21,7 @@ public AdminMenuSignIn(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs index 16cddae555d..0b6be3dfeba 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs @@ -14,11 +14,11 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration - .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting + .Add(S["URL rewriting"], S["URL rewriting"].PrefixPosition(), rewriting => rewriting .AddClass("url-rewriting") .Id("urlRewriting") .Permission(UrlRewritingPermissions.ManageUrlRewritingRules) @@ -32,7 +32,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools - .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting + .Add(S["URL rewriting"], S["URL rewriting"].PrefixPosition(), rewriting => rewriting .AddClass("url-rewriting") .Id("urlRewriting") .Permission(UrlRewritingPermissions.ManageUrlRewritingRules) diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml index 316c0cb2935..c077d976b78 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml @@ -1,4 +1,4 @@ -@T["URL Rewriting"] +@T["URL rewriting"] diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs index 126da8dcb2f..82e3133afb6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs @@ -23,7 +23,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], NavigationConstants.AdminMenuSecurityPosition, security => security @@ -38,7 +38,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .LocalNav() ) .Add(S["Settings"], settings => settings - .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login + .Add(S["User login"], S["User login"].PrefixPosition(), login => login .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -50,7 +50,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Access Control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl + .Add(S["Access control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl .AddClass("accessControl") .Id("accessControl") .Add(S["Users"], S["Users"].PrefixPosition(), users => users @@ -65,7 +65,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login + .Add(S["User login"], S["User login"].PrefixPosition(), login => login .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs index 50ddc2c7992..f17382b6abb 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs @@ -22,12 +22,12 @@ public ChangeEmailAdminMenu(IStringLocalizer stringLocaliz protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security .Add(S["Settings"], settings => settings - .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email + .Add(S["User change email"], S["User change email"].PrefixPosition(), email => email .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["User Change email"], S["User Change email"].PrefixPosition(), email => email + .Add(S["Change email"], S["Change email"].PrefixPosition(), email => email .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs index 27879336e97..50426869f80 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs @@ -22,12 +22,12 @@ public RegistrationAdminMenu(IStringLocalizer stringLocal protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings - .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration + .Add(S["User registration"], S["User registration"].PrefixPosition(), registration => registration .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration + .Add(S["Registration"], S["Registration"].PrefixPosition(), registration => registration .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs index 455d6ae8482..a4eaeb24334 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs @@ -22,12 +22,12 @@ public ResetPasswordAdminMenu(IStringLocalizer stringLoc protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Security"], security => security .Add(S["Settings"], settings => settings - .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password + .Add(S["User reset password"], S["User reset password"].PrefixPosition(), password => password .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -40,10 +40,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["User Reset password"], S["User Reset password"].PrefixPosition(), password => password - .Permission(CommonPermissions.ManageUsers) - .Action("Index", "Admin", _routeValues) - .LocalNav() + .Add(S["Security"], S["Security"].PrefixPosition(), security => security + .Add(S["Reset password"], S["Reset password"].PrefixPosition(), password => password + .Permission(CommonPermissions.ManageUsers) + .Action("Index", "Admin", _routeValues) + .LocalNav() + ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml index 081b06a99fd..a7a15998be9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml @@ -1 +1 @@ -@T["User Profile Settings"] +@T["User profile settings"] diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml index 4abb0482ec5..dc139349922 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml @@ -1,4 +1,4 @@ -@T["Access Control"] +@T["Access control"] diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs index 26577206f25..79cda258d76 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/AdminMenu.cs @@ -14,7 +14,7 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Workflows"], NavigationConstants.AdminMenuWorkflowsPosition, workflow => workflow diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs index 8c1799e9aa0..f6b875b47a8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs @@ -22,12 +22,12 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - if (UseLegacyFormat) + if (NavigationHelper.UseLegacyFormat()) { builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming + .Add(S["Workflow trimming"], S["Workflow trimming"], trimming => trimming .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageWorkflowSettings) .LocalNav() @@ -40,7 +40,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Workflow Trimming"], S["Workflow Trimming"].PrefixPosition(), trimming => trimming + .Add(S["Workflow trimming"], S["Workflow trimming"].PrefixPosition(), trimming => trimming .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageWorkflowSettings) .LocalNav() diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs b/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs index c0b2af8c4a4..c9a90ef5916 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/AdminNavigationProvider.cs @@ -2,9 +2,6 @@ namespace OrchardCore.Navigation; public abstract class AdminNavigationProvider : NamedNavigationProvider { - protected readonly bool UseLegacyFormat - = AppContext.TryGetSwitch(NavigationConstants.LegacyAdminMenuNavigationSwitchKey, out var enable) && enable; - public AdminNavigationProvider() : base(NavigationConstants.AdminId) { diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationHelper.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationHelper.cs index ea67b5f8d0d..337f9544269 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationHelper.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationHelper.cs @@ -7,6 +7,11 @@ namespace OrchardCore.Navigation; public static class NavigationHelper { + public static bool UseLegacyFormat() + { + return AppContext.TryGetSwitch(NavigationConstants.LegacyAdminMenuNavigationSwitchKey, out var enable) && enable; + } + /// /// Populates the menu shapes. /// From 6e753b900d86d045f892a212ae5946ba5cbbfd82 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 6 Dec 2024 07:44:48 -0800 Subject: [PATCH 10/19] Use Model.Text in the templates --- .../Views/NavigationItemText-admin.Id.cshtml | 4 ++-- .../Views/NavigationItemText-dashboard.Id.cshtml | 5 ++++- .../Views/NavigationItemText-audittrail.Id.cshtml | 5 ++++- .../Views/NavigationItemText-contentdefinition.Id.cshtml | 5 ++++- .../Views/NavigationItemText-content.Id.cshtml | 5 ++++- .../Views/NavigationItemText-new.Id.cshtml | 2 +- .../OrchardCore.Cors/Views/NavigationItemText-cors.Id.cshtml | 5 ++++- .../OrchardCore.Demo/Views/NavigationItemText-demo.Id.cshtml | 5 ++++- .../Views/NavigationItemText-email.Id.cshtml | 2 +- .../Views/NavigationItemText-facebook.Id.cshtml | 5 ++++- .../Views/NavigationItemText-facebookApp.Id.cshtml | 5 ++++- .../Views/NavigationItemText-facebookPixel.Id.cshtml | 5 ++++- .../Views/NavigationItemText-github.Id.cshtml | 5 ++++- .../Views/NavigationItemText-google.Id.cshtml | 5 ++++- .../Views/NavigationItemText-googleAnalytics.Id.cshtml | 5 ++++- .../Views/NavigationItemText-googleTagManager.Id.cshtml | 5 ++++- .../Views/NavigationItemText-localization.Id.cshtml | 5 ++++- .../Views/NavigationItemText-media.Id.cshtml | 5 ++++- .../Views/NavigationItemText-microsoft.Id.cshtml | 5 ++++- .../Views/NavigationItemText-microsoftentraid.Id.cshtml | 2 +- .../Views/NavigationItemText-openid.Id.cshtml | 2 +- .../Views/NavigationItemText-search.Id.cshtml | 2 +- .../Views/NavigationItemText-reverseproxy.Id.cshtml | 4 ++-- .../Views/NavigationItemText-roles.Id.cshtml | 5 ++++- .../Views/NavigationItemText-azureaisearch.Id.cshtml | 2 +- .../Views/NavigationItemText-search.Id.cshtml | 2 +- .../Views/NavigationItemText-Elasticsearch.Id.cshtml | 5 ++++- .../Views/NavigationItemText-search.Id.cshtml | 2 +- .../Views/NavigationItemText-search.Id.cshtml | 2 +- .../Views/NavigationItemText-search.Id.cshtml | 2 +- .../Views/NavigationItemText-configuration.Id.cshtml | 2 +- .../Views/NavigationItemText-general.Id.cshtml | 4 ++-- .../Views/NavigationItemText-settings.Id.cshtml | 2 +- .../Views/NavigationItemText-tools.Id.cshtml | 2 +- .../OrchardCore.Sms/Views/NavigationItemText-sms.Id.cshtml | 2 +- .../Views/NavigationItemText-taxonomyfilters.Id.cshtml | 4 ++-- src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs | 2 +- .../Views/NavigationItemText-design.Id.cshtml | 2 +- .../Views/NavigationItemText-design.Id.cshtml | 2 +- .../Views/NavigationItemText-twitter.Id.cshtml | 5 ++++- .../Views/NavigationItemText-urlrewriting.Id.cshtml | 2 +- .../Views/NavigationItemText-UserProfileSettings.Id.cshtml | 5 ++++- .../Views/NavigationItemText-accessControl.Id.cshtml | 2 +- .../Views/NavigationItemText-security.Id.cshtml | 2 +- .../Views/NavigationItemText-users.Id.cshtml | 5 ++++- .../Views/NavigationItemText-workflows.Id.cshtml | 5 ++++- 46 files changed, 116 insertions(+), 50 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml index f17a5c55fa4..a0258b128b8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml @@ -5,11 +5,11 @@ - @T["Admin"] + @Model.Text return; } -@T["Admin"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml index efd5afd2447..4ad956d05f2 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml @@ -1 +1,4 @@ -@T["Dashboard"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml index db9fc2ed4fb..f0e172e9086 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml @@ -1 +1,4 @@ -@Model.Text + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml index a43c770944b..a4befa87880 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/NavigationItemText-contentdefinition.Id.cshtml @@ -1 +1,4 @@ -@T["Content definition"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-content.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-content.Id.cshtml index 11f4a7176d4..4639ba4f839 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-content.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-content.Id.cshtml @@ -1 +1,4 @@ -@T["Content"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-new.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-new.Id.cshtml index 61896c80aab..22dfd3b2c5d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-new.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/NavigationItemText-new.Id.cshtml @@ -1,4 +1,4 @@ -@T["New"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/Views/NavigationItemText-cors.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Cors/Views/NavigationItemText-cors.Id.cshtml index 4e4e100023a..cfe21309a56 100644 --- a/src/OrchardCore.Modules/OrchardCore.Cors/Views/NavigationItemText-cors.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Cors/Views/NavigationItemText-cors.Id.cshtml @@ -1 +1,4 @@ -@T["CORS"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Views/NavigationItemText-demo.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Views/NavigationItemText-demo.Id.cshtml index 877ea0cab50..ab2e3f4984e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Demo/Views/NavigationItemText-demo.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Demo/Views/NavigationItemText-demo.Id.cshtml @@ -1 +1,4 @@ -@T["Demo"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Email/Views/NavigationItemText-email.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Email/Views/NavigationItemText-email.Id.cshtml index 513bf0fef34..d943f075b84 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/Views/NavigationItemText-email.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Email/Views/NavigationItemText-email.Id.cshtml @@ -1,4 +1,4 @@ -@T["Email"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebook.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebook.Id.cshtml index 75b3138c222..e23437c500d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebook.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebook.Id.cshtml @@ -1 +1,4 @@ -@T["Meta"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml index e620358386e..e23437c500d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookApp.Id.cshtml @@ -1 +1,4 @@ -@T["Meta app"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml index dc063a23e43..e23437c500d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/NavigationItemText-facebookPixel.Id.cshtml @@ -1 +1,4 @@ -@T["Meta pixel"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.GitHub/Views/NavigationItemText-github.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.GitHub/Views/NavigationItemText-github.Id.cshtml index 1397f802376..9ca61d8f123 100644 --- a/src/OrchardCore.Modules/OrchardCore.GitHub/Views/NavigationItemText-github.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.GitHub/Views/NavigationItemText-github.Id.cshtml @@ -1 +1,4 @@ -@T["GitHub"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-google.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-google.Id.cshtml index 0dacf258951..65c5303af80 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-google.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-google.Id.cshtml @@ -1 +1,4 @@ -@T["Google"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleAnalytics.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleAnalytics.Id.cshtml index b0d580c1df0..65c5303af80 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleAnalytics.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleAnalytics.Id.cshtml @@ -1 +1,4 @@ -@T["Google Analytics"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleTagManager.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleTagManager.Id.cshtml index f0990e2e25c..65c5303af80 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleTagManager.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Google/Views/NavigationItemText-googleTagManager.Id.cshtml @@ -1 +1,4 @@ -@T["Google Tag Manager"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/Views/NavigationItemText-localization.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Localization/Views/NavigationItemText-localization.Id.cshtml index 4ca42c58931..c924a69bf51 100644 --- a/src/OrchardCore.Modules/OrchardCore.Localization/Views/NavigationItemText-localization.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Localization/Views/NavigationItemText-localization.Id.cshtml @@ -1 +1,4 @@ -@T["Localization"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/NavigationItemText-media.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/NavigationItemText-media.Id.cshtml index ea4fa84c645..9351960fa9a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Views/NavigationItemText-media.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/NavigationItemText-media.Id.cshtml @@ -1 +1,4 @@ -@T["Media"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft.Id.cshtml index bd433c813fa..d04756aefc1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoft.Id.cshtml @@ -1 +1,4 @@ -@T["Microsoft"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml index a5e6671dc71..14efd39b6ad 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Views/NavigationItemText-microsoftentraid.Id.cshtml @@ -1,4 +1,4 @@ -@T["Microsoft Entra ID"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/NavigationItemText-openid.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/NavigationItemText-openid.Id.cshtml index 37482c6e5d9..edf22b99fce 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/Views/NavigationItemText-openid.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/Views/NavigationItemText-openid.Id.cshtml @@ -1,4 +1,4 @@ -@T["OpenID Connect"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Views/NavigationItemText-search.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Queries/Views/NavigationItemText-search.Id.cshtml index 1bca0499158..e3e22dfbe14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Views/NavigationItemText-search.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Views/NavigationItemText-search.Id.cshtml @@ -1,4 +1,4 @@ -@T["Search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml index 919e84ee841..67b540457c5 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/Views/NavigationItemText-reverseproxy.Id.cshtml @@ -4,11 +4,11 @@ - @T["Reverse proxy"] + @Model.Text return; } -@T["Reverse proxy"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Views/NavigationItemText-roles.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Roles/Views/NavigationItemText-roles.Id.cshtml index e01822d44f2..eba6d71aa9f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Roles/Views/NavigationItemText-roles.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Roles/Views/NavigationItemText-roles.Id.cshtml @@ -1 +1,4 @@ -@T["Roles"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml index 188f7fe5019..d04756aefc1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-azureaisearch.Id.cshtml @@ -1,4 +1,4 @@ -@T["Azure AI search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-search.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-search.Id.cshtml index 1bca0499158..e3e22dfbe14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-search.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/Views/NavigationItemText-search.Id.cshtml @@ -1,4 +1,4 @@ -@T["Search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-Elasticsearch.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-Elasticsearch.Id.cshtml index e209899726a..c84626c12c0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-Elasticsearch.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-Elasticsearch.Id.cshtml @@ -1 +1,4 @@ -@T["Search"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-search.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-search.Id.cshtml index 1bca0499158..e3e22dfbe14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-search.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Views/NavigationItemText-search.Id.cshtml @@ -1,4 +1,4 @@ -@T["Search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/NavigationItemText-search.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/NavigationItemText-search.Id.cshtml index 1bca0499158..e3e22dfbe14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/NavigationItemText-search.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Views/NavigationItemText-search.Id.cshtml @@ -1,4 +1,4 @@ -@T["Search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Views/NavigationItemText-search.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Search/Views/NavigationItemText-search.Id.cshtml index 1bca0499158..e3e22dfbe14 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/Views/NavigationItemText-search.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Search/Views/NavigationItemText-search.Id.cshtml @@ -1,4 +1,4 @@ -@T["Search"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml index 056ca36a2c8..58fd3708090 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-configuration.Id.cshtml @@ -1,4 +1,4 @@ -@T["Configuration"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml index 15081b0572b..f9595c25d4d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-general.Id.cshtml @@ -5,11 +5,11 @@ - @T["General"] + @Model.Text return; } -@T["General"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml index 9bf672ffb24..58fd3708090 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-settings.Id.cshtml @@ -1,4 +1,4 @@ -@T["Settings"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml index f6cd025fb7f..bead4f789e9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Settings/Views/NavigationItemText-tools.Id.cshtml @@ -1,4 +1,4 @@ -@T["Tools"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/Views/NavigationItemText-sms.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Sms/Views/NavigationItemText-sms.Id.cshtml index fadfbabe7a8..dcb18020c7c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/Views/NavigationItemText-sms.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Sms/Views/NavigationItemText-sms.Id.cshtml @@ -1,4 +1,4 @@ -@T["SMS"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml index 2acb126d90c..84353dc2501 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/NavigationItemText-taxonomyfilters.Id.cshtml @@ -5,11 +5,11 @@ - @T["Taxonomy filters"] + @Model.Text return; } -@T["Taxonomy filters"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs index 2a65a73a7ee..bab13e5c8be 100644 --- a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Multi-Tenancy"], "after", tenancy => tenancy + .Add(S["Multi-tenancy"], "after.25", tenancy => tenancy .AddClass("menu-multitenancy") .Id("multitenancy") .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/NavigationItemText-design.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/NavigationItemText-design.Id.cshtml index 534939c85af..58fd3708090 100644 --- a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/NavigationItemText-design.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/NavigationItemText-design.Id.cshtml @@ -1,4 +1,4 @@ -@T["Design"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml index c66bc7411d0..fe929ac2430 100644 --- a/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Themes/Views/NavigationItemText-design.Id.cshtml @@ -1,4 +1,4 @@ -@T["Design"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml index f343d0a4bb5..6388651d972 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/NavigationItemText-twitter.Id.cshtml @@ -1 +1,4 @@ -@T["X (Twitter)"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml index c077d976b78..fb5b70afc9c 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml @@ -1,4 +1,4 @@ -@T["URL rewriting"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml index a7a15998be9..23e55035a40 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-UserProfileSettings.Id.cshtml @@ -1 +1,4 @@ -@T["User profile settings"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml index dc139349922..6f884903ef9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-accessControl.Id.cshtml @@ -1,4 +1,4 @@ -@T["Access control"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml index 612de51fd90..6f884903ef9 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-security.Id.cshtml @@ -1,4 +1,4 @@ -@T["Security"] +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-users.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-users.Id.cshtml index 2ac1d8f896d..c0f03d000dc 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-users.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavigationItemText-users.Id.cshtml @@ -1 +1,4 @@ -@T["Users"] + + + +@Model.Text diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml index 6224b0fd00d..86a1ee2fa4e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml @@ -1 +1,4 @@ -@T["Workflows"] + + + +@Model.Text From 99624241d94e97117294162ce48717d5e7e5538b Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 6 Dec 2024 08:03:09 -0800 Subject: [PATCH 11/19] shorten the switch key --- .../OrchardCore.Navigation.Core/NavigationConstants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs index a94f6fa988f..016e0b2366c 100644 --- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs +++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationConstants.cs @@ -24,5 +24,5 @@ public static class NavigationConstants public const string AdminMenuId = "adminMenu"; - public const string LegacyAdminMenuNavigationSwitchKey = "LegacyAdminMenuNavigationSwitch"; + public const string LegacyAdminMenuNavigationSwitchKey = "LegacyAdminMenuNavigation"; } From 8869d230118735ce12478ed36c5767408ad8029e Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 6 Dec 2024 08:15:51 -0800 Subject: [PATCH 12/19] don't use icons --- .../NavigationItemText-audittrail.Id.cshtml | 18 ++++++++++++++---- .../NavigationItemText-urlrewriting.Id.cshtml | 18 ++++++++++++++---- .../NavigationItemText-workflows.Id.cshtml | 16 +++++++++++++--- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml index f0e172e9086..e7eaa5c96b1 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml @@ -1,4 +1,14 @@ - - - -@Model.Text +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @Model.Text + + return; +} + + +@Model.Text \ No newline at end of file diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml index fb5b70afc9c..9bfa4bb962f 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/Views/NavigationItemText-urlrewriting.Id.cshtml @@ -1,4 +1,14 @@ - - - -@Model.Text +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @Model.Text + + return; +} + + +@Model.Text \ No newline at end of file diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml index 86a1ee2fa4e..19f1b2a28bd 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/NavigationItemText-workflows.Id.cshtml @@ -1,4 +1,14 @@ - - - +@using OrchardCore.Navigation + +@if (NavigationHelper.UseLegacyFormat()) +{ + + + + @Model.Text + + return; +} + + @Model.Text From 7c9cd3c98a4885f95d90ac64472a9e47c1c2fc35 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Dec 2024 09:38:15 -0800 Subject: [PATCH 13/19] move Content definitions into Design menu --- .../OrchardCore.ContentTypes/AdminMenu.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index 25dcb26958b..80137cf6e5f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -18,8 +18,27 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { + if (NavigationHelper.UseLegacyFormat()) + { + builder + .Add(S["Content"], content => content + .Add(S["Content definition"], S["Content definition"].PrefixPosition("9"), contentDefinition => contentDefinition + .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes + .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") + .Permission(Permissions.ViewContentTypes) + .LocalNav() + ) + .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts + .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") + .Permission(Permissions.ViewContentTypes) + .LocalNav() + ) + ) + ); + } + builder - .Add(S["Content"], content => content + .Add(S["Design"], content => content .Add(S["Content definition"], S["Content definition"].PrefixPosition("9"), contentDefinition => contentDefinition .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") From dbdd7fff57b0712407fc8c31d19fee0072358738 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Dec 2024 09:54:19 -0800 Subject: [PATCH 14/19] fix placement of content definitions --- src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index 80137cf6e5f..3676263f614 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -39,7 +39,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Design"], content => content - .Add(S["Content definition"], S["Content definition"].PrefixPosition("9"), contentDefinition => contentDefinition + .Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) From e5145940c064f8711eb6c5cd38f776c951ee30db Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Dec 2024 09:54:31 -0800 Subject: [PATCH 15/19] move media to root level --- .../OrchardCore.Media/AdminMenu.cs | 45 ++++++++++++------- .../OrchardCore.Media/MediaCacheAdminMenu.cs | 2 +- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index d414bb0ed26..96553165480 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -14,19 +14,19 @@ public AdminMenu(IStringLocalizer stringLocalizer) protected override ValueTask BuildAsync(NavigationBuilder builder) { - builder - .Add(S["Content"], content => content - .AddClass("media") - .Id("media") - .Add(S["Media library"], S["Media library"].PrefixPosition(), media => media - .Permission(Permissions.ManageMedia) - .Action("Index", "Admin", "OrchardCore.Media") - .LocalNav() - ) - ); - if (NavigationHelper.UseLegacyFormat()) { + builder + .Add(S["Content"], content => content + .AddClass("media") + .Id("media") + .Add(S["Media library"], S["Media library"].PrefixPosition(), media => media + .Permission(Permissions.ManageMedia) + .Action("Index", "Admin", "OrchardCore.Media") + .LocalNav() + ) + ); + builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media @@ -46,19 +46,30 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) return ValueTask.CompletedTask; } + builder + .Add(S["Media"], "after.15", media => media + .AddClass("media") + .Id("media") + .Add(S["Library"], S["Library"].PrefixPosition("1"), library => library + .Permission(Permissions.ManageMedia) + .Action("Index", "Admin", "OrchardCore.Media") + .LocalNav() + ) + .Add(S["Profiles"], S["Profiles"].PrefixPosition("5"), mediaProfiles => mediaProfiles + .Action("Index", "MediaProfiles", "OrchardCore.Media") + .Permission(Permissions.ManageMediaProfiles) + .LocalNav() + ) + ); + builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media options"], S["Media options"].PrefixPosition(), options => options + .Add(S["Options"], S["Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") .Permission(Permissions.ViewMediaOptions) .LocalNav() ) - .Add(S["Media profiles"], S["Media profiles"].PrefixPosition(), mediaProfiles => mediaProfiles - .Action("Index", "MediaProfiles", "OrchardCore.Media") - .Permission(Permissions.ManageMediaProfiles) - .LocalNav() - ) ) ); diff --git a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs index 6cca2aa0eb4..1fdc41496a0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs @@ -33,7 +33,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media cache"], S["Media cache"].PrefixPosition(), cache => cache + .Add(S["Cache"], S["Cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media") .Permission(MediaCachePermissions.ManageAssetCache) .LocalNav() From 9a00fc3ddb21be8db5c70e48be7ccf2f8a2701ac Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Sat, 14 Dec 2024 23:17:01 -0800 Subject: [PATCH 16/19] update blog theme --- .../OrchardCore.ContentTypes/AdminMenu.cs | 4 +- .../OrchardCore.Contents/AdminMenu.cs | 2 +- .../TheBlogTheme/Recipes/blog.recipe.json | 72 ++++++++----------- 3 files changed, 33 insertions(+), 45 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index 3676263f614..dd3d00de982 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -40,12 +40,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Design"], content => content .Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition - .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes + .Add(S["Types"], S["Types"].PrefixPosition("1"), types => types .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() ) - .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts + .Add(S["Parts"], S["Parts"].PrefixPosition("2"), parts => parts .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs index f3721c246b1..dc933456f2a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs @@ -65,7 +65,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content => { content.AddClass("content").Id("content"); - await content.AddAsync(S["Content items"], S["Content items"].PrefixPosition(), async contentItems => + await content.AddAsync(S["Content items"], "before", async contentItems => { if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager)) { diff --git a/src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json b/src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json index ceabdaee507..e0434064b4e 100644 --- a/src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json +++ b/src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json @@ -1119,6 +1119,19 @@ } ] }, + { + "name": "MediaProfiles", + "MediaProfiles": { + "banner": { + "Hint": "A banner image (2048px x 600px, cropped)", + "Width": 2048, + "Height": 600, + "Mode": 2, + "Format": 0, + "Quality": 100 + } + } + }, { "name": "media", "Files": [ @@ -1264,62 +1277,37 @@ "Classes": [] }, { - "$type": "OrchardCore.AdminMenu.AdminNodes.PlaceholderAdminNode, OrchardCore.AdminMenu", - "LinkText": "Content Types", - "IconClass": null, - "PermissionNames": [], - "UniqueId": "2f1fc33133334a1abf7d1a0516ee8b4e", + "$type": "OrchardCore.Contents.AdminNodes.ContentTypesAdminNode, OrchardCore.Contents", + "ShowAll": false, + "ContentTypes": [ + { + "ContentTypeId": "Article" + }, + { + "ContentTypeId": "Page" + }, + { + "ContentTypeId": "Taxonomy" + } + ], + "UniqueId": "ee18224e1b814c638b0732678b74cfd9", "Enabled": true, "Text": null, "Id": null, "Href": null, "Url": null, - "Position": "1", - "Priority": 50, + "Position": null, "LinkToFirstChild": true, "LocalNav": false, "Culture": null, - "Items": [ - { - "$type": "OrchardCore.Contents.AdminNodes.ContentTypesAdminNode, OrchardCore.Contents", - "ShowAll": true, - "IconClass": null, - "ContentTypes": [], - "UniqueId": "ee18224e1b814c638b0732678b74cfd9", - "Enabled": true, - "Text": null, - "Id": null, - "Href": null, - "Url": null, - "Position": null, - "LinkToFirstChild": true, - "LocalNav": false, - "Culture": null, - "Items": [], - "Classes": [] - } - ], + "Items": [], "Classes": [] } - ], - "Classes": [] + ] } ] } ] - }, - { - "name": "MediaProfiles", - "MediaProfiles": { - "banner": { - "Hint": "A banner image (2048px x 600px, cropped)", - "Width": 2048, - "Height": 600, - "Mode": 2, - "Format": 0, - "Quality": 100 - } - } } ] } From ab9b7d4c48f3686ae5b8dc7e9f3e1befde61ccec Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Sun, 15 Dec 2024 13:34:21 -0800 Subject: [PATCH 17/19] adding content --- src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index dd3d00de982..3676263f614 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -40,12 +40,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Design"], content => content .Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition - .Add(S["Types"], S["Types"].PrefixPosition("1"), types => types + .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() ) - .Add(S["Parts"], S["Parts"].PrefixPosition("2"), parts => parts + .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() From 995ed0633706b3db01cd822c74f1b2489d9f8c2e Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 17 Dec 2024 08:15:20 -0800 Subject: [PATCH 18/19] Use title case --- .../OrchardCore.AdminMenu/AdminMenu.cs | 2 +- .../Navigation/AuditTrailAdminMenu.cs | 11 ++++++----- .../OrchardCore.BackgroundTasks/AdminMenu.cs | 4 ++-- .../OrchardCore.ContentLocalization/AdminMenu.cs | 8 ++++---- .../OrchardCore.ContentTypes/AdminMenu.cs | 12 ++++++------ .../OrchardCore.Contents/AdminMenu.cs | 2 +- .../ExportContentToDeploymentTargetAdminMenu.cs | 2 +- .../OrchardCore.Cors/AdminMenu.cs | 3 ++- .../OrchardCore.CustomSettings/AdminMenu.cs | 2 +- .../OrchardCore.Deployment.Remote/AdminMenu.cs | 8 ++++---- .../OrchardCore.Deployment/AdminMenu.cs | 12 ++++++------ .../OrchardCore.Email/AdminMenu.cs | 4 ++-- .../OrchardCore.Facebook/AdminMenu.cs | 4 ++-- .../OrchardCore.Media.AmazonS3/AdminMenu.cs | 4 ++-- .../OrchardCore.Media.Azure/AdminMenu.cs | 4 ++-- .../OrchardCore.Media/AdminMenu.cs | 6 +++--- .../OrchardCore.OpenId/ClientAdminMenu.cs | 4 ++-- .../OrchardCore.OpenId/ValidationAdminMenu.cs | 4 ++-- .../OrchardCore.Queries/AdminMenu.cs | 2 +- .../OrchardCore.Queries/Sql/AdminMenu.cs | 2 +- .../OrchardCore.ReverseProxy/AdminMenu.cs | 4 ++-- .../OrchardCore.Search.AzureAI/AdminMenu.cs | 6 +++--- .../OrchardCore.Search.Elasticsearch/AdminMenu.cs | 4 ++-- .../OrchardCore.Search.Lucene/AdminMenu.cs | 4 ++-- .../OrchardCore.Search/AdminMenu.cs | 2 +- .../OrchardCore.Security/AdminMenu.cs | 4 ++-- src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs | 2 +- .../OrchardCore.Sitemaps/AdminMenu.cs | 10 +++++----- src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs | 4 ++-- .../OrchardCore.Taxonomies/AdminMenu.cs | 4 ++-- .../OrchardCore.Templates/AdminTemplatesAdminMenu.cs | 2 +- .../OrchardCore.Tenants/AdminMenu.cs | 2 +- .../OrchardCore.Tenants/FeatureProfilesAdminMenu.cs | 2 +- .../OrchardCore.Twitter/AdminMenuSignin.cs | 5 +++-- .../OrchardCore.UrlRewriting/AdminMenu.cs | 2 +- .../OrchardCore.Users/AdminMenu.cs | 6 +++--- .../OrchardCore.Users/ChangeEmailAdminMenu.cs | 4 ++-- .../OrchardCore.Users/RegistrationAdminMenu.cs | 2 +- .../OrchardCore.Users/ResetPasswordAdminMenu.cs | 4 ++-- .../OrchardCore.Workflows/Trimming/AdminMenu.cs | 4 ++-- 40 files changed, 90 insertions(+), 87 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs index f1e6896a380..d8f3a5fc332 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs @@ -37,7 +37,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) // Configuration and settings menus for the AdminMenu module. builder .Add(S["Tools"], tools => tools - .Add(S["Admin menus"], S["Admin menus"].PrefixPosition(), adminMenu => adminMenu + .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu .Permission(Permissions.ManageAdminMenu) .Action("List", "Menu", "OrchardCore.AdminMenu") .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs index 67f0bf386ed..7c7a23c4664 100644 --- a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs @@ -32,16 +32,16 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) if (NavigationHelper.UseLegacyFormat()) { builder - .Add(S["Audit trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration + .Add(S["Audit Trail"], NavigationConstants.AdminMenuAuditTrailPosition, configuration => configuration .AddClass("audittrail") .Id("audittrail") .Action(nameof(AdminController.Index), "Admin", _routeValues) .Permission(AuditTrailPermissions.ViewAuditTrail) .LocalNav() - ) + , priority: 1) .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), auditTrail => auditTrail + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail .AddClass("audittrail") .Id("audittrailSettings") .Action("Index", "Admin", _routeValues) @@ -50,12 +50,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) ); + return ValueTask.CompletedTask; } builder .Add(S["Tools"], tools => tools - .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), configuration => configuration + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), configuration => configuration .AddClass("audittrail") .Id("audittrail") .Action(nameof(AdminController.Index), "Admin", _routeValues) @@ -64,7 +65,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Settings"], settings => settings - .Add(S["Audit trail"], S["Audit trail"].PrefixPosition(), auditTrail => auditTrail + .Add(S["Audit Trail"], S["Audit Trail"].PrefixPosition(), auditTrail => auditTrail .AddClass("audittrail") .Id("audittrailSettings") .Action("Index", "Admin", _settingsRouteValues) diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs index b85c22fda91..60ec6750ded 100644 --- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Tasks"], S["Tasks"].PrefixPosition(), tasks => tasks - .Add(S["Background tasks"], S["Background tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") .Permission(Permissions.ManageBackgroundTasks) .LocalNav() @@ -32,7 +32,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools - .Add(S["Background tasks"], S["Background tasks"].PrefixPosition(), backgroundTasks => backgroundTasks + .Add(S["Background Tasks"], S["Background Tasks"].PrefixPosition(), backgroundTasks => backgroundTasks .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks") .Permission(Permissions.ManageBackgroundTasks) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs index 70d118da65a..96c9895eb53 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs @@ -34,14 +34,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings .Add(S["Localization"], localization => localization - .Add(S["Content request culture provider"], S["Content request culture provider"].PrefixPosition(), provider => provider + .Add(S["Content Request Culture Provider"], S["Content Request Culture Provider"].PrefixPosition(), provider => provider .AddClass("contentrequestcultureprovider") .Id("contentrequestcultureprovider") .Action("Index", "Admin", _providersRouteValues) .Permission(Permissions.ManageContentCulturePicker) .LocalNav() ) - .Add(S["Content culture picker"], S["Content culture picker"].PrefixPosition(), picker => picker + .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker .AddClass("contentculturepicker") .Id("contentculturepicker") .Action("Index", "Admin", _pickerRouteValues) @@ -58,14 +58,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization - .Add(S["Content culture"], S["Content culture"].PrefixPosition(), provider => provider + .Add(S["Content Culture"], S["Content Culture"].PrefixPosition(), provider => provider .AddClass("contentrequestcultureprovider") .Id("contentrequestcultureprovider") .Action("Index", "Admin", _providersRouteValues) .Permission(Permissions.ManageContentCulturePicker) .LocalNav() ) - .Add(S["Content culture picker"], S["Content culture picker"].PrefixPosition(), picker => picker + .Add(S["Content Culture Picker"], S["Content Culture Picker"].PrefixPosition(), picker => picker .AddClass("contentculturepicker") .Id("contentculturepicker") .Action("Index", "Admin", _pickerRouteValues) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs index 3676263f614..5a3c69c39f2 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs @@ -22,13 +22,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Content"], content => content - .Add(S["Content definition"], S["Content definition"].PrefixPosition("9"), contentDefinition => contentDefinition - .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes + .Add(S["Content Definition"], S["Content Definition"].PrefixPosition("9"), contentDefinition => contentDefinition + .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() ) - .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts + .Add(S["Content Parts"], S["Content Parts"].PrefixPosition("2"), contentParts => contentParts .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() @@ -39,13 +39,13 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Design"], content => content - .Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition - .Add(S["Content types"], S["Content types"].PrefixPosition("1"), contentTypes => contentTypes + .Add(S["Content Definition"], S["Content Definition"].PrefixPosition(), contentDefinition => contentDefinition + .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes .Action(nameof(AdminController.List), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() ) - .Add(S["Content parts"], S["Content parts"].PrefixPosition("2"), contentParts => contentParts + .Add(S["Content Parts"], S["Content Parts"].PrefixPosition("2"), contentParts => contentParts .Action(nameof(AdminController.ListParts), _adminControllerName, "OrchardCore.ContentTypes") .Permission(Permissions.ViewContentTypes) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs index dc933456f2a..3304290ae04 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs @@ -65,7 +65,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) await builder.AddAsync(S["Content"], NavigationConstants.AdminMenuContentPosition, async content => { content.AddClass("content").Id("content"); - await content.AddAsync(S["Content items"], "before", async contentItems => + await content.AddAsync(S["Content Items"], "before", async contentItems => { if (!await _authorizationService.AuthorizeContentTypeDefinitionsAsync(context.User, CommonPermissions.ListContent, listableContentTypes, _contentManager)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs index 651ab7efa7b..7cea8ffca4c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetAdminMenu.cs @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Deployment targets"], S["Deployment targets"].PrefixPosition(), targetSettings => targetSettings + .Add(S["Deployment Targets"], S["Deployment Targets"].PrefixPosition(), targetSettings => targetSettings .Action("Index", "Admin", _routeValues) .Permission(OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs index 75619b4ebbd..f9ba300f6f7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs @@ -28,13 +28,14 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) ); + return ValueTask.CompletedTask; } builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["CORS"], S["CORS"].PrefixPosition(), entry => entry + .Add(S["Cross-Origin Resource Sharing"], S["Cross-Origin Resource Sharing"].PrefixPosition(), entry => entry .AddClass("cors") .Id("cors") .Action("Index", "Admin", "OrchardCore.Cors") diff --git a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs index 6c206adf7e0..dc0279ee2a2 100644 --- a/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs @@ -45,7 +45,7 @@ protected override async ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers + .Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), customSettings => customSettings .Action("Index", "Admin", routeValues) .AddClass(htmlName) .Id(htmlName) diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs index 7475d78de67..c6a5a8befb8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/AdminMenu.cs @@ -19,12 +19,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Import/Export"], import => import - .Add(S["Remote instances"], S["Remote instances"].PrefixPosition(), remote => remote + .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteInstances) .LocalNav() ) - .Add(S["Remote clients"], S["Remote clients"].PrefixPosition(), remote => remote + .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteClients) .LocalNav() @@ -38,12 +38,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Deployments"], import => import - .Add(S["Remote instances"], S["Remote instances"].PrefixPosition(), remote => remote + .Add(S["Remote Instances"], S["Remote Instances"].PrefixPosition(), remote => remote .Action("Index", "RemoteInstance", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteInstances) .LocalNav() ) - .Add(S["Remote clients"], S["Remote clients"].PrefixPosition(), remote => remote + .Add(S["Remote Clients"], S["Remote Clients"].PrefixPosition(), remote => remote .Action("Index", "RemoteClient", "OrchardCore.Deployment.Remote") .Permission(Permissions.ManageRemoteClients) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs index 420cf2dfbc8..b56865d3bce 100644 --- a/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs @@ -19,17 +19,17 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Import/Export"], S["Import/Export"].PrefixPosition(), import => import - .Add(S["Deployment plans"], S["Deployment plans"].PrefixPosition(), deployment => deployment + .Add(S["Deployment Plans"], S["Deployment Plans"].PrefixPosition(), deployment => deployment .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") .Permission(CommonPermissions.Export) .LocalNav() ) - .Add(S["Package import"], S["Package import"].PrefixPosition(), deployment => deployment + .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment .Action("Index", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() ) - .Add(S["JSON import"], S["JSON import"].PrefixPosition(), deployment => deployment + .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment .Action("Json", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() @@ -43,17 +43,17 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Deployments"], S["Deployments"].PrefixPosition(), import => import - .Add(S["Plans"], "1", deployment => deployment + .Add(S["Plans"], S["Plans"].PrefixPosition("1"), deployment => deployment .Action("Index", "DeploymentPlan", "OrchardCore.Deployment") .Permission(CommonPermissions.Export) .LocalNav() ) - .Add(S["Package import"], S["Package import"].PrefixPosition(), deployment => deployment + .Add(S["Package Import"], S["Package Import"].PrefixPosition(), deployment => deployment .Action("Index", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() ) - .Add(S["JSON import"], S["JSON import"].PrefixPosition(), deployment => deployment + .Add(S["JSON Import"], S["JSON Import"].PrefixPosition(), deployment => deployment .Action("Json", "Import", "OrchardCore.Deployment") .Permission(CommonPermissions.Import) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs index d71a8c2d792..ba6e936d908 100644 --- a/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Email/AdminMenu.cs @@ -36,7 +36,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(Permissions.ManageEmailSettings) .LocalNav() ) - .Add(S["Email test"], S["Email test"].PrefixPosition(), entry => entry + .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry .AddClass("emailtest") .Id("emailtest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") @@ -52,7 +52,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing - .Add(S["Email test"], S["Email test"].PrefixPosition(), entry => entry + .Add(S["Email Test"], S["Email Test"].PrefixPosition(), entry => entry .AddClass("emailtest") .Id("emailtest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Email") diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs index fd010ac677e..1dc2650a025 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/AdminMenu.cs @@ -26,7 +26,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Meta app"], S["Meta app"].PrefixPosition(), metaApp => metaApp + .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp .AddClass("facebookApp") .Id("facebookApp") .Action("Index", "Admin", _routeValues) @@ -42,7 +42,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Integrations"], S["Integrations"].PrefixPosition(), integrations => integrations - .Add(S["Meta app"], S["Meta app"].PrefixPosition(), metaApp => metaApp + .Add(S["Meta App"], S["Meta App"].PrefixPosition(), metaApp => metaApp .AddClass("facebookApp") .Id("facebookApp") .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs index 5bef1e5da43..ee963814024 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs @@ -18,7 +18,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder.Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Amazon S3 options"], S["Amazon S3 options"].PrefixPosition(), options => options + .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") .Permission(Permissions.ViewAmazonS3MediaOptions) .LocalNav() @@ -31,7 +31,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder.Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Amazon S3 options"], S["Amazon S3 options"].PrefixPosition(), options => options + .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") .Permission(Permissions.ViewAmazonS3MediaOptions) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs index 59a38260932..25d8fc54ef1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Azure Blob options"], S["Azure Blob options"].PrefixPosition(), options => options + .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") .Permission(Permissions.ViewAzureMediaOptions) .LocalNav() @@ -33,7 +33,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Tools"], tools => tools .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Azure Blob options"], S["Azure Blob options"].PrefixPosition(), options => options + .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") .Permission(Permissions.ViewAzureMediaOptions) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index 96553165480..7fcc278c5e2 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -20,7 +20,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Content"], content => content .AddClass("media") .Id("media") - .Add(S["Media library"], S["Media library"].PrefixPosition(), media => media + .Add(S["Media Library"], S["Media Library"].PrefixPosition(), media => media .Permission(Permissions.ManageMedia) .Action("Index", "Admin", "OrchardCore.Media") .LocalNav() @@ -30,12 +30,12 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media options"], S["Media options"].PrefixPosition(), options => options + .Add(S["Media Options"], S["Media Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") .Permission(Permissions.ViewMediaOptions) .LocalNav() ) - .Add(S["Media profiles"], S["Media profiles"].PrefixPosition(), mediaProfiles => mediaProfiles + .Add(S["Media Profiles"], S["Media Profiles"].PrefixPosition(), mediaProfiles => mediaProfiles .Action("Index", "MediaProfiles", "OrchardCore.Media") .Permission(Permissions.ManageMediaProfiles) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs index 53eb1e5e4ab..93361c05771 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ClientAdminMenu.cs @@ -30,7 +30,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("openid") .Id("openid") .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings - .Add(S["Authentication client"], S["Authentication client"].PrefixPosition(), client => client + .Add(S["Authentication Client"], S["Authentication Client"].PrefixPosition(), client => client .Action("Index", "Admin", _clientRouteValues) .Permission(Permissions.ManageClientSettings) .LocalNav() @@ -46,7 +46,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId - .Add(S["Authentication client"], S["Authentication client"].PrefixPosition(), client => client + .Add(S["Authentication Client"], S["Authentication Client"].PrefixPosition(), client => client .Action("Index", "Admin", _clientRouteValues) .Permission(Permissions.ManageClientSettings) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs index 6d0d5da077d..56a38e42365 100644 --- a/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.OpenId/ValidationAdminMenu.cs @@ -22,7 +22,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("openid") .Id("openid") .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings - .Add(S["Token validation"], S["Token validation"].PrefixPosition(), validation => validation + .Add(S["Token Validation"], S["Token Validation"].PrefixPosition(), validation => validation .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") .Permission(Permissions.ManageValidationSettings) .LocalNav() @@ -38,7 +38,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["OpenID Connect"], S["OpenID Connect"].PrefixPosition(), openId => openId - .Add(S["Token validation"], S["Token validation"].PrefixPosition(), validation => validation + .Add(S["Token Validation"], S["Token Validation"].PrefixPosition(), validation => validation .Action("Index", "ValidationConfiguration", "OrchardCore.OpenId") .Permission(Permissions.ManageValidationSettings) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs index b020bd83075..cc267176fa1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries - .Add(S["All queries"], "1", allQueries => allQueries + .Add(S["All Queries"], "1", allQueries => allQueries .Action("Index", "Admin", "OrchardCore.Queries") .AddClass("searchallqueries") .Id("searchallqueries") diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs index 11cf18ecbbf..fb4c50fd271 100644 --- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/AdminMenu.cs @@ -17,7 +17,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Search"], NavigationConstants.AdminMenuSearchPosition, search => search .Add(S["Queries"], S["Queries"].PrefixPosition(), queries => queries - .Add(S["Run SQL query"], S["Run SQL query"].PrefixPosition(), sql => sql + .Add(S["Run SQL Query"], S["Run SQL Query"].PrefixPosition(), sql => sql .Action("Query", "Admin", "OrchardCore.Queries") .Permission(Permissions.ManageSqlQueries) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs index 029f70fbd73..8fb04d07f69 100644 --- a/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.ReverseProxy/AdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Reverse proxy"], S["Reverse proxy"].PrefixPosition(), entry => entry + .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), entry => entry .AddClass("reverseproxy") .Id("reverseproxy") .Action("Index", "Admin", _routeValues) @@ -43,7 +43,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["Reverse proxy"], S["Reverse proxy"].PrefixPosition(), proxy => proxy + .Add(S["Reverse Proxy"], S["Reverse Proxy"].PrefixPosition(), proxy => proxy .AddClass("reverseproxy") .Id("reverseproxy") .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs index 27d0c1b0667..e065968eb0a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.AzureAI/AdminMenu.cs @@ -34,7 +34,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), indexing => indexing - .Add(S["Azure AI indices"], S["Azure AI indices"].PrefixPosition(), indexes => indexes + .Add(S["Azure AI Indices"], S["Azure AI Indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.AzureAI") .AddClass("azureaiindices") .Id("azureaiindices") @@ -54,7 +54,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Azure AI search"], S["Azure AI search"].PrefixPosition(), azureAISearch => azureAISearch + .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch .AddClass("azure-ai-search") .Id("azureaisearch") .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = AzureAISearchDefaultSettingsDisplayDriver.GroupId }) @@ -69,7 +69,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Azure AI search"], S["Azure AI search"].PrefixPosition(), azureAISearch => azureAISearch + .Add(S["Azure AI Search"], S["Azure AI Search"].PrefixPosition(), azureAISearch => azureAISearch .AddClass("azure-ai-search") .Id("azureaisearch") .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs index 89caa025672..6f3159ef762 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), import => import - .Add(S["Elasticsearch indices"], S["Elasticsearch indices"].PrefixPosition(), indexes => indexes + .Add(S["Elasticsearch Indices"], S["Elasticsearch Indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.Elasticsearch") .AddClass("elasticsearchindices") .Id("elasticsearchindices") @@ -28,7 +28,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Queries"], S["Queries"].PrefixPosition(), import => import - .Add(S["Run Elasticsearch query"], S["Run Elasticsearch query"].PrefixPosition(), queries => queries + .Add(S["Run Elasticsearch Query"], S["Run Elasticsearch Query"].PrefixPosition(), queries => queries .Action("Query", "Admin", "OrchardCore.Search.Elasticsearch") .AddClass("elasticsearchquery") .Id("elasticsearchquery") diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs index 3a16450eafa..cff75fd6424 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/AdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("search") .Id("search") .Add(S["Indexing"], S["Indexing"].PrefixPosition(), import => import - .Add(S["Lucene indices"], S["Lucene indices"].PrefixPosition(), indexes => indexes + .Add(S["Lucene Indices"], S["Lucene Indices"].PrefixPosition(), indexes => indexes .Action("Index", "Admin", "OrchardCore.Search.Lucene") .AddClass("luceneindices") .Id("luceneindices") @@ -28,7 +28,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) ) .Add(S["Queries"], S["Queries"].PrefixPosition(), import => import - .Add(S["Run Lucene query"], S["Run Lucene query"].PrefixPosition(), queries => queries + .Add(S["Run Lucene Query"], S["Run Lucene Query"].PrefixPosition(), queries => queries .Action("Query", "Admin", "OrchardCore.Search.Lucene") .AddClass("lucenequery") .Id("lucenequery") diff --git a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs index acae45509cc..f3f346e8a77 100644 --- a/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Search/AdminMenu.cs @@ -42,7 +42,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Search"], S["Search"].PrefixPosition(), search => search - .Add(S["Site search"], S["Site search"].PrefixPosition(), search => search + .Add(S["Site Search"], S["Site Search"].PrefixPosition(), search => search .Action("Index", "Admin", _routeValues) .AddClass("searchsettings") .Id("searchsettings") diff --git a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs index 93d89b69b78..fbb5c41c539 100644 --- a/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Security/AdminMenu.cs @@ -29,7 +29,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .AddClass("security") .Id("security") .Add(S["Settings"], settings => settings - .Add(S["Security headers"], S["Security headers"].PrefixPosition(), headers => headers + .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers .Permission(SecurityPermissions.ManageSecurityHeadersSettings) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -43,7 +43,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["Security headers"], S["Security headers"].PrefixPosition(), headers => headers + .Add(S["Security Headers"], S["Security Headers"].PrefixPosition(), headers => headers .Permission(SecurityPermissions.ManageSecurityHeadersSettings) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs index f3fb287d850..def1d069a62 100644 --- a/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Seo/AdminMenu.cs @@ -42,7 +42,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Search"], S["Search"].PrefixPosition(), search => search - .Add(S["Search engine optimization"], S["Search engine optimization"].PrefixPosition(), seo => seo + .Add(S["Search Engine Optimization"], S["Search Engine Optimization"].PrefixPosition(), seo => seo .AddClass("seo") .Id("seo") .Add(S["Robots"], S["Robots"].PrefixPosition(), robots => robots diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs index 427cf61c21f..134725b9a45 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs @@ -24,11 +24,11 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Action("List", "Admin", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemap indexes"], S["Sitemap indexes"].PrefixPosition("2"), indexes => indexes + .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemaps cache"], S["Sitemaps cache"].PrefixPosition("3"), cache => cache + .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache .Action("List", "SitemapCache", "OrchardCore.Sitemaps") .LocalNav() ) @@ -39,17 +39,17 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder .Add(S["Tools"], tools => tools - .Add(S["Search engine optimization"], S["Search engine optimization"].PrefixPosition(), seo => seo + .Add(S["Search Engine Optimization"], S["Search Engine Optimization"].PrefixPosition(), seo => seo .Permission(Permissions.ManageSitemaps) .Add(S["Sitemaps"], S["Sitemaps"].PrefixPosition("1"), sitemaps => sitemaps .Action("List", "Admin", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemap indexes"], S["Sitemap indexes"].PrefixPosition("2"), indexes => indexes + .Add(S["Sitemap Indexes"], S["Sitemap Indexes"].PrefixPosition("2"), indexes => indexes .Action("List", "SitemapIndex", "OrchardCore.Sitemaps") .LocalNav() ) - .Add(S["Sitemaps cache"], S["Sitemaps cache"].PrefixPosition("3"), cache => cache + .Add(S["Sitemaps Cache"], S["Sitemaps Cache"].PrefixPosition("3"), cache => cache .Action("List", "SitemapCache", "OrchardCore.Sitemaps") .LocalNav() ) diff --git a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs index 4740000fc41..e430080ee34 100644 --- a/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Sms/AdminMenu.cs @@ -35,7 +35,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Permission(SmsPermissions.ManageSmsSettings) .LocalNav() ) - .Add(S["SMS test"], S["SMS test"].PrefixPosition(), sms => sms + .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms .AddClass("smstest") .Id("smstest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") @@ -62,7 +62,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ) .Add(S["Tools"], tools => tools .Add(S["Testing"], S["Testing"].PrefixPosition(), testing => testing - .Add(S["SMS test"], S["SMS test"].PrefixPosition(), sms => sms + .Add(S["SMS Test"], S["SMS Test"].PrefixPosition(), sms => sms .AddClass("smstest") .Id("smstest") .Action(nameof(AdminController.Test), typeof(AdminController).ControllerName(), "OrchardCore.Sms") diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs index a58408e3dc6..cc3ac7d3620 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/AdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], "1", settings => settings - .Add(S["Taxonomy filters"], S["Taxonomy filters"].PrefixPosition(), filters => filters + .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters .AddClass("taxonomyfilters") .Id("taxonomyfilters") .Permission(Permissions.ManageTaxonomies) @@ -42,7 +42,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Taxonomy filters"], S["Taxonomy filters"].PrefixPosition(), filters => filters + .Add(S["Taxonomy Filters"], S["Taxonomy Filters"].PrefixPosition(), filters => filters .AddClass("taxonomyfilters") .Id("taxonomyfilters") .Permission(Permissions.ManageTaxonomies) diff --git a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs index ccf41c4a077..5d2a236357f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Templates/AdminTemplatesAdminMenu.cs @@ -16,7 +16,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Design"], design => design - .Add(S["Admin templates"], S["Admin templates"].PrefixPosition(), import => import + .Add(S["Admin Templates"], S["Admin Templates"].PrefixPosition(), import => import .Action("Admin", "Template", "OrchardCore.Templates") .Permission(AdminTemplatesPermissions.ManageAdminTemplates) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs index bab13e5c8be..d83190e5574 100644 --- a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Multi-tenancy"], "after.25", tenancy => tenancy + .Add(S["Multi-Tenancy"], "after.25", tenancy => tenancy .AddClass("menu-multitenancy") .Id("multitenancy") .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs index 780c21ae860..e675610dc72 100644 --- a/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Tenants/FeatureProfilesAdminMenu.cs @@ -30,7 +30,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Multi-Tenancy"], tenancy => tenancy .AddClass("menu-multitenancy") - .Add(S["Feature profiles"], S["Feature profiles"].PrefixPosition(), featureProfiles => featureProfiles + .Add(S["Feature Profiles"], S["Feature Profiles"].PrefixPosition(), featureProfiles => featureProfiles .Action("Index", "FeatureProfiles", "OrchardCore.Tenants") .Permission(Permissions.ManageTenantFeatureProfiles) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs index 2244ec15694..fd38cefd0c1 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs @@ -26,7 +26,8 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Security"], security => security .Add(S["Authentication"], authentication => authentication - .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter + + .Add(S["Sign In with X (Twitter)"], S["Sign In with X (Twitter)"].PrefixPosition(), twitter => twitter .AddClass("twitter") .Id("twitter") .Action("Index", "Admin", _routeValues) @@ -42,7 +43,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security .Add(S["Authentication"], S["Authentication"].PrefixPosition(), authentication => authentication - .Add(S["Sign in with X (Twitter)"], S["Sign in with X (Twitter)"].PrefixPosition(), twitter => twitter + .Add(S["Sign In with X (Twitter)"], S["Sign In with X (Twitter)"].PrefixPosition(), twitter => twitter .AddClass("twitter") .Id("twitter") .Action("Index", "Admin", _routeValues) diff --git a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs index 0b6be3dfeba..17ef389cba4 100644 --- a/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.UrlRewriting/AdminMenu.cs @@ -18,7 +18,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) { builder .Add(S["Configuration"], configuration => configuration - .Add(S["URL rewriting"], S["URL rewriting"].PrefixPosition(), rewriting => rewriting + .Add(S["URL Rewriting"], S["URL Rewriting"].PrefixPosition(), rewriting => rewriting .AddClass("url-rewriting") .Id("urlRewriting") .Permission(UrlRewritingPermissions.ManageUrlRewritingRules) diff --git a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs index 82e3133afb6..6f1c9a83f6f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs @@ -38,7 +38,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .LocalNav() ) .Add(S["Settings"], settings => settings - .Add(S["User login"], S["User login"].PrefixPosition(), login => login + .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -50,7 +50,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Access control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl + .Add(S["Access Control"], NavigationConstants.AdminMenuAccessControlPosition, accessControl => accessControl .AddClass("accessControl") .Id("accessControl") .Add(S["Users"], S["Users"].PrefixPosition(), users => users @@ -65,7 +65,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["User login"], S["User login"].PrefixPosition(), login => login + .Add(S["User Login"], S["User Login"].PrefixPosition(), login => login .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs index f17382b6abb..85649a4b2f0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ChangeEmailAdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Security"], security => security .Add(S["Settings"], settings => settings - .Add(S["User change email"], S["User change email"].PrefixPosition(), email => email + .Add(S["User Change Email"], S["User Change Email"].PrefixPosition(), email => email .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["Change email"], S["Change email"].PrefixPosition(), email => email + .Add(S["Change Email"], S["Change Email"].PrefixPosition(), email => email .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs index 50426869f80..c96debc48a0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/RegistrationAdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Security"], security => security .Add(S["Settings"], S["Settings"].PrefixPosition(), settings => settings - .Add(S["User registration"], S["User registration"].PrefixPosition(), registration => registration + .Add(S["User Registration"], S["User Registration"].PrefixPosition(), registration => registration .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs index a4eaeb24334..19e90f2f44e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Users/ResetPasswordAdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Security"], security => security .Add(S["Settings"], settings => settings - .Add(S["User reset password"], S["User reset password"].PrefixPosition(), password => password + .Add(S["User Reset Password"], S["User Reset Password"].PrefixPosition(), password => password .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() @@ -41,7 +41,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings .Add(S["Security"], S["Security"].PrefixPosition(), security => security - .Add(S["Reset password"], S["Reset password"].PrefixPosition(), password => password + .Add(S["Reset Password"], S["Reset Password"].PrefixPosition(), password => password .Permission(CommonPermissions.ManageUsers) .Action("Index", "Admin", _routeValues) .LocalNav() diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs index f6b875b47a8..3d2d1561951 100644 --- a/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Trimming/AdminMenu.cs @@ -27,7 +27,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Settings"], settings => settings - .Add(S["Workflow trimming"], S["Workflow trimming"], trimming => trimming + .Add(S["Workflow Trimming"], S["Workflow Trimming"], trimming => trimming .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageWorkflowSettings) .LocalNav() @@ -40,7 +40,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Settings"], settings => settings - .Add(S["Workflow trimming"], S["Workflow trimming"].PrefixPosition(), trimming => trimming + .Add(S["Workflow Trimming"], S["Workflow Trimming"].PrefixPosition(), trimming => trimming .Action("Index", "Admin", _routeValues) .Permission(Permissions.ManageWorkflowSettings) .LocalNav() From ff19ab97633ee73ea6d6fbcf2d5eeba03b890248 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 17 Dec 2024 08:19:48 -0800 Subject: [PATCH 19/19] move media options under settings --- .../OrchardCore.Media.AmazonS3/AdminMenu.cs | 2 +- src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs | 2 +- src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs | 2 +- .../OrchardCore.Media/MediaCacheAdminMenu.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs index ee963814024..7bb6133c7e5 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/AdminMenu.cs @@ -29,7 +29,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) return ValueTask.CompletedTask; } - builder.Add(S["Tools"], tools => tools + builder.Add(S["Settings"], settings => settings .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Amazon S3 Options"], S["Amazon S3 Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.AmazonS3") diff --git a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs index 25d8fc54ef1..f653b08a2fc 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media.Azure/AdminMenu.cs @@ -31,7 +31,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Tools"], tools => tools + .Add(S["Settings"], settings => settings .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Azure Blob Options"], S["Azure Blob Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media.Azure") diff --git a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs index 7fcc278c5e2..f36428800c6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/AdminMenu.cs @@ -63,7 +63,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) ); builder - .Add(S["Tools"], tools => tools + .Add(S["Settings"], settings => settings .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Options"], S["Options"].PrefixPosition(), options => options .Action("Options", "Admin", "OrchardCore.Media") diff --git a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs index 1fdc41496a0..d3f3cdfa043 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/MediaCacheAdminMenu.cs @@ -19,7 +19,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) builder .Add(S["Configuration"], configuration => configuration .Add(S["Media"], S["Media"].PrefixPosition(), media => media - .Add(S["Media cache"], S["Media cache"].PrefixPosition(), cache => cache + .Add(S["Media Cache"], S["Media Cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media") .Permission(MediaCachePermissions.ManageAssetCache) .LocalNav() @@ -31,7 +31,7 @@ protected override ValueTask BuildAsync(NavigationBuilder builder) } builder - .Add(S["Tools"], tools => tools + .Add(S["Settings"], settings => settings .Add(S["Media"], S["Media"].PrefixPosition(), media => media .Add(S["Cache"], S["Cache"].PrefixPosition(), cache => cache .Action("Index", "MediaCache", "OrchardCore.Media")