Merge pull request #242 from TechnologyEnhancedLearning/RC

Merge RC changes to LH Phoenix

Author: AnjuJose011

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -300,7 +300,7 @@ public static string GetDurationText(this int durationInMilliseconds)
                     else
                     {
                         duration = $"{t.Minutes}min {t.Seconds}sec";
-                        duration = duration.Replace("0min", string.Empty);
+                        duration = duration.StartsWith("0min") ? duration.Replace("0min", string.Empty) : duration;
                     }
                 }
             }

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

@@ -58,8 +58,8 @@
     flex: 1 0 0;
 }
 
-.nhsuk-header__logo  .nhsuk-header__link--service {
-    display:inline-flex;
+.nhsuk-header__logo .nhsuk-header__link--service {
+    display: inline-flex;
 }
 
 .nhsuk-header__service-name {
@@ -90,22 +90,15 @@
     height: px2rem(18);
     text-align: center;
     border-radius: px2rem(9);
-    padding:px2rem(1) px2rem(3) 0;
+    padding: px2rem(1) px2rem(3) 0;
 }
 
 .nhsuk-header__menu {
     display: none;
 }
 
-.nhsuk-header__search {
-    .nhsuk-search__input {
-        width: px2rem(260);
-    }
-    
-    label {
-        color: #E0E0E6;
-    }
-
+.nhsuk-header__search .nhsuk-search__input {
+    width: px2rem(260);
 }
 
 .nhsuk-header__search {
@@ -135,7 +128,7 @@
 }
 
 .beta-banner + div {
-    border-top:1px solid $color_nhsuk-grey-3;
+    border-top: 1px solid $color_nhsuk-grey-3;
 }
 
 .beta-banner__beta-box {
@@ -194,14 +187,14 @@
 @media (min-width: px2rem(990)) {
 
     .nhsuk-header__navigation-item--current a {
-        border-bottom:4px solid $nhsuk-grey-lighter;
-        font-weight:normal;
+        border-bottom: 4px solid $nhsuk-grey-lighter;
+        font-weight: normal;
     }
 
     .nhsuk-header__navigation-link {
-        position:relative;
+        position: relative;
     }
-    
+
     .nhsuk-header__navigation-item:last-child {
         margin-right: 16px;
     }
@@ -275,7 +268,7 @@
         text-align: center;
         margin: 0;
         right: 0;
-        font-weight:600;
+        font-weight: 600;
     }
 
     .nhsuk-header__search-form {
@@ -300,7 +293,7 @@
         background: $nhsuk-error-color;
         color: $nhsuk-white;
         min-width: px2rem(18);
-        width:fit-content;
+        width: fit-content;
         height: px2rem(18);
         text-align: center;
         border-radius: px2rem(9);
@@ -349,7 +342,7 @@
     }
 
     .nhsuk-header__logo {
-        max-width:none;
+        max-width: none;
     }
 
     .nhsuk-header__mobile-only-nav {
@@ -409,7 +402,7 @@
     }
 
     .nhsuk-header__search .nhsuk-search__submit {
-        padding-top:nhsuk-spacing(1);
+        padding-top: nhsuk-spacing(1);
     }
 
     .nhsuk-header__menu {

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

@@ -223,7 +223,4 @@
             </div>
         </div>
     </div>
-</div>
-
-
-
+</div>

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

@@ -92,7 +92,7 @@
                 @* Weblink *@
                 @if (canShowMoreDetails && resourceItem.ResourceTypeEnum == ResourceTypeEnum.WebLink)
                 {
-                    <div class="nhsuk-card nhsuk-bg-light-blue">
+                    <div id="resourcePg" class="nhsuk-card nhsuk-bg-light-blue">
                         <div class="nhsuk-card__content">
                             <p class="nhsuk-body-l nhsuk-u-margin-bottom-3">Visit site:</p>
                             @{
@@ -103,7 +103,7 @@
                                     displayText = resourceItem.WebLinkDetails.Url;
                                 }
                             }
-                            <p class="nhsuk-body-l word-break__break-word"><a href="@GetWeblinkNavigateLink(resourceItem.WebLinkDetails.Url)" target="_blank">@displayText</a></p>
+                            <p class="nhsuk-body-l word-break__break-word"><a v-on:click=checkUserCertificateAvailability(@resourceItem.Id) href="@GetWeblinkNavigateLink(resourceItem.WebLinkDetails.Url)" target="_blank">@displayText</a></p>
                         </div>
                     </div>
                 }
@@ -127,12 +127,12 @@
                 @if (canShowMoreDetails && resourceItem.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
                 {
                     <div class="resource-panel-container">
-                        <div class="nhsuk-card nhsuk-bg-light-blue">
+                        <div id="resourcePg" class="nhsuk-card nhsuk-bg-light-blue">
                             <div class="nhsuk-card__content">
                                 <p class="nhsuk-body-l nhsuk-u-margin-bottom-3">Download:</p>
                                 <p class="nhsuk-body-l word-break__break-word">
                                     <span class="nhsuk-u-margin-right-4 pill @UtilityHelper.GetPillColour(resourceItem.GenericFileDetails.File.FileName)">@GetFileExtension(resourceItem.GenericFileDetails.File.FileName)</span>
-                                    <a class="nhsuk-u-margin-right-4" href="@GetDownloadResourceLink(resourceItem.GenericFileDetails.File.FilePath, resourceItem.GenericFileDetails.File.FileName)">@resourceItem.GenericFileDetails.File.FileName</a> (@resourceItem.GenericFileDetails.File.FileSizeKb KB)
+                                    <a v-on:click=checkUserCertificateAvailability(@resourceItem.Id) class="nhsuk-u-margin-right-4" href="@GetDownloadResourceLink(resourceItem.GenericFileDetails.File.FilePath, resourceItem.GenericFileDetails.File.FileName)">@resourceItem.GenericFileDetails.File.FileName</a> (@resourceItem.GenericFileDetails.File.FileSizeKb KB)
                                 </p>
                             </div>
                         </div>