diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs index 7d08f46eabb..fee003ba35f 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; @@ -9,10 +11,13 @@ using OrchardCore.Admin.Controllers; using OrchardCore.Admin.Drivers; 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 +98,38 @@ 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(nameof(Navbar), new FunctionValue(async (args, 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; + })); + + o.MemberAccessStrategy.Register((navbar, name, context) => + { + return name switch + { + nameof(Navbar.Properties) => new ObjectValue(navbar.Properties), + _ => NilValue.Instance + }; + }); + }); + } + } } diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml b/src/OrchardCore.Modules/OrchardCore.Admin/Views/Navbar.cshtml index 91b5f1d422d..81684dd717b 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, (string)Model.Metadata.DisplayType)); + + 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/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/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)); } 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..4e9858d9b0f 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); diff --git a/src/docs/reference/modules/Admin/README.md b/src/docs/reference/modules/Admin/README.md index 1d9a085227c..c1a29493539 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 navbar = Navbar() | shape_render %} + + // Subsequently in the layout.liquid file, invoke the shape at the location where you want to display it. + {{ navbar }} + ``` + +=== "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..38a9c99cc86 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 navbar = Navbar() | shape_render %} +``` +2. Subsequently in the `layout.liquid` file, invoke the shape at the location where you want to display it. + +``` +{{ navbar }} +```