Reorganize the Admin Menu

src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs

@@ -22,18 +22,34 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
 
     protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
-        builder
+        if (NavigationHelper.UseLegacyFormat())
+        {
+            builder
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["Settings"], settings => settings
                     .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
-                        .AddClass("admin").Id("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
+                    .AddClass("admin").Id("admin")
+                    .Action("Index", "Admin", _routeValues)
+                    .Permission(PermissionsAdminSettings.ManageAdminSettings)
+                    .LocalNav()
+                )
+            );
+
         return ValueTask.CompletedTask;
     }
 }

src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml

@@ -1,4 +1,15 @@
-<span class="icon">
-    <i class="fa-solid fa-tachometer" aria-hidden="true"></i>
+@using OrchardCore.Navigation
+
+@if (NavigationHelper.UseLegacyFormat())
+{
+    <span class="icon">
+        <i class="fa-solid fa-tachometer" aria-hidden="true"></i>
+    </span>
+    <span class="title">@Model.Text</span>
+
+    return;
+}
+
+<span class="icon icon-none">
 </span>
-<span class="title">@T["Admin"]</span>
+<span class="title">@Model.Text</span>

src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml

@@ -1 +1,4 @@
-<span class="icon"><i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i></span><span class="title">@T["Dashboard"]</span>
+<span class="icon">
+    <i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i>
+</span>
+<span class="title">@Model.Text</span>

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["Configuration"], configuration => configuration
-                .Add(S["Admin Menus"], S["Admin Menus"].PrefixPosition(), adminMenu => adminMenu
-                    .Permission(Permissions.ManageAdminMenu)
-                    .Action("List", "Menu", "OrchardCore.AdminMenu")
-                    .LocalNav()
-                )
-            );
+        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
+                        .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);

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs

@@ -14,8 +14,22 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
 
     protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
+        if (NavigationHelper.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["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)

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<AuditTrailAdminMenu> stringLocalizer)
@@ -22,13 +29,48 @@ public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer
 
     protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
+        if (NavigationHelper.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["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;

src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs

@@ -43,7 +43,6 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AuditTrailAdminMenu>();
-        services.AddNavigationProvider<AuditTrailSettingsAdminMenu>();
 
         services.AddSiteDisplayDriver<AuditTrailSettingsDisplayDriver>();
         services.AddSiteDisplayDriver<AuditTrailTrimmingSettingsDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.AuditTrail/Views/NavigationItemText-audittrail.Id.cshtml

@@ -1 +1,14 @@
-<span class="icon"><i class="fa-solid fa-history" aria-hidden="true"></i></span><span class="title">@Model.Text</span>
+@using OrchardCore.Navigation
+
+@if (NavigationHelper.UseLegacyFormat())
+{
+    <span class="icon">
+        <i class="fa-solid fa-history" aria-hidden="true"></i>
+    </span>
+    <span class="title">@Model.Text</span>
+
+    return;
+}
+
+<span class="icon icon-none"></span>
+<span class="title">@Model.Text</span>

src/OrchardCore.Modules/OrchardCore.BackgroundTasks/AdminMenu.cs

@@ -14,14 +14,28 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
 
     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
-                        .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks")
-                        .Permission(Permissions.ManageBackgroundTasks)
-                        .LocalNav()
+        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
+                            .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
+                    .Action("Index", "BackgroundTask", "OrchardCore.BackgroundTasks")
+                    .Permission(Permissions.ManageBackgroundTasks)
+                    .LocalNav()
                 )
             );
 

src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs

@@ -28,18 +28,20 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
 
     protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
-        builder
+        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)
@@ -50,6 +52,29 @@ protected override ValueTask BuildAsync(NavigationBuilder builder)
                 )
             );
 
+            return ValueTask.CompletedTask;
+        }
+
+        builder
+            .Add(S["Settings"], settings => settings
+                .Add(S["Localization"], S["Localization"].PrefixPosition(), localization => localization
+                    .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
+                        .AddClass("contentculturepicker")
+                        .Id("contentculturepicker")
+                        .Action("Index", "Admin", _pickerRouteValues)
+                        .Permission(Permissions.ManageContentCulturePicker)
+                        .LocalNav()
+                    )
+                )
+            );
+
         return ValueTask.CompletedTask;
     }
 }

src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs

@@ -18,15 +18,34 @@ public AdminMenu(IStringLocalizer<AdminMenu> 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["Content Definition"], S["Content Definition"].PrefixPosition("9"), contentDefinition => contentDefinition
-                    .Add(S["Content Types"], S["Content Types"].PrefixPosition("1"), contentTypes => contentTypes
+            .Add(S["Design"], content => content
+                .Add(S["Content definition"], S["Content definition"].PrefixPosition(), contentDefinition => contentDefinition
+                    .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()