sufia 4.2.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0becb3e785f413597d7424ec1ed417c1712a740
-  data.tar.gz: a7c8c1607bb853f638cf2be54eaf105feeb80cea
+  metadata.gz: 202087176245b06ed3908752e6474c316fe2d669
+  data.tar.gz: 46a3bf0c6206c0d76738b2e1092b310f793f02d6
 SHA512:
-  metadata.gz: afe990f4ee1a1b7cef86f77919fcf79808399553de7627057f34bae0f54f3782f89d4a5b9f07267d57222269f5451918493063b43bbc299a39e8d8b929c29739
-  data.tar.gz: b708364b4863882be9f7376c83a99d7202d1d9b9784844e550ebac24db019f9228b24fbaf4492e7fd884813ea07fac81b975118940a8b733f5d0da6905798a5b
+  metadata.gz: e9d2a4b2abc2ccbd14ecee1047f87c9f5ffc3cc93b9361fe7a5a3c651d601c014534230a8098e83aadb8ec078a071678257333816eb65a7874f767fab3398ae8
+  data.tar.gz: f1e9781b0f053375be769c16c963b1702de618b471f9af9c2177ceba5262b091da4e24bb5b143c7476614aced26800ed559aa5e7e189ed4ecfa7ba8d35e33798

data/History.md

@@ -1,5 +1,25 @@
 # History of Sufia releases
 
+## 4.3.1
+
+* Adds an ORCID field to the user model. [Michael J. Giarlo]
+* Styles count for views and downloads, refs #9672 [Michael Tribone]
+* Merge pull request #787 from projecthydra/update_master_to_bl-5.8 [Justin Coyne]
+* More facets modal defaults to numerical sort [Adam Wead]
+* Upgrade to Blacklight 5.8 [Adam Wead]
+* Adding select2 name look up to permissions form for GenericFile and Batch. [Carolyn Cole]
+* Adding blacklight gallery default views to catalog controller to match with the new installer.
+* Display file stats for user.  Feature #9305 [Valerie Maher]
+* Making sure the modal is actually sorted numerically and allow some files to be on the second p
+* Fixing a bug that the home page crashes when a featured work has been destroyed [Carolyn Cole]
+* Fixes button size and alignment issues with metadata and upload forms, refs #9569 [Michael Tribone]
+* Updated dev notes [Valerie Maher]
+* Disable check all instead of making it disappear.  User testing indicated this was confusing [Carolyn Cole]
+* Views should not use the invalid Agent schema.org class [Michael J. Giarlo]
+* README should not implicitly suggest an outdated version of Sufia. (Inspired by #719 -- thx, @mistydemeo!) [Michael J. Giarlo]
+
+## 4.3.0 - YANKED
+
 ## 4.2.0
 
 * Caches google analytics data in the database so we do not have to retrieve them each time the page is loaded [Carolyn Cole]
@@ -172,6 +192,7 @@ This release contains bug fixes and css fixes found after the Sufia 4.0 release.
   * changing to bootstrap 3 danger from important to get the red background for permissions, and fixing collection detail spacing when there is no description [Carolyn Cole]
   * Upgrade to rspec 3. Fixes #493 [Carolyn Cole]
   * Removed extraneous colons preceding key names. Fixes #516 [kerchner]
+
 ## 4.0.0.rc1
 
   * Use the bootstrap_form helpers (bootstrap_forms is no longer available) [Justin Coyne]

data/README.md

@@ -65,7 +65,7 @@ If you have questions or need help, please email [the Hydra community developmen
 ### Add gems to Gemfile
 
 ```
-gem 'sufia', '~> 4.0.0'
+gem 'sufia'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 
@@ -123,22 +123,6 @@ The line with kaminari listed as a dependency in Gemfile is a temporary fix to a
 [problem](https://github.com/amatsuda/kaminari/pull/322) in the current release of kaminari.
 Technically you should not have to list kaminari, which is a dependency of blacklight and sufia.
 
-#### Bundler
-
-Users have reported problems with the initial `bundle install` command, seeing an error such as:
-
-```
-Bundler could not find compatible versions for gem "bootstrap-sass":
-  In Gemfile:
-    sufia (~> 4.0.0) ruby depends on
-      bootstrap-sass (< 3.2) ruby
-
-    sufia (~> 4.0.0) ruby depends on
-      bootstrap-sass (3.2.0.2)
-```
-
-The solution is to update your bundler gem to the latest version.
-
 ### Proxies and Transfers
 
 To add proxies and transfers to your Sufia 4-based app, run the 'sufia:models:proxies' generator and then run 'rake db:migrate'.
@@ -181,7 +165,7 @@ The generator will create a configuration file at _config/analytics.yml_.  Edit
 * An application name (you can make this up)
 * An application version (you can make this up)
 
-Lastly, you will need to set `config.analytics = true` in _config/initializers/sufia.rb_ and ensure that the OAuth client email
+Lastly, you will need to set `config.analytics = true` and `config.analytic_start_date` in _config/initializers/sufia.rb_ and ensure that the OAuth client email
 has the proper access within your Google Analyics account.  To do so, go to the _Admin_ tab for your Google Analytics account.
 Click on _User Management_, in the _Account_ column, and add "Read & Analyze" permissions for the OAuth client email address.
 
@@ -265,7 +249,11 @@ This information is for people who want to modify the engine itself, not an appl
 ### run the tests
 
 ```
-rake clean spec
+rake jetty:start
+redis-server
+rake engine_cart:clean
+rake engine_cart:generate
+rake spec
 ```
 
 ### Change validation behavior

data/SUFIA_VERSION

@@ -1 +1 @@
-4.2.0
+4.3.1

data/app/assets/javascripts/sufia.js

@@ -51,7 +51,12 @@
 //= require sufia/batch
 
 //= require hydra_collections
-//= require browse_everything
+
+//
+// For Browse-everything until https://github.com/projecthydra-labs/browse-everything/issues/85 is resolved:
+//= require jquery.treetable
+//= require browse_everything/behavior
+//
 //= require jquery.blacklightTagCloud
 //= require sufia/tagcloud
 //= require nestable

data/app/assets/javascripts/sufia/permissions.js

@@ -9,33 +9,9 @@
    */
 
 Blacklight.onLoad(function() {
-  // input for uids -  attach function to verify uid
-  $('#new_user_name_skel').on('blur', function() {
-      // clear out any existing messages
-      $('#directory_user_result').html('');
-      var un = $('#new_user_name_skel').val();
-      var perm = $('#new_user_permission_skel').val();
-      if ( $.trim(un).length == 0 ) {
-        return;
-      }
-      $.ajax( {
-        url: "/directory/user/" + un,
-        success: function( data ) {
-          if (data != null) {
-            if (!data.length) {
-              $('#directory_user_result').html('User id ('+un+ ') does not exist.');
-              $('#new_user_name_skel').select();
-              $('#new_user_permission_skel').val('none');
-              return;
-            }
-            else {
-              $('#new_user_permission_skel').focus();
-            }
-          }
-        }
-      });
 
-  });
+  // Attach the user search select2 box to the permission form
+  $("#new_user_name_skel").userSearch();
 
   // add button for new user
   $('#add_new_user_skel').on('click', function() {

data/app/assets/stylesheets/sufia.css.scss

@@ -8,6 +8,7 @@
  *= require nestable
 */
 
+@import "bootstrap-sprockets";
 @import 'bootstrap';
 @import 'blacklight/blacklight';
 @import "browse_everything";
@@ -34,6 +35,11 @@
   padding-top: 10px;
 }
 
+.profile img.orcid {
+  float: left;
+  margin-right: 2px;
+}
+
 /* This class is to workaround an issue in which Bootstrap requires a div to display a tooltip
  * on a disabled button. Using a span instead of a div would be ideal but unfortunately it does
  * not render the tooltip correctly in all browsers (e.g. in Chrome the tooltip is detected in

data/app/assets/stylesheets/sufia/_buttons.scss

@@ -5,4 +5,9 @@
 .btn-raised:active {
   box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.1);
   transition-delay: 0s;
-}
+}
+
+.action-button {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}

data/app/assets/stylesheets/sufia/_dashboard.scss

@@ -18,6 +18,16 @@
     background-color: $badge-background-color;
     color: $badge-font-color;
   }
+  .badge-optional {
+    background-color: $badge-optional-background-color;
+    border-radius: 2px;
+    color: $badge-font-color;
+    padding: 0 .25em;
+  }
+  .views-downloads-dashboard {
+    list-style-type: none;
+    padding-left: 0;
+  }
   .panel-default > .panel-heading {
     background-color: $panel-background-color;
   }

data/app/assets/stylesheets/sufia/_file-listing.scss

@@ -160,3 +160,11 @@ input#check_all {
 #my_nav {
   margin-bottom: 20px;
 }
+
+#check_all:disabled:hover:before {
+  content: "Too many items, can not select all.";
+  border: 1px;
+  font-size: .75em;
+  display: block;
+  width: 30em;
+}

data/app/assets/stylesheets/sufia/_settings.scss

@@ -23,6 +23,7 @@ $teal: #2CAEB7;
 $vermilion: #F30;
 
 $badge-background-color: $highlight-yellow;
+$badge-optional-background-color: $gray-medium;
 $badge-font-color: $classic-white;
 $content-wrapper-background-color: $cream-light;
 $dashboard-background-color: $classic-white;

data/app/helpers/batch_edits_helper.rb

@@ -6,7 +6,7 @@ module BatchEditsHelper
   end
 
   def render_check_all
-    unless @disable_select_all || params[:controller].match("my/collections")
+    unless params[:controller].match("my/collections")
       render partial: 'batch_edits/check_all'
     end
   end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -1,5 +1,9 @@
 module Sufia
   module SufiaHelperBehavior
+    def orcid_label(style_class='')
+      "#{image_tag 'orcid.png', { alt: t('sufia.user_profile.orcid.alt'), class: style_class }} #{t('sufia.user_profile.orcid.label')}".html_safe
+    end
+
     def error_messages_for(object)
       if object.try(:errors) and object.errors.full_messages.any?
         content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
@@ -164,6 +168,13 @@ module Sufia
       end
     end
 
+    def user_display_name_and_key(user_key)
+      user = ::User.find_by_user_key(user_key)
+      return user_key if user.nil?
+
+      user.respond_to?(:name) ? "#{user.name} (#{user_key})" : user_key
+    end
+
     private
 
     def search_action_for_dashboard

data/app/models/featured_work_list.rb

@@ -17,7 +17,10 @@ class FeaturedWorkList
     return @works if @works
     @works = FeaturedWork.all
     add_solr_document_to_works
-    @works
+    @works = @works.reject do |work|
+      work.destroy if work.generic_file_solr_document.blank?
+      work.generic_file_solr_document.blank?
+    end
   end
 
   private

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

@@ -16,8 +16,8 @@
 
   <%= render partial: 'generic_files/permission_form', formats: [:html], locals: { gf: @generic_file, batch: @batch } %>
 
-  <div class="row" id="permissions_submit">
-    <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary btn-lg',
+  <div class="action-button" id="permissions_submit">
+    <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary',
         onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
   </div>
 

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

@@ -1,7 +1,9 @@
-<div class="dropdown" >
-  <%= check_box_tag 'check_all', 'yes', @all_checked, class: 'pull-left', disabled: ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
-  <a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-cog" title="click for selection options"></span></a>
-  <ul class="dropdown-menu">
-    <%= render partial: "#{controller_name}/batch_edits_actions" %>
-  </ul>
+<div class="dropdown batch_document_selector_all" >
+  <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
+  <% if !@disable_select_all %>
+    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-cog" title="click for selection options"></span></a>
+    <ul class="dropdown-menu">
+      <%= render partial:"#{controller_name}/batch_edits_actions" %>
+    </ul>
+  <% end %>
 </div>

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

@@ -10,7 +10,7 @@
         <% end %>
    
       </div><!-- /well -->
-    <div class="row">
+    <div class="action-button">
       <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn btn-primary',
         onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
     </div>

data/app/views/dashboard/_index_partials/_stats.html.erb

@@ -1,11 +1,20 @@
 <div class="panel panel-default">
   <div class="panel-heading dashboard-panel">
     <h3 class="panel-title"><%= t("sufia.dashboard.stats.heading") %></h3></div>
+
   <table class="table table-condensed">
     <tr>
       <td><span class="badge"><%= number_of_files %></span></td>
-      <td><%= t("sufia.dashboard.stats.files") %></td>
+
+      <td>
+        <%= t("sufia.dashboard.stats.files") %>
+        <ul class="views-downloads-dashboard">
+          <li><span class="badge-optional"><%= @user.total_file_views %></span> <%= t("sufia.dashboard.stats.file_views").pluralize(@user.total_file_views) %></li>
+          <li><span class="badge-optional"><%= @user.total_file_downloads %></span> <%= t("sufia.dashboard.stats.file_downloads").pluralize(@user.total_file_downloads) %></li>
+        </ul>
+      </td>
     </tr>
+
     <tr>
       <td><span class="badge"><%= number_of_collections %></span></td>
       <td><%= t("sufia.dashboard.stats.collections") %></td>

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

@@ -12,7 +12,7 @@
         <% end %>
 
       </div><!-- /well -->
-    <div>
+    <div class="action-button">
       <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
     </div>
   <% end %>

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

@@ -2,8 +2,8 @@
     <%= form_for @generic_file, url: sufia.generic_file_path(@generic_file), html: {multipart: true, class: 'form-horizontal', id: 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render partial: "generic_files/permission_form", locals: { gf: @generic_file, f: f } %>
-      <div class="row" id="permissions_submit">
-        <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary btn-lg', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
+      <div class="action-button" id="permissions_submit">
+        <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
       </div>
   <% end %>
 </div><!-- /#permissions_display -->

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

@@ -53,12 +53,10 @@
   <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>
+      <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).  Select the user, by name or <%=t('sufia.account_label') %>. Then select the access level you wish to grant and click on Add this <%= t('sufia.account_label') %> to complete adding the permission.</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>
+        <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 %>
       </div>
       <div class="col-sm-4">
         <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
@@ -116,7 +114,7 @@
     <% next if permission[:name].downcase == 'registered' %>
     <% next if permission[:name].downcase == depositor %>
     <tr>
-      <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", permission[:name], class: "control-label" %></td>
+      <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", user_display_name_and_key(permission[:name]), class: "control-label" %></td>
       <td>
         <div class="col-sm-8">
           <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia.config.permission_levels, permission[:access]), class: 'form-control select_perm' %>

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

@@ -10,7 +10,7 @@
             <p id="upload_field">
                 <%= file_field_tag "filedata"  %>
              </p>
-            <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary btn-xs" %>
+            <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary" %>
           </div>
         </div>
     <hr />
@@ -27,7 +27,7 @@
       </div>
     <% end %>
     <div id="save_version_note" class="alert hide">You must click &quot;Save Revision&quot; to revert a previous version of this file</div>
-    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn btn-primary btn-xs', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
+    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
   <% end %>
   </div> <!-- /well -->
 </div> <!-- /row -->

data/app/views/records/show_fields/_contributor.html.erb

@@ -1,5 +1,5 @@
 <% record.contributor.each do |contributor| %>
-  <span itemprop="contributor" itemscope itemtype="http://schema.org/Agent">
+  <span itemprop="contributor" itemscope itemtype="http://schema.org/Person">
     <span itemprop="name"><%= link_to_field('contributor', contributor) %></span>
   </span>
   <br />

data/app/views/records/show_fields/_creator.html.erb

@@ -1,5 +1,5 @@
 <% record.creator.each do |creator| %>
-<span itemprop="creator" itemscope itemtype="http://schema.org/Agent">
+<span itemprop="creator" itemscope itemtype="http://schema.org/Person">
   <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("desc_metadata__creator", :facetable)) %></span>
 </span>
 <br />

data/app/views/users/_profile.html.erb

@@ -1,7 +1,6 @@
         <div class="tab-pane" id="profile">
           <h2>User Info</h2>
-             <dl id="user_info"> 
-                <%= render partial: 'social_media_info', locals: {user: @user} %>
+             <dl id="user_info">
                 <%= render partial: 'user_info', locals: {user: @user} %>
              </dl>
         </div>

data/app/views/users/_user_info.html.erb

@@ -1,14 +1,31 @@
 <dl id="user_info" class="row">
+
+<% if user.orcid.present? %>
+  <dt class="col-xs-5"><%= orcid_label('orcid') %></dt>
+  <dd class="col-xs-7"><%= link_to user.orcid, user.orcid, { target: '_blank' } %></dd>
+<% end %>
+
+<% if user.facebook_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-facebook"></i> Facebook Handle</dt>
   <dd class="col-xs-7"><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
+<% end %>
 
+<% if user.twitter_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-twitter"></i> Twitter Handle</dt>
   <dd class="col-xs-7"><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
- 
+<% end %>
+
+<% if user.googleplus_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-google-plus"></i> Google+ Handle</dt>
   <dd class="col-xs-7"><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
- 
-  <dt class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>
+<% end %>
+
+<% if user.linkedin_handle.present? %>
+  <dt class="col-xs-5"><i class="fa fa-linkedin"></i> LinkedIn</dt>
+  <dd class="col-xs-7"><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", { target: '_blank' } %></dd>
+<% end %>
+
+  <dt class="col-xs-5"><i class="fa fa-envelope"></i> Email</dt>
   <dd class="col-xs-7"><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>