diff --git a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs index a23e986e0..5f4540b57 100644 --- a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs @@ -208,7 +208,7 @@ public IActionResult HomepageWithAuthentication() /// The resource dashboard type. /// The catalogue dashboard type. /// Home page. - public async Task Index(string dashboardTrayLearningResourceType = "all", string myLearningDashboard = "my-in-progress", string resourceDashboard = "popular-resources", string catalogueDashboard = "popular-catalogues") + public async Task Index(string dashboardTrayLearningResourceType = "all", string myLearningDashboard = "my-in-progress", string resourceDashboard = "my-recent-completed", string catalogueDashboard = "popular-catalogues") { if (this.User?.Identity.IsAuthenticated == true) { diff --git a/LearningHub.Nhs.WebUI/Styles/layout/_layout.scss b/LearningHub.Nhs.WebUI/Styles/layout/_layout.scss index bbacdc52d..c2ef190b0 100644 --- a/LearningHub.Nhs.WebUI/Styles/layout/_layout.scss +++ b/LearningHub.Nhs.WebUI/Styles/layout/_layout.scss @@ -320,6 +320,12 @@ input:required:invalid, input:focus:invalid { -webkit-line-clamp: 3; -webkit-box-orient: vertical; } +.line-clamp-5 { + display: -webkit-box !important; + overflow: hidden; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; +} .search-box-container { display: flex; flex-direction: row; diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss index 6dde76f58..d2bec44ae 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss @@ -47,6 +47,12 @@ } } +.course-card { + border: 1px solid #1C366A; + border-radius: 8px; + box-shadow: 2px 2px 0 #1C366A; +} + .dashboard-card-content { display: flex; flex-direction: column; @@ -185,6 +191,33 @@ div.bmj-best-practice-logo-image { background-color: #f0f4f5; } +.filterlink { + display: inline-block; + padding: 6px 12px; + font-weight: bold; + text-decoration: none; + border: 2px solid transparent; + border-radius: 4px; + font-family: sans-serif; +} +.filteractive { + color: $nhsuk-blue; + border-color: #0b63ce; + background-color: $nhsuk-pale-blue-color; +} + +.filterinactive { + color: #6e6e6e; + border-color: #c2c2c2; + background-color: #f1f1f1; + opacity: 0.7; +} + +filterfocus { + color: black; + background-color: #ffeb3b; + border-color: #212b32; +} .dashboard-paging { width: 100%; display: flex; diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml index 88e11b91b..700138dda 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml @@ -79,7 +79,7 @@

- @item.Name + @item.Name

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml index 379cffa64..41d02c3e8 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml @@ -65,7 +65,7 @@

- @item.Name + @item.Name

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml index 486a6b624..a5b5b6acd 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml @@ -76,7 +76,7 @@

- @item.Name + @item.Name

diff --git a/LearningHub.Nhs.WebUI/Views/Home/Dashboard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/Dashboard.cshtml index 4acd0c8c7..59528c734 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/Dashboard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/Dashboard.cshtml @@ -21,7 +21,7 @@ }
-
+
@@ -39,7 +39,7 @@
-
+
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml index fd8932610..dcdb35170 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml @@ -23,7 +23,8 @@ CatalogueDashboard = Model.Catalogues.Type, CurrentPage = Model.Catalogues.CurrentPage, TotalPages = Model.Catalogues.TotalPages, - TotalCount = Model.Catalogues.TotalCount + TotalCount = Model.Catalogues.TotalCount, + DashboardTrayLearningResourceType = Model.DashboardTrayLearningResourceType }; } diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml index b2716efb4..485eb1af4 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml @@ -42,10 +42,10 @@ } ); } -
+
-

+

@if ((ResourceTypeEnum)Model.Item2.ResourceTypeId == ResourceTypeEnum.Moodle) { diff --git a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml index 03d76d2b8..799c4169d 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml @@ -22,10 +22,10 @@ return moodleApiService.GetCourseUrl(courseId); } } -
+
-

+

@if (ViewActivityHelper.GetResourceTypeDesc(Model.Item2.ResourceType) == "Course") { diff --git a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml index 76dd1a61d..1fd3e413a 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml @@ -32,7 +32,7 @@

My courses and elearning

-