hyrax 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 22ddfe8e8c1460fde698f49262a96de5ed83e1e6123dca1c9fdc202936b04e4e
-  data.tar.gz: 0e8ebfc5c1f48013d9c5513edee21abe45d019794f278cec0e2a42480e05075e
+SHA1:
+  metadata.gz: 6f086851536da61deedbb9795675b44319ad7708
+  data.tar.gz: fdc35cc7f45c521f8b196b8642900270d4714ba9
 SHA512:
-  metadata.gz: 3eb864d6b6bba16982ac67c2121324861b8a7b64ed17d64d8bf145554494509bf886aff95102f6d8b96893380723d81d740140e7dfbe2a6ba650cd09dd39ddfb
-  data.tar.gz: a8c02242bd7627bb2d04a694fe2405fe5927acd39d8c41939cae76043948d4b4d7caeec8f142d4c3d14b5969fcb8c10cd24644b8d77ab296585052b2e5a8c2a4
+  metadata.gz: 4d043eb1fd8223cf6f517c6eba02228c637bcd5179bd32fae7b2def80373c285e5b5c4c6ba6410585cc35b9e20f8f5ef5ac8da7db260c69aa2825a0a64c3d512
+  data.tar.gz: 305a94619c505e545a44d8c26ffc2e03168563c5caa0c6bb1ac7cd00b80afe822b1fad3b8a4e8b9e5e75cfe69516b738d6c1c440c13f45d47726ff2bbf371f7f

data/.gitignore

@@ -50,6 +50,9 @@ tmp
 *.log
 *~
 
+## Xray Rails
+.xrayconfig.yml
+
 #redis snapshot db
 dump.rdb
 

data/README.md

@@ -62,7 +62,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.2.0__. If you are looking for instructions on installing a different
+v2.2.1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -161,7 +161,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.2.0/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.2.1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/stylesheets/hyrax/_proxy-rights.scss

@@ -7,4 +7,10 @@ table#authorizedProxies {
       color: red;
     }
   }
-}
+}
+
+.proxy-rights {
+  label {
+    display: block;
+  }
+}

data/app/presenters/hyrax/admin/users_presenter.rb

@@ -20,6 +20,12 @@ module Hyrax
         user.last_sign_in_at || user.created_at
       end
 
+      # return [Boolean] true if the devise trackable module is enabled.
+      def show_last_access?
+        return @show_last_access unless @show_last_access.nil?
+        @show_last_access = ::User.devise_modules.include?(:trackable)
+      end
+
       private
 
         # Returns a list of users excluding the system users and guest_users

data/app/presenters/hyrax/collapsable_section_presenter.rb

@@ -26,7 +26,7 @@ module Hyrax
                     href: "##{id}",
                     'aria-expanded' => open,
                     'aria-controls' => id) do
-                      safe_join([content_tag(:span, '', class: icon_class),
+                      safe_join([content_tag(:span, '', class: icon_class, 'aria-hidden' => true),
                                  content_tag(:span, text)], ' ')
                     end
       end

data/app/views/_logo.html.erb

@@ -1,4 +1,4 @@
 <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>"></span>
+  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
   <span class="institution_name"><%= application_name %></span>
 </a>

data/app/views/_user_util_links.html.erb

@@ -5,14 +5,14 @@
       <%= render_notifications(user: current_user) %>
     </li>
     <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
+      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
         <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user"></span>
+        <span class="fa fa-user" aria-hidden="true"></span>
         <span class="caret"></span>
       <% end %>
-      <ul class="dropdown-menu dropdown-menu-right" role="menu">
+      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
         <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
 
         <li class="divider"></li>

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

@@ -12,7 +12,9 @@
       </button>
       <% if current_user %>
         <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
-          <span data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
+
+          <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>
           <span class="caret"></span>
         </button>
 

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

@@ -1,3 +1,3 @@
 <div class="col-md-2">
-  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
+  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search" aria-hidden="true"></span>
 </div>

data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb

@@ -7,17 +7,17 @@
           <div class="col-sm-4">
             <div class="pull-right">
               <%= link_to edit_admin_admin_set_path(presenter), class: 'btn btn-primary' do %>
-                <span class="fa fa-edit"></span> <%= t(:'helpers.action.edit') %>
+                <span class="fa fa-edit" aria-hidden="true"></span> <%= t(:'helpers.action.edit') %>
               <% end %>
               <% if presenter.disable_delete? %>
                 <span title="<%= presenter.disabled_message %>">
                   <%= link_to admin_admin_set_path(presenter), class: 'btn btn-danger disabled' do %>
-                    <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+                    <span class="fa fa-remove" aria-hidden="true"></span> <%= t(:'helpers.action.delete') %>
                   <% end %>
                 </span>
               <% else %>
                 <%= link_to admin_admin_set_path(presenter), class: 'btn btn-danger', data: { confirm: t('.confirm_delete'), method: :delete } do %>
-                  <span class="fa fa-remove"></span> <%= t(:'helpers.action.delete') %>
+                  <span class="fa fa-remove" aria-hidden="true"></span> <%= t(:'helpers.action.delete') %>
                 <% end %>
               <% end %>
             </div>

data/app/views/hyrax/admin/admin_sets/edit.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit"></span> <%= t('.header', title: @form.title) %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: @form.title) %></h1>
 <% end %>
 
 <div class="row">

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

@@ -1,9 +1,9 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-sitemap"></span> Administrative Sets</h1>
+  <h1><span class="fa fa-sitemap" aria-hidden="true"></span> Administrative Sets</h1>
   <% if can? :create, AdminSet %>
     <div class="pull-right">
       <%= link_to hyrax.new_admin_admin_set_path, class: 'btn btn-primary' do %>
-        <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
+        <span class="fa fa-edit" aria-hidden="true"></span> <%= t(:'helpers.action.admin_set.new') %>
       <% end %>
     </div>
   <% end %>

data/app/views/hyrax/admin/admin_sets/new.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/admin/admin_sets/show.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-sitemap"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-sitemap" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 
 <div class="row">
@@ -14,7 +14,7 @@
               <%= render_thumbnail_tag @presenter.solr_document, {}, suppress_link: true %>
             </div>
           <% else %>
-            <span class="fa fa-sitemap collection-icon-search"></span>
+            <span class="fa fa-sitemap collection-icon-search" aria-hidden="true"></span>
           <% end %>
         </div>
         <div class="col-md-10">

data/app/views/hyrax/admin/appearances/show.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-paint-brush"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-paint-brush" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 
 <div class="panel panel-default">

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

@@ -1,7 +1,7 @@
 <div class="collection-types-wrapper">
   <% provide :page_title, construct_page_title( t('.header') ) %>
   <% provide :page_header do %>
-    <h1><span class="fa fa-folder-open"></span> <%= t('.header') %>: <%= @form.title %></h1>
+    <h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %>: <%= @form.title %></h1>
   <% end %>
 
   <div class="row">

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

@@ -1,7 +1,7 @@
 <div class="collection-types-wrapper">
   <% # for modal dialogue setup and interaction see app/assets/javascripts/collection_types.es6 %>
   <% provide :page_header do %>
-    <h1><span class="fa fa-folder-open"></span> <%= t('.header') %></h1>
+    <h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %></h1>
   <% end %>
 
   <div class="panel panel-default">

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

@@ -1,6 +1,6 @@
 <% provide :page_title, construct_page_title( t('.header') ) %>
 <% provide :page_header do %>
-  <h1><span class="fa fa-folder-open"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-folder-open" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 
 <div class="row">

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

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-wrench"></span> <%= t('.header') %></h1>
+  <h1><span class="fa fa-wrench" aria-hidden="true"></span> <%= t('.header') %></h1>
 <% end %>
 <div class="flip row">
   <div class="col-md-12">

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

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-user"></span> <%= t('hyrax.admin.users.index.title') %></h1>
+  <h1><span class="fa fa-user" aria-hidden="true"></span> <%= t('hyrax.admin.users.index.title') %></h1>
 <% end %>
 
 <div class="panel panel-default users-listing">
@@ -15,7 +15,9 @@
             <th></th>
             <th><%= t('.id_label') %></th>
             <th><%= t('.role_label') %></th>
-            <th><%= t('.access_label') %></th>
+            <% if @presenter.show_last_access? %>
+              <th><%= t('.access_label') %></th>
+            <% end %>
           </tr>
         </thead>
         <tbody>
@@ -32,12 +34,14 @@
                     <% end %>
                   </ul>
               </td>
-              <td>
-                <%# in the case that a user is created who never signs in, this is necessary %>
-                <relative-time datetime="<%= @presenter.last_accessed(user).getutc.iso8601 %>" title="<%= @presenter.last_accessed(user).to_formatted_s(:standard) %>">
-                  <%= @presenter.last_accessed(user).to_formatted_s(:long_ordinal) %>
-                </relative-time>
-              </td>
+              <% if @presenter.show_last_access? %>
+                <td>
+                  <%# in the case that a user is created who never signs in, this is necessary %>
+                  <relative-time datetime="<%= @presenter.last_accessed(user).getutc.iso8601 %>" title="<%= @presenter.last_accessed(user).to_formatted_s(:standard) %>">
+                    <%= @presenter.last_accessed(user).to_formatted_s(:long_ordinal) %>
+                  </relative-time>
+                </td>
+              <% end %>
             </tr>
           <% end %>
         </tbody>

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

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-users"></span>  <%= t("hyrax.admin.workflow_roles.header") %></h1>
+  <h1><span class="fa fa-users" aria-hidden="true"></span>  <%= t("hyrax.admin.workflow_roles.header") %></h1>
 <% end %>
 
 <div class="row">

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

@@ -13,17 +13,17 @@
           <div class="row">
             <div class="col-xs-12">
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <button id="addfiles" class="btn btn-success fileinput-button">
+                <span id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add files...</span>
-                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple />
-                </button>
+                    <input type="file" name="files[]" multiple />
+                </span>
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <button id="addfolder" class="btn btn-success fileinput-button">
+                <span id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add folder...</span>
-                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple directory webkitdirectory />
-                </button>
+                    <input type="file" name="files[]" multiple directory webkitdirectory />
+                </span>
                 <% 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/app/views/hyrax/base/_show_actions.html.erb

@@ -10,23 +10,20 @@
       <% end %>
       <% if presenter.valid_child_concerns.length > 0 %>
         <div class="btn-group">
-          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Attach Child <span class="caret"></span>
-          </button>
-
-          <input type="checkbox"  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-default submits-batches submits-batches-add',
-              data: { toggle: "modal", target: "#collection-list-container" } %>
-
-          <ul class="dropdown-menu">
-            <% presenter.valid_child_concerns.each do |concern| %>
-              <li>
-                <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
-              </li>
-            <% end %>
-          </ul>
+          <button type="button" class="btn btn-default dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Attach Child <span class="caret"></span></button>
+            <ul class="dropdown-menu">
+              <% presenter.valid_child_concerns.each do |concern| %>
+                <li>
+                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
+                </li>
+              <% end %>
+            </ul>
         </div>
+        <input type="checkbox"  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-default submits-batches submits-batches-add',
+            data: { toggle: "modal", target: "#collection-list-container" } %>
       <% end %>
   <% end %>
   <% if presenter.work_featurable? %>

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

@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit"></span><%= t("hyrax.works.update.header") %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t("hyrax.works.update.header") %></h1>
 <% end %>
 
 <%= render 'form' %>

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

@@ -31,6 +31,6 @@
 
   <td class="date"><%= document.date_uploaded %></td>
   <td class='text-center'>
-    <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>"></span></td>
+    <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>
   <td><%= render_visibility_link document %></td>
 </tr>

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

@@ -4,5 +4,5 @@
                 alt: "",
                 role: "presentation" %>
 <% else %>
-  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search"></span>
+  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search" aria-hidden="true"></span>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_header do %>
-  <h1><span class="fa fa-square-o"></span> <%= t(:'hyrax.admin.sidebar.content_blocks') %></h1>
+  <h1><span class="fa fa-square-o" aria-hidden="true"></span> <%= t(:'hyrax.admin.sidebar.content_blocks') %></h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb

@@ -7,9 +7,11 @@
   <div class="row">
     <div class="col-xs-6 proxy-search">
       <h4><%= t("hyrax.dashboard.authorize_proxies") %></h4>
-      <label class="sr-only" for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
-      <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
-      <%= hidden_field_tag :delete_button_label, nil, data: { label: I18n.t('hyrax.dashboard.proxy_delete') } %>
+      <div class="form-group">
+        <label for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
+        <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
+        <%= hidden_field_tag :delete_button_label, nil, data: { label: I18n.t('hyrax.dashboard.proxy_delete') } %>
+      </div>
     </div>
 
     <div class="col-xs-6">

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

@@ -13,11 +13,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <button class="btn btn-success fileinput-button">
+        <span class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
-        </button>
+          <input type="file" name="files[]" single />
+        </span>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->
@@ -90,11 +90,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <button class="btn btn-success fileinput-button">
+        <span class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
-        </button>
+          <input type="file" name="files[]" single />
+        </span>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->

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

@@ -31,7 +31,7 @@
 
   <td class="date"><%= document.date_uploaded %></td>
   <td class='text-center'>
-    <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>"></span></td>
+    <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>
   <td><%= render_visibility_link document %></td>
 
   <td>

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

@@ -8,13 +8,13 @@
                     class: "itemicon itemedit",
                     title: t('hyrax.collection.document_list.edit'),
                     id: "edit_work_link_#{document.id}" do %>
-          <i class='glyphicon glyphicon-pencil'></i> <%= t('hyrax.collection.document_list.edit') %>
+          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> <%= t('hyrax.collection.document_list.edit') %>
         <% end %>
       </li>
     <% end %>
     <li>
       <%= display_trophy_link(current_user, document.id) do |text| %>
-        <i class='glyphicon glyphicon-star'></i> <%= text %>
+        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
       <% end %>
     </li>
   </ul>