From 15366e89e58d47b992481da356a6d2cd0aef1e09 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 31 Mar 2011 15:44:24 -0700 Subject: [PATCH] Fixing #17500: Change order of menu items to reflect real usage --HG-- branch : 1.x --- src/Orchard.Web/Core/Navigation/AdminMenu.cs | 2 +- src/Orchard.Web/Core/Reports/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs | 3 +-- src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs | 2 +- src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/AdminMenu.cs b/src/Orchard.Web/Core/Navigation/AdminMenu.cs index 5aaab0c05..3ecb9f64f 100644 --- a/src/Orchard.Web/Core/Navigation/AdminMenu.cs +++ b/src/Orchard.Web/Core/Navigation/AdminMenu.cs @@ -9,7 +9,7 @@ namespace Orchard.Core.Navigation { public void GetNavigation(NavigationBuilder builder) { //todo: - add new menu? and list menus? ...and remove hard-coded menu name here builder.AddImageSet("navigation") - .Add(T("Navigation"), "6", + .Add(T("Navigation"), "7", menu => menu .Add(T("Main Menu"), "0", item => item.Action("Index", "Admin", new { area = "Navigation" }) .Permission(Permissions.ManageMainMenu))); diff --git a/src/Orchard.Web/Core/Reports/AdminMenu.cs b/src/Orchard.Web/Core/Reports/AdminMenu.cs index 75ac9d39c..b8c1a0e76 100644 --- a/src/Orchard.Web/Core/Reports/AdminMenu.cs +++ b/src/Orchard.Web/Core/Reports/AdminMenu.cs @@ -9,7 +9,7 @@ namespace Orchard.Core.Reports { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("reports") - .Add(T("Reports"), "50", + .Add(T("Reports"), "12", menu => menu.Add(T("View"), "0", item => item.Action("Index", "Admin", new { area = "Reports" }) .Permission(StandardPermissions.AccessAdminPanel))); } diff --git a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs index fc1861c8e..6f8ef8cf0 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs @@ -9,7 +9,7 @@ namespace Orchard.Comments { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("comments") - .Add(T("Comments"), "30", + .Add(T("Comments"), "4", menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" }) .Permission(Permissions.ManageComments))); } diff --git a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs index b8c35b8cf..38d074bfc 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/AdminMenu.cs @@ -13,7 +13,7 @@ namespace Orchard.Media { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("media") - .Add(T("Media"), "8", + .Add(T("Media"), "6", menu => menu.Add(T("Media"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Media" }) .Permission(Permissions.ManageMedia))); } diff --git a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs index be5007cf9..3fcbf4553 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs @@ -12,7 +12,7 @@ namespace Orchard.Modules { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("modules") - .Add(T("Modules"), "20", menu => menu.Action("Features", "Admin", new {area = "Orchard.Modules"}).Permission(Permissions.ManageFeatures) + .Add(T("Modules"), "9", menu => menu.Action("Features", "Admin", new {area = "Orchard.Modules"}).Permission(Permissions.ManageFeatures) .Add(T("Features"), "0", item => item.Action("Features", "Admin", new {area = "Orchard.Modules"}).Permission(Permissions.ManageFeatures).LocalNav()) .Add(T("Installed"), "1", item => item.Action("Index", "Admin", new {area = "Orchard.Modules"}).Permission(StandardPermissions.SiteOwner).LocalNav())); } diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs index 5ac706c71..d2f1ab9a9 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs @@ -1,5 +1,4 @@ -using Orchard.Environment; -using Orchard.Environment.Configuration; +using Orchard.Environment.Configuration; using Orchard.Localization; using Orchard.Security; using Orchard.UI.Navigation; diff --git a/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs index c670b3311..489206872 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Tags { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("tags") - .Add(T("Tags"), "35", + .Add(T("Tags"), "8", menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Tags" }) .Permission(Permissions.ManageTags))); } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs index 07256906c..5f1e0a5c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Themes { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("themes") - .Add(T("Themes"), "25", menu => menu.Action("Index", "Admin", new { area = "Orchard.Themes" }).Permission(Permissions.ApplyTheme) + .Add(T("Themes"), "10", menu => menu.Action("Index", "Admin", new { area = "Orchard.Themes" }).Permission(Permissions.ApplyTheme) .Add(T("Installed"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" }).Permission(Permissions.ApplyTheme).LocalNav())); } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs index 46ee208ce..7c36edcd2 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs @@ -9,7 +9,7 @@ namespace Orchard.Users { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("users") - .Add(T("Users"), "40", + .Add(T("Users"), "11", menu => menu.Action("Index", "Admin", new { area = "Orchard.Users" }).Permission(StandardPermissions.SiteOwner) .Add(T("Users"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }) .LocalNav().Permission(StandardPermissions.SiteOwner))); diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs index c8a54a50f..1f236d331 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Widgets { public void GetNavigation(NavigationBuilder builder) { builder.AddImageSet("widgets") - .Add(T("Widgets"), "10", + .Add(T("Widgets"), "5", menu => menu.Add(T("Configure"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Widgets" }) .Permission(Permissions.ManageWidgets))); }