hyrax 5.0.0 → 5.0.3

data/app/views/catalog/_search_form.html.erb

@@ -20,24 +20,17 @@
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
           </button>
-
-          <ul class="dropdown-menu dropdown-menu-right">
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
-                  data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
-            </li>
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
-                  data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
-            </li>
-            <li class="dropdown-item">
-              <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
-                  data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
-            </li>
-          </ul>
+          <div class="dropdown-menu dropdown-menu-right">
+            <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#", class: "dropdown-item",
+                data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
+            <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#", class: "dropdown-item",
+                data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
+            <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#", class: "dropdown-item",
+                data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
+          </div>
         <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
-    
+
   </div><!-- /.form-group -->
 <% end %>

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,4 @@
 <div class="col-md-3">
-  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
+  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ alt: document.title_or_label }, { suppress_link: true }) %>
 </div> 
 

data/app/views/catalog/_thumbnail_list_default.html.erb

@@ -1,10 +1,10 @@
 <% model = document.hydra_model %>
 <div class="col-md-3">
   <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
-    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, suppress_link: true) %>
+    <%= document_presenter(document)&.thumbnail&.thumbnail_tag({ alt: document.title_or_label }, { suppress_link: true }) %>
   <% else %>
     <div class="list-thumbnail">
-      <%= document_presenter(document)&.thumbnail&.thumbnail_tag %>
+      <%= document_presenter(document)&.thumbnail&.thumbnail_tag(alt: document.title_or_label) %>
     </div>
   <% end %>
 </div>

data/app/views/hyrax/admin/analytics/collection_reports/index.html.erb

@@ -8,11 +8,11 @@
   <div class="col-sm-12">
     <div class="collection-reports">
 
-<% if Hyrax.config.analytics? %>
+<% if Hyrax.config.analytics_reporting? %>
       <div class="card">
         <div class="card-header"><%= t('.repo_summary') %> <b><%= pluralize(Collection.count, "collection") %></b>, <%= t('.repo_summary_2') %> <b><%= @pageviews.all %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all %> <%= t('.downloads') %></b>.</div>
         <div class="card-body">
-      
+
                <div class="row text-center">
                 <div class="nav nav-pills btn-group" role="group">
                     <% if params[:start_date] %>
@@ -54,7 +54,7 @@
                   <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_collection_reports_path %>
                   <%= render "custom_range" %></div>
               </div>
-            
+
             </div>
           </div>
           <p class="text-center"><%= t('.report_generated_on') %> <b><%= Time.current %></b>.</p>
@@ -67,4 +67,4 @@
   <% end %>
     </div>
   </div>
-</div>
+</div>

data/app/views/hyrax/admin/analytics/work_reports/index.html.erb

@@ -9,7 +9,7 @@
     <div class="work-reports">
 
     <div class="card">
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <% if current_user.ability.admin? %>
         <div class="card-header"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
       <% else %>

data/app/views/hyrax/admin/collection_types/_form.html.erb

@@ -1,17 +1,17 @@
 <%= render "shared/nav_safety_modal" %>
 <div class="card tabs" id="collection-types-controls">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#metadata" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.metadata') %></a>
     </li>
     <% if @form.persisted? %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#settings" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.settings') %></a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#participants" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.participants') %></a>
       </li>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#appearance" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm"><%= t('hyrax.admin.collection_types.form.tab.appearance') %></a>
       </li>
     <% end %>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -41,7 +41,7 @@
                   <button class="btn btn-danger btn-sm delete-collection-type"
                           data-collection-type="<%= collection_type.to_json %>"
                           data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s }) %>"
-                          data-has-collections="<%= collection_type.collections.any? %>">
+                          data-has-collections="<%= collection_type.collections? %>">
                     <%= t('helpers.action.delete') %>
                   </button>
                   <% end %>

data/app/views/hyrax/admin/features/index.html.erb

@@ -9,7 +9,7 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th></th>
+                <th>Status</th>
                 <th class="name"><%= t('.feature') %></th>
                 <th class="description"><%= t('.description') %></th>
                 <th class="action"><%= t('.action') %></th>

data/app/views/hyrax/base/_file_manager_actions.html.erb

@@ -1,6 +1,6 @@
   <div class="actions card">
     <div class="d-flex">
-      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" } %>
+      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" }, 'aria-disabled': true %>
       <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary ", data: { action: "alpha-sort-action" } %>
     </div>
   </div>

data/app/views/hyrax/base/_file_manager_member.html.erb

@@ -3,7 +3,8 @@
       <%= simple_form_for [main_app, node], remote: true, html: {'data-type': 'json'} do |f| %>
         <div class="card-header">
           <div class="order-title">
-            <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title" }, value: node.to_s, label: false, hint: false %>
+            <label class="sr-only" id='<%= "edit_#{f.object.model_name.singular}_title" %>'>Edit title</label>
+            <%= f.input :title, as: :string, input_html: { name: "#{f.object.model_name.singular}[title][]", class: "title", 'aria-labelledby': "edit_#{f.object.model_name.singular}_title" }, value: node.to_s, label: false, hint: false %>
           </div>
           <div class="file-set-link float-right">
             <%= link_to contextual_path(node, @presenter), title: "Edit file" do %>
@@ -11,9 +12,11 @@
             <% end %>
           </div>
           <% if node.respond_to?(:label) %>
-            <div class="order-filename">
-              <em title="<%= node.page_title %>">(<%= truncate(node.label, length: 29) %>)</em>
-            </div>
+            <% unless node.label.nil? %>
+              <div class="order-filename" >
+                <em title="<%= node.page_title %>">(<%= truncate(node.label, length: 29) %>)</em>
+              </div>
+            <% end %>
           <% end %>
         </div>
         <div class="card-body">

data/app/views/hyrax/base/_file_manager_thumbnail.html.erb

@@ -1 +1 @@
-<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100' }, {}) %>
+<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100', 'alt': "Thumbnail image for #{node.title[0]}" }, {}) %>

data/app/views/hyrax/base/_form_files.html.erb

@@ -1,4 +1,4 @@
-<%= render "base_form_files_prepend", locals: { f: f } %>
+<%= render partial: "base_form_files_prepend", locals: { f: f } %>
 <div id="fileupload">
   <!-- Redirect browsers with JavaScript disabled to the origin page -->
   <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>

data/app/views/hyrax/base/_form_member_of_collections.html.erb

@@ -33,6 +33,10 @@ HTML Properties:
     </tr>
     </thead>
     <tbody>
+      <tr class="sr-only">
+        <td>This table will only display data if works are assigned to collections</td>
+        <td><span></span></td>
+      </tr>
     </tbody>
   </table>
 </div>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -17,7 +17,7 @@
             class: presenter.display_unfeature_link? ? 'btn btn-secondary' : 'btn btn-secondary collapse' %>
       <% end %>
     <% end %>
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <% # turbolinks needs to be turned off or the page will use the cache and the %>
       <% # analytics graph will not show unless the page is refreshed. %>
       <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
@@ -34,13 +34,12 @@
         <div class="btn-group">
           <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.attach_child') %>
-            <ul class="dropdown-menu">
-              <% presenter.valid_child_concerns.each do |concern| %>
-                <li class="dropdown-item">
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
-                </li>
-              <% end %>
-            </ul>
+          </button>
+          <div class="dropdown-menu">
+            <% presenter.valid_child_concerns.each do |concern| %>
+              <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id), class: "dropdown-item" %>
+            <% end %>
+          </div>
         </div>
       <% end %>
       <%= link_to t('.delete'), [main_app, presenter], class: 'btn btn-danger', data: { confirm: t('.confirm_delete', work_type: presenter.human_readable_type) }, method: :delete %>

data/app/views/hyrax/base/_work_button_row.html.erb

@@ -38,7 +38,7 @@
           data: { behavior: 'unfeature' },
           class: presenter.display_feature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
     <% end %>
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <%= link_to t(".analytics"), presenter.stats_path, id: 'stats', class: 'btn btn-secondary' %>
     <% end %>
   </div>

data/app/views/hyrax/batch_select/_add_button.html.erb

@@ -1,3 +1,3 @@
 <div data-behavior="batch-add-button">
-  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}", checks: "active" %>
+  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}", checks: "active", 'aria-labelledby': "batch_document_#{document.id}" %>
 </div>

data/app/views/hyrax/content_blocks/_form.html.erb

@@ -29,7 +29,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -45,7 +45,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
@@ -61,7 +61,7 @@
           </div>
           <div class="card-footer d-flex justify-content-end">
             <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.edit_content_blocks_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,7 +12,7 @@
         </div>
       </div>
     </li>
-    <li class="nav-item">
+    <li class="nav-item <%= 'active' if current_page?(hyrax.dashboard_path) %>">
       <%= link_to hyrax.dashboard_path, class: "nav-link", title: t('hyrax.admin.sidebar.dashboard') do %>
         <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
       <% end %>

data/app/views/hyrax/dashboard/_user_activity.html.erb

@@ -3,7 +3,7 @@
     <%= t('.title') %>
   </div>
   <div class="card-body d-flex justify-content-center">
-    <% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_reporting? %>
       <%= render 'user_activity_graph' %>
 
       <!-- FIXME: This is like embedded a card in a card...seems odd -->
@@ -22,4 +22,4 @@
       </div>
     <% end %>
   </div>
-</div>
+</div>

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -1,28 +1,28 @@
 <%= render "shared/nav_safety_modal" %>
 <div class="tabs mt-4" id="collection-edit-controls">
   <ul class="nav nav-tabs" id="dashboard-collection-tab" role="tablist">
-    <li class="nav-item">
+    <li class="nav-item" role="presentation">
       <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
         <%= t('.tabs.description') %>
       </a>
     </li>
     <% if @form.persisted? %>
       <% if collection_brandable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#branding" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.branding') %>
         </a>
       </li>
       <% end %>
       <% if collection_discoverable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#discovery" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.discovery') %>
         </a>
       </li>
       <% end %>
       <% if collection_sharable?(collection: @collection) %>
-      <li class="nav-item">
+      <li class="nav-item" role="presentation">
         <a href="#sharing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
           <%= t('.tabs.sharing') %>
         </a>

data/app/views/hyrax/dashboard/collections/_form_share.html.erb

@@ -25,10 +25,11 @@
                                         class: 'form-control search-input' %>
               </div>
               <div class="form-group">
-                <label class="mr-2">as</label>
+                <label id="add_group_as" class="mr-2">as</label>
                 <%= builder.select :access,
                                       access_options,
                                       { prompt: t('.select_a_role') },
+                                     'aria-labelledby': "add_group_as",
                                       class: 'form-control' %>
               </div>
             <% end %>
@@ -56,10 +57,11 @@
                                         placeholder: t('.search_for_a_user') %>
               </div>
               <div class="form-group">
-                <label class="mx-2">as</label>
+                <label id="add_user_as" class="mx-2">as</label>
                 <%= builder.select :access,
                                     access_options,
                                     { prompt: t('.select_a_role') },
+                                    'aria-labelledby': "add_user_as",
                                     class: 'form-control' %>
               </div>
             <% end %>
@@ -75,8 +77,8 @@
 
     <h2 class="h3"><%= t(".current_shared") %></h2>
     <section class="section-collection-sharing">
-     
-      
+
+
       <%= render 'form_share_table', access: 'managers', filter: :manage? %>
       <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
       <%= render 'form_share_table', access: 'viewers', filter: :view? %>

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -12,7 +12,7 @@
     <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
       data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-    <input type="checkbox" class="disabled batch_document_selector" disabled=true />
+    <input type="checkbox" id="batch_document_<%= id %>" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3" do %>
         <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
           { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
         ) %>

data/app/views/hyrax/dashboard/show_admin.html.erb

@@ -3,34 +3,34 @@
 <% end %>
 
 <div class="spaced-rows">
-  <% if Hyrax.config.analytics? %>
-  <div class="row">
-    <div class="col">
-      <div class="card">
-        <div class="card-header">
-          <h2 class="card-title"><%= t(".graph_reports") %>:</h2>
-          <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
-          <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
-        </div>
-        <div class="card-body">
-          <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+  <% if Hyrax.config.analytics_reporting? %>
+    <div class="row">
+      <div class="col">
+        <div class="card">
+          <div class="card-header">
+            <h2 class="card-title"><%= t(".graph_reports") %>:</h2>
+            <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
+            <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
+          </div>
+          <div class="card-body">
+            <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
-  <div class="row">
-    <div class="col">
-      <div class="card">
-        <%= render 'user_activity' %>
+    <div class="row">
+      <div class="col">
+        <div class="card">
+          <%= render 'user_activity' %>
+        </div>
       </div>
     </div>
-  </div>
   <% end %>
 
   <div class="row">
     <div class="col">
-     <%= render 'repository_growth' %>
+      <%= render 'repository_growth' %>
     </div>
   </div>
 
@@ -50,4 +50,3 @@
 <div class="clearfix mt-5">
   <%= render 'tabs' %>
 </div>
-

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -33,7 +33,7 @@
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics_reporting? %>
     <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                         icon_class: "fa fa-pie-chart",

data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb

@@ -22,7 +22,7 @@
     <table class="embargoes table">
       <thead>
         <tr>
-          <th><input type="checkbox" id="checkAllBox" class="batch_document_selector"/> <%= t('.select_all') %></th>
+          <th><input type="checkbox" id="checkAllBox" class="batch_document_selector" aria-labelledby="checkAllBox"/> <label for="checkAllBox"><%= t('.select_all') %></label></th>
           <%= render partial: 'table_headers' %>
         </tr>
       </thead>
@@ -31,19 +31,19 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_embargo_path(curation_concern) %></td>
+          <td class="title"><label for="batch_document_<%= curation_concern.id %>"><%= link_to curation_concern, edit_embargo_path(curation_concern) %></label></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="embargo-release-date"><%= curation_concern.embargo_release_date %></td>
           <td class="visibility-after-embargo"><%= visibility_badge(curation_concern.visibility_after_embargo) %></td>
-          <td class="actions"><%= link_to t('.deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-embargo-info">
           <td></td>
-          <td colspan=5>
-            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true %>
-            <%= t('.change_all', cc: curation_concern) %>
-            <%= visibility_badge(curation_concern.visibility_after_embargo) %>?
+          <td colspan=4>
+            <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true, 'aria-labelledby': "embargoes_#{i}_copy_visibility" %>
+            <label for="embargoes_<%= i %>_copy_visibility"><%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_embargo) %>?</label>
           </td>
+          <td class="actions"><%= link_to t('.deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
       <% end %>
       </tbody>

data/app/views/hyrax/file_sets/_actions.html.erb

@@ -45,8 +45,16 @@
                     class: "download",
                     data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
       </li>
-    <% end %>
 
+      <% file_set.extensions_and_mime_types&.each do |hash| %>
+        <% next unless hash[:name] %>
+        <li class ="dropdown-item" role="menuitem" tabindex="-1">
+          <a href="<%= download_url(id: file_set.id, locale: 'en', file: hash[:name], mime_type: hash[:mime_type]) %>" download>
+            Download <em>(as <%= hash[:name] %>)</em>
+          </a>
+        </li>
+      <% end %>
+    <% end %>
     </ul>
   </div>
   <% end %>

data/app/views/hyrax/file_sets/_permission_form.html.erb

@@ -56,8 +56,10 @@
         <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
       </div>
       <div class="col-sm-3">
-        <span class="sr-only"><%= t('.add_new_group_skel') %></span>
-        <button class="btn btn-secondary" id="add_new_group_skel"><i class="fa fa-plus"></i></button>
+        <button class="btn btn-secondary" id="add_new_group_skel">
+          <span class="sr-only"><%= t('.add_new_group_skel') %></span>
+          <i class="fa fa-plus"></i>
+        </button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>

data/app/views/hyrax/file_sets/_show_actions.html.erb

@@ -1,5 +1,5 @@
 <div class="form-actions">
-  <% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_reporting? %>
     <% # turbolinks needs to be turned off or the page will use the cache and the %>
     <% # analytics graph will not show unless the page is refreshed. %>
     <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>

data/app/views/hyrax/homepage/_featured.html.erb

@@ -4,5 +4,5 @@
     <div class="col-sm-10">
       <%= render 'hyrax/homepage/featured_fields', featured: presenter %>
     </div>
-</div>
+  </div>
 </li>

data/app/views/hyrax/homepage/_recent_document.html.erb

@@ -11,10 +11,10 @@
           <% end %>
         </h3>
         <p class="recent-field">
-          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.depositor_label') %>:</span> <%= link_to_profile recent_document.depositor(t('hyrax.homepage.recently_uploaded.document.depositor_missing')) %>
+          <span class="recent-label text-dark"><%= t('hyrax.homepage.recently_uploaded.document.depositor_label') %>:</span> <%= link_to_profile recent_document.depositor(t('hyrax.homepage.recently_uploaded.document.depositor_missing')) %>
         </p>
         <p class="recent-field">
-          <span class="recent-label"><%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>:</span> <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %>
+          <span class="recent-label text-dark"><%= t('hyrax.homepage.recently_uploaded.document.keyword_label') %>:</span> <%= link_to_facet_list(recent_document.keyword, 'keyword', t('hyrax.homepage.recently_uploaded.document.keyword_missing')).html_safe %>
         </p>
       </div>
     </div>

data/app/views/hyrax/leases/_list_expired_active_leases.html.erb

@@ -32,19 +32,19 @@
         <tr>
           <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
-          <td class="title"><%= link_to curation_concern, edit_lease_path(curation_concern) %></td>
+          <td class="title"><label for="batch_document_<%= curation_concern.id %>"><%= link_to curation_concern, edit_lease_path(curation_concern) %></label></td>
           <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
           <td class="lease-release-date"><%= curation_concern.lease_expiration_date %></td>
           <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
-          <td class="actions"><%= link_to t('.deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
         <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-lease-info">
           <td></td>
-          <td colspan=5>
-            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true %>
-            <%= t('.change_all', cc: curation_concern) %>
-            <%= visibility_badge(curation_concern.visibility_after_lease) %>?
+          <td colspan=4>
+            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true, 'aria-labelledby': "leases_#{i}_copy_visibility" %>
+            <label for="leases_<%= i %>_copy_visibility"><%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_lease) %>?</label>
           </td>
+          <td class="actions"><%= link_to t('.deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
       <% end %>
       </tbody>

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -14,7 +14,7 @@
         <input type="checkbox" name="batch_document_ids[]" id="batch_document_<%= id %>" value="<%= id %>" class="batch_document_selector"
                data-hasaccess="<%= (can?(:edit, collection_presenter.solr_document)) %>" />
     <% else %>
-        <input type="checkbox" class="disabled" disabled=true />
+        <input type="checkbox" id="batch_document_<%= id %>" class="disabled batch_document_selector" disabled=true />
     <% end %>
   </td>
   <td>

data/app/views/hyrax/my/collections/_tabs.html.erb

@@ -1,5 +1,5 @@
 <% current_page_dashboard = current_page?(hyrax.dashboard_collections_path(locale: nil)) %>
-<ul class="nav nav-tabs" id="my_nav" role="navigation">
+<ul class="nav nav-tabs" id="my_nav">
   <li<%= ' class="nav-item"'.html_safe if current_page_dashboard %>>
     <%= link_to(
       t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"),