Skip to content

TD_5434 Move the Centre Name to the top of footer across all Learning Portal Pages. #3198

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 8 commits into from
May 21, 2025
Merged

TD_5434 Move the Centre Name to the top of footer across all Learning Portal Pages. #3198

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6bdcc3
TD_5343_Adding the centre information in the footer through out the l…
ABSinhaa Mar 27, 2025
9b5a190
TD_5434 Corrected the spacing indentation within the cshtml pages.
ABSinhaa Mar 27, 2025
e2dcf21
Updates styling and hading wording according to design
kevwhitt-hee Apr 1, 2025
05b7dbf
Fixes styling
kevwhitt-hee Apr 1, 2025
d1a41de
TD_5434 code changes for the new way for showing the banner text in t…
ABSinhaa Apr 10, 2025
105f110
TD-5434_remove unwanted ommented code as we do not need the horizonta…
ABSinhaa Apr 14, 2025
1d5cbad
TD_5434_ made changes based on the new comments received by the team,…
ABSinhaa Apr 28, 2025
046fab2
TD-5434_Made changes to the code and now we are loading the banner te…
ABSinhaa Apr 29, 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
14 changes: 14 additions & 0 deletions DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
13 changes: 13 additions & 0 deletions ...talLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
{
public class DlsFooterBannerTextViewModel
{
public readonly string? CentreName;

public DlsFooterBannerTextViewModel(string centreName)
{
CentreName = centreName;
}

}
}
71 changes: 34 additions & 37 deletions DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,58 +6,55 @@
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/courses.css")" asp-append-version="true">

@{
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 {
<partial name="Shared/_NavMenuItems" />
<partial name="Shared/_NavMenuItems" />
}

@if (Model.JavascriptSearchSortFilterPaginateEnabled)
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
{
<vc:loading-spinner page-has-side-nav-menu="false" />
<vc:loading-spinner page-has-side-nav-menu="false" />
}
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">

<div class="nhsuk-grid-column-full">
<h1 id="page-heading">Available Activities</h1>
@if (Model.BannerText != null)
{
<h2 class="page-subheading">@Model.BannerText</h2>
}
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">Available Activities</h1>

<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />

<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
@if (Model.NoDataFound)
{
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No data to display</b>
</p>
}
else
{
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />

<div id="searchable-elements">
@foreach (var availableCourse in Model.AvailableCourses)
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
@if (Model.NoDataFound)
{
<partial name="Available/_AvailableCourseCard" model="availableCourse" />
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No data to display</b>
</p>
}
</div>
}
<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
else
{
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />

<div id="searchable-elements">
@foreach (var availableCourse in Model.AvailableCourses)
{
<partial name="Available/_AvailableCourseCard" model="availableCourse" />
}
</div>
}
<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
</div>

@if (Model.JavascriptSearchSortFilterPaginateEnabled)
{
@section scripts {
<script src="@Url.Content("~/js/learningPortal/available.js")" asp-append-version="true"></script>
}
@section scripts {
<script src="@Url.Content("~/js/learningPortal/available.js")" asp-append-version="true"></script>
}
}
91 changes: 44 additions & 47 deletions DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,64 @@
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/completed.css")" asp-append-version="true">

@{
ViewData["Application"] = "Learning Portal";
ViewData["Title"] = "My Completed Activities";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed";
ViewData["HeaderPathName"] = "Learning Portal";
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)
{
<vc:loading-spinner page-has-side-nav-menu="false" />
<vc:loading-spinner page-has-side-nav-menu="false" />
}
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">My Completed Activities</h1>
@if (Model.BannerText != null)
{
<h2 class="page-subheading">@Model.BannerText</h2>
}

@if (!Model.ApiIsAccessible)
{
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
}
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">My Completed Activities</h1>

<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
@if (!Model.ApiIsAccessible)
{
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
}

<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
@if (Model.NoDataFound)
{
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No data to display</b>
</p>
}
else
{
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />

<div id="searchable-elements">
@foreach (var completedLearningItem in Model.CompletedActivities)
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
@if (Model.NoDataFound)
{
if (completedLearningItem is CompletedCourseViewModel)
{
<partial name="Completed/CompletedCourseCard/_CompletedCourseCard" model="completedLearningItem" />
}
else
{
<partial name="Completed/CompletedActionPlanResourceCard/_CompletedActionPlanResourceCard" model="completedLearningItem" />
}
<p class="nhsuk-u-margin-top-4" role="alert">
<b>No data to display</b>
</p>
}
else
{
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />

<div id="searchable-elements">
@foreach (var completedLearningItem in Model.CompletedActivities)
{
if (completedLearningItem is CompletedCourseViewModel)
{
<partial name="Completed/CompletedCourseCard/_CompletedCourseCard" model="completedLearningItem" />
}
else
{
<partial name="Completed/CompletedActionPlanResourceCard/_CompletedActionPlanResourceCard" model="completedLearningItem" />
}
}
</div>
}
</div>
}

<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
</div>

@if (Model.JavascriptSearchSortFilterPaginateEnabled)
{
@section scripts {
<script src="@Url.Content("~/js/learningPortal/completed.js")" asp-append-version="true"></script>
}
@section scripts {
<script src="@Url.Content("~/js/learningPortal/completed.js")" asp-append-version="true"></script>
}
}
103 changes: 50 additions & 53 deletions DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,75 +8,72 @@
<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/current.css")" asp-append-version="true">

@{
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 {
<partial name="Shared/_NavMenuItems" />
<partial name="Shared/_NavMenuItems" />
}

@if (Model.JavascriptSearchSortFilterPaginateEnabled)
@if (Model.JavascriptSearchSortFilterPaginateEnabled)
{
<vc:loading-spinner page-has-side-nav-menu="false" />
<vc:loading-spinner page-has-side-nav-menu="false" />
}
<div class="nhsuk-grid-row" id="@(Model.JavascriptSearchSortFilterPaginateEnabled ? "js-styling-hidden-area-while-loading" : "no-js-styling")">
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">My Current Activities</h1>
@if (Model.BannerText != null)
{
<h2 class="page-subheading word-break">@Model.BannerText</h2>
}

@if (!Model.ApiIsAccessible)
{
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
}
<div class="nhsuk-grid-column-full">
<h1 id="page-heading">My Current Activities</h1>

<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />
@if (!Model.ApiIsAccessible)
{
<vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
text="@LearningHubWarningTextHelper.ResourceDetailsMayBeOutOfDate" />
}

@if (Model.NoDataFound)
{
<p class="nhsuk-u-margin-top-4" role="alert">
<b>You are not enrolled on anything.</b> View <a asp-action="Available">Available activities</a>.
</p>
}
else
{
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
<partial name="SearchablePage/Configurations/_FullWidthSearchSortAndFilter" model="Model" />

<div id="searchable-elements">
@foreach (var currentLearningItem in Model.CurrentActivities)
@if (Model.NoDataFound)
{
if (currentLearningItem is SelfAssessmentCardViewModel)
{
<partial name="SelfAssessments/_SelfAssessmentCard" model="currentLearningItem" />
}
else if (currentLearningItem is CurrentLearningResourceViewModel)
{
<partial name="Current/_CurrentLearningResourceCard" model="currentLearningItem" />
}
else
{
<partial name="Current/CurrentCourseCard/_CurrentCourseCard" model="currentLearningItem" />
}
<p class="nhsuk-u-margin-top-4" role="alert">
<b>You are not enrolled on anything.</b> View <a asp-action="Available">Available activities</a>.
</p>
}
else
{
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />

<div id="searchable-elements">
@foreach (var currentLearningItem in Model.CurrentActivities)
{
if (currentLearningItem is SelfAssessmentCardViewModel)
{
<partial name="SelfAssessments/_SelfAssessmentCard" model="currentLearningItem" />
}
else if (currentLearningItem is CurrentLearningResourceViewModel)
{
<partial name="Current/_CurrentLearningResourceCard" model="currentLearningItem" />
}
else
{
<partial name="Current/CurrentCourseCard/_CurrentCourseCard" model="currentLearningItem" />
}
}
</div>
}
</div>
}

<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
<partial name="SearchablePage/_BottomPagination" model="Model" />
</div>
</div>

@if (Model.JavascriptSearchSortFilterPaginateEnabled)
{
@section scripts {
<script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
}
@section scripts {
<script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
}
}
19 changes: 19 additions & 0 deletions DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
@using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
@model DlsFooterBannerTextViewModel
@{
var currentApplication = ViewData["Application"]?.ToString();
}
@{
if (!String.IsNullOrEmpty(currentApplication) && (currentApplication.Contains("Learning Portal") || currentApplication.Contains("Supervisor")))
{
<h2 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2 nhsuk-u-secondary-text-color">Need help?</h2>
<div class="nhsuk-footer nhsuk-u-font-size-16 nhsuk-u-secondary-text-color">
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<span>Centre contact information:</span> <span>@Model.CentreName</span>
</li>
</ul>
</div>
}
}

4 changes: 4 additions & 0 deletions DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
@{

}
<footer role="contentinfo">
<div class="nhsuk-footer-container">
<div class="nhsuk-width-container">
@await Component.InvokeAsync("DlsFooterBannerText", new { centreName = ViewData["BannerText"] })
<h2 class="nhsuk-u-visually-hidden">Support links</h2>
<div class="nhsuk-footer">
<ul class="nhsuk-footer__list">
Expand Down
Loading
Loading