sufia 6.2.0 → 6.3.0

data/app/search_builders/deposit_search_builder.rb

@@ -0,0 +1,19 @@
+class DepositSearchBuilder < Blacklight::Solr::SearchBuilder
+  include Hydra::Collections::SearchBehaviors
+
+  # includes the depositor_facet to get information on deposits.
+  #  use caution when combining this with other searches as it sets the rows to zero to just get the facet information
+  # @param solr_parameters the current solr parameters
+  def include_depositor_facet(solr_parameters)
+    solr_parameters[:"facet.field"].concat([Solrizer.solr_name("depositor", :symbol)])
+
+    # defualt facet limit is 10, which will only show the top 10 users not all users deposits
+    solr_parameters[:"facet.limit"] = ::User.count
+
+    # only get file information
+    solr_parameters[:fq] = "has_model_ssim:GenericFile"
+
+    # we only want the facte counts not the actual data
+    solr_parameters[:rows] = 0
+  end
+end

data/app/search_builders/sufia/my_search_builder_behavior.rb

@@ -16,5 +16,4 @@ module Sufia::MySearchBuilderBehavior
   def discovery_permissions
     ["edit"]
   end
-
-end
+end

data/app/search_builders/sufia/search_builder.rb

@@ -1,5 +1,4 @@
 module Sufia::SearchBuilder
-
   include BlacklightAdvancedSearch::AdvancedSearchBuilder
   include Hydra::Collections::SearchBehaviors
 
@@ -44,7 +43,6 @@ module Sufia::SearchBuilder
   # @param user_parameters the current user-subitted parameters
   def only_generic_files_and_collections(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"GenericFile\" \"Collection\")"
+    solr_parameters[:fq] << "#{Solrizer.solr_name('has_model', :symbol)}:(\"GenericFile\" \"Collection\")"
   end
-
 end

data/app/uploaders/tinymce_asset_uploader.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class TinymceAssetUploader < CarrierWave::Uploader::Base
-
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
@@ -47,5 +46,4 @@ class TinymceAssetUploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
-
 end

data/app/views/_controls.html.erb

@@ -3,10 +3,10 @@
     <div class="col-xs-12 col-sm-5 col-md-6">
       <nav class="navbar navbar-default" role="navigation">
         <ul class="nav navbar-nav">
-            <li <%= 'class=active' if current_page?(root_path) %>><a href="/" >Home</a></li>
-                <li <%= 'class=active' if current_page?(sufia.about_path) %>><a href="/about/" >About</a></li>
-                <li <%= 'class=active' if action_name == "help" %>><a href="/help/" >Help</a></li>
-            <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_form_index_path %>" >Contact</a></li>
+            <li <%= 'class=active' if current_page?(root_path) %>><a href="<%= root_path %>">Home</a></li>
+            <li <%= 'class=active' if current_page?(sufia.about_path) %>><a href="<%= sufia.about_path %>">About</a></li>
+            <li <%= 'class=active' if action_name == "help" %>><a href="<%= sufia.static_path('help') %>">Help</a></li>
+            <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_path %>">Contact</a></li>
         </ul><!-- /.nav -->
       </nav><!-- /.navbar -->
     </div>
@@ -14,4 +14,4 @@
       <%= render partial: 'catalog/search_form' %>
     </div>
   </div> <!-- /.row -->
-</div><!-- /#masthead_controls -->
+</div><!-- /#masthead_controls -->

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

@@ -0,0 +1,19 @@
+<h3>Deposits By Users</h3>
+<%= form_for "deposit_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
+  <%= f.label "#{ t("sufia.admin.stats.deposited_form.heading") } #{ t("sufia.admin.stats.deposited_form.start_label") }" %>
+  <input type="date" name="deposit_stats[start_date]" value="<%= @deposit_stats[:start_date] %>"></input>
+  <%= f.label t("sufia.admin.stats.deposited_form.end_label") %>
+  <input type="date" name="deposit_stats[end_date]" value="<%= @deposit_stats[:end_date] %>"></input>
+  <%= f.submit "Load Stats" %>
+<%- end %>
+
+<ul>
+  <% @depositors.each do |usr| %>
+    <li>
+      <a href="<%= sufia.profile_path(usr[:key]) %>" title="View user's profile"><%= usr[:user].name %></a>
+      <% num_files = usr[:deposits]%>
+      deposited <%= pluralize(num_files, "file") %>
+    </li>
+  <% end %>
+</ul>
+

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

@@ -31,4 +31,6 @@
       <p><%= link_to "View top 20", sufia.admin_stats_path, controller: "stats", dep_count: "20" %> </p>
     <% end %>
   </ul>
+
+  <%= render "admin/stats/deposits" %>
 </div>

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

@@ -18,12 +18,12 @@
           <div class="row">
             <%= simple_form_for @generic_file, url: batch_edits_path, method: :put, remote: true,
               builder: Sufia::FormBuilder, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
-              <div class="col-sm-2 col-sm-offset-1">
+              <div class="col-xs-12 col-sm-4">
                 <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
                   <%= f.input_label term %> <span class="chevron"></span>
                 </a>
               </div>
-              <div id="collapse_<%= term %>" class="collapse scrolly col-sm-6">
+              <div id="collapse_<%= term %>" class="collapse scrolly col-xs-12 col-sm-7">
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
                   <%# TODO we don't need to show required %>

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

@@ -1,5 +1,5 @@
-<h2 class="non lower">Actions</h2>
-<p>
+<h2 class="sr-only">Actions</h2>
+<div class="actions-controls-collections">
   <span class="label label-default"><%= link_to "Browse", collections.collection_path %></span> &nbsp;&nbsp;
   <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_files_path %></span>
-</p>
+</div>

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

@@ -14,9 +14,9 @@
                 <legend><%= t("sufia.collection.select_form.select_heading") %></legend>
               <ul>
                 <% user_collections.sort { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }.each do |collection|  %>
-                  <li> <label for="id_<%= collection.id %>" class="sr-only">Add to <%=collection.title%></label>
+                  <li>
                     <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %>
-                    <%= label_tag(:collection, collection.title, "aria-hidden" =>true) %>
+                    <%= label_tag(:collection, collection.title, for: "id_#{collection.id}") %>
                   </li>
                 <% end %>
               </ul>

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

@@ -13,15 +13,18 @@
      <%# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {action: "index"} but I'm not sure -%>
      <% unless @response.response['numFound'] < 2 %>
         <%= form_tag collections.collection_path(@collection), method: :get, class: 'per_page form-inline' do %>
-          <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
-          <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
-          &nbsp;&nbsp;&nbsp;
-          <%= label_tag(:per_page) do %>
-            Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %> per page
-            <% end %>
-            <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
-            &nbsp;&nbsp;&nbsp;
-            <button class="btn btn-info"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
+             <fieldset class="col-xs-12 col-sm-9 col-md-8 col-lg-10">
+               <legend class="sr-only"><%= t('sufia.sort_label') %></legend>
+               <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
+               <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
+               <%= label_tag(:per_page) do %>
+                   Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
+                   per page
+               <% end %>
+               <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
+               &nbsp;&nbsp;&nbsp;
+               <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
+             </fieldset>
             <%= render 'view_type_group' %>
          <% end %>
       <% end unless sort_fields.empty? %>

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

@@ -1,5 +1,5 @@
 <% if has_alternative_views? -%>
-<div class="view-type">
+<div class="view-type col-xs-12 col-sm-3 col-md-4 col-lg-2">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <%  document_index_views.each do |view, config| %>

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

@@ -4,14 +4,14 @@
 
 <% unless has_collection_search_parameters? %>
   <div class="row">
+    <div class="col-xs-12 col-sm-10 pull-right">
+      <%= render 'collections/form' %>
+    </div>
     <div class="col-xs-12 col-sm-2">
       <%= render 'collections/media_display', collection: @collection %>
-    </div>
-    <div class="col-xs-12 col-sm-10"><!-- class="column second"> -->
       <%= render 'collections/edit_actions' %>
-      <%= render 'collections/form' %>
-    </div><!-- /columns second -->
-  </div> <!-- /columns two-b -->
+    </div>
+  </div>
 <% end %>
 
 <h2>Manage Items in this Collection</h2>

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

@@ -20,20 +20,21 @@
     </div>
   </div>
 
-<%= render 'sort_and_per_page' %>
-
 <% if has_collection_search_parameters? %>
     <% header_title = "Search Results within this Collection" %>
 <% else %>
     <% header_title = "Items in this Collection" %>
 <% end %>
 
-<div>
-  <!-- Use CSS class h2 rather than HTML h2 tag to allow header and search box to align vertically -->
-  <span class="h2"><%= header_title %></span>
-  <%= render partial: 'search_form'%>
+<div class="row">
+  <div class="col-xs-12">
+    <h2 class="col-xs-6 col-md-7 col-lg-6"><%= header_title %></h2>
+    <div class="col-xs-6 col-md-5 col-lg-6"><%= render partial: 'search_form' %></div>
+  </div>
 </div>
 
+<%= render 'sort_and_per_page' %>
+
 <%= render_document_index @member_docs %>
 
 <%= render partial: 'paginate' %>

data/app/views/homepage/_announcement.html.erb

@@ -0,0 +1,5 @@
+<% if  can?(:update, ContentBlock) || !@announcement_text.value.blank? %>
+  <div id="announcement" class="row">
+    <%= editable_content_block @announcement_text %>
+  </div>
+<% end %>

data/app/views/homepage/_home.html.erb

@@ -1,3 +1,4 @@
+<%= render 'announcement' %>
 <div id="home_header" class="row">
   <%= render partial: 'home_header' %>
 </div>

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

@@ -18,16 +18,20 @@
   <div class="sort-toggle">
     <% unless @response.response['numFound'] < 2 %>
       <%= form_tag sufia.dashboard_files_path, method: :get, class: 'per_page form-inline' do %>
-        <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
-        <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>			      
-        &nbsp;&nbsp;&nbsp;
-        <%= label_tag :per_page do %>
-          Show <%= select_tag :per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), 
-                              title: "Number of results to display per page" %> per page
-        <% end %>
-        <%= render_hash_as_hidden_fields params_for_search().except(:per_page, :sort, :utf8) %>
-        &nbsp;&nbsp;&nbsp;
-        <button class="btn btn-info" id="dashboard_sort_submit"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
+            <fieldset class="col-xs-12">
+              <legend class="sr-only"><%= t('sufia.sort_label') %></legend>
+              <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
+              <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
+              <%= label_tag :per_page do %>
+                  Show <%= select_tag :per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])),
+                                      title: "Number of results to display per page" %> per page
+              <% end %>
+              <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort, :utf8)) %>
+              &nbsp;&nbsp;&nbsp;
+              <button class="btn btn-info" id="dashboard_sort_submit"><span class="glyphicon glyphicon-refresh"></span>
+                Refresh
+              </button>
+            </fieldset>
       <% end %>
     <% end unless sort_fields.empty? %>
   </div>

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

@@ -29,7 +29,7 @@
 
 <%= render 'search_header' %>
 
-<h2 class="sr-only"><%=@page_title %></h2>
+<h2 class="sr-only"><%= @page_title %></h2>
 <%= render partial: 'document_list' %>
 
 <% content_for :sidebar do %>

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

@@ -1,5 +1,3 @@
-<h1>About</h1> 
-<h2>What is <%=t('sufia.product_name') %>?</h2>
 <%= editable_content_block @page %>
 <%= tiny_mce_stuff if can? :update, ContentBlock%>
 

data/app/views/single_use_links/new_download.html.erb

@@ -1,5 +1,5 @@
 <div class="single-use-link">
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to download the file</p>
-<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="glyphicon glyphicon-link large-icon"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.id}" %>
+<%= link_to @asset, @link, class: 'download-link', data: { 'no-turbolink' => ''} %> <%= link_to raw('<i class="glyphicon glyphicon-link large-icon"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.id}" %>
 </div>

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

@@ -2,7 +2,7 @@
   <h1 class="lower"><%= @asset %></h1>
     <h2 class="non lower">Actions</h2>
     <p>
-      <%= link_to "Download (can only be used once)", @download_link %>
+      <%= link_to "Download (can only be used once)", @download_link, data: { 'no-turbolink' => ''} %>
     </p>
   <h2> Descriptions:</h2>
 

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

@@ -1,5 +1,5 @@
 <%= link_to sufia.notifications_path, id: "notify_link", class: "btn btn-default", title: "User Notifications" do %>
- <span class="sr-only">click for notifications.</span>
+ <span class="sr-only">View user notifications.</span>
  <%= render partial: 'users/notify_number' %>
 <% end %>  
 <div class='hide'> 

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

@@ -1,5 +1,5 @@
-<i class="glyphicon glyphicon-bullhorn"></i>
+<span class="glyphicon glyphicon-bullhorn"></span>
 <% if @notify_number > 0 %>
-  <span id="notify_number" class="overlay"> <%=@notify_number%></span>
+  <span id="notify_number" class="overlay"> <%= @notify_number %></span>
   <span class="sr-only">unread notifications</span>
 <% end %>

data/config/initializers/simple_form.rb

@@ -7,7 +7,7 @@ SimpleForm.setup do |config|
   # stack. The options given below are used to wrap the
   # whole input.
   config.wrappers :default, class: :input,
-    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+                            hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.

data/config/initializers/simple_form_bootstrap.rb

@@ -132,6 +132,6 @@ SimpleForm.setup do |config|
     check_boxes: :vertical_radio_and_checkboxes,
     radio_buttons: :vertical_radio_and_checkboxes,
     file: :vertical_file_input,
-    boolean: :vertical_boolean,
+    boolean: :vertical_boolean
   }
 end

data/config/locales/sufia.en.yml

@@ -176,6 +176,10 @@ en:
           heading: "Display Files Deposited:"
           start_label: "Start"
           end_label: "end [defaults to now]"
+        user_deposits:
+          heading: "Display files deposited by users"
+          start_label: "Starting"
+          end_label: "Ending [defaults to now]"
 
   simple_form:
     labels:

data/config/routes.rb

@@ -45,7 +45,7 @@ Sufia::Engine.routes.draw do
   # User profile & follows
   resources :users, only: [:index, :show, :edit, :update], as: :profiles do
     member do
-      post 'trophy' => 'users#toggle_trophy' #used by trophy.js
+      post 'trophy' => 'users#toggle_trophy' # used by trophy.js
       post 'follow' => 'users#follow'
       post 'unfollow' => 'users#unfollow'
     end
@@ -147,7 +147,7 @@ Sufia::Engine.routes.draw do
   # Static page routes (workaround)
   get ':action' => 'static#:action', constraints: { action: /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, as: :static
 
-  #Single use link errors
+  # Single use link errors
   get 'single_use_link/not_found' => 'errors#single_use_error'
   get 'single_use_link/expired' => 'errors#single_use_error'
 
@@ -155,5 +155,4 @@ Sufia::Engine.routes.draw do
   unless Rails.env.development? || Rails.env.test?
     match '*error' => 'errors#routing', via: [:get, :post]
   end
-
 end

data/lib/generators/sufia/admin_stat_generator.rb

@@ -2,7 +2,6 @@
 require 'rails/generators'
 
 class Sufia::AdminStatGenerator < Rails::Generators::Base
-
   source_root File.expand_path('../templates', __FILE__)
 
   desc """
@@ -12,6 +11,4 @@ This is a generator for adding Admin Stats into sufia
   def insert_stats_admin
     copy_file 'sufia/stats_admin.rb', 'config/initializers/stats_admin.rb'
   end
-
 end
-

data/lib/generators/sufia/install_generator.rb

@@ -7,7 +7,7 @@ module Sufia
 
     source_root File.expand_path('../templates', __FILE__)
 
-    argument :model_name, type: :string , default: "user"
+    argument :model_name, type: :string, default: "user"
     desc """
   This generator makes the following changes to your application:
    1. Runs sufia-models:install
@@ -40,9 +40,9 @@ module Sufia
     def inject_sufia_controller_behavior
       controller_name = "ApplicationController"
       file_path = "app/controllers/application_controller.rb"
-      if File.exists?(file_path)
+      if File.exist?(file_path)
         insert_into_file file_path, after: 'include Blacklight::Controller' do
-          "  \n# Adds Sufia behaviors into the application controller (#{controller_name}) \n" +
+          "  \n# Adds Sufia behaviors into the application controller (#{controller_name}) \n" \
           "  include Sufia::Controller\n"
         end
         gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
@@ -78,23 +78,23 @@ module Sufia
 
     # The engine routes have to come after the devise routes so that /users/sign_in will work
     def inject_routes
-      gsub_file 'config/routes.rb',  /root (:to =>|to:) "catalog#index"/, ''
+      gsub_file 'config/routes.rb', /root (:to =>|to:) "catalog#index"/, ''
 
-      routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" +
+      routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" \
         "  # This must be the very last route in the file because it has a catch-all route for 404 errors.
     # This behavior seems to show up only in production mode.
     mount Sufia::Engine => '/'\n  root to: 'homepage#index'\n"
 
       sentinel = /devise_for :users/
-      inject_into_file 'config/routes.rb', routing_code, { after: sentinel, verbose: false }
+      inject_into_file 'config/routes.rb', routing_code, after: sentinel, verbose: false
     end
 
     # Add behaviors to the SolrDocument model
     def inject_sufia_solr_document_behavior
       file_path = "app/models/solr_document.rb"
-      if File.exists?(file_path)
+      if File.exist?(file_path)
         inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
-          "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
+          "\n  # Adds Sufia behaviors to the SolrDocument.\n" \
             "  include Sufia::SolrDocumentBehavior\n"
         end
       else
@@ -113,6 +113,5 @@ module Sufia
     def install_admin_stats
       generate "sufia:admin_stat"
     end
-
   end
 end