Skip to content

Replace search button text to Search. Correct catalogue alt name. Rem… #302

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
Parent: Merge RC changes into CI
merged 1 commit into from
Apr 19, 2024
Merged

Replace search button text to Search. Correct catalogue alt name. Rem… #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@
.search-filter-items {
border-top: 1px $nhsuk-grey-light solid;
background-color: $nhsuk-grey-white;

h2 {
font-size: larger;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
}
</div>
<div>
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
asp-route-bookmarked="@item.IsBookmarked"
asp-route-id="@item.BookmarkId"
asp-route-title="@item.Name.Truncate(60)"
Expand All @@ -90,7 +90,7 @@
<div>
@if (!string.IsNullOrEmpty(item.BadgeUrl))
{
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<div class="catalogue-title nhsuk-u-margin-bottom-7">
@if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
{
<img alt="ELFH catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
<img alt="Provider's catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
}

<h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>
Expand All @@ -140,7 +140,7 @@
@if (ViewBag.UserAuthenticated)
{
<div class="nhsuk-u-margin-bottom-4">
<a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
<a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
asp-route-bookmarked="@Model.Catalogue.IsBookmarked"
asp-route-id="@Model.Catalogue.BookmarkId"
asp-route-title="@Model.Catalogue.Name.Truncate(60)"
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
else
{
<h3 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h3>
<h2 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h2>
<div class="resource-metadata">
<div class="nhsuk-u-padding-right-5"><span class="nhsuk-u-font-weight-bold">Type:</span> @UtilityHelper.GetPrettifiedResourceTypeName((ResourceTypeEnum)item.ResourceTypeId, item.DurationInMilliseconds)</div>
<div class="nhsuk-u-padding-right-5 star-rating-container">
Expand Down
4 changes: 1 addition & 3 deletions LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
<label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search</label>
<input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" value="@Model" placeholder="Search">
<button class="nhsuk-search__submit" type="submit">
<span class="nhsuk-u-visually-hidden">
Submit
</span>
<span class="nhsuk-u-visually-hidden">Search</span>
<svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
</svg>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
</div>
<div>
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
asp-route-bookmarked="@Model.IsBookmarked"
asp-route-id="@Model.BookmarkId"
asp-route-title="@Model.Name.Truncate(60)"
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}
</div>
<div>
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkResource"
asp-route-bookmarked="@Model.Item2.IsBookmarked"
asp-route-id="@Model.Item2.BookmarkId"
asp-route-title="@Model.Item2.Title.Truncate(60)"
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
</form>
}
</div>
<a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
<a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
asp-route-id="@Model.ResourceItem.BookmarkId"
asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
Expand Down Expand Up @@ -256,7 +256,7 @@
</form>
}
</div>
<a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
<a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
asp-route-id="@Model.ResourceItem.BookmarkId"
asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@
<div>
@if (provider != null)
{
<img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
<img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
}
else @if (hasBadge)
{
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
}
</div>
</div>
Expand Down
32 changes: 20 additions & 12 deletions LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h4>Sort by:</h4>
<fieldset class="nhsuk-grid-column-full">
<legend>
<h2>Sort by:</h2>
</legend>

<div class="nhsuk-radios">
@foreach (var sortItem in resourceResult.SortItemList)
Expand All @@ -107,16 +109,18 @@
}

</div>
</div>
</fieldset>
</div>

@if (resourceResult.SearchResourceAccessLevelFilters != null && resourceResult.SearchResourceAccessLevelFilters.Any())
{
<hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h4>Filter by audience access level:</h4>
<fieldset class="nhsuk-grid-column-full">
<legend>
<h2>Filter by audience access level:</h2>
</legend>

<div class="nhsuk-checkboxes">
@foreach (var filter in resourceResult.SearchResourceAccessLevelFilters)
Expand All @@ -132,7 +136,7 @@
</div>
}
</div>
</div>
</fieldset>
</div>
}

Expand All @@ -141,8 +145,10 @@
<hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h4>Filter by provider:</h4>
<fieldset class="nhsuk-grid-column-full">
<legend>
<h2>Filter by provider:</h2>
</legend>

<div class="nhsuk-checkboxes">
@foreach (var filter in resourceResult.SearchProviderFilters)
Expand All @@ -159,15 +165,17 @@
</div>
}
</div>
</div>
</fieldset>
</div>
}

<hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h4>Filter by:</h4>
<fieldset class="nhsuk-grid-column-full">
<legend>
<h2>Filter by:</h2>
</legend>

<div class="nhsuk-checkboxes">
@foreach (var filter in resourceResult.SearchFilters)
Expand All @@ -185,7 +193,7 @@
}

</div>
</div>
</fieldset>
</div>

<button class="nhsuk-button nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-0" data-module="nhsuk-button" type="submit">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<div class="resource-author">
@if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources)
{
<img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Resource catalog badge"/>
<img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Provider's catalogue badge"/>
}

@if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources)
Expand Down
4 changes: 1 addition & 3 deletions LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
<label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search the learning hub</label>
<input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" placeholder="Search the learning hub" value="@Model">
<button class="nhsuk-search__submit" type="submit">
<span class="nhsuk-u-visually-hidden">
Submit
</span>
<span class="nhsuk-u-visually-hidden">Search</span>
<svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
</svg>
Expand Down