Merge pull request #2862 from WGBH-MLA/civil-rights-video2

Civil rights video2
WGBH-MLA · Oct 17, 2024 · f1e065b · f1e065b
2 parents 8be400e + 8dad436
commit f1e065b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/app/assets/stylesheets/globals/exhibits.css.scss b/app/assets/stylesheets/globals/exhibits.css.scss
@@ -25,13 +25,23 @@
   height: 97vh;
 }
 
-#exhibit-main iframe.exhibit-small-iframe, #collection-main iframe.exhibit-small-iframe {
+#exhibit-main iframe.exhibit-small-iframe, #collection-main iframe.exhibit-small-iframe, #exgal-main iframe.exhibit-small-iframe {
   width: 100%;
   height: auto;
   min-height: auto;
   aspect-ratio: 16 / 9;
 }
 
+#exgal-main iframe.exhibit-small-iframe {
+  margin-top: 2vh;
+}
+
+#exgal-modal-viewer iframe.exhibit-small-iframe {
+  width: 100%;
+  min-height: 68vh;
+  height: 68vh;
+}
+
 #exhibit-main iframe.exhibit-small-iframe.four-three, #collection-main iframe.exhibit-small-iframe.four-three {
   aspect-ratio: 4 / 3;
 }

diff --git a/app/views/exhibits/_gallery_player.html.erb b/app/views/exhibits/_gallery_player.html.erb
@@ -35,7 +35,7 @@
 
 <% elsif media_info[:type] == 'iframe' %>
   <div class="exgal-player-container exgal-modal-height">
-    <iframe src="<%= media_info[:url] %>"></iframe>
+   <iframe style="border: 0;" class="exhibit-small-iframe" src="<%= media_info[:url] %>"></iframe>
   </div>
 <% end %>
 

diff --git a/app/views/exhibits/civil-rights.md b/app/views/exhibits/civil-rights.md
@@ -68,10 +68,10 @@ NAEB began operations in 1934 from a precursor organization that had been formed
 
 ## Gallery
 
-- <a class="type">image</a>
-  <img alt="Black and White photograph from the March on Washington for Jobs and Freedom" src="https://s3.amazonaws.com/americanarchive.org/exhibits/CivilRights_SignatureImage.jpg">
-  <a class="caption-text">Warren K. Leffler, photographer. Participants in the March on Washington for Jobs and Freedom, August 28, 1963.</a>
-  <a class="credit-link" href="https://www.loc.gov/rr/print/">Courtesy of U.S. News & World Report Magazine Photograph Collection, Prints and Photographs Division, Library of Congress.</a>
+- <a class="type">iframe</a>
+  <a href="https://player.vimeo.com/video/983252534?h=0e726a503d" class="media-url"></a>
+  <a class="asset-url" href="https://player.vimeo.com/video/983252534?h=0e726a503d" class="media-url"></a>
+  <a class="caption-text">Voices from the Southern Civil Rights Movement</a> 
 
 
 ## Records

diff --git a/spec/features/exhibits_spec.rb b/spec/features/exhibits_spec.rb
@@ -17,7 +17,6 @@
   it 'gets all components of a gallery item' do
     # TODO: change this to a real exhibit once they're all reformatted
     visit '/exhibits/civil-rights'
-    expect(page.find(:css, 'div.exgal-1 div.exgal-caption')).to have_content 'Warren K. Leffler, photographer. Participants in the March on Washington for Jobs and Freedom, August 28, 1963.'
-    expect(page.find(:css, 'div.exgal-1 h4.exgal-source_text')).to have_content 'Courtesy of U.S. News & World Report Magazine Photograph Collection, Prints and Photographs Division, Library of Congress.'
+    expect(page.find(:css, 'div.exgal-1 div.exgal-caption')).to have_content 'Voices from the Southern Civil Rights Movement'
   end
 end