Skip to content

Commit d93c319

Browse files
authored
Merge pull request #1720 from TechnologyEnhancedLearning/Develop/Fixes/TD-6914-Issue-with-the-alignment-of-Catalogue-tag-showing-on-'Catalogue'-search-results
TD-6914:fixed the alignment of Catalogue tag showing on 'Catalogue' …
2 parents a115507 + 0be3ae5 commit d93c319

2 files changed

Lines changed: 13 additions & 20 deletions

File tree

LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,17 @@ li.autosuggestion-option:last-of-type {
338338
}
339339

340340

341-
341+
.search-catalogue-badge {
342+
position: absolute;
343+
top: 0;
344+
right: 0;
345+
background-color: #0056b3;
346+
color: white;
347+
padding: 5px 15px;
348+
border-top-right-radius: 8px;
349+
border-bottom-left-radius: 8px;
350+
font-size: 0.8em;
351+
}
342352

343353
.side-nav__item:last-child {
344354
border-bottom: none;

LearningHub.Nhs.WebUI/Views/Search/_SearchCatalogueResult.cshtml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,13 @@
2424
&query={searchSignalQueryEncoded}&name={payload?.DocumentFields?.Name}";
2525
return url;
2626
}
27-
// var catalogueResult = Model.ResourceSearchResult;
28-
// var pagingModel = Model.CatalogueResultPaging;
29-
// var searchString = HttpUtility.UrlEncode(Model.SearchString);
30-
// var suggestedSearchString = Model.DidYouMeanEnabled ? HttpUtility.UrlEncode(Model.SuggestedCatalogue) : HttpUtility.UrlEncode(Model.SearchString);
31-
32-
// string GetCatalogueUrl(string catalogueUrl, int? nodePathId, int itemIndex, int catalogueId, SearchClickPayloadModel payload)
33-
// {
34-
// var searchSignal = payload?.SearchSignal;
35-
// string encodedCatalogueUrl = HttpUtility.UrlEncode("/Catalogue/" + catalogueUrl);
36-
// string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
37-
// string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
38-
39-
// var url = $@"/search/record-catalogue-click?url={encodedCatalogueUrl}&nodePathId={nodePathId}&itemIndex={payload?.HitNumber}
40-
// &pageIndex={pagingModel.CurrentPage}&totalNumberOfHits={payload?.SearchSignal?.Stats?.TotalHits}&searchText={suggestedSearchString}&catalogueId={catalogueId}
41-
// &GroupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal?.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal?.UserQuery)}
42-
// &query={searchSignalQueryEncoded}&name={payload?.DocumentFields?.Name}";
43-
// return url;
4427
}
4528

4629
<div class="resource-item nhsuk-card nhsuk-card--clickable nhsuk-u-margin-bottom-4">
4730

48-
<div class="nhsuk-card__content" style="padding: 10px;">
31+
<div class="nhsuk-card__content nhsuk-u-padding-bottom-2 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2">
4932

50-
<div style="position: absolute; top: 0; right: 0; background-color: #0056b3; color: white; padding: 5px 15px; border-top-right-radius: 8px; border-bottom-left-radius: 8px; font-size: 0.8em;"> Catalogue </div>
33+
<div class="search-catalogue-badge"> Catalogue </div>
5134

5235
<h3 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2">
5336
<a class="nhsuk-card__link" href="@GetUrl(item.CatalogueUrl, item.NodePathId ?? 0, 0, Convert.ToInt32(item.Id), item.Click.Payload)">@item.Title</a>

0 commit comments

Comments
 (0)