Merge pull request #287 from TechnologyEnhancedLearning/TD-3162-TD-3163-corrections

Merge-Apply additional corrections for TD3162 and TD3163

Author: AnjuJose011

LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml

@@ -126,7 +126,7 @@
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
         @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
         {
-          <img alt="catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+          <img alt="ELFH 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>
@@ -146,7 +146,8 @@
            asp-route-title="@Model.Catalogue.Name.Truncate(60)"
            asp-route-nodeId="@Model.Catalogue.NodeId"
            asp-route-path="@Model.Catalogue.Url"
-           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
+           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)"
+           aria-label="@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks">@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
         </div>
       }
 

LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml

@@ -2,8 +2,8 @@
 
 <form id="search" asp-controller="catalogue" asp-action="index" asp-fragment="searchTab" method="get" role="search">
     <div class="nhsuk-form-group  nhsuk-header__search-form--search-results">
-        <label class="nhsuk-label nhsuk-u-visually-hidden" for="search-field">Search</label>
-        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="search-field" value="@Model" placeholder="Search">
+        <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

LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml

@@ -63,11 +63,11 @@
           @if (providerExists)
           {
             var provider = @Model.Providers.First();
-            <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 (!string.IsNullOrEmpty(Model.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.BadgeUrl))" alt="@(Model.Name)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
       </div>

LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml

@@ -77,11 +77,11 @@
           @if (providerExists)
           {
             var provider = @Model.Item2.Providers.First();
-            <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 (!string.IsNullOrEmpty(Model.Item2.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="@(Model.Item2.CatalogueName)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
       </div>

LearningHub.Nhs.WebUI/Views/Resource/_ResourceInformation.cshtml

@@ -7,6 +7,7 @@
 @inject Microsoft.Extensions.Options.IOptions<LearningHub.Nhs.WebUI.Configuration.Settings> options
 @{
   var resourceItem = Model.ResourceItem;
+  bool providerExists = Model.ResourceItem.Providers?.Count > 0;
 
   bool CanDisplayEsrLink()
   {
@@ -39,9 +40,15 @@
         <div class="display__flex-space-between">
           <h2>Resource details</h2>
 
+          @if (providerExists)
+          {
+            var providersss = @resourceItem.Providers;
+            var provider = @resourceItem.Providers.First();
+            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
+          }
           @if (!string.IsNullOrEmpty(resourceItem.Catalogue.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(resourceItem.Catalogue.BadgeUrl))" alt="@(resourceItem.Catalogue.Name)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(resourceItem.Catalogue.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
 

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

@@ -2,8 +2,8 @@
 
 <form id="search" asp-controller="search" asp-action="results" method="get" role="search">
     <div class="nhsuk-u-margin-bottom-5 nhsuk-header__search-form--search-results">
-        <label class="nhsuk-label nhsuk-u-visually-hidden" for="search-field">Search the learning hub</label>
-        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="search-field" placeholder="Search the learning hub" value="@Model">
+        <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

LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml

@@ -27,7 +27,7 @@
       @await Component.InvokeAsync("NavigationItems", new { navView = "MobileTopRightNav", controllerName = controllerName })
       @if (User.Identity.IsAuthenticated) {
         <div class="nhsuk-header__menu">
-          <label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
+          <button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</button>
           @await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
         </div>
       }
@@ -41,7 +41,7 @@
 
   @if (User.Identity.IsAuthenticated) {
     <div class="nhsuk-header__menu nhsuk-header__not-mobile">
-      <label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
+      <button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</button>
       @await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
     </div>
   }