From 8979d3a186425e3f212cb290ef1834a526dc324a Mon Sep 17 00:00:00 2001 From: Dalin Akrasi Date: Fri, 19 Apr 2024 13:32:36 +0100 Subject: [PATCH] Replace search button text to Search. Correct catalogue alt name. Remove button role from bookmark links. Replace search bar val "submit" with "search". Replace h3 with h2 for search items. Add fieldset and legend to search filter. --- .../Styles/nhsuk/pages/catalogue.scss | 6 +++- .../Styles/nhsuk/pages/search.scss | 4 +++ .../Views/Catalogue/Catalogues.cshtml | 4 +-- .../Views/Catalogue/Index.cshtml | 4 +-- .../Views/Catalogue/_ContentStructure.cshtml | 2 +- .../Views/Catalogue/_SearchBar.cshtml | 4 +-- .../Views/Home/_CatalogueCard.cshtml | 2 +- .../Views/Home/_ResourceCard.cshtml | 2 +- .../Views/Resource/Resource.cshtml | 4 +-- .../Search/_CatalogueSearchResult.cshtml | 4 +-- .../Views/Search/_ResourceFilter.cshtml | 32 ++++++++++++------- .../Views/Search/_ResourceSearchResult.cshtml | 2 +- .../Views/Search/_SearchBar.cshtml | 4 +-- 13 files changed, 43 insertions(+), 31 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss index 4aba85b35..611b62efa 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss @@ -91,9 +91,13 @@ textarea { padding: 20px 0 32px 0; border-bottom: 1px solid $nhsuk-grey-light; - p, h3 { + p, h2, h3 { margin: 0; } + + h2.nhsuk-u-reading-width { + font-size: x-large; + } } .personal-details-table { diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss index 9e800942d..c43713aaa 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss @@ -156,6 +156,10 @@ .search-filter-items { border-top: 1px $nhsuk-grey-light solid; background-color: $nhsuk-grey-white; + + h2 { + font-size: larger; + } } } diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml index d184442fb..6eda29434 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml @@ -76,7 +76,7 @@ }
- @if (!string.IsNullOrEmpty(item.BadgeUrl)) { - @(item.Name) + Provider's catalogue badge }
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml index 23be8c9a0..4a62262bc 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml @@ -126,7 +126,7 @@
@if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl)) { - ELFH catalogue badge + Provider's catalogue badge }

@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)

@@ -140,7 +140,7 @@ @if (ViewBag.UserAuthenticated) {
- @item.Name +

@item.Name

Type: @UtilityHelper.GetPrettifiedResourceTypeName((ResourceTypeEnum)item.ResourceTypeId, item.DurationInMilliseconds)
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml index 2e7f5c50b..c8d254bf8 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml @@ -5,9 +5,7 @@
- - }
- @if (provider != null) { - @provider.Name + @provider.Name catalogue badge } else @if (hasBadge) { - @(item.Name) + Provider's catalogue badge }
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml index 818f2bf1f..429eae962 100644 --- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml @@ -89,8 +89,10 @@ }
-
-

Sort by:

+
+ +

Sort by:

+
@foreach (var sortItem in resourceResult.SortItemList) @@ -107,7 +109,7 @@ }
-
+
@if (resourceResult.SearchResourceAccessLevelFilters != null && resourceResult.SearchResourceAccessLevelFilters.Any()) @@ -115,8 +117,10 @@
-
-

Filter by audience access level:

+
+ +

Filter by audience access level:

+
@foreach (var filter in resourceResult.SearchResourceAccessLevelFilters) @@ -132,7 +136,7 @@
}
-
+
} @@ -141,8 +145,10 @@
-
-

Filter by provider:

+
+ +

Filter by provider:

+
@foreach (var filter in resourceResult.SearchProviderFilters) @@ -159,15 +165,17 @@
}
-
+ }
-
-

Filter by:

+
+ +

Filter by:

+
@foreach (var filter in resourceResult.SearchFilters) @@ -185,7 +193,7 @@ }
-
+