Merge pull request #628 from DFE-Digital/next

Pathways QA Resolutions

.github/workflows/docker-contentful-space-export.yml

@@ -70,7 +70,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
         with:
           context: Contentful-Backup
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/docker-contentful-space-import.yml

@@ -70,7 +70,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
         with:
           context: Contentful-Backup
           file: ./Contentful-Backup/Dockerfile2

.github/workflows/docker-publish.yml

@@ -81,7 +81,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
         with:
           context: Childrens-Social-Care-CPD
           push: ${{ github.event_name != 'pull_request' }}

Childrens-Social-Care-CPD/Views/Shared/_ErrorLayout.cshtml

@@ -118,7 +118,7 @@
                     {
                         <li class="dfe-header__navigation-item" id="mmi-pathwaysModules">
                             <a class="dfe-header__navigation-link" href="/pathways-social-work-leadership-modules/about-pathways">
-                                Pathways modules
+                                Pathways leadership modules
                                 <svg class="dfe-icon dfe-icon__chevron-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
                                     <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
                                 </svg>

Childrens-Social-Care-CPD/Views/Shared/_Header.cshtml

@@ -71,7 +71,7 @@
                     }
                     if (featuresConfig.IsEnabled(Features.PathwaysModules))
                     {
-                        RenderMenuItem("pathwaysModules", "Pathways modules", "pathways-social-work-leadership-modules/about-pathways", category == "Pathways modules");
+                        RenderMenuItem("pathwaysModules", "Pathways leadership modules", "pathways-social-work-leadership-modules/about-pathways", category == "Pathways modules");
                     }
                 }
             </ul>

Childrens-Social-Care-CPD/Views/Shared/_PathwaysModuleIndex.cshtml

@@ -41,8 +41,15 @@
             @if (Model.PathwaysModule?.Sections != null) {
                 foreach (var moduleSection in Model.PathwaysModule.Sections)
                 {
-                    string displayText = moduleSection.ShortName ?? moduleSection.Name;
                     sectionCount++;
+
+                    string modulePagesText = "page";
+                    if (moduleSection.Pages?.Count > 1) {
+                        modulePagesText += "s";
+                    }
+
+                    string displayText = moduleSection.ShortName ?? moduleSection.Name;
+
                     <section class="module-overview--section">
                         <div class="progress-bar">
                             <span class="icon not_started">
@@ -62,9 +69,12 @@
                                             Add Content item(s) to this Pathways Module Section to resolve this.
                                         </div>
                                     }
-                                    @displayText <span class="module-section--pages">(@moduleSection.Pages?.Count pages)</span>
+                                    @displayText <span class="module-section--pages">(@moduleSection.Pages?.Count @modulePagesText)</span>
                                 </h4>
-                                <a href="/@moduleSection.Pages?[0].Id" class="section-nav-link govuk-link" data-track-label="">Go to this section</a>
+                                @if(moduleSection != Model.PathwaysModule.Sections[Model.PathwaysModule.Sections.Count - 1])
+                                {
+                                    <a href="/@moduleSection.Pages?[0].Id" class="section-nav-link govuk-link" data-track-label="">Go to this section</a>
+                                }
                             </div>
                             <p class="govuk-body">@moduleSection.Summary</p>
                             <hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible">

Childrens-Social-Care-CPD/styles/scss/overrides/_dfe-overrides.scss

@@ -592,8 +592,8 @@ content: "";
 @media (min-width: 40.0625em) {
 .gem-c-attachment__thumbnail {
         position: relative;
-        width: 140px;
-        height: auto;
+        width: 110px;
+        height: 150px;
         max-width: 140px;
         margin-right: 20px;
         margin-bottom: 15px;
@@ -605,8 +605,8 @@ content: "";
 .gem-c-attachment__thumbnail-image {
     display: block;
     max-width: 280px;
-    width: 140px;
-    height: auto;
+    width: 110px;
+    height: 150px;
     border: rgba(11, 12, 12, 0.1);
     outline: 5px solid rgba(11, 12, 12, 0.1);
     background: #ffffff;

Childrens-Social-Care-CPD/styles/scss/overrides/_site.scss

@@ -339,6 +339,7 @@ div.infobox-width-container {
     position: absolute;
     top: 0;
     left: 0;
+    pointer-events: none;
 }
 
 .infobox .govuk-grid-column-three-quarters {

Childrens-Social-Care-CPD/wwwroot/google308335d112360551.html

@@ -0,0 +1 @@
+google-site-verification: google308335d112360551.html