From 5b9584e1bf3a2f4a571c1a094b081402111e6a23 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 5 Mar 2024 10:30:50 -0800 Subject: [PATCH 1/5] Add Navbar shape liquid helpers --- .../Liquid/NavbarAccessor.cs | 5 +++ .../Liquid/NavbarShapeFilter.cs | 30 +++++++++++++++++ .../OrchardCore.Admin/Startup.cs | 32 +++++++++++++++++++ .../TheAdmin/Views/Layout.cshtml | 2 +- .../TheBlogTheme/Views/Layout.liquid | 2 ++ .../TheTheme/Views/Layout.cshtml | 2 +- 6 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs create mode 100644 src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs new file mode 100644 index 00000000000..d661765ef7a --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs @@ -0,0 +1,5 @@ +namespace OrchardCore.Admin.Liquid; + +public class NavbarAccessor +{ +} diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs new file mode 100644 index 00000000000..268b27dfc4d --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs @@ -0,0 +1,30 @@ +using System.Threading.Tasks; +using Fluid; +using Fluid.Values; +using OrchardCore.Admin.Models; +using OrchardCore.DisplayManagement; +using OrchardCore.DisplayManagement.ModelBinding; +using OrchardCore.Liquid; + +namespace OrchardCore.Admin.Liquid; + +public class NavbarShapeFilter : ILiquidFilter +{ + private readonly IDisplayManager _displayManager; + private readonly IUpdateModelAccessor _updateModelAccessor; + + public NavbarShapeFilter( + IDisplayManager displayManager, + IUpdateModelAccessor updateModelAccessor) + { + _displayManager = displayManager; + _updateModelAccessor = updateModelAccessor; + } + + public async ValueTask ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context) + { + var shape = await _displayManager.BuildDisplayAsync(_updateModelAccessor.ModelUpdater); + + return FluidValue.Create(shape, context.Options); + } +} diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index 7d08f46eabb..cc8023b5484 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs @@ -1,4 +1,6 @@ using System; +using Fluid; +using Fluid.Values; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApplicationModels; @@ -8,11 +10,15 @@ using Microsoft.Extensions.Options; using OrchardCore.Admin.Controllers; using OrchardCore.Admin.Drivers; +using OrchardCore.Admin.Liquid; using OrchardCore.Admin.Models; +using OrchardCore.DisplayManagement; using OrchardCore.DisplayManagement.Handlers; +using OrchardCore.DisplayManagement.ModelBinding; using OrchardCore.DisplayManagement.Theming; using OrchardCore.Environment.Shell.Configuration; using OrchardCore.Environment.Shell.Scope; +using OrchardCore.Liquid; using OrchardCore.Modules; using OrchardCore.Mvc.Core.Utilities; using OrchardCore.Mvc.Routing; @@ -93,4 +99,30 @@ public override void ConfigureServices(IServiceCollection services) services.AddSiteSettingsPropertyDeploymentStep(S => S["Admin settings"], S => S["Exports the admin settings."]); } } + + [RequireFeatures("OrchardCore.Liquid")] + public class LiquidStartup : StartupBase + { + public override void ConfigureServices(IServiceCollection services) + { + services.Configure(o => + { + o.Scope.SetValue("Navbar", new ObjectValue(new NavbarAccessor())); + o.MemberAccessStrategy.Register(async (obj, name, ctx) => + { + if (ctx is LiquidTemplateContext context) + { + var displayManager = context.Services.GetRequiredService>(); + var updateModelAccessor = context.Services.GetRequiredService(); + + var shape = await displayManager.BuildDisplayAsync(updateModelAccessor.ModelUpdater); + + return FluidValue.Create(shape, ctx.Options); + } + + return NilValue.Instance; + }); + }); + } + } } diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml index f1f5e2e92c2..be7a31a8c0d 100644 --- a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml +++ b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml @@ -12,7 +12,7 @@ // Branding and Navbar are pre-rendered to allow resource injection. var brandingHtml = await DisplayAsync(await New.AdminBranding()); - var navbar = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, "DetailAdmin")); + var navbar = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, "DetailAdmin")); } diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid index eef06ae255c..4cfb2137fc1 100644 --- a/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid +++ b/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid @@ -1,3 +1,4 @@ +{% assign navbarShape = Navbar | shape_render %} @@ -30,6 +31,7 @@ {{ "Menu" | t }} {% shape "menu", alias: "alias:main-menu", cache_id: "main-menu", cache_fixed_duration: "00:05:00", cache_tag: "alias:main-menu" %} + {{ navbarShape }} {% render_section "Header", required: false %} diff --git a/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml index d4b1f23ac1c..2fe8b0e2ea0 100644 --- a/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml +++ b/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml @@ -11,7 +11,7 @@ @{ var adminSettings = Site.As(); // Navbar is pre-rendered to allow resource injection. - var navbar = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater)); + var navbar = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater)); } From 30d2ae5ece62ba9b0ea20c7454fc163135951f7c Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Sun, 17 Mar 2024 13:14:33 -0700 Subject: [PATCH 2/5] Adding Navbar shape type for Liquid --- src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs | 11 ++++++++++- .../TheBlogTheme/Views/Layout.liquid | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index cc8023b5484..acbd6fd9bc3 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs @@ -107,7 +107,7 @@ public override void ConfigureServices(IServiceCollection services) { services.Configure(o => { - o.Scope.SetValue("Navbar", new ObjectValue(new NavbarAccessor())); + o.Scope.SetValue(nameof(Navbar), new ObjectValue(new NavbarAccessor())); o.MemberAccessStrategy.Register(async (obj, name, ctx) => { if (ctx is LiquidTemplateContext context) @@ -122,6 +122,15 @@ public override void ConfigureServices(IServiceCollection services) return NilValue.Instance; }); + + o.MemberAccessStrategy.Register((navbar, name, context) => + { + return name switch + { + nameof(Navbar.Properties) => new ObjectValue(navbar.Properties), + _ => NilValue.Instance + }; + }); }); } } diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid index 4cfb2137fc1..eef06ae255c 100644 --- a/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid +++ b/src/OrchardCore.Themes/TheBlogTheme/Views/Layout.liquid @@ -1,4 +1,3 @@ -{% assign navbarShape = Navbar | shape_render %} @@ -31,7 +30,6 @@ {{ "Menu" | t }} {% shape "menu", alias: "alias:main-menu", cache_id: "main-menu", cache_fixed_duration: "00:05:00", cache_tag: "alias:main-menu" %} - {{ navbarShape }} {% render_section "Header", required: false %} From c714cde78df3cdf7eed31c86e5316191f74d62d8 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 21 Mar 2024 11:46:47 -0700 Subject: [PATCH 3/5] Add Navbar() function and document the changes --- .../OrchardCore.Admin/Startup.cs | 9 +++-- .../OrchardCore.Admin/Views/Navbar.cshtml | 16 ++++++++- ...ContentCulturePickerNavbarDisplayDriver.cs | 34 ++----------------- .../Views/ContentCulturePicker.cshtml | 21 ++++++++++-- .../Views/NavbarUserMenu.cshtml | 2 +- .../TheTheme/Views/NavbarUserMenu.cshtml | 2 +- .../LiquidViewParser.cs | 2 ++ src/docs/reference/modules/Admin/README.md | 30 +++++++++++++++- src/docs/releases/1.9.0.md | 16 ++++++++- 9 files changed, 89 insertions(+), 43 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index acbd6fd9bc3..9a7ff60dec3 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.Options; using OrchardCore.Admin.Controllers; using OrchardCore.Admin.Drivers; -using OrchardCore.Admin.Liquid; using OrchardCore.Admin.Models; using OrchardCore.DisplayManagement; using OrchardCore.DisplayManagement.Handlers; @@ -107,8 +106,7 @@ public override void ConfigureServices(IServiceCollection services) { services.Configure(o => { - o.Scope.SetValue(nameof(Navbar), new ObjectValue(new NavbarAccessor())); - o.MemberAccessStrategy.Register(async (obj, name, ctx) => + o.Scope.SetValue(nameof(Navbar), new FunctionValue(async (args, ctx) => { if (ctx is LiquidTemplateContext context) { @@ -121,8 +119,8 @@ public override void ConfigureServices(IServiceCollection services) } return NilValue.Instance; - }); - + })); + /* o.MemberAccessStrategy.Register((navbar, name, context) => { return name switch @@ -131,6 +129,7 @@ public override void ConfigureServices(IServiceCollection services) _ => NilValue.Instance }; }); + */ }); } } diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml b/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml index 91b5f1d422d..660e9509314 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml @@ -1,6 +1,20 @@ +@using OrchardCore.Admin.Models +@using OrchardCore.DisplayManagement +@using OrchardCore.DisplayManagement.ModelBinding + +@inject IDisplayManager DisplayManager +@inject IUpdateModelAccessor UpdateModelAccessor + @if (Model.Content == null) { - return; + dynamic shape = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, "DetailAdmin")); + + if (shape.Content == null) + { + return; + } + + Model.Content = shape.Content; }
    diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerNavbarDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerNavbarDisplayDriver.cs index a8ed26a24a0..6261765a95f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerNavbarDisplayDriver.cs +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerNavbarDisplayDriver.cs @@ -1,42 +1,14 @@ -using System.Globalization; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Localization; using OrchardCore.Admin.Models; -using OrchardCore.ContentLocalization.ViewModels; using OrchardCore.DisplayManagement.Handlers; using OrchardCore.DisplayManagement.Views; -using OrchardCore.Localization; namespace OrchardCore.ContentLocalization.Drivers; public class ContentCulturePickerNavbarDisplayDriver : DisplayDriver { - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly ILocalizationService _localizationService; - - public ContentCulturePickerNavbarDisplayDriver( - IHttpContextAccessor httpContextAccessor, - ILocalizationService localizationService) - { - _httpContextAccessor = httpContextAccessor; - _localizationService = localizationService; - } - - public override async Task DisplayAsync(Navbar model, BuildDisplayContext context) + public override IDisplayResult Display(Navbar model) { - var supportedCultures = (await _localizationService.GetSupportedCulturesAsync()).Select(c => CultureInfo.GetCultureInfo(c)); - - return Initialize("ContentCulturePicker", model => - { - model.SupportedCultures = supportedCultures; - model.CurrentCulture = _httpContextAccessor - .HttpContext - .Features - .Get()?.RequestCulture?.Culture ?? CultureInfo.CurrentUICulture; - - }).RenderWhen(() => Task.FromResult(supportedCultures.Count() > 1)) - .Location("Detail", "Content:5"); + return View("ContentCulturePicker", model) + .Location("Detail", "Content:5"); } } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Views/ContentCulturePicker.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Views/ContentCulturePicker.cshtml index 6f25b695e5b..3f059e42635 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Views/ContentCulturePicker.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Views/ContentCulturePicker.cshtml @@ -1,7 +1,24 @@ +@using Microsoft.AspNetCore.Localization +@using OrchardCore.Localization +@using System.Globalization + +@inject ILocalizationService LocalizationService +@{ + var supportedCultures = (await LocalizationService.GetSupportedCulturesAsync()).Select(c => CultureInfo.GetCultureInfo(c)); + + if (supportedCultures.Count() < 2) + { + return; + } + + var currentCulture = Context.Request.HttpContext.Features + .Get()?.RequestCulture?.Culture ?? CultureInfo.CurrentUICulture; +} +
  • - +
    - @foreach (var culture in Model.SupportedCultures) + @foreach (var culture in supportedCultures) { if (culture.Name != Model.CurrentCulture.Name) { diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml index baeae2fd23c..ef54c10a202 100644 --- a/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/NavbarUserMenu.cshtml @@ -5,5 +5,5 @@ @inject IUpdateModelAccessor UpdateModelAccessor
  • - @await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType)) + @await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType))
    • diff --git a/src/OrchardCore.Themes/TheTheme/Views/NavbarUserMenu.cshtml b/src/OrchardCore.Themes/TheTheme/Views/NavbarUserMenu.cshtml index 7783314f8d9..3d16bbfcdad 100644 --- a/src/OrchardCore.Themes/TheTheme/Views/NavbarUserMenu.cshtml +++ b/src/OrchardCore.Themes/TheTheme/Views/NavbarUserMenu.cshtml @@ -5,4 +5,4 @@ @inject IDisplayManager DisplayManager @inject IUpdateModelAccessor UpdateModelAccessor -@await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType)) +@await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType)) diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs index 138e3c1c2c0..77e479ddc1b 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs @@ -15,6 +15,7 @@ namespace OrchardCore.DisplayManagement.Liquid public class LiquidViewParser : FluidParser { public LiquidViewParser(IOptions liquidViewOptions) + : base(new FluidParserOptions() { AllowFunctions = true }) { RegisterEmptyTag("render_body", RenderBodyTag.WriteToAsync); RegisterParserTag("render_section", ArgumentsList, RenderSectionTag.WriteToAsync); @@ -63,6 +64,7 @@ public LiquidViewParser(IOptions liquidViewOptions) { configuration(this); } + } public Parser> ArgumentsListParser => ArgumentsList; diff --git a/src/docs/reference/modules/Admin/README.md b/src/docs/reference/modules/Admin/README.md index 1d9a085227c..a82d01ab977 100644 --- a/src/docs/reference/modules/Admin/README.md +++ b/src/docs/reference/modules/Admin/README.md @@ -54,7 +54,35 @@ Here are samples using logo and favicon from media module. ## Navbar Shape -The navigation bar shape is available in two display types `Detail` for the frontend and `DetailAdmin` for the backend admin. If you wish to add a menu item to the navigation bar, simply create a display driver for `Navbar`. +The navigation bar shape is available in two display types `Detail` for the frontend and `DetailAdmin` for the backend admin. The `Navbar` shape is composed and used `TheAdmin` and `TheTheme` themes. If you wish to compose and use the `Navbar` shape in other themes, you may create it using two steps + + +=== "Liquid" + + ``` liquid + // Construct the shape at the beginning of the layout.liquid file to enable navbar items to potentially contribute to the resources output as necessary. + {% assign navbarShape = Navbar() | shape_render %} + + // Subsequently in the layout.liquid file, invoke the shape at the location where you want to display it. + {{ navbarShape }} + ``` + +=== "Razor" + + ``` html + @inject IDisplayManager DisplayManager + @inject IUpdateModelAccessor UpdateModelAccessor + @{ + // Construct the shape at the beginning of the layout.cshtml file to enable navbar items to potentially contribute to the resources output as necessary. + var navbar = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, "Detail")); + } + + // Subsequently in the layout.cshtml file, invoke the shape at the location where you want to display it. + @navbar + ``` + + +If you wish to add a menu item to the navbar, simply create a display driver for `Navbar`. As an illustration, we inject the Visit Site link into `DetailAdmin` display type using a display driver as outlined below: diff --git a/src/docs/releases/1.9.0.md b/src/docs/releases/1.9.0.md index 6d354ff6fa7..aae8133054b 100644 --- a/src/docs/releases/1.9.0.md +++ b/src/docs/releases/1.9.0.md @@ -182,7 +182,21 @@ public class PersonController : Controller In this example, (if the admin prefix remains the default "Admin") you can reach the Index action at `~/Admin/Person` (or by the route name `Person`), because its own action-level attribute took precedence. You can reach Create at `~/Admin/Person/Create` (route name `PersonCreate`) and Edit for the person whose identifier string is "john-doe" at `~/Admin/Person/john-doe` (route name `PersonEdit`). -## Users Module +### Users Module Added a new User Localization feature that allows to be able to configure the culture per user from the admin UI. +### Navbar + +Added a new `Navbar()` function to Liquid to allow building the `Navbar` shape using Liquid. Here are the steps needed to add the `Navbar` shape into your custom Liquid shape: + +1. Construct the shape at the beginning of the `layout.liquid` file to enable navbar items to potentially contribute to the resources output as necessary. + +``` +{% assign navbarShape = Navbar() | shape_render %} +``` +2. Subsequently in the `layout.liquid` file, invoke the shape at the location where you want to display it. + +``` +{{ navbarShape }} +``` From d0014877a02322ab9fdc3670b2218b62230a4c9b Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 21 Mar 2024 11:53:04 -0700 Subject: [PATCH 4/5] cleanup --- src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs | 3 +-- src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml | 2 +- .../OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs | 1 - src/docs/reference/modules/Admin/README.md | 4 ++-- src/docs/releases/1.9.0.md | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index 9a7ff60dec3..fee003ba35f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs @@ -120,7 +120,7 @@ public override void ConfigureServices(IServiceCollection services) return NilValue.Instance; })); - /* + o.MemberAccessStrategy.Register((navbar, name, context) => { return name switch @@ -129,7 +129,6 @@ public override void ConfigureServices(IServiceCollection services) _ => NilValue.Instance }; }); - */ }); } } diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml b/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml index 660e9509314..81684dd717b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml @@ -7,7 +7,7 @@ @if (Model.Content == null) { - dynamic shape = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, "DetailAdmin")); + dynamic shape = await DisplayAsync(await DisplayManager.BuildDisplayAsync(UpdateModelAccessor.ModelUpdater, (string)Model.Metadata.DisplayType)); if (shape.Content == null) { diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs index 77e479ddc1b..4e9858d9b0f 100644 --- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs +++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewParser.cs @@ -64,7 +64,6 @@ public LiquidViewParser(IOptions liquidViewOptions) { configuration(this); } - } public Parser> ArgumentsListParser => ArgumentsList; diff --git a/src/docs/reference/modules/Admin/README.md b/src/docs/reference/modules/Admin/README.md index a82d01ab977..c1a29493539 100644 --- a/src/docs/reference/modules/Admin/README.md +++ b/src/docs/reference/modules/Admin/README.md @@ -61,10 +61,10 @@ The navigation bar shape is available in two display types `Detail` for the fron ``` liquid // Construct the shape at the beginning of the layout.liquid file to enable navbar items to potentially contribute to the resources output as necessary. - {% assign navbarShape = Navbar() | shape_render %} + {% assign navbar = Navbar() | shape_render %} // Subsequently in the layout.liquid file, invoke the shape at the location where you want to display it. - {{ navbarShape }} + {{ navbar }} ``` === "Razor" diff --git a/src/docs/releases/1.9.0.md b/src/docs/releases/1.9.0.md index aae8133054b..38a9c99cc86 100644 --- a/src/docs/releases/1.9.0.md +++ b/src/docs/releases/1.9.0.md @@ -193,10 +193,10 @@ Added a new `Navbar()` function to Liquid to allow building the `Navbar` shape u 1. Construct the shape at the beginning of the `layout.liquid` file to enable navbar items to potentially contribute to the resources output as necessary. ``` -{% assign navbarShape = Navbar() | shape_render %} +{% assign navbar = Navbar() | shape_render %} ``` 2. Subsequently in the `layout.liquid` file, invoke the shape at the location where you want to display it. ``` -{{ navbarShape }} +{{ navbar }} ``` From 14c85f4764ab8fc4ad4aa06cd032f2e8cc22aa88 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 21 Mar 2024 11:54:39 -0700 Subject: [PATCH 5/5] cleanup --- .../Liquid/NavbarAccessor.cs | 5 ---- .../Liquid/NavbarShapeFilter.cs | 30 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs delete mode 100644 src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs deleted file mode 100644 index d661765ef7a..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarAccessor.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace OrchardCore.Admin.Liquid; - -public class NavbarAccessor -{ -} diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs deleted file mode 100644 index 268b27dfc4d..00000000000 --- a/src/OrchardCore.Modules/OrchardCore.Admin/Liquid/NavbarShapeFilter.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Threading.Tasks; -using Fluid; -using Fluid.Values; -using OrchardCore.Admin.Models; -using OrchardCore.DisplayManagement; -using OrchardCore.DisplayManagement.ModelBinding; -using OrchardCore.Liquid; - -namespace OrchardCore.Admin.Liquid; - -public class NavbarShapeFilter : ILiquidFilter -{ - private readonly IDisplayManager _displayManager; - private readonly IUpdateModelAccessor _updateModelAccessor; - - public NavbarShapeFilter( - IDisplayManager displayManager, - IUpdateModelAccessor updateModelAccessor) - { - _displayManager = displayManager; - _updateModelAccessor = updateModelAccessor; - } - - public async ValueTask ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext context) - { - var shape = await _displayManager.BuildDisplayAsync(_updateModelAccessor.ModelUpdater); - - return FluidValue.Create(shape, context.Options); - } -}