From 5d9c01698e2152ed80c9a8b8292a335894ac9631 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Fri, 31 Jan 2025 09:40:21 +0000 Subject: [PATCH 1/3] Header changes for NHS Design System v 9 --- .../Frameworks/Shared/_NavMenuItems.cshtml | 5 ---- .../LearningMenu/Shared/_NavMenuItems.cshtml | 2 -- .../Shared/_NavMenuItems.cshtml | 4 ---- .../Views/Shared/_Layout.cshtml | 23 ++++++++++--------- .../Views/Shared/_NavMenuItems.cshtml | 6 ----- .../SuperAdmin/Shared/_NavMenuItems.cshtml | 5 ---- .../Supervisor/Shared/_NavMenuItems.cshtml | 4 ---- .../Shared/_NavMenuItems.cshtml | 5 ---- 8 files changed, 12 insertions(+), 42 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml index 770be2e6fb..b2f8dff16a 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml @@ -5,32 +5,27 @@
  • Dashboard -
  • Frameworks -
  • Role Profiles -
  • Support -
  • My account -
    • diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml index 2ea72c7d40..dd019227a7 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/Shared/_NavMenuItems.cshtml @@ -2,12 +2,10 @@
  • Learning portal -
  • My account -
    • diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml index 90242f331c..6502b36796 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_NavMenuItems.cshtml @@ -3,24 +3,20 @@
  • Current activities -
  • Completed activities -
  • Available activities -
  • My account -
    • diff --git a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml index 890b9fb60d..91d6edec1e 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml @@ -66,7 +66,7 @@ @await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml") }
    -
    +
    } -
    } @{ @@ -162,7 +164,6 @@ -
    @RenderSection("NavBreadcrumbs", false) diff --git a/DigitalLearningSolutions.Web/Views/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_NavMenuItems.cshtml index 7d0bb38bf8..9db232ee6f 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_NavMenuItems.cshtml @@ -7,13 +7,11 @@
  • Welcome -
  • Find your centre -
    • @if (Configuration.IsPricingPageEnabled()) @@ -21,7 +19,6 @@
  • Pricing -
    • } @@ -30,7 +27,6 @@
  • My account -
    • } @@ -39,13 +35,11 @@ else
  • Log in -
  • Register -
    • } diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_NavMenuItems.cshtml index 320595c7dd..ce49fd5a26 100644 --- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_NavMenuItems.cshtml @@ -5,30 +5,25 @@
  • Users -
  • Centres -
  • Reports -
  • System -
  • My account -
    • diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_NavMenuItems.cshtml index 9b76f73856..99e8331bab 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_NavMenuItems.cshtml @@ -4,26 +4,22 @@
  • Dashboard -
  • My Staff -
  • Self Assessments -
  • My account -
    • diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Shared/_NavMenuItems.cshtml index f9d8c4301f..51ddaebd54 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Shared/_NavMenuItems.cshtml @@ -8,31 +8,26 @@
  • Centre -
  • Delegates -
  • Course setup -
    • }
  • Support -
  • My account -
    • From 226edb1acdbc5c00c8a6eaeb059b81e223a8472d Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Fri, 31 Jan 2025 11:58:22 +0000 Subject: [PATCH 2/3] TD-5327 Updates to latest version and finishes fixing styling issues --- .../DigitalLearningSolutions.Web.csproj | 236 + DigitalLearningSolutions.Web/Scripts/nhsuk.ts | 2 - .../Views/Shared/_DlsFooter.cshtml | 56 +- .../package-lock.json | 18956 ---------------- DigitalLearningSolutions.Web/package.json | 2 +- DigitalLearningSolutions.Web/yarn.lock | 4267 ++-- 6 files changed, 2170 insertions(+), 21349 deletions(-) delete mode 100644 DigitalLearningSolutions.Web/package-lock.json diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj index d93a524c4d..dcbccf6154 100644 --- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj +++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj @@ -88,6 +88,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151,6 +369,24 @@ <_ContentIncludedByDefault Remove="Views\Shared\Components\VerifyEmailWarningIfAppropriate\Default.cshtml" /> + + + + + + + + + + + + + + + + + + diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 9a0e4bb5cd..5114afd99e 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -4,7 +4,6 @@ import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link'; import Details from 'nhsuk-frontend/packages/components/details/details'; import Radios from 'nhsuk-frontend/packages/components/radios/radios'; import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes'; -import Card from 'nhsuk-frontend/packages/components/card/card'; // Polyfills import 'nhsuk-frontend/packages/polyfills'; @@ -20,6 +19,5 @@ document.addEventListener( SkipLink(); Radios(); Checkboxes(); - Card(); }, ); diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index 556ae2192c..e6247132a5 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -1,28 +1,38 @@ -
    - + > @await RenderSectionAsync("scripts", false)
    diff --git a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml index 91d6edec1e..bad93d024c 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml @@ -80,90 +80,93 @@ } -
    - + } - @{ - var visualSeparatorNoNavBar = (bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] == true ? "visual-separator-no-nav-bar" : string.Empty; - } -
    + @{ + var visualSeparatorNoNavBar = (bool?)ViewData[LayoutViewDataKeys.DoNotDisplayNavBar] == true ? "visual-separator-no-nav-bar" : string.Empty; + } +
    - - - + + + @RenderSection("NavBreadcrumbs", false) @@ -176,9 +179,8 @@ @await RenderSectionAsync("scripts", false) - - + >