Skip to content

Dls release v1.2.0 #3104

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

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Dls release v1.2.0 #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18225a
TD-5327 Removes second toggle-menu stops nhsuk.js being instantiated …
kevwhitt-hee Feb 3, 2025
7fd2a25
Merge pull request #3103 from TechnologyEnhancedLearning/Develop/Fixe…
kevwhitt-hee Feb 3, 2025
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
1 change: 0 additions & 1 deletion DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<partial name="/Views/LearningPortal/Shared/_LoadingSpinner.cshtml" />
</div>
<partial name="_DlsFooter" />
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
@await RenderSectionAsync("scripts", false)
</div>
</body>
Expand Down
12 changes: 1 addition & 11 deletions DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,13 @@
}
</a>
</div>

@if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] != true)
{
<div class="nhsuk-header__content" id="content-header">
<div class="nhsuk-header__menu">
<button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-label="Open menu">Menu</button>
</div>
</div>
}
<vc:logo customisation-id="@((int?)ViewData[LayoutViewDataKeys.CustomisationIdForHeaderLogo])" />
</div>

@if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] != true)
{
<div class="nhsuk-navigation-container">
<nav class="nhsuk-header__navigation" id="header-navigation" aria-label="Primary navigation" role="navigation">
<nav class="nhsuk-navigation" id="header-navigation" aria-label="Primary navigation" role="navigation">
<ul class="nhsuk-header__navigation-list">
@if (IsSectionDefined("NavMenuItems"))
{
Expand Down Expand Up @@ -180,7 +171,6 @@
@await RenderSectionAsync("scripts", false)
<script src="@Url.Content("~/js/learningPortal/dlscommon.js")" asp-append-version="true"></script>
<script src="@Url.Content("~/js/cookiesbanner.js")" asp-append-version="true"></script>
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
<input type="hidden" id="keepAlivePingPath" value="@Url.Action("ping","keepSessionAlive")" />

</div>
Expand Down
Loading