hyrax 5.0.0.rc1 → 5.0.0.rc3

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

@@ -1,69 +1,70 @@
-     <div id="fileupload">
-        <!-- Redirect browsers with JavaScript disabled to the origin page -->
-        <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
-        <!-- The table listing the files available for upload/download -->
-        <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
-        <% if Hyrax.config.browse_everything? %>
-          <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
-                contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
-                upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
-                upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
-        <% else %>
-          <%= t('hyrax.base.form_files.local_upload_html',
-                upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
-                upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
-        <% end %>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="fileupload-buttonbar">
-          <div class="row">
-            <div class="col-12">
-                <div class="fileinput-button" id="add-files">
-                  <input id="addfiles" type="file" style="display:none;"  name="files[]" multiple />
-                  <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
-                    <span class="fa fa-plus"></span>
-                    <span><%=  t(".add_files") %></span>
-                  </button>
-                </div>
-                <div class="fileinput-button">
-                  <input id="addfolder" type="file" style="display:none;"  name="files[]" multiple directory webkitdirectory />
-                  <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
-                    <span class="fa fa-plus"></span>
-                    <span><%=  t(".add_folder") %></span>
-                  </button>
-                </div>
-                <% if Hyrax.config.browse_everything? %>
-                  <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
-                    'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
-                    'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
-                    <span class="fa fa-plus"></span>
-                    <%= t('hyrax.upload.browse_everything.browse_files_button') %>
-                  <% end %>
-                <% end %>
-                <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
-                    <span class="fa fa-ban"></span>
-                    <span><%= t('.cancel_upload') %></span>
-                </button>
-                <!-- The global file processing state -->
-                <span class="fileupload-process"></span>
-            </div>
+<%= render "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>
+  <!-- The table listing the files available for upload/download -->
+  <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
+  <% if Hyrax.config.browse_everything? %>
+    <%= t('hyrax.base.form_files.local_upload_browse_everything_html',
+          contact_href: link_to(t("hyrax.upload.alert.contact_href_text"), hyrax.contact_form_index_path),
+          upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
+          upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
+  <% else %>
+    <%= t('hyrax.base.form_files.local_upload_html',
+          upload_file_limit: Hyrax.config.uploader[:maxNumberOfFiles],
+          upload_size_limit: Hyrax.config.uploader[:maxFileSize] / 1.megabytes) %>
+  <% end %>
+  <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+  <div class="fileupload-buttonbar">
+    <div class="row">
+      <div class="col-12">
+          <div class="fileinput-button" id="add-files">
+            <input id="addfiles" type="file" style="display:none;"  name="files[]" multiple />
+            <button type="button" class="btn btn-success" onclick="document.getElementById('addfiles').click();">
+              <span class="fa fa-plus"></span>
+              <span><%=  t(".add_files") %></span>
+            </button>
           </div>
-          <div class="row">
-            <div class="col-12">
-              <!-- The global progress state -->
-              <div class="fileupload-progress fade">
-                  <!-- The global progress bar -->
-                  <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                      <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
-                  </div>
-                  <!-- The extended global progress state -->
-                  <div class="progress-extended">&nbsp;</div>
-              </div>
-            </div>
+          <div class="fileinput-button">
+            <input id="addfolder" type="file" style="display:none;"  name="files[]" multiple directory webkitdirectory />
+            <button type="button" class="btn btn-success" onclick="document.getElementById('addfolder').click();">
+              <span class="fa fa-plus"></span>
+              <span><%=  t(".add_folder") %></span>
+            </button>
           </div>
+          <% if Hyrax.config.browse_everything? %>
+            <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
+              'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
+              'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) do %>
+              <span class="fa fa-plus"></span>
+              <%= t('hyrax.upload.browse_everything.browse_files_button') %>
+            <% end %>
+          <% end %>
+          <button type="reset" id="file-upload-cancel-btn" class="btn btn-warning cancel">
+              <span class="fa fa-ban"></span>
+              <span><%= t('.cancel_upload') %></span>
+          </button>
+          <!-- The global file processing state -->
+          <span class="fileupload-process"></span>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <!-- The global progress state -->
+        <div class="fileupload-progress fade">
+            <!-- The global progress bar -->
+            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+                <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
+            </div>
+            <!-- The extended global progress state -->
+            <div class="progress-extended">&nbsp;</div>
         </div>
-        <div class="dropzone">
-          <%= t('hyrax.base.form_files.dropzone') %>
-        </div>
-     </div>
+      </div>
+    </div>
+  </div>
+  <div class="dropzone">
+    <%= t('hyrax.base.form_files.dropzone') %>
+  </div>
+</div>
 
 <%= render 'hyrax/uploads/js_templates' %>

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

@@ -31,7 +31,7 @@
         </li>
         <li class="form-check">
           <label class="form-check-label">
-            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, class: 'form-check-input', data: { 'target': '#collapseEmbargo' } %>
+            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, 'aria-label': 'Embargo', class: 'form-check-input', data: { 'target': '#collapseEmbargo' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO) %>
             <br />
             <%= t('hyrax.visibility.embargo.note_html') %>
@@ -39,7 +39,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_embargo, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :embargo_release_date, wrapper: :inline, value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :embargo_release_date, wrapper: :inline, 'aria-label': 'Embargo Release Date', value: f.object.embargo_release_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_embargo, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
               </div>
             </div>
@@ -47,7 +47,7 @@
         </li>
         <li class="form-check">
           <label class="form-check-label">
-            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, class: 'form-check-input', data: { 'target': '#collapseLease' } %>
+            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, 'aria-label': 'Lease', class: 'form-check-input', data: { 'target': '#collapseLease' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE) %>
             <br />
             <%= t('hyrax.visibility.lease.note_html') %>
@@ -55,7 +55,7 @@
               <div class="form-inline">
                 <%= f.input :visibility_during_lease, wrapper: :inline, collection: visibility_options(:loosen), include_blank: false %>
                 <%= t('hyrax.works.form.visibility_until') %>
-                <%= f.date_field :lease_expiration_date, wrapper: :inline, value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
+                <%= f.date_field :lease_expiration_date, wrapper: :inline, 'aria-label': 'Lease Expiration Date', value: f.object.lease_expiration_date&.to_date || Date.tomorrow, class: 'datepicker form-control' %>
                 <%= f.input :visibility_after_lease, wrapper: :inline, collection: visibility_options(:restrict), include_blank: false %>
               </div>
             </div>

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

@@ -2,7 +2,7 @@
   <div class="col-sm-6">
     <% if !workflow_restriction?(presenter) %>
       <% if presenter.show_deposit_for?(collections: @user_collections) %>
-        <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+        <input type="checkbox" aria-label="Batch Documents" style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
         <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
                       class: 'btn btn-secondary submits-batches submits-batches-add',
                       data: { toggle: "modal", target: "#collection-list-container" } %>

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

@@ -6,33 +6,35 @@
   </button>
   <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>
     <div id="workflow_controls_collapse" class="card-body collapse">
-      <div class="col-sm-3 workflow-actions">
-        <h3><%= t('.actions') %></h3>
+      <div class="row">
+        <div class="col-sm-3 workflow-actions">
+          <h3><%= t('.actions') %></h3>
 
-        <% presenter.workflow.actions.each do |key, label| %>
-          <div class="form-check">
-            <label class="form-check-label">
-              <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
-              <%= label %>
-            </label>
-          </div>
-        <% end %>
-      </div>
-      <div class="col-sm-9 workflow-comments">
-        <div class="form-group">
-          <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
-          <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          <% presenter.workflow.actions.each do |key, label| %>
+            <div class="form-check">
+              <label class="form-check-label">
+                <%= radio_button_tag 'workflow_action[name]', key, key == 'comment_only', class: 'form-check-input' %>
+                <%= label %>
+              </label>
+            </div>
+          <% end %>
         </div>
+        <div class="col-sm-9 workflow-comments">
+          <div class="form-group">
+            <label for="workflow_action_comment"><%= t('.review_comment') %>:</label>
+            <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
+          </div>
 
-        <input class="btn btn-primary" type="submit" value="Submit" />
+          <input class="btn btn-primary" type="submit" value="Submit" />
 
-        <h4><%= t('.previous_comments') %></h4>
-        <dl>
-          <% presenter.workflow.comments.each do |comment| %>
-            <dt><%= comment.name_of_commentor %></dt>
-            <dd><%= comment.comment %></dd>
-          <% end %>
-        </dl>
+          <h4><%= t('.previous_comments') %></h4>
+          <dl>
+            <% presenter.workflow.comments.each do |comment| %>
+              <dt><%= comment.name_of_commentor %></dt>
+              <dd><%= comment.comment %></dd>
+            <% end %>
+          </dl>
+        </div>
       </div>
     </div>
   <% end %>

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

@@ -53,11 +53,10 @@
     <%# = render 'sharing_with', presenter: @presenter %>
     <%# = render 'user_activity', presenter: @presenter %>
 
-<span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
+<span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" ></span>
 <% @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 %>" >
+  <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" ></span>
 <% end %>
 
   </div>
 </div>
-

data/app/views/hyrax/base/show.json.jbuilder

@@ -2,5 +2,6 @@
 @curation_concern = ::Wings::ActiveFedoraConverter.convert(resource: @curation_concern) if
   @curation_concern.is_a?(Hyrax::Resource) && Object.const_defined?("Wings")
 
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.extract! @curation_concern, *@curation_concern.class.fields.reject { |f| [:has_model].include? f }
+json.id @curation_concern.id.to_s
 json.version @curation_concern.try(:etag)

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

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

data/app/views/hyrax/collections/show.html.erb

@@ -4,9 +4,9 @@
     <div class="col-md-12">
 
       <% if @presenter.banner_file.present? %>
-          <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
+        <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
-          <div class="hyc-generic">
+        <div class="hyc-generic">
       <% end %>
 
       <div class="hyc-title">
@@ -80,11 +80,11 @@
   <!-- Search results label -->
   <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
     <div class="hyc-blacklight hyc-bl-title">
-    <% if collection_search_parameters? %>
-      <h2>
-        <%= t('hyrax.dashboard.collections.show.search_results') %>
-      </h2>
-    <% end %>
+      <% if collection_search_parameters? %>
+        <h2>
+          <%= t('hyrax.dashboard.collections.show.search_results') %>
+        </h2>
+      <% end %>
     </div>
   <% end %>
 
@@ -125,6 +125,4 @@
   <% end # if @members_count > 0 %>
 </div>
 
-
 <span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
-

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

@@ -12,9 +12,10 @@
         </div>
       </div>
     </li>
-    <li class="nav-item"><%= link_to hyrax.dashboard_path, class: "nav-link" do %>
-          <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
-        <% end %>
+    <li class="nav-item">
+      <%= 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 %>
     </li>
     <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
     <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>

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

@@ -2,7 +2,7 @@
                   
   <h3 class="h4"><%= t(".#{access}.title") %></h3>
   <p><%= t(".#{access}.help") %></p>
-  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+  <p><%= t(".#{access}.help_with_works", type_title: collection_type.title) if collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
   <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
     <table class="table table-striped share-status">
       <thead>
@@ -31,4 +31,4 @@
   <% else %>
     <p><em><%= t(".#{access}.empty") %></em></p>
   <% end %>
-</div>
+</div>

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" disabled=true />
+    <input type="checkbox" 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", "aria-hidden" => "true" do %>
+      <%= link_to [main_app, document], "class" => "media-left mr-3", "aria-hidden" => "true" 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/collections/_sort_and_per_page.html.erb

@@ -11,8 +11,8 @@
   <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
       <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page' do %>
-         <div class="form-group row form-control-lg">
-           <fieldset class="col-sm-9">
+         <div class="form-group row">
+           <fieldset class="col-sm-7 col-lg-8">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
              <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
@@ -22,7 +22,7 @@
              <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort)) %>
              <button class="btn btn-info"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
-           <div class="col-sm-3">
+           <div class="col-sm-5 col-lg-4">
              <%= render 'hyrax/collections/view_type_group' %>
            </div>
          </div>

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

@@ -1,6 +1,6 @@
 <div id="versioning_display" class="tab-pane">
   <h2><%= t('.header') %></h2>
-  <%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
+  <% if @version_list.supports_multiple_versions? %><%= simple_form_for [main_app, curation_concern], html: { multipart: true, class: 'nav-safety' } do |f| %>
     <div id="fileuploadVersioning">
       <!-- Redirect browsers with JavaScript disabled to the origin page -->
       <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"/></noscript>
@@ -45,10 +45,10 @@
         <%= t('.upload') %>
       <% end %>
 
-    </div> <!-- fileuploadVersioning -->
-  <% end %>
+    </div> <!-- /fileuploadVersioning -->
+  <% end %><% end %>
 
-  <%= form_for [main_app, curation_concern],
+  <% if !@version_list.empty? %><%= form_for [main_app, curation_concern],
                html: { class: 'edit_file_set_previous_version nav-safety' } do |f| %>
     <h3><%= t('.restore') %></h3>
     <% @version_list.each do |version| %>
@@ -68,7 +68,7 @@
                  type: 'submit' do %>
       <%= t('.save') %>
     <% end %>
-  <% end %>
+  <% end %><% end %>
 
   <%= render 'hyrax/uploads/js_templates_versioning' %>
 

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -2,21 +2,21 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
       <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>
 <% else %>
     <div>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg', mime_type: 'audio/ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3', mime_type: 'audio/mpeg') %>" type="audio/mpeg" />
         <%= t('hyrax.file_set.show.downloadable_content.audio_tag_not_supported') %>
       </audio>
     </div>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -4,7 +4,7 @@
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
-      data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+      data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
       target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -2,13 +2,13 @@
   <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
-        <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
-        <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+        <source src="<%= hyrax.download_path(file_set, file: 'webm', mime_type: 'video/webm') %>" type="video/webm" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp4', mime_type: 'video/mp4') %>" type="video/mp4" />
         <%= t('hyrax.file_set.show.downloadable_content.video_tag_not_supported') %>
       </video>
       <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
                   hyrax.download_path(file_set),
-                  data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
+                  data: { label: file_set.id.to_s, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids },
                   target: :_blank,
                   id: "file_download" %>
     </div>

data/app/views/hyrax/my/_search_form.html.erb

@@ -7,7 +7,7 @@
     </label>
 
     <div class="input-group mb-sm-auto col-sm-9">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>

data/app/views/hyrax/my/facet.html.erb

@@ -9,7 +9,7 @@
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
   <div class="facet-extended-list">
-    <%= render_facet_limit(@display_facet, layout: false) %>
+    <%= render_facet_limit(@display_facet, layout: false, partial: 'catalog/facet_limit') %>
   </div>
 
   <%# Removed component footer and placed the facet pagination partial within a `container` div %>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -1,6 +1,6 @@
 <% if messages.present? %>
   <div class="table-responsive">
-    <table class="table table-striped datatable">
+    <table class="table table-striped datatable" data-order='[[0, "desc"]]'>
       <thead>
         <tr>
           <th><%= t('hyrax.mailbox.date') %></th>

data/app/views/hyrax/users/_vitals.html.erb

@@ -9,7 +9,7 @@
 
 <div class="list-group-item">
   <span class="badge dark-text"><%= number_of_works(user) %></span>
-  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
+  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_works(user) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional dark-text"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

data/app/views/layouts/_head_tag_content.html.erb

@@ -9,6 +9,7 @@ signed in %>
 <!-- added for use on small devices like phones -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="resourcesync" href="<%= hyrax.capability_list_url %>" />
+<meta name="generator" content="Samvera Hyrax <%= ::Hyrax::VERSION %>" />
 
 <!-- Twitter card metadata -->
 <%= yield :twitter_meta %>

data/app/views/shared/_footer.html.erb

@@ -6,7 +6,7 @@
     </div>
     <div class="navbar-right">
       <div class="navbar-text text-right">
-        <p><%= t('hyrax.footer.copyright_html') %></p>
+        <p><%= t('hyrax.footer.copyright_html', current_year: Time.current.year) %></p>
         <p><%= t('hyrax.background_attribution_html') %></p>
       </div>
     </div>

data/bin/dev-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+mkdir -p /app/samvera/hyrax-webapp/tmp/pids
+rm -f /app/samvera/hyrax-webapp/tmp/pids/*
+
+# Copy gems installed in the image to the dev bundle
+mkdir -p /app/bundle/ruby/$RUBY_MAJOR.0
+cp -Rn /usr/local/bundle/* /app/bundle/ruby/$RUBY_MAJOR.0
+bundle install
+
+# Run the command
+exec "$@"

data/chart/hyrax/Chart.yaml

@@ -2,11 +2,11 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.3.0
-appVersion: 3.3.0
+version: 3.6.0
+appVersion: 5.0.0
 dependencies:
   - name: fcrepo
-    version: 1.0.0
+    version: 2.0.0
     repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
@@ -34,6 +34,6 @@ dependencies:
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: nginx.enabled
   - name: fits
-    version: 0.1.0
-    repository:  https://samvera-labs.github.io/fits-charts
+    version: 0.2.0
+    repository: https://samvera-labs.github.io/fits-charts
     condition: fits.enabled

data/chart/hyrax/templates/_helpers.tpl

@@ -147,6 +147,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
+{{- define "hyrax.postgresql.port" -}}
+{{- if .Values.postgresql.enabled }}
+{{- .Values.postgresql.containerPorts.postgresql | default 5432 }}
+{{- else }}
+{{- .Values.externalPostgresql.port | default 5432 }}
+{{- end }}
+{{- end -}}
+
 {{- define "hyrax.postgresql.url" -}}
 {{- printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) -}}
 {{- end -}}

data/chart/hyrax/templates/configmap-env.yaml

@@ -14,7 +14,7 @@ data:
   CH12N_TOOL: "fits"
   {{- end }}
   DB_HOST: {{ template "hyrax.postgresql.host" . }}
-  DB_PORT: {{ .Values.postgresql.containerPorts.postgresql | default 5432 | quote }}
+  DB_PORT: {{ include "hyrax.postgresql.port" . | quote }}
   DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}