sufia 7.1.0 → 7.2.0

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

@@ -2,7 +2,7 @@
   <% if presenter.trophies.count > 0 %>
     <table>
       <% presenter.trophies.each do |t| %>
-        <tr id="trophyrow_<%= t.id %>">
+        <tr id="trophyrow_<%= t.id %>" class='highlighted-works'>
           <td>
             <%= link_to t do %>
               <%= image_tag t.thumbnail_path, width: 90 %>

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

@@ -1,16 +1,6 @@
-    <!-- profile and view buttons -->
-      <% if signed_in? %>
-        <% if presenter.current_user? %>
-          <%= link_to sufia.edit_profile_path(@user), class: "btn btn-default" do %>
-            <i class="glyphicon glyphicon-edit"></i> Edit Your Profile
-          <% end %>
-        <% elsif current_user.following?(@user) %>
-          <%= link_to sufia.unfollow_profile_path(@user), method: :post, class: "btn btn-default" do %>
-            <i class="glyphicon glyphicon-eye-close"></i> Unfollow
-          <% end %>
-        <% else %>
-          <%= link_to sufia.follow_profile_path(@user), method: :post, class: "btn btn-default" do %>
-            <i class="glyphicon glyphicon-eye-open"></i> Follow
-          <% end %>
-        <% end %>
-      <% end %>
+<!-- profile and view buttons -->
+<% if signed_in? && presenter.current_user? %>
+  <%= link_to sufia.edit_profile_path(@user), class: "btn btn-default" do %>
+    <i class="glyphicon glyphicon-edit"></i> Edit Your Profile
+  <% end %>
+<% end %>

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

@@ -16,8 +16,3 @@
       <li><span class="badge badge-optional"><%= user.total_file_downloads %></span> <%= t("sufia.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
   </ul>
 </div>
-
-<div class="list-group-item">
-  <%= render "users/follower_modal", followers: user.followers, user: user %>
-  <%= render "users/following_modal", following: user.all_following, user: user %>
-</div>

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

@@ -2,31 +2,31 @@
   <%= render partial: 'search_form' %>
   <h1><%= application_name %> Users</h1>
 </div>
-<table class="table table-striped"> 
-    <thead> 
-        <tr> 
-            <th>Avatar</th> 
+<table class="table table-striped">
+    <thead>
+        <tr>
+            <th>Avatar</th>
             <th class="sorts"><i id="name" class="<%=params[:sort].blank? ? 'caret up' : params[:sort]== "name desc" ? 'caret' : params[:sort]== "name" ? 'caret up' : ''%>"></i> User Name</th>
             <th class="sorts"><i id="login" class="<%=params[:sort]== "login desc" ? 'caret' : params[:sort]== "login" ? 'caret up' : ''%>"></i> User Id</th>
             <th class="sorts"><i id="department" class="<%=params[:sort]== "department desc" ? 'caret' : params[:sort]== "department" ? 'caret up' : ''%>"></i> Department</th>
-            <th>Files Deposited</th> 
-        </tr> 
-    </thead> 
-    <tbody> 
-        <% @users.each do |user| %> 
-            <tr> 
+            <th>Works Created</th>
+        </tr>
+    </thead>
+    <tbody>
+        <% @users.each do |user| %>
+            <tr>
               <td><%= link_to sufia.profile_path(user) do %>
-                    <%= image_tag user.avatar.url(:thumb), width: 30 %>
+                    <%= image_tag(user.avatar.url(:thumb), width: 30) if user.avatar.file %>
                   <% end %>
               </td>
                <td><%= link_to user.name, sufia.profile_path(user) %></td>
                <td><%= link_to user.user_key, sufia.profile_path(user) %></td>
                <td><%= user.department %></td>
-               <td><%= number_of_deposits(user) %></td>
-            </tr> 
-         <% end %> 
-    </tbody> 
-</table> 
+               <td><%= number_of_works(user) %></td>
+            </tr>
+         <% end %>
+    </tbody>
+</table>
 <div class="pager">
   <%= paginate @users, theme: 'blacklight', route_set: sufia %>
 </div>

data/config/features.rb

@@ -0,0 +1,10 @@
+Flipflop.configure do
+  # Strategies will be used in the order listed here.
+  strategy :cookie
+  strategy :active_record, class: Sufia::Feature
+  strategy :default
+
+  feature :assign_admin_set,
+          default: true,
+          description: "Ability to assign uploaded items to an admin set"
+end

data/config/locales/sufia.en.yml

@@ -1,5 +1,13 @@
 en:
   sufia:
+    admin_sets:
+      index:
+        header:         "Administrative Collections"
+    controls:
+      home:             "Home"
+      about:            "About"
+      help:             "Help"
+      contact:          "Contact"
     product_name:       "Sufia"
     product_twitter_handle: "@HydraSphere"
     institution_name:   "Institution Name"
@@ -15,7 +23,7 @@ en:
     view_profile:       "View Profile"
     edit_profile:       "Edit Profile"
     single_use_links:
-      button:  "Single-Use Link to File"
+      button: "Single-Use Link to File"
       expiration_message: "Link %{link} expires %{time}"
     directory:
       suffix:           "@example.org"
@@ -34,9 +42,6 @@ en:
           my_collections:
             label_short:  "My Collections"
             label_long:   "My Collections"
-          my_highlights:
-            label_short:  "My Highlights"
-            label_long:   "My Highlights"
           my_shares:
             label_short:  "My Shares"
             label_long:   "My Shares"
@@ -58,6 +63,10 @@ en:
       processing: "File is being processed; you may edit when processing has completed"
       permissions_message: "Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions."
       change_permissions_message_html: "<p>You have changed the permissions on this %{curation_concern_human_readable_type}, <i>%{curation_concern}</i>, making it visible to <b>%{visibility_badge}</b>.</p><p>Would you like change all of the files within the %{curation_concern_human_readable_type} to <b>%{visibility_badge}</b> as well?</p>"
+      change_access_message_html: "<p>You have changed the access level on work <i>%{curation_concern}</i>, making it accessible to other users or groups to view or edit.</p><p>Would you like change all of the files within the work to have the same access users, groups and visibility as well?</p>"
+      change_access_yes_message: "Yes please."
+      change_access_no_message: "No. I'll update it manually."
+      change_access_flash_message: "Updating file access levels. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file acess levels."
       alert:
         fail_html: "There was a problem during upload, none of your files uploaded correctly. Please %{reload_href}.  Use the %{contact_href} to report the error if it persists."
         fail_restart_href_text: "start over"
@@ -71,15 +80,22 @@ en:
         title:              'Featured Works'
         no_works:           'No works have been featured'
         drag:               'Drag'
+      featured_researcher:
+        tab_label:          'Featured Researcher'
+        title:              'Featured Researcher'
       recently_uploaded:
         depositor:          'Depositor'
         details:            'Details'
         tab_label:          'Recently Uploaded'
+        title:              'Recently Uploaded'
         no_public:          'No public work has been contributed.'
+      admin_sets:
+        link:               'View all administrative collections'
+        tab_label:          'Explore Collections'
+        title:              'Explore Collections'
     toolbar:
       admin:
-        menu: "Admin"
-        statistics: "Repository Statistics"
+        menu: "Administration"
       dashboard:
         menu: "Dashboard"
         my: "My Dashboard"
@@ -125,13 +141,11 @@ en:
         file_downloads:     "Download"
         works:              "Works created"
         collections:        "Collections created"
-        following:          "People you follow"
-        followers:          "People who are following you"
       my:
         works:        "My Works"
         collections:  "My Collections"
         highlights:   "My Highlights"
-        shares:       "Files Shared with Me"
+        shares:       "Works Shared with Me"
         facet_label:
           files:        "Filter your files"
           collections:  "Filter your collections"
@@ -180,7 +194,7 @@ en:
           keyword: "could not be updated. You do not have sufficient privileges to edit them."
         title:  "Files failed"
         subject: "Batch upload permission denied"
-    background_attribution: "Background image courtesy of Penn State University"
+    background_attribution_html: "Background image CC by-nc-sa by <a href=\"https://flic.kr/p/eirxaf\">f2b1610</a>"
     bread_crumb:
       search_results: "Back to search results"
     visibility:
@@ -189,10 +203,6 @@ en:
       open_title_attr: "Change the visibility of this resource"
       private_title_attr: "Change the visibility of this resource"
     user_profile:
-      no_followers: "No one is following you."
-      no_following: "You are not following anyone."
-      no_followers_other: "No one is following this user."
-      no_following_other: "This user is not following anyone."
       orcid:
         alt: "ORCID icon"
         label: "ORCID Profile"
@@ -278,11 +288,25 @@ en:
       notifications_deleted: "Notifications have been deleted"
     file_set:
       browse_view: "Browse View"
+      show:
+        download: "Download the file"
     work:
       browse_view: "Browse View"
     footer:
       copyright_html: "<strong>Copyright &copy; 2016 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
     admin:
+      admin_sets:
+        edit:
+          header:         "Edit Administrative Set"
+        new:
+          header:         "Create New Administrative Set"
+        show:
+          header:           "Administrative Set"
+          item_list_header: "Works in This Set"
+      sidebar:
+        admin_sets: "Administrative Sets"
+        settings:   "Settings"
+        statistics: "Statistics"
       stats:
         registered: "Registered"
         deposited_form:
@@ -307,6 +331,7 @@ en:
         related_url:      "Related URL"
         files:            "Upload a new version of this file from your computer"
         collection_ids:   "Add as member of collection"
+        admin_set_id:     "Add as member of administrative set"
       collection:
         total_items:      "Total Items"
         size:             "Size"
@@ -314,14 +339,14 @@ en:
 
     hints:
       generic_work:
-        resource_type_html: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
+        resource: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
         title: "A name to aid in identifying a work."
         keyword: "Words or phrases you select to describe what the work is about. These are used to search for content."
         subject: "Headings or index terms describing what the work is about; these do need to conform to an existing vocabulary."
-        creator_html: "The person or group responsible for the work. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot;."
+        creator: "The person or group responsible for the work. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot;."
         related_url: "A link to a website or other specific content (audio, video, PDF document) related to the work. An example is the URL of a research project from which the work was derived."
-        based_near_html: "A place name related to the work, such as its site of publication, or the city, state, or country the work contents are about. Calls upon the <a href='http://www.geonames.org'>GeoNames web service</a>."
-        contributor_html: "A person or group you want to recognize for playing a role in the creation of the work, but not the primary role."
+        based_near: "A place name related to the work, such as its site of publication, or the city, state, or country the work contents are about. Calls upon the <a href='http://www.geonames.org'>GeoNames web service</a>."
+        contributor: "A person or group you want to recognize for playing a role in the creation of the work, but not the primary role."
         date_created: "The date on which the work was generated."
         description: "Free-text notes about the work. Examples include abstracts of a paper or citation information for a journal article."
         identifier: "A unique handle identifying the work. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
@@ -329,14 +354,14 @@ en:
         publisher: "The person or group making the work available. Generally this is the institution."
         rights: "Licensing and distribution information governing access to the work. Select from the provided drop-down list."
       collection:
-        resource_type_html: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
+        resource_type: "Pre-defined categories to describe the type of content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
         title: "A name to aid in identifying a collection."
         keyword: "Words or phrases you select to describe what the collection is about. These are used to search for content."
         subject: "Headings or index terms describing what the collection is about; these do need to conform to an existing vocabulary."
-        creator_html: "The person or group responsible for the collection. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot;."
+        creator: "The person or group responsible for the collection. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot;."
         related_url: "A link to a website or other specific content (audio, video, PDF document) related to the collection. An example is the URL of a research project from which the collection was derived."
-        based_near_html: "A place name related to the collection, such as its site of publication, or the city, state, or country the collection contents are about. Calls upon the <a href='http://www.geonames.org'>GeoNames web service</a>."
-        contributor_html: "A person or group you want to recognize for playing a role in the creation of the collection, but not the primary role."
+        based_near: "A place name related to the collection, such as its site of publication, or the city, state, or country the collection contents are about. Calls upon the <a href='http://www.geonames.org'>GeoNames web service</a>."
+        contributor: "A person or group you want to recognize for playing a role in the creation of the collection, but not the primary role."
         date_created: "The date on which the collection was created."
         description: "Free-text notes about the collection. Examples include abstracts of a paper or citation information for a journal article."
         identifier: "A unique handle identifying the collection. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
@@ -354,18 +379,35 @@ en:
       relationships_parent_row_empty:
         label: "In %{type}:"
         empty: "There are no %{type} relationships."
-      relationships_member_rows:
-        label: "Has related %{type}:"
-        empty: "This %{type} does not have any related works."
       metadata:
         header: Descriptions
         attribute_name_label: Attribute Name
         attribute_values_label: Values
+      form_files:
+        local_upload: Add Local Files
+        external_upload: Cloud Providers
+        dropzone: "Drop files here."
       items:
         header: Items
+        thumbnail: Thumbnail
+        title: Title
+        date_uploaded: "Date Uploaded"
+        visibility: Visibility
+        actions: Actions
         empty:  "This %{type} has no files associated with it. Click \"edit\" to add more files."
       citations:
         header: 'Citations:'
+      social_media:
+        facebook: 'Facebook'
+        twitter: 'Twitter'
+        tumblr: 'Tumblr'
+        google: 'Google+'
+    file_sets:
+      groups_description:
+        description_html: >
+          The list of groups in the drop-down marked "Select a group" is a list of User Managed Groups that
+          you are a member of.  You may select a specific group and assign an access level for a file 
+          within %{application_name}, similarly to adding user access levels.
     visibility:
       open:
         label_html: Public
@@ -384,9 +426,18 @@ en:
     search:
       fields:
         show:
+          based_near: Location
+          contributor: Contributors
           keyword: Keyword
 
 
   helpers:
     action:
+      admin_set:
+        new: "Create new administrative set"
       cancel: "Cancel"
+      edit: "Edit"
+    submit:
+      admin_set:
+        create: 'Save'
+        update: 'Save'

data/config/routes.rb

@@ -69,13 +69,8 @@ Sufia::Engine.routes.draw do
     end
   end
 
-  # User profile & follows
-  resources :users, only: [:index, :show, :edit, :update], as: :profiles do
-    member do
-      post 'follow' => 'users#follow'
-      post 'unfollow' => 'users#unfollow'
-    end
-  end
+  # User profile
+  resources :users, only: [:index, :show, :edit, :update], as: :profiles
 
   resources :users, only: [] do
     resources :operations, only: [:index, :show], controller: 'sufia/operations'
@@ -115,9 +110,6 @@ Sufia::Engine.routes.draw do
     get '/shares/facet/:id',  controller: 'my/shares', action: :facet, as: 'dashboard_shares_facet'
   end
 
-  # advanced routes for advanced search
-  get 'search' => 'advanced#index', as: :advanced
-
   # Contact form routes
   post 'contact' => 'contact_form#create', as: :contact_form_index
   get 'contact' => 'contact_form#new'
@@ -128,6 +120,8 @@ Sufia::Engine.routes.draw do
       member do
         get :confirm
         post :copy
+        get :confirm_access
+        post :copy_access
       end
     end
   end
@@ -146,8 +140,15 @@ Sufia::Engine.routes.draw do
     end
   end
 
-  namespace :admin do
-    get 'stats' => 'stats#index', as: :stats
+  resources :admin_sets, controller: 'sufia/admin_sets'
+
+  resource :admin, controller: 'sufia/admin', only: [:show]
+  scope 'admin', module: 'sufia/admin', as: 'admin' do
+    resources :admin_sets
+    resource 'stats', only: [:show]
+    resources :features, only: [:index] do
+      resources :strategies, only: [:update, :destroy]
+    end
   end
 
   resources :content_blocks, only: ['create', 'update']
@@ -155,11 +156,9 @@ Sufia::Engine.routes.draw do
   post '/tinymce_assets' => 'tinymce_assets#create'
 
   get 'about' => 'pages#show', id: 'about_page'
-  # Static page routes (workaround)
-  get ':action' => 'static#:action', constraints: { action: /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, as: :static
 
-  # Catch-all (for routing errors)
-  unless Rails.env.development? || Rails.env.test?
-    match '*error' => 'errors#routing', via: [:get, :post]
+  # Static page routes
+  %w(help terms zotero mendeley agreement versions).each do |action|
+    get action, controller: 'static', action: action, as: action
   end
 end

data/db/migrate/20160415212015_create_features.rb

@@ -0,0 +1,10 @@
+class CreateFeatures < ActiveRecord::Migration
+  def change
+    create_table :sufia_features do |t|
+      t.string :key, null: false
+      t.boolean :enabled, null: false, default: false
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/sufia/install_generator.rb

@@ -20,6 +20,7 @@ module Sufia
    8. Installs hydra:batch_edit
    9. Updates simple_form to use browser validations
    10. Installs Blacklight gallery (and removes it's scss)
+   11. Runs the jquery-datatables generator
          """
 
     def banner
@@ -40,15 +41,16 @@ module Sufia
     end
 
     # Add behaviors to the user model
-    def inject_sufia_user_behavior
+    def inject_sufia_user_behaviors
       file_path = "app/models/#{model_name.underscore}.rb"
       if File.exist?(file_path)
         inject_into_file file_path, after: /include CurationConcerns\:\:User.*$/ do
           "\n  # Connects this user object to Sufia behaviors." \
-            "\n  include Sufia::User\n"
+          "\n  include Sufia::User" \
+          "\n  include Sufia::UserUsageStats\n"
         end
       else
-        puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g sufia client"
+        puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g sufia:install client"
       end
     end
 
@@ -66,25 +68,6 @@ module Sufia
       copy_file 'config/analytics.yml', 'config/analytics.yml'
     end
 
-    def solr_config
-      say_status("info", "GENERATING SUFIA FULL-TEXT", :blue)
-      source = File.expand_path("../../../../solr/config/solrconfig.xml", __FILE__)
-      copy_file source, 'solr/conf/solrconfig.xml', force: true
-    end
-
-    # Adds user stats-related methods
-    def user_stats
-      file_path = "app/models/#{model_name.underscore}.rb"
-
-      if File.exist?(file_path)
-        inject_into_file file_path, after: /include Sufia\:\:User.*$/ do
-          "\n  include Sufia::UserUsageStats"
-        end
-      else
-        puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generator assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails g sufia:user_stats client"
-      end
-    end
-
     def insert_abilities
       insert_into_file 'app/models/ability.rb', after: /CurationConcerns::Ability/ do
         "\n  include Sufia::Ability\n"
@@ -104,12 +87,6 @@ module Sufia
       end
     end
 
-    def use_blacklight_layout_theme
-      file_path = "app/controllers/application_controller.rb"
-      return unless File.exist?(file_path)
-      gsub_file file_path, /with_themed_layout '1_column'/, "layout 'sufia-one-column'"
-    end
-
     def catalog_controller
       copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
     end
@@ -122,12 +99,7 @@ module Sufia
     def inject_routes
       gsub_file 'config/routes.rb', /root (:to =>|to:) "catalog#index"/, ''
       gsub_file 'config/routes.rb', /'welcome#index'/, "'sufia/homepage#index'" # Replace the root path injected by CurationConcerns
-
-      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.\n" \
-        "  # This behavior seems to show up only in production mode.\n" \
-        "  mount Sufia::Engine => '/'\n"
-
+      routing_code = "\n mount Sufia::Engine => '/'\n"
       sentinel = /end\Z/
       inject_into_file 'config/routes.rb', routing_code, before: sentinel, verbose: false
     end
@@ -169,5 +141,9 @@ module Sufia
       # includes to sufia.scss
       remove_file 'app/assets/stylesheets/blacklight_gallery.css.scss'
     end
+
+    def datatables
+      generate 'jquery:datatables:install bootstrap3'
+    end
   end
 end