Merge pull request #6521 from avalonmediasystem/audio_description

Backend and edit form for audio description support

Author: masaball

app/assets/stylesheets/avalon.scss

@@ -931,13 +931,24 @@ h5.card-title {
         .file-remove {
           display: none;
         }
-        .mb-3 {
-          margin-bottom: 0.2rem;
-        }
         .fa-gears {
           display: none;
         }
         display: flex;
+
+        .ms-3 {
+          margin-left: 0 !important;
+        }
+
+        .form-check-inline {
+          margin-right: 0;
+          white-space: nowrap;
+
+          &:first-of-type {
+            margin-left: 0.5rem;
+            margin-right: -0.5rem;
+          }
+        }
       }
       margin-top: 0.75rem;
 
@@ -956,7 +967,7 @@ h5.card-title {
     }
 
     div.supplemental-file-data.is-editing:not(.edit-item)+div.supplemental-file-data {
-      margin-top: 2.5rem;
+      margin-top: 2.75rem;
     }
 
     .supplemental-file-form {
@@ -981,11 +992,9 @@ h5.card-title {
       height: 25px;
     }
 
-    &.captions,
-    &.transcripts {
-      div.supplemental-file-data.is-editing:last-child {
-        margin-bottom: 1.75rem;
-      }
+    
+    div.supplemental-file-data.is-editing:last-child {
+      margin-bottom: 2rem;
     }
   }
 }

app/models/concerns/iiif_supplemental_file_behavior.rb

@@ -16,16 +16,16 @@ module IiifSupplementalFileBehavior
   private
 
   def supplemental_files_rendering(object)
-    tags = ['caption', nil]
+    tags = ['caption', 'description', nil]
     supplemental_files = []
     tags.each do |tag|
       supplemental_files += object.supplemental_files(tag: tag).collect do |sf|
-                              {
-                                "@id" => object_supplemental_file_url(object, sf),
-                                "type" => determine_rendering_type(sf.file.content_type),
-                                "label" => { "en" => [sf.label] },
-                                "format" => sf.file.content_type
-                              }
+        {
+          "@id" => object_supplemental_file_url(object, sf),
+          "type" => determine_rendering_type(sf.file.content_type),
+          "label" => { "en" => [sf.label] },
+          "format" => sf.file.content_type
+        }
       end
     end