Skip to content

Commit b201060

Browse files
kevwhitt-heekevwhitt-hee
committed
Sets nav width to same as width container override and loads nhsuk js
1 parent 8f26f84 commit b201060

File tree

3 files changed

+78
-75
lines changed

3 files changed

+78
-75
lines changed

‎DigitalLearningSolutions.Web/Styles/layout.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ nav, .nhsuk-header__navigation, #header-navigation {
329329
}
330330
}
331331

332-
.nhsuk-width-container {
332+
.nhsuk-width-container, .nhsuk-header__navigation-list {
333333
max-width: 1144px !important;
334334
padding-left: $nhsuk-gutter !important;
335335
padding-right: $nhsuk-gutter !important;

‎DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<partial name="/Views/LearningPortal/Shared/_LoadingSpinner.cshtml" />
9696
</div>
9797
<partial name="_DlsFooter" />
98+
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
9899
@await RenderSectionAsync("scripts", false)
99100
</div>
100101
</body>

‎DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml‎

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -80,90 +80,93 @@
8080
</div>
8181
</div>
8282
}
83-
<div class="nhsuk-width-container nhsuk-header__container">
84-
<div class="nhsuk-header__logo">
85-
<a class="nhsuk-header__link nhsuk-header__link--service"
86-
href="@(ViewData[LayoutViewDataKeys.HeaderPath] ?? Configuration["AppRootPath"] + "/Home")"
87-
aria-label="NHS Digital Learning Solutions - @(ViewData[LayoutViewDataKeys.HeaderPathName] ?? "Landing Page")">
88-
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="NHS Logo" focusable="false" viewBox="0 0 40 16">
89-
<title>NHS</title>
90-
<path class="nhsuk-logo__background" d="M0 0h40v16H0z"></path>
91-
<path class="nhsuk-logo__text" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
92-
<image src="https://assets.nhs.uk/images/nhs-logo.png" width="40" height="16" xlink:href=""></image>
93-
</svg>
94-
95-
<span class="nhsuk-header__service-name">@(ViewData[LayoutViewDataKeys.HeaderPrefix] ?? "Digital Learning Solutions ")@(headerExtension)</span>
96-
@if (ViewData[LayoutViewDataKeys.Application] != null)
83+
<div class="nhsuk-width-container nhsuk-header__container">
84+
<div class="nhsuk-header__logo">
85+
<a class="nhsuk-header__link nhsuk-header__link--service"
86+
href="@(ViewData[LayoutViewDataKeys.HeaderPath] ?? Configuration["AppRootPath"] + "/Home")"
87+
aria-label="NHS Digital Learning Solutions - @(ViewData[LayoutViewDataKeys.HeaderPathName] ?? "Landing Page")">
88+
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="NHS Logo" focusable="false" viewBox="0 0 40 16">
89+
<title>NHS</title>
90+
<path class="nhsuk-logo__background" d="M0 0h40v16H0z"></path>
91+
<path class="nhsuk-logo__text" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
92+
<image src="https://assets.nhs.uk/images/nhs-logo.png" width="40" height="16" xlink:href=""></image>
93+
</svg>
94+
95+
<span class="nhsuk-header__service-name">@(ViewData[LayoutViewDataKeys.HeaderPrefix] ?? "Digital Learning Solutions ")@(headerExtension)</span>
96+
@if (ViewData[LayoutViewDataKeys.Application] != null)
97+
{
98+
if (ViewData[LayoutViewDataKeys.Application].ToString() == "Framework Service" | ViewData[LayoutViewDataKeys.Application].ToString() == "Supervise")
9799
{
98-
if (ViewData[LayoutViewDataKeys.Application].ToString() == "Framework Service" | ViewData[LayoutViewDataKeys.Application].ToString() == "Supervise")
99-
{
100-
<sup class="header-beta header-beta--dark">Beta</sup>
101-
}
100+
<sup class="header-beta header-beta--dark">Beta</sup>
102101
}
103-
</a>
104-
</div>
105-
106-
@if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] != true)
107-
{
108-
<div class="nhsuk-header__content" id="content-header">
109-
<div class="nhsuk-header__menu">
110-
<button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-label="Open menu">Menu</button>
111-
</div>
112-
</div>
113-
}
114-
<vc:logo customisation-id="@((int?)ViewData[LayoutViewDataKeys.CustomisationIdForHeaderLogo])" />
102+
}
103+
</a>
115104
</div>
116105

117106
@if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] != true)
118107
{
119-
<div class="nhsuk-navigation-container">
120-
<nav class="nhsuk-header__navigation" id="header-navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
121-
<div class="nhsuk-width-container">
122-
<ul class="nhsuk-header__navigation-list">
123-
@if (IsSectionDefined("NavMenuItems"))
124-
{
125-
@RenderSection("NavMenuItems", true)
126-
}
127-
else if (dlsSubApplication != null)
128-
{
129-
<partial name="_AutoNavMenuItems.cshtml" model="@dlsSubApplication" />
130-
}
108+
<div class="nhsuk-header__content" id="content-header">
109+
<div class="nhsuk-header__menu">
110+
<button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-label="Open menu">Menu</button>
111+
</div>
112+
</div>
113+
}
114+
<vc:logo customisation-id="@((int?)ViewData[LayoutViewDataKeys.CustomisationIdForHeaderLogo])" />
115+
</div>
116+
117+
@if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] != true)
118+
{
119+
<div class="nhsuk-navigation-container">
120+
<nav class="nhsuk-header__navigation" id="header-navigation" aria-label="Primary navigation" role="navigation">
121+
<ul class="nhsuk-header__navigation-list">
122+
@if (IsSectionDefined("NavMenuItems"))
123+
{
124+
@RenderSection("NavMenuItems", true)
125+
}
126+
else if (dlsSubApplication != null)
127+
{
128+
<partial name="_AutoNavMenuItems.cshtml" model="@dlsSubApplication" />
129+
}
131130

132-
@if (User.IsAdminAccount())
131+
@if (User.IsAdminAccount())
132+
{
133+
if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] != true)
133134
{
134-
if ((bool?)ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] != true)
135-
{
136-
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
137-
<a class="nhsuk-header__navigation-link" asp-controller="ApplicationSelector" asp-action="Index">
138-
Switch application
139-
</a>
140-
</li>
141-
}
142-
135+
<li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
136+
<a class="nhsuk-header__navigation-link" asp-controller="ApplicationSelector" asp-action="Index">
137+
Switch application
138+
</a>
139+
</li>
143140
}
144-
<li class="nhsuk-mobile-menu-container">
145-
<button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
146-
<span class="nhsuk-u-visually-hidden">Browse</span>
147-
More
148-
<svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
149-
<path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
150-
</svg>
151-
</button>
152-
</li>
153-
</ul>
154-
</div>
141+
142+
}
143+
<li class="nhsuk-header__navigation-item nhsuk-header__navigation-item--home">
144+
<a class="nhsuk-header__navigation-link" asp-controller="Home" asp-action="Index">
145+
Home
146+
</a>
147+
</li>
148+
<li class="nhsuk-mobile-menu-container">
149+
<button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
150+
<span class="nhsuk-u-visually-hidden">Browse</span>
151+
More
152+
<svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
153+
<path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
154+
</svg>
155+
</button>
156+
</li>
157+
</ul>
155158
</nav>
156-
</div>
157-
}
159+
</div>
160+
}
158161

159-
@{
160-
var visualSeparatorNoNavBar = (bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] == true ? "visual-separator-no-nav-bar" : string.Empty;
161-
}
162-
<div class="visual-separator @visualSeparatorNoNavBar"></div>
162+
@{
163+
var visualSeparatorNoNavBar = (bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] == true ? "visual-separator-no-nav-bar" : string.Empty;
164+
}
165+
<div class="visual-separator @visualSeparatorNoNavBar"></div>
163166

164-
<feature name="@(FeatureFlags.UserFeedbackBar)">
165-
<partial name="_UserFeedbackBarPartial" model=@(userResearchUrl) />
166-
</feature>
167+
<feature name="@(FeatureFlags.UserFeedbackBar)">
168+
<partial name="_UserFeedbackBarPartial" model=@(userResearchUrl) />
169+
</feature>
167170

168171
@RenderSection("NavBreadcrumbs", false)
169172
</header>
@@ -176,9 +179,8 @@
176179
<partial name="_DlsFooter" />
177180
@await RenderSectionAsync("scripts", false)
178181
<script src="@Url.Content("~/js/learningPortal/dlscommon.js")" asp-append-version="true"></script>
179-
180182
<script src="@Url.Content("~/js/cookiesbanner.js")" asp-append-version="true"></script>
181-
183+
<script src="@Url.Content("~/js/nhsuk.js")" asp-append-version="true"></script>>
182184
<input type="hidden" id="keepAlivePingPath" value="@Url.Action("ping","keepSessionAlive")" />
183185

184186
</div>

0 commit comments

Comments
 (0)