From c6bdcc31109c6cb36b88608d2e2b92b4a958f6a6 Mon Sep 17 00:00:00 2001 From: ABSINHAA Date: Thu, 27 Mar 2025 16:16:58 +0000 Subject: [PATCH 1/8] TD_5343_Adding the centre information in the footer through out the learning portal pages as texts. --- .../LearningPortal/Available/Available.cshtml | 13 +++++-------- .../LearningPortal/Completed/Completed.cshtml | 7 ++----- .../LearningPortal/Current/Current.cshtml | 7 ++----- .../Views/Shared/_DlsFooter.cshtml | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml index 5fc25aa747..a9edfdbebf 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml @@ -6,10 +6,11 @@ @{ - ViewData["Application"] = "Learning Portal"; - ViewData["Title"] = "Available Activities"; - ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Available"; - ViewData["HeaderPathName"] = "Learning Portal"; + ViewData["Application"] = "Learning Portal"; + ViewData["Title"] = "Available Activities"; + ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Available"; + ViewData["HeaderPathName"] = "Learning Portal"; + ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { @@ -24,10 +25,6 @@

Available Activities

- @if (Model.BannerText != null) - { -

@Model.BannerText

- } diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml index 034b347511..a1fb6041a3 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml @@ -10,6 +10,7 @@ ViewData["Title"] = "My Completed Activities"; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed"; ViewData["HeaderPathName"] = "Learning Portal"; + ViewData["BannerText"] = Model.BannerText; } @if (Model.JavascriptSearchSortFilterPaginateEnabled) @@ -19,11 +20,7 @@

My Completed Activities

- @if (Model.BannerText != null) - { -

@Model.BannerText

- } - + @if (!Model.ApiIsAccessible) {

My Current Activities

- @if (Model.BannerText != null) - { -

@Model.BannerText

- } - + @if (!Model.ApiIsAccessible) {
+
+ @{ + if (currentPath.Contains("/LearningPortal/Current") || currentPath.Contains("/LearningPortal/Completed") || currentPath.Contains("/LearningPortal/Available")) + { +

Centre Information

+
+
    +
  • + Centre contact information: @ViewData["BannerText"] +
    • +
+
+ } + } +

Support links

From 9b5a1908e374f2c97c24973593d5be529fd36650 Mon Sep 17 00:00:00 2001 From: ABSINHAA Date: Thu, 27 Mar 2025 16:28:21 +0000 Subject: [PATCH 2/8] TD_5434 Corrected the spacing indentation within the cshtml pages. --- .../LearningPortal/Available/Available.cshtml | 58 +++++------ .../LearningPortal/Completed/Completed.cshtml | 88 ++++++++--------- .../LearningPortal/Current/Current.cshtml | 98 +++++++++---------- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml index a9edfdbebf..f426092d15 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml @@ -14,47 +14,47 @@ } @section NavMenuItems { - + } - @if (Model.JavascriptSearchSortFilterPaginateEnabled) +@if (Model.JavascriptSearchSortFilterPaginateEnabled) { - + }
-
-

Available Activities

+
+

Available Activities

- + -
- @if (Model.NoDataFound) - { - - } - else - { - - - - -
- @foreach (var availableCourse in Model.AvailableCourses) +
+ @if (Model.NoDataFound) { - + } -
- } - -
+ else + { + + + + +
+ @foreach (var availableCourse in Model.AvailableCourses) + { + + } +
+ } + +
@if (Model.JavascriptSearchSortFilterPaginateEnabled) { - @section scripts { - -} + @section scripts { + + } } diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml index a1fb6041a3..5db52aa68e 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml @@ -6,64 +6,64 @@ @{ - ViewData["Application"] = "Learning Portal"; - ViewData["Title"] = "My Completed Activities"; - ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed"; - ViewData["HeaderPathName"] = "Learning Portal"; - ViewData["BannerText"] = Model.BannerText; + ViewData["Application"] = "Learning Portal"; + ViewData["Title"] = "My Completed Activities"; + ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed"; + ViewData["HeaderPathName"] = "Learning Portal"; + ViewData["BannerText"] = Model.BannerText; } @if (Model.JavascriptSearchSortFilterPaginateEnabled) { - + }
-
-

My Completed Activities

- - @if (!Model.ApiIsAccessible) - { - - } +
+

My Completed Activities

- + @if (!Model.ApiIsAccessible) + { + + } -
- @if (Model.NoDataFound) - { - - } - else - { - - - + -
- @foreach (var completedLearningItem in Model.CompletedActivities) +
+ @if (Model.NoDataFound) { - if (completedLearningItem is CompletedCourseViewModel) - { - - } - else - { - - } + + } + else + { + + + + +
+ @foreach (var completedLearningItem in Model.CompletedActivities) + { + if (completedLearningItem is CompletedCourseViewModel) + { + + } + else + { + + } + } +
} -
- } - -
+ +
@if (Model.JavascriptSearchSortFilterPaginateEnabled) { - @section scripts { - -} + @section scripts { + + } } diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml index c92dc5c241..26022b32f4 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml @@ -8,72 +8,72 @@ @{ - ViewData["Application"] = "Learning Portal"; - ViewData["Title"] = "My Current Activities"; - ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current"; - ViewData["HeaderPathName"] = "Learning Portal"; + ViewData["Application"] = "Learning Portal"; + ViewData["Title"] = "My Current Activities"; + ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current"; + ViewData["HeaderPathName"] = "Learning Portal"; ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { - + } - @if (Model.JavascriptSearchSortFilterPaginateEnabled) +@if (Model.JavascriptSearchSortFilterPaginateEnabled) { - + }
-
-

My Current Activities

- - @if (!Model.ApiIsAccessible) - { - - } +
+

My Current Activities

- + @if (!Model.ApiIsAccessible) + { + + } - @if (Model.NoDataFound) - { - - } - else - { -
- - - + -
- @foreach (var currentLearningItem in Model.CurrentActivities) + @if (Model.NoDataFound) { - if (currentLearningItem is SelfAssessmentCardViewModel) - { - - } - else if (currentLearningItem is CurrentLearningResourceViewModel) - { - - } - else - { - - } + + } + else + { +
+ + + + +
+ @foreach (var currentLearningItem in Model.CurrentActivities) + { + if (currentLearningItem is SelfAssessmentCardViewModel) + { + + } + else if (currentLearningItem is CurrentLearningResourceViewModel) + { + + } + else + { + + } + } +
} -
- } - -
+ +
@if (Model.JavascriptSearchSortFilterPaginateEnabled) { - @section scripts { - -} + @section scripts { + + } } From e2dcf218bf2cbe7221ce081d25ec7033ef1c1752 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 1 Apr 2025 08:27:23 +0100 Subject: [PATCH 3/8] Updates styling and hading wording according to design --- DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index abd8845153..1a13982ce9 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -7,11 +7,11 @@ @{ if (currentPath.Contains("/LearningPortal/Current") || currentPath.Contains("/LearningPortal/Completed") || currentPath.Contains("/LearningPortal/Available")) { -

Centre Information

+

Need help?

  • - Centre contact information: @ViewData["BannerText"] + Centre contact information: @ViewData["BannerText"]
From 05b7dbf02e66c6b9639501f0a112689c592ca7ed Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 1 Apr 2025 08:40:13 +0100 Subject: [PATCH 4/8] Fixes styling --- DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index 1a13982ce9..313431a56f 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -8,10 +8,10 @@ if (currentPath.Contains("/LearningPortal/Current") || currentPath.Contains("/LearningPortal/Completed") || currentPath.Contains("/LearningPortal/Available")) {

Need help?

-
+
  • - Centre contact information: @ViewData["BannerText"] + Centre contact information: @ViewData["BannerText"]
From d1a41de01854a53a395f62d364c60669510464b8 Mon Sep 17 00:00:00 2001 From: ABSINHAA Date: Thu, 10 Apr 2025 20:50:23 +0100 Subject: [PATCH 5/8] TD_5434 code changes for the new way for showing the banner text in the footer using view component, removing the banner text from the supervisor module and adding the centre information to the footer there. --- .../DlsFooterBannerTextViewComponent.cs | 14 ++++++++++ .../DlsFooterBannerTextViewModel.cs | 13 +++++++++ .../DlsFooterBannerText/Default.cshtml | 28 +++++++++++++++++++ .../Views/Shared/_DlsFooter.cshtml | 18 ++---------- .../Views/Supervisor/Index.cshtml | 5 +--- 5 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml diff --git a/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs new file mode 100644 index 0000000000..cc95af7a9c --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs @@ -0,0 +1,14 @@ +using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents; +using Microsoft.AspNetCore.Mvc; + +namespace DigitalLearningSolutions.Web.ViewComponents +{ + public class DlsFooterBannerTextViewComponent : ViewComponent + { + public IViewComponentResult Invoke(string centreName) + { + var model = new DlsFooterBannerTextViewModel(centreName); + return View(model); + } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs new file mode 100644 index 0000000000..9d81f502a2 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs @@ -0,0 +1,13 @@ +namespace DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents +{ + public class DlsFooterBannerTextViewModel + { + public readonly string? CentreName; + + public DlsFooterBannerTextViewModel(string centreName) + { + CentreName = centreName; + } + + } +} diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml new file mode 100644 index 0000000000..dfb4a86629 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml @@ -0,0 +1,28 @@ +@using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents +@model DlsFooterBannerTextViewModel +@{ + var currentApplication = ViewData["Application"]?.ToString(); +} +@{ + if (!String.IsNullOrEmpty(currentApplication) && (currentApplication.Contains("Learning Portal") || currentApplication.Contains("Supervisor"))) + { +

Need help?

+
+
    +
  • + Centre contact information: @Model.CentreName +
    • +
+
+ //
+ } +} + +@* *@ diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index 313431a56f..1d2b57ed60 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -1,24 +1,10 @@ @{ - var currentPath = Context.Request.Path.ToString(); + }
- @{ - if (currentPath.Contains("/LearningPortal/Current") || currentPath.Contains("/LearningPortal/Completed") || currentPath.Contains("/LearningPortal/Available")) - { -

Need help?

-
-
    -
  • - Centre contact information: @ViewData["BannerText"] -
    • -
-
- } - } -
-
+ @await Component.InvokeAsync("DlsFooterBannerText", new { centreName = ViewData["BannerText"] })

Support links

    diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml index 07b71ef446..1242abf69b 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml @@ -51,10 +51,7 @@ else {

    There are no tasks requiring your attention.

    } -@if (Model.BannerText != null) -{ -

    @Model.BannerText

    -} +
      From 105f110eee0bde14353dd82021cd4059a554a62c Mon Sep 17 00:00:00 2001 From: ABSINHAA Date: Mon, 14 Apr 2025 11:15:34 +0100 Subject: [PATCH 6/8] TD-5434_remove unwanted ommented code as we do not need the horizontal rule anymore. --- .../Shared/Components/DlsFooterBannerText/Default.cshtml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml index dfb4a86629..02e2a52057 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml @@ -14,15 +14,6 @@
- //
} } -@* *@ From 1d5cbadee5c1fdc291993edca53150eea0527ac9 Mon Sep 17 00:00:00 2001 From: ABSinhaa Date: Mon, 28 Apr 2025 15:45:26 +0100 Subject: [PATCH 7/8] TD_5434_ made changes based on the new comments received by the team, added the logic to show the footer application through out the aplication only when the BannerText field has a value. removed the banner text from the Learning Menu module pages. --- .../Views/LearningMenu/CoursePassword.cshtml | 2 +- DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml | 2 +- .../Shared/Components/DlsFooterBannerText/Default.cshtml | 5 +---- DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml index 2699f054e9..d2218c6822 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml @@ -12,6 +12,7 @@ ViewData["CustomisationId"] = Model.Id; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}/Password"; ViewData["HeaderPathName"] = Model.Title; + ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { @@ -36,7 +37,6 @@

@Model.Title

@Model.Description

-

@Model.BannerText

diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml index eadf1f5d7b..f2d91633fa 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml @@ -12,6 +12,7 @@ ViewData["CustomisationId"] = Model.Id; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}"; ViewData["HeaderPathName"] = Model.Title; + ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { @@ -42,7 +43,6 @@ }

@Model.CentreName

-

@Model.BannerText

diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml index 02e2a52057..d4ab3023bc 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml @@ -1,10 +1,7 @@ @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents @model DlsFooterBannerTextViewModel @{ - var currentApplication = ViewData["Application"]?.ToString(); -} -@{ - if (!String.IsNullOrEmpty(currentApplication) && (currentApplication.Contains("Learning Portal") || currentApplication.Contains("Supervisor"))) + if (!String.IsNullOrEmpty(Model.CentreName)) {

Need help?

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml index 1242abf69b..e493dfdd1f 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml @@ -6,6 +6,7 @@ ViewData["Title"] = "Dashboard"; ViewData["Application"] = "Supervisor"; ViewData["HeaderPathName"] = "Supervisor"; + ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { From 046fab248028cb79bc895f6c664ebdcbc69bdc06 Mon Sep 17 00:00:00 2001 From: ABSinhaa Date: Tue, 29 Apr 2025 15:20:44 +0100 Subject: [PATCH 8/8] TD-5434_Made changes to the code and now we are loading the banner text information directly from the centre table into the view component based on the logged in user, instead of using the views to inject it into the view components, did some clean up of removing the unwanted bannerText viewdata assigning, cleaned up unwanted braces. --- .../DlsFooterBannerTextViewComponent.cs | 26 ++++++++++++++++--- .../DlsFooterBannerTextViewModel.cs | 6 ++--- .../Views/LearningMenu/CoursePassword.cshtml | 1 - .../Views/LearningMenu/Index.cshtml | 1 - .../LearningPortal/Available/Available.cshtml | 1 - .../LearningPortal/Completed/Completed.cshtml | 1 - .../LearningPortal/Current/Current.cshtml | 1 - .../DlsFooterBannerText/Default.cshtml | 4 +-- .../Views/Shared/_DlsFooter.cshtml | 5 +--- .../Views/Supervisor/Index.cshtml | 1 - 10 files changed, 29 insertions(+), 18 deletions(-) diff --git a/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs index cc95af7a9c..bf484f426e 100644 --- a/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs +++ b/DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs @@ -1,13 +1,33 @@ -using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents; +using System.Security.Claims; +using DigitalLearningSolutions.Data.DataServices; +using DigitalLearningSolutions.Web.Helpers; using Microsoft.AspNetCore.Mvc; +using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents; +using DigitalLearningSolutions.Web.Services; +using System; +using System.Threading.Tasks; namespace DigitalLearningSolutions.Web.ViewComponents { public class DlsFooterBannerTextViewComponent : ViewComponent { - public IViewComponentResult Invoke(string centreName) + private readonly ICentresService centresService; + + public DlsFooterBannerTextViewComponent(ICentresService centresService) { - var model = new DlsFooterBannerTextViewModel(centreName); + this.centresService = centresService; + } + + public IViewComponentResult Invoke() + { + var centreId = ((ClaimsPrincipal)User).GetCustomClaimAsInt(CustomClaimTypes.UserCentreId); + if (centreId == null) + { + return View(new DlsFooterBannerTextViewModel(null)); + } + + var bannerText = centresService.GetBannerText(Convert.ToInt32(centreId)); + var model = new DlsFooterBannerTextViewModel(bannerText); return View(model); } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs index 9d81f502a2..3a0fdcdd92 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs @@ -2,11 +2,11 @@ { public class DlsFooterBannerTextViewModel { - public readonly string? CentreName; + public readonly string? BannerText; - public DlsFooterBannerTextViewModel(string centreName) + public DlsFooterBannerTextViewModel(string bannerText) { - CentreName = centreName; + BannerText = bannerText; } } diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml index d2218c6822..7f892b6015 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml @@ -12,7 +12,6 @@ ViewData["CustomisationId"] = Model.Id; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}/Password"; ViewData["HeaderPathName"] = Model.Title; - ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml index f2d91633fa..a01dc12393 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml @@ -12,7 +12,6 @@ ViewData["CustomisationId"] = Model.Id; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}"; ViewData["HeaderPathName"] = Model.Title; - ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml index f426092d15..dcb270c4a7 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml @@ -10,7 +10,6 @@ ViewData["Title"] = "Available Activities"; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Available"; ViewData["HeaderPathName"] = "Learning Portal"; - ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml index 5db52aa68e..bd2e5ae5af 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml @@ -10,7 +10,6 @@ ViewData["Title"] = "My Completed Activities"; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed"; ViewData["HeaderPathName"] = "Learning Portal"; - ViewData["BannerText"] = Model.BannerText; } @if (Model.JavascriptSearchSortFilterPaginateEnabled) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml index 26022b32f4..8f1366568c 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml @@ -12,7 +12,6 @@ ViewData["Title"] = "My Current Activities"; ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current"; ViewData["HeaderPathName"] = "Learning Portal"; - ViewData["BannerText"] = Model.BannerText; } @section NavMenuItems { diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml index d4ab3023bc..c6ae013148 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml @@ -1,13 +1,13 @@ @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents @model DlsFooterBannerTextViewModel @{ - if (!String.IsNullOrEmpty(Model.CentreName)) + if (!String.IsNullOrEmpty(Model.BannerText)) {

Need help?

  • - Centre contact information: @Model.CentreName + Centre contact information: @Model.BannerText
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml index 1d2b57ed60..ce244973fa 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml @@ -1,10 +1,7 @@ -@{ - -}