sufia 4.0.0.rc2 → 4.0.0

data/app/controllers/concerns/sufia/breadcrumbs.rb

@@ -0,0 +1,41 @@
+  module Sufia
+  module Breadcrumbs
+    extend ActiveSupport::Concern
+
+    def build_breadcrumbs
+      if request.referer 
+        trail_from_referer
+      else
+        default_trail
+      end
+    end
+
+    def default_trail
+      if user_signed_in?
+        add_breadcrumb I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path
+      end
+    end
+
+    def trail_from_referer
+      case request.referer
+      when /catalog/
+        add_breadcrumb I18n.t('sufia.bread_crumb.search_results'), request.referer
+      when /dashboard/
+        default_trail
+        add_breadcrumb_for_controller    
+      else
+        default_trail
+      end
+    end
+
+    def add_breadcrumb_for_controller
+      case controller_name
+      when /files|batch/
+        add_breadcrumb I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path
+      when /collections/
+        add_breadcrumb I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path
+      end
+    end
+
+  end
+end

data/app/controllers/concerns/sufia/files_controller_behavior.rb

@@ -8,6 +8,7 @@ module Sufia
   module FilesControllerBehavior
     extend ActiveSupport::Concern
     extend Sufia::FilesController::UploadCompleteBehavior
+    include Sufia::Breadcrumbs
 
     included do
       include Hydra::Controller::ControllerBehavior
@@ -34,8 +35,9 @@ module Sufia
 
       # actions: audit, index, create, new, edit, show, update,
       #          destroy, permissions, citation, stats
-      before_filter :authenticate_user!, except: [:show, :citation]
+      before_filter :authenticate_user!, except: [:show, :citation, :stats]
       before_filter :has_access?, except: [:show]
+      before_filter :build_breadcrumbs, only: [:show, :edit, :stats]
       prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
       load_resource only: [:audit]
       load_and_authorize_resource except: [:index, :audit]

data/app/controllers/concerns/sufia/homepage_controller.rb

@@ -8,7 +8,7 @@ module Sufia::HomepageController
     include Sufia::Controller
     include Blacklight::SolrHelper
 
-    self.solr_search_params_logic += [:only_generic_files]
+    self.solr_search_params_logic += [:only_generic_files, :add_access_controls_to_solr_params]
     layout 'homepage'
   end
 

data/app/helpers/sufia/blacklight_override.rb

@@ -5,7 +5,7 @@ module Sufia
     end
 
     def url_for_document doc, options = {}
-      if doc['has_model_ssim'].first == ::Collection.to_class_uri
+      if (doc.is_a?(SolrDocument) && doc.hydra_model == 'Collection')
         [collections, doc]
       else
         [sufia, doc]

data/app/helpers/sufia/records_helper_behavior.rb

@@ -13,14 +13,16 @@ module Sufia
       title = title || get_label(key)
       link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover',
               'data-content' => content,
-              'data-original-title' => title do
-        content_tag 'i', '', class: "glyphicon glyphicon-question-sign large-icon"
+              'data-original-title' => title,
+              'aria-label' => get_aria_label(key) do
+        content_tag 'i', '', "aria-hidden" => true, class: "help-icon"
       end
     end
 
     def help_icon_modal(modal_id)
-      link_to '#' + modal_id, id: "generic_file_#{modal_id}_help_modal", rel: 'button', data: { toggle: 'modal' } do
-        content_tag 'i', '', class: 'glyphicon glyphicon-question-sign large-icon'
+      link_to '#' + modal_id, id: "generic_file_#{modal_id}_help_modal", rel: 'button', 
+              data: { toggle: 'modal' }, 'aria-label' => get_aria_label(modal_id) do
+        content_tag 'i', '', "aria-hidden" => true, class: 'help-icon'
       end
     end
 
@@ -31,16 +33,28 @@ module Sufia
     def get_label(key)
       I18n.t("sufia.field_label.#{key}", default: key.to_s.humanize)
     end
+
+    def get_aria_label(key)
+      I18n.t("sufia.aria_label.#{key}", default: default_aria_label(key.to_s.humanize))
+    end
   
     private
 
     def more_or_less_button(key, html_class, symbol)
       # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
       content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
-        (symbol + content_tag('span', class: 'sr-only') do
+        (sr_hidden(symbol) + content_tag('span', class: 'sr-only') do
           "add another #{key.to_s}"
         end).html_safe
       end
     end
+
+    def sr_hidden text
+      content_tag :span, text, "aria-hidden" => true
+    end
+
+    def default_aria_label text
+      I18n.t("sufia.aria_label.default", title: text)
+    end
   end
 end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -5,14 +5,21 @@ module Sufia
     # example:
     #   config.index.thumbnail_method = :sufia_thumbnail_tag
     def sufia_thumbnail_tag(document, options)
-      path = if document.image? || document.pdf? || document.video? || document.office_document?
-        sufia.download_path document.noid, datastream_id: 'thumbnail'
-      elsif document.audio?
-        "audio.png"
+      # collection
+      if (document.collection?)
+        content_tag(:span, "", class: "glyphicon glyphicon-th collection-icon-search")
+
+      # file
       else
-        "default.png"
+        path = if document.image? || document.pdf? || document.video? || document.office_document?
+          sufia.download_path document.noid, datastream_id: 'thumbnail'
+        elsif document.audio?
+          "audio.png"
+        else
+          "default.png"
+        end
+        image_tag path, options
       end
-      image_tag path, options
     end
 
     # Create a link back to the dashboard screen, keeping the user's facet, query and paging choices intact by using session.

data/app/models/concerns/sufia/solr_document_behavior.rb

@@ -103,5 +103,9 @@ module Sufia
       Array(self[::Ability.edit_user_field])
     end
 
+    def collection?
+      hydra_model == 'Collection'
+    end
+
   end
 end

data/app/views/_user_util_links.html.erb

@@ -3,9 +3,11 @@
       <%= render partial: 'users/notify_link' %>
       <%= link_to sufia.dashboard_index_path, class: "btn btn-default", id: "dashboard_link", title: "click for Dashboard" do %>
         <span class="glyphicon glyphicon-dashboard"></span>
+        <span class="sr-only">click for </span>
         <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <span class="sr-only"> dashboard</span>
       <% end %>
-      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret" title="click for additional menu options"></span></a>
+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" title="click for additional menu options"><span class="caret" ></span></a>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
         <li><%= link_to raw('<span class="glyphicon glyphicon-upload"></span> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
         <li><%= link_to raw('<span class="glyphicon glyphicon-user"></span> my profile'), sufia.profile_path(current_user), id: 'profile_nav_link' %></li>
@@ -16,6 +18,6 @@
     </div><!-- /.btn-group -->
 <% else %>
     <div class="btn-group login_button pull-right">
-    <%= link_to raw('<span class="glyphicon glyphicon-log-in"></span> Login'), new_user_session_path, class: "btn btn-default btn-group" %>
+    <%= link_to raw('<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> Login'), new_user_session_path, class: "btn btn-default btn-group", title: "Login" %>
     </div>
 <% end %>

data/app/views/batch/_metadata.html.erb

@@ -1,16 +1,15 @@
-<h2>Individual Titles <small>(applied to individual files uploaded)</small><small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
+<h2>Individual Titles  </h2>
 <div id="" class="well">
-  <p>
-  <i class="glyphicon glyphicon-info-sign"></i> Filename will be the default title.  Please provide a more meaningful title, and filenames will still be preserved by the system.
-  </p>
   <div class="row">
     <div class="col-sm-8">
+      <h3>Applies to individual files uploaded</h3>
+      <%= content_tag :p, t('sufia.batch.help.title'), class: "help-block" %>
       <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
-        <div class="form-group">
-          <%= f.label :title, "<span class='error'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
+        <div class="batch-group">
+          <%= f.label :title, "<span class='required-field'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
+          <%= help_icon(:title) %>
           <div id="additional_title_clone">
             <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, required: true %>
-            <%= help_icon(:title) %>
           </div>
         </div>
       <% end %>
@@ -24,55 +23,50 @@
 
 <%= hidden_field_tag(:extra_description_count, "1") %>
 <div  id="descriptions_display">
-  <h2 class="non lower">Bulk Descriptions <small>(applied to all files just uploaded)</small>  <small class="pull-right"><span class="error">*</span> indicates required fields</small></h2>
+  <h2>Bulk Descriptions</h2>
   <div class="well">
-    <div class="form-group" id="resources">
+    <h3>Applies to all files just uploaded</h3>
+    <div class="batch-group" id="resources">
       <%# See if this works: render_edit_field_partial(:type, f:f) %>
       <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
-      <p class="help-block">You may select multiple types to apply to all files<p>
-      <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7 } %>
       <%= help_icon(:resource_type) %>
+      <%= content_tag :p, t('sufia.batch.help.resource_type'), class: "help-block" %>
+      <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7, "aria-label" => "Rights combo box" } %>
     </div>
 
-    <div class="form-group">
-      <%= f.label :tag, "<span class='error'>*</span> Keyword".html_safe, class: "control-label" %>
+    <div class="batch-group">
+      <%= f.label :tag, "<span class='required-field'>*</span> Keyword".html_safe, class: "control-label" %>
+      <%= help_icon(:tag) %>
       <div id="additional_tag_clone">
         <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
-        <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="sr-only">add another Tag</span></button>
-        &nbsp;
-        <%= help_icon(:tag) %>
+        <button class="adder btn" name="additional_tag" id="additional_tag_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Keyword</span></button>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
 
-    <div class="form-group">
-      <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, class: "control-label" %>
+    <div class="batch-group">
+      <%= f.label :creator, "<span class='required-field'>*</span> Creator".html_safe, class: "control-label" %>
+      <%= help_icon(:creator) %>
       <div id="additional_creator_clone">
         <%= f.text_field :creator, name: "generic_file[creator][]", value: "", required: true %>
-          <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="sr-only">add another Creator</span></button>
-          &nbsp;
-          <%= help_icon(:creator) %>
+        <button class="adder btn" name="additional_creator" id="additional_creator_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Creator</span></button>
       </div>
       <div id="additional_creator_elements"></div>
     </div>
 
-    <div class="form-group">
-      <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, class: "control-label" %>
+    <div class="batch-group">
+      <%= f.label :rights, '<span class="required-field">*</span> Rights'.html_safe, class: "control-label" %>
+      <%= help_icon_modal('rightsModal') %>
       <div id="additional_rights_clone">
         <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), required: true %>
-        <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="sr-only">add another Rights</span></button>
-        &nbsp;
-        <%= help_icon_modal('rightsModal') %>
+        <button class="adder btn" name="additional_rights" id="additional_rights_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Rights</span></button>
         <%= render partial: "generic_files/rights_modal" %>
       </div>
-
       <div id="additional_rights_elements"></div>
     </div>
 
-    <div class="row" id="add_descriptions">
-      <a href="#" id="add_descriptions" >Add More Description Types</a>
-    </div>
-      <!-- hidden on initial load -->
+    <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
+    <!-- hidden on initial load -->
 
     <%= render partial: 'more_metadata', locals: {f:f} %>
 

data/app/views/batch/_more_metadata.html.erb

@@ -1,5 +1,6 @@
-    <div id="more_descriptions">
-      <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
-        <%= render partial: "generic_files/field_form", locals: { generic_file: @generic_file, f: f, render_req: false, key: term } %>
-      <% end %>
-    </div> <!-- /more_descriptions -->
+<div id="more_descriptions">
+  <button id="hide_addl_descriptions" class="btn btn-default" aria-label="hide additional metadata description fields">Hide Additional Fields</button>
+  <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
+    <%= render partial: "generic_files/field_form", locals: { generic_file: @generic_file, f: f, render_req: false, key: term } %>
+  <% end %>
+</div> <!-- /more_descriptions -->

data/app/views/batch/edit.html.erb

@@ -3,13 +3,13 @@
 <% end %>
 
 <h1>Apply Metadata</h1>
-<div class="alert">
+<p>
   The information you provide for Title will be applied to the corresponding file only; however all other
   information you provide will be applied <em>to the entire batch of files</em> you have just 
   deposited into <%= t('sufia.product_name') %>. You may edit individual files from 
   <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %>
-  once this step is finished.
-</div>
+  once this step is finished. <span class="required-field">*</span> indicates required fields.
+</p>
 <%= form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
 
   <%= render partial: 'metadata', formats: [:html], locals: {f: f} %>

data/app/views/batch_edits/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: 'generic_files/breadcrumbs', locals: {include_file: false} %>
+<%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
 <h2 class="non lower">Batch Edit Descriptions &nbsp;&nbsp;&nbsp;<small>Click on labels below to edit file descriptions.</small> </h2>
 <div class="scrollx scrolly fileHeight"> <!-- original values -->
   <h3> <b>Changes will be applied to: (<%= @names.size %> files) </b></h3>

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

@@ -4,11 +4,9 @@
     <div class="row">
       <div class="col-xs-12">
         <div class="input-group">
-          <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", 
-              placeholder: t("sufia.search.form.q.placeholder") %>
 
-          <%# if this label goes before the search field, it"ll mess up the rounded corners %>
           <label class="sr-only" for="search-field-header"><%= t("sufia.search.form.q.label") %></label>
+          <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("sufia.search.form.q.placeholder") %>
 
           <div class="input-group-btn">
             <button type="submit" class="btn btn-primary" id="search-submit-header">

data/app/views/collections/_form_for_select_collection.html.erb

@@ -1,9 +1,9 @@
-<div class="modal fade" id="collection-list-container">
+<div role="dialog" class="modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title" >
   <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Add to collection</h4>
+          <h4 class="modal-title" id="col_add_title">Add to collection</h4>
         </div>
         <div class="modal-body">
           <% if user_collections.blank? %>
@@ -14,7 +14,10 @@
               <ul>
                 <% user_collections.sort! { |c1,c2| c1['desc_metadata__date_modified_dtsi'] <=> c2['desc_metadata__date_modified_dtsi'] }  %>
                 <% user_collections.each do |collection| %>
-                  <li> <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+                  <li> <label for="<%= collection.id %>" class="sr-only">Add to <%=collection.title%></label>
+                    <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %>
+                    <%= label_tag(:collection, collection.title, "aria-hidden" =>true) %>
+                  </li>
                 <% end %>
               </ul>
             </div><!-- collection-list -->

data/app/views/collections/_show_actions.html.erb

@@ -1,7 +1,7 @@
 <h2 class="sr-only">Actions</h2>
 <div class="actions-controls-collections">
   <% if can? :edit, @collection %>
-      <span class="label label-default"><%= link_to "Edit", collections.edit_collection_path %></span> &nbsp;&nbsp;
-      <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_files_path %></span>
+      <span class="label label-default"><%= link_to "Edit", collections.edit_collection_path, title: "Edit this Collection" %></span> &nbsp;&nbsp;
+      <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_files_path, title: "Add files to this Collection" %></span>
   <%end %>
 </div>

data/app/views/collections/edit.html.erb

@@ -1,7 +1,5 @@
 <% @page_title = "Edit Collection #{display_title(@collection)} - #{application_name}" %>
-<%= render partial: 'generic_files/breadcrumbs', locals: {
-      include_file: false, generic_file: GenericFile.new(title: @collection.title) 
-    } %>
+<%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
 
 <h1>Edit Collection: <%= display_title(@collection) %></h1>
 

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

@@ -1,7 +1,6 @@
 <% @page_title = "#{@collection.title} - #{application_name}" %>
 
-<%= render partial: 'generic_files/breadcrumbs', locals: {
-  include_file: false, generic_file: GenericFile.new(title: @collection.title) } %>
+<%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
 
   <div itemscope itemtype="http://schema.org/CollectionPage" class="row">
     <div class="col-sm-10 pull-right">

data/app/views/generic_files/_field_form.html.erb

@@ -1,5 +1,5 @@
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="form-group">
+<div class="batch-group">
   <% vals = generic_file[key] %>
   <% if render_req && required?(key) %>
     <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
@@ -7,7 +7,7 @@
   <% else %>
     <%= f.label key, get_label(key) %>
   <% end %>
-
+  <%= help_icon(key) %>
   <% if key == :resource_type %>
     <%# resource_type is a multiselect box, so don't render one row for each %>
     <%= render_edit_field_partial(key, record: generic_file, f: f, render_req: render_req) %>
@@ -16,4 +16,4 @@
       <%= render_edit_field_partial(key, record: generic_file, f: f,  v: v, index: index, render_req: render_req) %>
     <% end %>
   <% end %>
- </div><!-- /.form-group -->
+ </div><!-- /.batch-group -->

data/app/views/generic_files/_permission_form.html.erb

@@ -12,7 +12,12 @@
 </h2>
 
 <div class="alert alert-info hidden" id="save_perm_note">Permissions are <strong>not</strong> saved until the &quot;Save&quot; button is pressed at the bottom of the page.</div>
-<div class="alert alert-warning hidden" id="permissions_error"><a class="close" data-dismiss="alert" href="#">×</a><span id="permissions_error_text"></span></div>
+<div class="alert alert-warning hidden" id="permissions_error">
+  <a class="close" data-dismiss="alert" href="#">
+    <span class="sr-only">Close this alert</span>
+    <span aria-hidden="true">×</span>
+  </a>
+<span id="permissions_error_text"></span></div>
 
 <div class="well">
 
@@ -44,33 +49,45 @@
       <span id="share_with_tooltip" class="h5"><%= help_icon('share_with', share_with_text) %></span>
     </h3>
   </div>
+
   <div class="form-group">
     <div id="new-user">
       <p class="col-sm-12">Enter <%=t('sufia.account_label') %> (one at a time)</p>
+      <p class="sr-only">Use the add button to give access to one <%=t('sufia.account_label') %> at a time (it will be added to the list below).</p>
       <div class="col-sm-5">
         <div class="input-group">
+          <label for="new_user_name_skel" class="sr-only"><%= t('sufia.account_label') %> (without the <%= t('sufia.directory.suffix') %> part)</label>
           <%= text_field_tag 'new_user_name_skel', nil, class: "form-control" %><span class="input-group-addon"><%=t('sufia.directory.suffix') %></span>
         </div>
       </div>
       <div class="col-sm-4">
+        <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
         <%= select_tag 'new_user_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'form-control' %>
       </div>
       <div class="col-sm-3">
-        <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="glyphicon glyphicon-plus"></i> Add</button>
+        <button class="btn btn-mini btn-inverse" id="add_new_user_skel">
+          <span class="sr-only">Add this <%= t('sufia.account_label') %></span>
+          <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i> Add</span>
+        </button>
         <br /> <span id="directory_user_result"></span>
       </div>
     </div>
   </div>
+
   <div class="form-group">
     <div id="new-group" >
+      <p class="sr-only">Use the add button to give access to one group at a time (it will be added to the list below).</p>
       <div class="col-sm-5">
+        <label for="new_group_name_skel" class="sr-only">Group</label>
         <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
       </div>
       <div class="col-sm-4">
+        <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
         <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'form-control' %>
       </div>
       <div class="col-sm-3">
-        <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="glyphicon glyphicon-plus"></i> Add</button>
+        <span class="sr-only">Add this group</span>
+        <button class="btn btn-mini btn-inverse" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i> Add</button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>