Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEST-538: Fixing HTML validation errors, making sure menu.liquid is used #9

Merged
merged 11 commits into from
May 22, 2024
Merged

NEST-538: Fixing HTML validation errors, making sure menu.liquid is used #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e29531
Adding aria-label to main
DemeSzabolcs May 16, 2024
7311acc
Trying to fix menu
DemeSzabolcs May 16, 2024
7adcf7b
Debugging menu
DemeSzabolcs May 17, 2024
07bbfcb
Revert "Debugging menu"
DemeSzabolcs May 18, 2024
9498504
Renaming menu
DemeSzabolcs May 18, 2024
12feefb
Renaming menu.liquid to lowercase
DemeSzabolcs May 18, 2024
5f2372b
Updating layout with localization
DemeSzabolcs May 20, 2024
2292b37
Unlocalizing because of liquid
DemeSzabolcs May 20, 2024
aa3601c
Localization
DemeSzabolcs May 20, 2024
62570ef
Downgrading to OC 1.8.0
DemeSzabolcs May 20, 2024
69bf974
Updating NuGet packages
DemeSzabolcs May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ShowOrchard.Theme/ShowOrchard.Theme.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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))">
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ShowOrchard.Theme/Views/Layout.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ShowOrchard.Theme/Views/Menu.liquid → ShowOrchard.Theme/Views/menu.liquid
View file
Open in desktop
File renamed without changes.