Cleanup configuration menu (#13260)

OrchardCMS · Apr 20, 2023 · 0a8ad51 · 0a8ad51
1 parent 83f0978
commit 0a8ad51
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
@@ -23,7 +23,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
             }
 
             builder
-                .Add(S["Configuration"], design => design
+                .Add(S["Configuration"], configuration => configuration
                     .Add(S["Settings"], settings => settings
                         .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
                         .AddClass("admin").Id("admin")

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
@@ -22,8 +22,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
             }
 
             builder
-                .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, design => design
-                    .AddClass("menu-configuration").Id("configuration")
+                .Add(S["Configuration"], configuration => configuration
                     .Add(S["GraphiQL"], S["GraphiQL"].PrefixPosition(), deployment => deployment
                         .Action("Index", "Admin", new { area = "OrchardCore.Apis.GraphQL" })
                         .Permission(Permissions.ExecuteGraphQL)

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs
@@ -25,7 +25,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
             }
 
             builder
-                .Add(S["Configuration"], localization => localization
+                .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(), registration => registration

diff --git a/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Localization/AdminMenu.cs
@@ -28,7 +28,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
             if (String.Equals(name, "admin", StringComparison.OrdinalIgnoreCase))
             {
                 builder
-                    .Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, localization => localization
+                    .Add(S["Configuration"], configuration => configuration
                         .Add(S["Settings"], settings => settings
                             .Add(S["Localization"], localization => localization
                                 .AddClass("localization").Id("localization")

diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/AdminMenu.cs
@@ -23,11 +23,12 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
             }
 
             builder.Add(S["Configuration"], configuration => configuration
-                .AddClass("recipes").Id("recipes")
                 .Add(S["Recipes"], S["Recipes"].PrefixPosition(), recipes => recipes
+                    .AddClass("recipes").Id("recipes")
                     .Permission(StandardPermissions.SiteOwner)
                     .Action("Index", "Admin", new { area = "OrchardCore.Recipes" })
-                    .LocalNav())
+                    .LocalNav()
+                    )
                 );
 
             return Task.CompletedTask;

diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Sitemaps/AdminMenu.cs
@@ -21,7 +21,7 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
                 return Task.CompletedTask;
             }
 
-            builder.Add(S["Configuration"], NavigationConstants.AdminMenuConfigurationPosition, cfg => cfg
+            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

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/AdminMenu.cs
@@ -32,7 +32,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
 
             builder
                 .Add(S["Configuration"], configuration => configuration
-                    .AddClass("menu-configuration").Id("configuration")
                     .Add(S["Tenants"], S["Tenants"].PrefixPosition(), tenant => tenant
                         .Action("Index", "Admin", new { area = "OrchardCore.Tenants" })
                         .Permission(Permissions.ManageTenants)