sufia 6.0.0 → 6.1.0

data/app/models/my_search_builder.rb

@@ -0,0 +1,4 @@
+# Added to allow for the My controller to show only things I have edit access to
+class MySearchBuilder < Blacklight::SearchBuilder
+  include Sufia::MySearchBuilderBehavior
+end

data/app/search_builders/sufia/my_search_builder_behavior.rb

@@ -0,0 +1,20 @@
+# Behavior for the my controller search builder to allow the my controller to only get access to
+# items I have edit access to.
+#
+# Separating as a behavior allows for easier overriding of the gem behavior.
+module Sufia::MySearchBuilderBehavior
+  extend ActiveSupport::Concern
+
+  included do
+    include Blacklight::Solr::SearchBuilderBehavior
+  end
+
+  include Hydra::AccessControlsEnforcement
+  include Sufia::SearchBuilder
+
+  # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
+  def discovery_permissions
+    ["edit"]
+  end
+
+end

data/app/search_builders/sufia/search_builder.rb

@@ -10,7 +10,7 @@ module Sufia::SearchBuilder
     ]
   end
 
-  def show_only_files_deposited_by_current_user(solr_parameters)
+  def show_only_resources_deposited_by_current_user(solr_parameters)
     solr_parameters[:fq] ||= []
     solr_parameters[:fq] += [
       ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: scope.current_user.user_key)

data/app/views/admin/stats/index.html.erb

@@ -0,0 +1,68 @@
+<div class="stats">
+  <h1>Statistics for <%= application_name %>
+    <%= Sufia::VERSION %></h1>
+  <br/>
+
+  <h2>Total Files: <%= @files_count[:total] %> </h2>
+  <br/>
+  <h3>Totals by Visibility</h3>
+  <ul>
+    <li>Open Access <span class="count">(<%= @files_count[:public] %>)</span></li>
+    <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @files_count[:registered] %>)</span></li>
+    <li>Private <span class="count">(<%= @files_count[:private] %>)</span></li>
+  </ul>
+
+  <h3>Top File Formats</h3>
+  <ul>
+    <% @top_formats.each do |k, v| %>
+      <li><%= k %> <span class="count">(<%= v %>)</span></li>
+    <% end %>
+  </ul>
+
+  <br/>
+
+  <h2>Total <%= application_name %> Users:&nbsp; <%= @users_count %> </h2>
+  <br/>
+
+  <h3>Newest Users</h3>
+  <%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
+  <%= f.label "Display users registered since" %>
+  <input type="date" name="users_stats[start_date]" value="<%= @users_stats[:start_date] %>"></input>
+  <%= f.submit "Load Stats" %>
+  <%- end %>
+
+  <%- if @users_stats[:start_date] %>
+    <div>Total: <%= @recent_users.count %></div>
+  <%- else %>
+    Five most recent users:
+  <%- end %>
+
+  <ul>
+    <% @recent_users.each do |usr| %>
+      <li>
+        <a href="<%= sufia.profile_path(usr.user_key) %>" title="View user's profile"><%= usr.name %></a>
+        <%- if usr.department %>
+          of <%= usr.department %>
+        <%- end %>
+        registered
+      <span class="date">
+        <%= usr.created_at.to_time.strftime("%m/%d/%Y") %>
+      </span>
+      </li>
+    <% end %>
+  </ul>
+
+
+  <br/>
+  <h3>Most Active Users (top <%= @active_users.count %>)</h3>
+  <ul>
+    <% @active_users.each do |k, v| %>
+      <li>
+        <%= link_to_profile(k) %> <span class="count">(<%= v %>)</span>
+      </li>
+    <% end %>
+    <% if !params[:dep_count] %>
+      <p><%= link_to "View top 20", sufia.admin_stats_path, controller: "stats", dep_count: "20" %> </p>
+    <% end %>
+  </ul>
+</div>

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

@@ -1,23 +1,25 @@
 <div class="btn-group">
-  <button class="btn btn-sm" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
-  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
-  <ul class="dropdown-menu">
-   <li>
-     <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>
-   </li>
-   <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{id}" %>
-   </li>
-   <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(id), class: 'itemicon itemedit', title: 'Edit File'  %>
-   </li>
-   <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(id), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
-   </li>
-   <li>
-     <%= display_trophy_link(@user, id) do |text| %>
-         <i class='glyphicon glyphicon-star'></i> <%= text %>
-     <% end %>
-   </li>
+  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span></button>
+  <ul class="dropdown-menu dropdown-menu-right">
+    <li>
+      <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>
+    </li>
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#',
+                  class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{id}" %>
+    </li>
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(id),
+                  class: 'itemicon itemedit', title: 'Edit File' %>
+    </li>
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(id),
+                  class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
+    </li>
+    <li>
+      <%= display_trophy_link(@user, id) do |text| %>
+        <i class='glyphicon glyphicon-star'></i> <%= text %>
+      <% end %>
+    </li>
   </ul>
 </div>

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

@@ -5,7 +5,7 @@
   <div class="row">
     <div class="col-sm-3">
       <%= link_to [collections, collection] do %>
-        <span class="glyphicon glyphicon-th collection-icon-search">
+          <%= image_tag "site_images/collection-icon.svg", class: "collection-icon-search" %>
       <% end %>
     </div>
     <div class="col-sm-9">

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

@@ -3,23 +3,25 @@
       <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" id="col_add_title"><%= t("sufia.collection.select_form.title") %></h4>
+          <span class="modal-title" id="col_add_title"><%= t("sufia.collection.select_form.title") %></span>
         </div>
         <div class="modal-body">
           <% if user_collections.blank? %>
             <em> <%= t("sufia.collection.select_form.no_collections") %></em><br><br><br><br>
           <% else %>
-            <%= t("sufia.collection.select_form.select_heading") %>
             <div class="collection-list">
+              <fieldset>
+                <legend><%= t("sufia.collection.select_form.select_heading") %></legend>
               <ul>
                 <% user_collections.sort! { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }  %>
                 <% user_collections.each do |collection| %>
-                  <li> <label for="<%= collection.id %>" class="sr-only">Add to <%=collection.title%></label>
+                  <li> <label for="id_<%= 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>
+              </fieldset>
             </div><!-- collection-list -->
           <% end %> <!-- else -->
         </div>

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

@@ -1,4 +1,5 @@
-    <h2 class="non lower">Actions</h2>
+<div id="show_actions">
+<h2 class="non lower">Actions</h2>
     <p>
       <%= render_download_link %>
       <% if Sufia.config.analytics %>
@@ -19,7 +20,7 @@
           <%= link_to "Feature", sufia.featured_work_path(@generic_file, format: :json), data: {behavior: 'feature'} %>
         <% elsif @generic_file.featured? %>
           &nbsp;|&nbsp;
-          Featured
+          <%= link_to "Unfeature", sufia.featured_work_path(@generic_file, format: :json), data: {behavior: 'unfeature-page'} %>
         <% end %>
       <% end %>
     </p>
@@ -43,3 +44,4 @@
 
     <!-- COinS hook for Zotero -->
     <span class="Z3988" title="<%= @generic_file.export_as_openurl_ctx_kev %>"></span>
+</div>

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

@@ -34,7 +34,7 @@
 <%= javascript_include_tag 'https://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4ff1d986721ebb24' %>
 
 <%= javascript_tag do %>
-  var addthis_config = {"data_track_addressbar":true};
+  var addthis_config = {"data_track_addressbar":false};
   initialize_audio();
 <% end %>
 

data/app/views/layouts/sufia-dashboard.html.erb

@@ -5,19 +5,20 @@
 <div id="wrapper">
   <div class="container-fluid">
     <div id="page-positioner">
-
+      <a href="#skip_to_content" class="sr-only">Skip to Content</a>
       <%= render partial: '/masthead' %>
       <%= render partial: '/controls' %>
       <%= render partial: '/flash_msg' %>
 
-      <div id="content-wrapper" class="dashboard">
+      <div id="content-wrapper" class="dashboard" role="main">
+        <a name="skip_to_content"></a>
         <div class="container-fluid">
           <div id="content-header" class="row"><%= yield :heading %></div>
         </div>
         <div class="container-fluid">
           <div id="content" class="row">
-            <div id="sidebar" class="col-xs-12 col-sm-3"><%= yield :sidebar %></div>
-            <div class="col-xs-12 col-sm-9"><%= yield %></div>
+            <div class="col-xs-12 col-sm-9 col-sm-push-3"><%= yield %></div>
+            <div id="sidebar" class="col-xs-12 col-sm-3 col-sm-pull-9"><%= yield :sidebar %></div>
           </div>
         </div>
       </div>

data/app/views/layouts/sufia-one-column.html.erb

@@ -8,10 +8,12 @@
 <div  id="wrapper">
   <div class="container-fluid">
     <div id="page-positioner">
+      <a href="#skip_to_content" class="sr-only">Skip to Content</a>
       <%= render partial: '/masthead' %>
       <%= render partial: '/controls' %>
       <%= render partial: '/flash_msg' %>
       <div id="content-wrapper" class="container-fluid">
+        <a name="skip_to_content"></a>
         <div id="content" class="row">
           <div class="col-xs-12">
             <%= yield %>

data/app/views/layouts/sufia-two-column.html.erb

@@ -8,17 +8,19 @@
 <div  id="wrapper"> 
   <div class="container-fluid">
     <div id="page-positioner">
+      <a href="#skip_to_content" class="sr-only">Skip to Content</a>
       <%= render partial: '/masthead' %>
       <%= render partial: '/controls' %>
       <%= render partial: '/flash_msg' %>
       <div id="content-wrapper" class="container-fluid">
+        <a name="skip_to_content"></a>
         <div class="row">
-          <div id="sidebar" class="col-xs-12 col-sm-3">
-            <%= yield :sidebar %>
-          </div>
-          <div id="content" class="col-xs-12 col-sm-9">
+          <div id="content" class="col-xs-12 col-sm-9 col-sm-push-3">
             <%= yield %>
           </div>
+          <div id="sidebar" class="col-xs-12 col-sm-3 col-sm-push-9">
+            <%= yield :sidebar %>
+          </div>
         </div><!-- /#content -->
       </div><!-- /#content-wrapper -->
       <%= render partial: '/footer' %>

data/app/views/my/_facet_layout.html.erb

@@ -1,8 +1,8 @@
 <div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
   <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h5 class="panel-title">
+    <h4 class="panel-title">
       <%= link_to facet_field_label(facet_field.field), "#", :"data-no-turbolink" => true %>
-    </h5>
+    </h4>
   </div>
   <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
     <div class="panel-body">

data/app/views/my/_facets.html.erb

@@ -8,13 +8,11 @@
       <span class="fa fa-bars"></span>
     </button>
 
-  <h4>
-    <%= t("sufia.dashboard.my.facet_label.#{current_tab}") %>
-  </h4>
-    </div>
+    <h3><%= t("sufia.dashboard.my.facet_label.#{current_tab}") %></h3>
+  </div>
 
   <div id="facet-panel-collapse" class="collapse panel-group">
-  <%= render_facet_partials %>
-</div>
+    <%= render_facet_partials %>
+  </div>
 </div>
 <% end %>

data/app/views/my/index.html.erb

@@ -10,8 +10,8 @@
 
 <% @page_title = "#{current_tab.capitalize} listing" %>
 
-<ul class="nav nav-tabs" id="my_nav">
-  <h1 class="sr-only">Listing Navigation Bar</h1>
+<h1 class="sr-only">My Files, Collections, Highlights, and Files Shared with Me</h1>
+<ul class="nav nav-tabs" id="my_nav" role="navigation">
   <span class="sr-only">You are currently listing your <%= current_tab.pluralize %> .  You have <%= @response.docs.count %> <%= current_tab.pluralize(@response.docs.count)%> </span>
   <li class="<%= "active" if @selected_tab == :files %>">
     <%= link_to t('sufia.dashboard.my.files'), sufia.dashboard_files_path %>
@@ -29,10 +29,11 @@
 
 <%= render 'search_header' %>
 
-<h1 class="sr-only"><%=@page_title %></h1>
+<h2 class="sr-only"><%=@page_title %></h2>
 <%= render partial: 'document_list' %>
 
 <% content_for :sidebar do %>
+  <span class="sr-only">Upload Files or Create Collection</span>
   <%= link_to t('sufia.dashboard.upload_html'), sufia.new_generic_file_path, class: "btn btn-primary" %>
   <%= link_to t('sufia.dashboard.create_collection_html'), collections.new_collection_path, id: "hydra-collection-add", class: "btn btn-primary" %>
   <%= render partial: 'facets', locals: {current_tab: current_tab} %>

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

@@ -7,25 +7,27 @@
       <%= f.file_field :avatar %>
       <%= f.hidden_field :avatar_cache %>
       <span class="help-block">JPG, GIF, or PNG (less than 2MB)</span>
+
+      <div class="checkbox">
+        <%= f.label :remove_avatar do %>
+          <%= f.check_box :remove_avatar %>
+          Delete picture
+          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign"></i></a>
+        <% end %>
+      </div>
+      <div class="checkbox">
+        <%= f.label :update_directory do %>
+          <%= f.check_box :update_directory %>
+          Refresh directory info
+          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign"></i></a>
+        <% end %>
+      </div>
     </div>
   </div><!-- .form-group -->
 
-  <div class="col-xs-offset-4 col-xs-8">
-    <div class="checkbox">
-      <%= f.label :remove_avatar do %>
-        <%= f.check_box :remove_avatar %>
-        Delete picture
-        <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign"></i></a>
-      <% end %>
-    </div>
-    <div class="checkbox">
-      <%= f.label :update_directory do %>
-        <%= f.check_box :update_directory %>
-        Refresh directory info
-        <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign"></i></a>
-      <% end %>
-    </div>
-  </div>
+  <% if Sufia.config.arkivo_api %>
+    <%= render partial: 'zotero', locals: { f: f, user: @user } %>
+  <% end %>
 
   <div class="form-group">
     <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
@@ -65,4 +67,3 @@
 <div class="well">
   <%= render 'dashboard/_index_partials/proxy_rights' %>
 </div>
-

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

@@ -18,7 +18,11 @@
               <% end %>
             </ul>
           <% else %>
-            <h3> <%= t("sufia.user_profile.no_followers") %></h3>
+            <% if current_user and @user.id == current_user.id %>
+                <h3> <%= t("sufia.user_profile.no_followers") %></h3>
+            <% else %>
+                <h3> <%= t("sufia.user_profile.no_followers_other") %></h3>
+            <% end %>
           <% end %>
         </div>
         <div class="modal-footer">

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

@@ -18,7 +18,11 @@
               <% end %>
             </ul>
           <% else %>
-            <h3><%= t("sufia.user_profile.no_following") %></h3>
+            <% if current_user and @user.id == current_user.id %>
+                <h3> <%= t("sufia.user_profile.no_following") %></h3>
+            <% else %>
+                <h3> <%= t("sufia.user_profile.no_following_other") %></h3>
+            <% end %>
           <% end %>
         </div>
         <div class="modal-footer">

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

@@ -1,10 +1,15 @@
 <dl id="user_info" class="row">
 
 <% if user.orcid.present? %>
-  <dt class="col-xs-5"><%= orcid_label('orcid') %></dt>
+  <dt class="col-xs-5"><%= orcid_label('profile') %></dt>
   <dd class="col-xs-7"><%= link_to user.orcid, user.orcid, { target: '_blank' } %></dd>
 <% end %>
 
+<% if user.zotero_userid.present? %>
+  <dt class="col-xs-5"><%= zotero_label(html_class: 'profile') %></dt>
+  <dd class="col-xs-7"><%= link_to zotero_profile_url(user.zotero_userid), zotero_profile_url(user.zotero_userid), { 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>

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

@@ -0,0 +1,12 @@
+  <div class="form-group">
+    <%= f.label :zotero, class: 'col-xs-4 control-label' do %>
+      <%= zotero_label %>
+    <% end %>
+    <div class="col-xs-8">
+    <% if user.zotero_userid.present? %>
+       <%= link_to t('sufia.user_profile.zotero.connected'), zotero_profile_url(user.zotero_userid), class: "form-control" %>
+    <% else %>
+       <%= link_to t('sufia.user_profile.zotero.unlinked'), sufia.api_zotero_initiate_path, id: "zotero", class: "btn btn-mini btn-primary" %>
+    <% end %>
+    </div>
+  </div><!-- .form-group -->