From e8a511b4a5473e085792e8e731f19fd01cedbf0e Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 6 Dec 2023 13:40:00 -0800
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8E=81=20Update=20theme=20show=20page?=
 =?UTF-8?q?s=20with=20video=20embed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates the scholarly theme's show page to handle video embed

Issue:
- https://github.com/scientist-softserv/palni-palci/issues/911
---
 .../scholarly_show/hyrax/base/show.html.erb   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/themes/scholarly_show/hyrax/base/show.html.erb b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
index 2b3050f09..4a0d4db30 100644
--- a/app/views/themes/scholarly_show/hyrax/base/show.html.erb
+++ b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
@@ -16,30 +16,32 @@
       <div class="panel-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.iiif_viewer? %>
+          <% if @presenter.video_embed_viewer? %>
+            <%= render 'video_embed_viewer', presenter: @presenter %>
             <div class="col-sm-12">
+              <div class="image-show-description">
+                <% render 'work_description', presenter: @presenter %>
+              </div>
+            </div>
+          <% elsif @presenter.iiif_viewer? %>
+            <div class="col-sm-12 centered-media">
               <%= render 'representative_media', presenter: @presenter, viewer: true %>
             </div>
             <div class="col-sm-12">
               <div class="image-show-description">
-                <%= render 'work_description', presenter: @presenter %>
+                <% render 'work_description', presenter: @presenter %>
               </div>
             </div>
-          <% elsif Flipflop.default_pdf_viewer? && @presenter.show_pdf_viewer? && @presenter.file_set_presenters.any?(&:pdf?) %>
+          <% elsif @presenter.pdf_viewer? %>
             <div class="col-sm-12">
               <%= render 'pdf_js', file_set_presenter: pdf_file_set_presenter(@presenter) %>
             </div>
-            <div class="col-sm-12">
-              <div class="image-show-description">
-                <%= render 'work_description', presenter: @presenter %>
-              </div>
-            </div>
           <% else %>
             <div class="col-sm-3 mb-1">
-              <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? && @presenter.file_set_presenters.any?(&:pdf?) %>
+              <%= render 'representative_media', presenter: @presenter, viewer: false %>
             </div>
             <div class="col-sm-9">
-              <%= render 'work_description', presenter: @presenter %>
+              <% render 'work_description', presenter: @presenter %>
             </div>
           <% end %>
         </div>

From 9ac04da4dc99c1fbe5027f9d6869894ba1ff125e Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 6 Dec 2023 13:47:50 -0800
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8E=81=20add=20video=20embed=20to=20r?=
 =?UTF-8?q?eshare=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../themes/reshare_show/hyrax/base/show.html.erb      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/themes/reshare_show/hyrax/base/show.html.erb b/app/views/themes/reshare_show/hyrax/base/show.html.erb
index 9d4938dc9..8dc99c03c 100644
--- a/app/views/themes/reshare_show/hyrax/base/show.html.erb
+++ b/app/views/themes/reshare_show/hyrax/base/show.html.erb
@@ -7,7 +7,9 @@
       <div class="panel-body py-0">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.iiif_viewer? %>
+          <% if @presenter.video_embed_viewer? %>
+            <%= render 'video_embed_viewer', presenter: @presenter %>
+          <% elsif @presenter.iiif_viewer? %>
             <div class="col-sm-12">
               <%= render 'representative_media', presenter: @presenter, viewer: true %>
             </div>
@@ -15,10 +17,11 @@
             <div class="col-sm-12">
               <%= render 'pdf_js', file_set_presenter: pdf_file_set_presenter(@presenter) %>
             </div>
+          <% else %>
+            <div class="col-12 text-center">
+              <%= render 'representative_media', presenter: @presenter, viewer: false %> 
+            </div>
           <% end %>
-          <div class="col-12 text-center">
-            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.universal_viewer? || @presenter.show_pdf_viewer? %>
-          </div>
         </div>
         <div class="row py-4">
           <div class="col-xs-12">

From 628981cbd888b64a0d94fefbde33496a0438e071 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 6 Dec 2023 13:56:26 -0800
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8E=81=20add=20video=20embed=20to=20c?=
 =?UTF-8?q?ultural=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cultural_show/hyrax/base/show.html.erb    | 68 +++++++------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/app/views/themes/cultural_show/hyrax/base/show.html.erb b/app/views/themes/cultural_show/hyrax/base/show.html.erb
index 95f79ad99..83c869d5d 100644
--- a/app/views/themes/cultural_show/hyrax/base/show.html.erb
+++ b/app/views/themes/cultural_show/hyrax/base/show.html.erb
@@ -11,64 +11,48 @@
       <div class="panel-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.iiif_viewer? %>
-            <div class="col-sm-12 centered-media">
-              <%= render 'representative_media', presenter: @presenter, viewer: true %>
-            </div>
-          <% elsif Flipflop.default_pdf_viewer? && @presenter.show_pdf_viewer? && @presenter.file_set_presenters.any?(&:pdf?) %>
-            <div class="col-sm-12">
-              <%= render 'pdf_js', file_set_presenter: pdf_file_set_presenter(@presenter) %>
-            </div>
-          <% end %>
           <div class="col-sm-12">
             <%= render "show_actions", presenter: @presenter %>
           </div>
-          <div class="centered-media <%= !@presenter.iiif_viewer? ? 'col-sm-6 text-center' : '' %>">
-            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? || @presenter.show_pdf_viewer? %>
-          <% if !@presenter.iiif_viewer? %>
-            <div>
-            <br/>
-              <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
-              <%= render 'citations', presenter: @presenter %>
-              <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
-            <br/>
-            </div>
+          <% if @presenter.video_embed_viewer? %>
+            <%= render 'video_embed_viewer', presenter: @presenter %>
+          <% else %>
+            <% if @presenter.iiif_viewer? %>
+              <div class="col-sm-12 centered-media">
+                <%= render 'representative_media', presenter: @presenter, viewer: true %>
+              </div>
+            <% elsif @presenter.pdf_viewer? %>
+              <div class="col-sm-12">
+                <%= render 'pdf_js', file_set_presenter: pdf_file_set_presenter(@presenter) %>
+              </div>
+            <% else %>
+              <div class="centered-media <%= !@presenter.viewer? ? 'col-sm-6 text-center' : '' %>">
+                <%= render 'representative_media', presenter: @presenter, viewer: false %>
+              </div>
+            <% end %>
           <% end %>
-          </div>
-          <div class="<%= @presenter.iiif_viewer? ? 'col-sm-8' : 'col-sm-6' %>">
+          <div class="<%= @presenter.viewer? ? 'col-sm-8' : 'col-sm-8' %>">
             <%= render 'work_description', presenter: @presenter %>
             <%= render 'metadata', presenter: @presenter %>
           </div>
-          <div class="<%= @presenter.iiif_viewer? ? 'col-sm-4' : 'col-sm-12' %> relationships-container">
+          <div class="col-sm-12 col-md-4 relationships-container">
             <div class='relationships-box'>
               <%= render 'relationships', presenter: @presenter %>
-              <% if @presenter.class == Hyrax::OerPresenter %>
-                <%= render 'related_items', presenter: @presenter %>
-              <% end %>
             </div>
-            <% if @presenter.iiif_viewer? %>
-              <div class="center-block">
-              <br>
-                <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
-                <%= render 'citations', presenter: @presenter %>
-                <!-- analytics_button is disabled until future fix -->
+            <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
+            <%= render 'citations', presenter: @presenter %>
+            <!-- analytics_button is disabled until future fix -->
             <%#= render 'analytics_button', presenter: @presenter %>
-              </div>
-            <% end %>
           </div>
           <div class="col-sm-12 work-show-items">
             <%= render 'items', presenter: @presenter %>
-            <%# TODO: we may consider adding these partials in the future %>
-            <%# = render 'sharing_with', presenter: @presenter %>
-            <%# = render 'user_activity', presenter: @presenter %>
           </div>
+          <span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
+          <% @presenter.member_of_collection_ids.each do |collection_id| %>
+            <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" >
+          <% end %>
         </div>
       </div>
     </div>
-    <span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
-    <% @presenter.member_of_collection_ids.each do |collection_id| %>
-      <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" >
-    <% end %>
   </div>
-</div>
+</div>
\ No newline at end of file