Merge pull request #9 from Lombiq/issue/NEST-538

sarahelsaig · web-flow · commit 2d1c4d51e81d · 2024-05-22T21:17:00.000+02:00
NEST-538: Fixing HTML validation errors, making sure menu.liquid is used
diff --git a/ShowOrchard.Theme/ShowOrchard.Theme.csproj b/ShowOrchard.Theme/ShowOrchard.Theme.csproj
@@ -15,11 +15,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OrchardCore.Theme.Targets" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.2" />
-        <PackageReference Include="OrchardCore.Taxonomies" Version="1.8.2" />
+        <PackageReference Include="OrchardCore.Theme.Targets" Version="1.8.0" />
+        <PackageReference Include="OrchardCore.ContentManagement" Version="1.8.0" />
+        <PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.0" />
+        <PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.0" />
+        <PackageReference Include="OrchardCore.Taxonomies" Version="1.8.0" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -41,7 +41,7 @@
     </ImportGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true' or !Exists($(LombiqHelpfulExtensionsPath))">
-        <PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.0" />
+        <PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true' or !Exists($(LombiqNodeJsExtensionsPath))">
@@ -56,8 +56,8 @@
 
     <ItemGroup>
         <ProjectReference Condition="Exists($(LombiqHostingMediaThemePath))" Include="$(LombiqHostingMediaThemePath)" />
-        <PackageReference Condition="!Exists($(LombiqHostingMediaThemePath))" Include="Lombiq.Hosting.MediaTheme" Version="6.0.0" />
-        <PackageReference Condition="!Exists($(LombiqHostingMediaThemeTargetsProps))" Include="Lombiq.Hosting.MediaTheme.Targets" Version="6.0.0" />
+        <PackageReference Condition="!Exists($(LombiqHostingMediaThemePath))" Include="Lombiq.Hosting.MediaTheme" Version="6.0.1" />
+        <PackageReference Condition="!Exists($(LombiqHostingMediaThemeTargetsProps))" Include="Lombiq.Hosting.MediaTheme.Targets" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ShowOrchard.Theme/Views/Layout.liquid b/ShowOrchard.Theme/Views/Layout.liquid
@@ -25,15 +25,15 @@
 </head>
 <body dir="{{ Culture.Dir }}">
 <header class="header">
-    <nav class="header__navigation navigation">
+    <nav class="header__navigation navigation" aria-label="{{ "Main navigation" | t }}">
         <div class="navigation__container container d-flex justify-content-between">
             <a class="navigation__logo" href="{{ "~/" | href }}">Show Orchard</a>
-            <button class="navigation__toggler navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainMenuContainer" aria-label="Toggle navigation">
+            <button class="navigation__toggler navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainMenuContainer" aria-label="{{ "Toggle navigation" | t }}">
                 <span class="navigation__togglerIcon"></span>
             </button>
         </div>
         <div class="navigation__menuContainer container collapse" id="mainMenuContainer">
-            {% shape "menu", alias: "alias:main-menu" %}
+            {% shape "menu", alias: "alias:main-menu", cache_id: "main-menu", cache_duration: "00:05:00", cache_tag: "alias:main-menu" %}
         </div>
     </nav>
 </header>
diff --git a/ShowOrchard.Theme/Views/menu.liquid b/ShowOrchard.Theme/Views/menu.liquid
