Pre-render Navbar to allow resource injection (#14747)

OrchardCMS · Nov 23, 2023 · aa1e1bd · aa1e1bd
1 parent 8adccea
commit aa1e1bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
@@ -10,8 +10,9 @@
 @{
     var adminSettings = Site.As<AdminSettings>();
 
-    // Branding is pre-rendered to allow resource injection
+    // Branding and Navbar are pre-rendered to allow resource injection
     var brandingHtml = await DisplayAsync(await New.AdminBranding());
+    var navbar = await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater, "DetailAdmin");
 }
 <!DOCTYPE html>
 <html lang="@Orchard.CultureName()" dir="@Orchard.CultureDir()" data-bs-theme="@await ThemeTogglerService.CurrentTheme()" data-tenant="@ThemeTogglerService.CurrentTenant">
@@ -60,7 +61,7 @@
                             }
                         </div>
                     </div>
-                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater, "DetailAdmin"))
+                    @await DisplayAsync(navbar)
                 </div>
             </div>
         </nav>

diff --git a/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml b/src/OrchardCore.Themes/TheTheme/Views/Layout.cshtml
@@ -10,6 +10,8 @@
 @inject ThemeTogglerService ThemeTogglerService
 @{
     var adminSettings = Site.As<AdminSettings>();
+    // Navbar is pre-rendered to allow resource injection
+    var navbar = await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater);
 }
 <!DOCTYPE html>
 <html lang="@Orchard.CultureName()" dir="@Orchard.CultureDir()" data-bs-theme="@await ThemeTogglerService.CurrentTheme()" data-tenant="@ThemeTogglerService.CurrentTenant">
@@ -49,7 +51,7 @@
             <div class="collapse navbar-collapse" id="navbar">
                 <div class="d-flex w-100 align-items-end justify-content-end justify-content-md-between flex-column flex-md-row">
                     <menu alias="alias:main-menu" cache-id="main-menu" cache-fixed-duration="00:05:00" cache-tag="alias:main-menu" />
-                    @await DisplayAsync(await DisplayManager.BuildDisplayAsync<Navbar>(UpdateModelAccessor.ModelUpdater))
+                    @await DisplayAsync(navbar)
                 </div>
             </div>
         </div>