From 9001907d5e9c25f3b81a2d6dfeca0f8b33822cb6 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Tue, 7 Nov 2023 13:09:46 +0000
Subject: [PATCH 1/7] Added Code to play embedded youtube and vimeo videos

---
 .../Contentful/Models/VideoResource.cs        |  2 +
 .../Views/Shared/_VideoResource.cshtml        | 56 +++++++++++++++----
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs b/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
index a07fc6cb..08730572 100644
--- a/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
+++ b/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
@@ -7,4 +7,6 @@ public class VideoResource : IContent
     public string Id { get; set; }
     public Asset Video { get; set; }
     public Document Transcript {  get; set; }
+    public string EmbededTitle { get; set; }
+    public string EmbededSourceUrl { get; set; }
 }
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 30da1af6..190e5dda 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -8,16 +8,50 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-        <video id="videoPlayer" preload="none">
-            <source src="@Model.Video.File.Url">
-        </video>
-        <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
-            <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
-            <div class="govuk-details__text">
-                @{
-                    await Html.RenderPartialAsync("_RichText", Model.Transcript);
-                }
-            </div>
-        </details>
+        @if(!string.IsNullOrEmpty(Model.EmbededTitle) && !string.IsNullOrEmpty(Model.EmbededSourceUrl))
+        {
+            <h2>
+                @Model.EmbededTitle
+            </h2>
+            if (@Model.EmbededSourceUrl.IndexOf("vimeo") > -1)
+            {
+                <iframe width="560" height="315"
+                        src="@Model.EmbededSourceUrl"
+                        title="@Model.EmbededTitle"
+                        frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                        allowfullscreen>
+                </iframe>
+            }
+            else
+            {
+                <video id="SomeID" name="media" src="@Model.EmbededSourceUrl" />
+            }
+
+            if (Model.Transcript != null && Model.Transcript.Content != null && Model.Transcript.Content.Any())
+            {
+                <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
+                    <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
+                    <div class="govuk-details__text">
+                        @{
+                            await Html.RenderPartialAsync("_RichText", Model.Transcript);
+                        }
+                    </div>
+                </details>
+            }
+        }
+        else
+        {
+            <video id="videoPlayer" preload="none">
+                <source src="@Model.Video.File.Url">
+            </video>
+            <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
+                <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
+                <div class="govuk-details__text">
+                    @{
+                        await Html.RenderPartialAsync("_RichText", Model.Transcript);
+                    }
+                </div>
+            </details>
+        }  
     </div>
 </div>
\ No newline at end of file

From 362b57de31d781ffa12308fc99504a0cf21fd8f5 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Tue, 7 Nov 2023 14:28:52 +0000
Subject: [PATCH 2/7] Modified tags

---
 .../Views/Shared/_VideoResource.cshtml                      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 190e5dda..34ea282c 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -18,13 +18,15 @@
                 <iframe width="560" height="315"
                         src="@Model.EmbededSourceUrl"
                         title="@Model.EmbededTitle"
-                        frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen>
                 </iframe>
             }
             else
             {
-                <video id="SomeID" name="media" src="@Model.EmbededSourceUrl" />
+                <video id="SomeID" name="media" src="@Model.EmbededSourceUrl" >
+                    <track label="English" kind="captions" srclang="en" default>
+                </video>
             }
 
             if (Model.Transcript != null && Model.Transcript.Content != null && Model.Transcript.Content.Any())

From 846d2340c2cc9d3a5cac8148a06dfb88672d5c75 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Tue, 7 Nov 2023 15:40:04 +0000
Subject: [PATCH 3/7] Resolved PR Comments

---
 .../Views/Shared/_VideoResource.cshtml        | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 34ea282c..9f17036d 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -24,36 +24,30 @@
             }
             else
             {
-                <video id="SomeID" name="media" src="@Model.EmbededSourceUrl" >
+                <video id="videoPlayer" name="media" src="@Model.EmbededSourceUrl">
                     <track label="English" kind="captions" srclang="en" default>
                 </video>
             }
 
-            if (Model.Transcript != null && Model.Transcript.Content != null && Model.Transcript.Content.Any())
-            {
-                <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
-                    <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
-                    <div class="govuk-details__text">
-                        @{
-                            await Html.RenderPartialAsync("_RichText", Model.Transcript);
-                        }
-                    </div>
-                </details>
-            }
+           
         }
         else
         {
             <video id="videoPlayer" preload="none">
                 <source src="@Model.Video.File.Url">
             </video>
-            <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
-                <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
-                <div class="govuk-details__text">
-                    @{
-                        await Html.RenderPartialAsync("_RichText", Model.Transcript);
-                    }
-                </div>
-            </details>
-        }  
+        }
+
+        if (Model.Transcript?.Content != null && Model.Transcript.Content.Any())
+        {
+        <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
+            <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
+            <div class="govuk-details__text">
+                @{
+                    await Html.RenderPartialAsync("_RichText", Model.Transcript);
+                }
+            </div>
+        </details>
+        }
     </div>
 </div>
\ No newline at end of file

From a221c20b958a1a8ef2e1539f83364a5703ab09d1 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Tue, 7 Nov 2023 15:47:41 +0000
Subject: [PATCH 4/7] Pull Request fixes

---
 Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 9f17036d..af01d108 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -24,7 +24,7 @@
             }
             else
             {
-                <video id="videoPlayer" name="media" src="@Model.EmbededSourceUrl">
+                <video name="media" src="@Model.EmbededSourceUrl">
                     <track label="English" kind="captions" srclang="en" default>
                 </video>
             }
@@ -33,7 +33,7 @@
         }
         else
         {
-            <video id="videoPlayer" preload="none">
+            <video id="videoPlayer" name="media" preload="none">
                 <source src="@Model.Video.File.Url">
             </video>
         }

From 2e531e6bc0b36b4b86cfbc66bf1b25f5b4ebf8a7 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Tue, 7 Nov 2023 16:05:10 +0000
Subject: [PATCH 5/7] PR Fix

---
 .../Views/Shared/_VideoResource.cshtml                   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index af01d108..0f964bfb 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -28,8 +28,6 @@
                     <track label="English" kind="captions" srclang="en" default>
                 </video>
             }
-
-           
         }
         else
         {
@@ -37,9 +35,7 @@
                 <source src="@Model.Video.File.Url">
             </video>
         }
-
-        if (Model.Transcript?.Content != null && Model.Transcript.Content.Any())
-        {
+        
         <details class="govuk-details govuk-!-margin-top-3" data-module="govuk-details">
             <summary class="govuk-details__summary"> <span class="govuk-details__summary-text">View transcript  </span></summary>
             <div class="govuk-details__text">
@@ -48,6 +44,7 @@
                 }
             </div>
         </details>
-        }
+        
+        
     </div>
 </div>
\ No newline at end of file

From d9b00ced614932b1e744e45e8829f803de32e449 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Wed, 8 Nov 2023 08:58:11 +0000
Subject: [PATCH 6/7] PR Fixes

---
 .../Contentful/Models/VideoResource.cs             |  3 +--
 .../Views/Shared/_VideoResource.cshtml             | 14 ++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs b/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
index 08730572..706384c0 100644
--- a/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
+++ b/Childrens-Social-Care-CPD/Contentful/Models/VideoResource.cs
@@ -7,6 +7,5 @@ public class VideoResource : IContent
     public string Id { get; set; }
     public Asset Video { get; set; }
     public Document Transcript {  get; set; }
-    public string EmbededTitle { get; set; }
-    public string EmbededSourceUrl { get; set; }
+    public string EmbeddedSourceUrl { get; set; }
 }
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 0f964bfb..17dd51b7 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -8,25 +8,19 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-        @if(!string.IsNullOrEmpty(Model.EmbededTitle) && !string.IsNullOrEmpty(Model.EmbededSourceUrl))
+        @if(!string.IsNullOrEmpty(Model.EmbeddedSourceUrl))
         {
-            <h2>
-                @Model.EmbededTitle
-            </h2>
-            if (@Model.EmbededSourceUrl.IndexOf("vimeo") > -1)
+            if (@Model.EmbeddedSourceUrl.IndexOf("vimeo") > -1)
             {
                 <iframe width="560" height="315"
-                        src="@Model.EmbededSourceUrl"
-                        title="@Model.EmbededTitle"
+                        src="@Model.EmbeddedSourceUrl"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen>
                 </iframe>
             }
             else
             {
-                <video name="media" src="@Model.EmbededSourceUrl">
-                    <track label="English" kind="captions" srclang="en" default>
-                </video>
+                <video name="media" src="@Model.EmbeddedSourceUrl" preload="none"></video>         
             }
         }
         else

From cef33b75b58822db834a7cf2b8e23fb434970900 Mon Sep 17 00:00:00 2001
From: Martin-Belton-gov <martin.belton@digital.education.gov.uk>
Date: Wed, 8 Nov 2023 09:10:40 +0000
Subject: [PATCH 7/7] Fix Static Attribute Issue

---
 Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
index 17dd51b7..84f35001 100644
--- a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
+++ b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -13,6 +13,7 @@
             if (@Model.EmbeddedSourceUrl.IndexOf("vimeo") > -1)
             {
                 <iframe width="560" height="315"
+                        title="Vimeo Video"
                         src="@Model.EmbeddedSourceUrl"
                         allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                         allowfullscreen>