From 6ec46d58dd1c04530f380f70a24911fd748e3eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= Date: Tue, 21 Feb 2023 10:57:23 +0300 Subject: [PATCH 1/3] fix blog menu item --- .../BloggingAdminMenuContributor.cs | 4 ++-- .../Navigation/BloggingAdminMenuNames.cs | 8 ++++++++ .../Pages/Blogging/Admin/Blogs/Index.cshtml | 13 +++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) rename modules/blogging/src/Volo.Blogging.Admin.Web/{ => Navigation}/BloggingAdminMenuContributor.cs (77%) create mode 100644 modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuNames.cs diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminMenuContributor.cs b/modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuContributor.cs similarity index 77% rename from modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminMenuContributor.cs rename to modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuContributor.cs index 93fe6c60d7..5ecbd864f9 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminMenuContributor.cs +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuContributor.cs @@ -19,9 +19,9 @@ namespace Volo.Blogging.Admin { var l = context.GetLocalizer(); - var managementRootMenuItem = new ApplicationMenuItem("BlogManagement", l["Menu:BlogManagement"]).RequirePermissions(BloggingPermissions.Blogs.Management); + var managementRootMenuItem = new ApplicationMenuItem(BloggingAdminMenuNames.GroupName, l["Menu:BlogManagement"]).RequirePermissions(BloggingPermissions.Blogs.Management); - managementRootMenuItem.AddItem(new ApplicationMenuItem("BlogManagement.Blogs", l["Menu:Blogs"], "~/Blogging/Admin/Blogs").RequirePermissions(BloggingPermissions.Blogs.Management)); + managementRootMenuItem.AddItem(new ApplicationMenuItem(BloggingAdminMenuNames.Blogs, l["Menu:Blogs"], "~/Blogging/Admin/Blogs").RequirePermissions(BloggingPermissions.Blogs.Management)); context.Menu.GetAdministration().AddItem(managementRootMenuItem); diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuNames.cs b/modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuNames.cs new file mode 100644 index 0000000000..6c872fa536 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Navigation/BloggingAdminMenuNames.cs @@ -0,0 +1,8 @@ +namespace Volo.Blogging.Admin; + +public class BloggingAdminMenuNames +{ + public const string GroupName = "BlogManagement"; + + public const string Blogs = GroupName + ".Blogs"; +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml index 9cda27c462..702394dcdb 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml @@ -4,6 +4,13 @@ @using Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs @using Volo.Blogging @using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Table +@using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers +@using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Blogging.Localization @inherits Volo.Blogging.Admin.Pages.Blogging.BloggingAdminPage @model IndexModel @@ -12,6 +19,12 @@ @{ ViewBag.PageTitle = "Blogs"; } +@inject IPageLayout PageLayout +@{ + PageLayout.Content.Title = L["Blogs"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:Blogs"].Value); + PageLayout.Content.MenuItemName = BloggingAdminMenuNames.Blogs; +} @section scripts { From eda2af56c63166c4a4eae8999a0fbb289962f9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= Date: Tue, 21 Feb 2023 11:05:24 +0300 Subject: [PATCH 2/3] Update Index.cshtml --- .../Pages/Blogging/Admin/Blogs/Index.cshtml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml index 702394dcdb..29d42be4db 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml @@ -22,7 +22,6 @@ @inject IPageLayout PageLayout @{ PageLayout.Content.Title = L["Blogs"].Value; - PageLayout.Content.BreadCrumb.Add(L["Menu:Blogs"].Value); PageLayout.Content.MenuItemName = BloggingAdminMenuNames.Blogs; } From ad320babc2c3a8898b4beb8fbaab0ab07b316e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= Date: Tue, 21 Feb 2023 20:55:52 +0300 Subject: [PATCH 3/3] refactoring --- .../Pages/Blogging/Admin/Blogs/Index.cshtml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml index 29d42be4db..5133555cc6 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/Index.cshtml @@ -4,12 +4,6 @@ @using Volo.Blogging.Admin.Pages.Blogging.Admin.Blogs @using Volo.Blogging @using Microsoft.AspNetCore.Mvc.Localization -@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert -@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button -@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card -@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid -@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Table -@using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers @using Volo.Abp.AspNetCore.Mvc.UI.Layout @using Volo.Blogging.Localization @inherits Volo.Blogging.Admin.Pages.Blogging.BloggingAdminPage