sufia 7.1.0 → 7.2.0

data/spec/views/{admin/stats/index.html.erb_spec.rb → sufia/admin/stats/show.html.erb_spec.rb}

@@ -1,4 +1,4 @@
-describe "admin/stats/index.html.erb", type: :view do
+describe "sufia/admin/stats/show.html.erb", type: :view do
   let(:presenter) do
     Sufia::AdminStatsPresenter.new({}, 5)
   end

data/spec/views/sufia/batch_uploads/_form.html.erb_spec.rb

@@ -14,7 +14,9 @@ describe 'sufia/batch_uploads/_form.html.erb', type: :view do
     assign(:form, form)
     allow(controller).to receive_messages(current_user: user,
                                           controller_name: 'batch_uploads',
-                                          action_name: 'new')
+                                          action_name: 'new',
+                                          repository: CurationConcerns::GenericWorksController.new.repository,
+                                          blacklight_config: CurationConcerns::GenericWorksController.new.blacklight_config)
   end
 
   let(:page) do

data/spec/views/sufia/homepage/_featured_works.html.erb_spec.rb

@@ -5,16 +5,18 @@ describe "sufia/homepage/_featured_works.html.erb", type: :view do
 
   context "without featured works" do
     before { render }
-    it {
+    it do
       is_expected.to have_content 'No works have been featured'
       is_expected.not_to have_selector('form')
-    }
+    end
   end
 
   context "with featured works" do
-    let(:doc) { SolrDocument.new(id: '12345678',
-                                 title_tesim: ['Doc title'],
-                                 has_model_ssim: ['GenericWork']) }
+    let(:doc) do
+      SolrDocument.new(id: '12345678',
+                       title_tesim: ['Doc title'],
+                       has_model_ssim: ['GenericWork'])
+    end
     let(:presenter) { Sufia::WorkShowPresenter.new(doc, nil) }
     let(:featured_work) { FeaturedWork.new }
     before do
@@ -26,10 +28,10 @@ describe "sufia/homepage/_featured_works.html.erb", type: :view do
       render
     end
 
-    it {
+    it do
       is_expected.not_to have_content 'No works have been featured'
       is_expected.not_to have_selector('form')
       is_expected.to have_selector('ol#featured_works')
-    }
+    end
   end
 end

data/spec/views/sufia/homepage/{_home_header.html.erb_spec.rb → index.html.erb_spec.rb}

@@ -1,7 +1,6 @@
-
-describe "sufia/homepage/_home_header.html.erb", type: :view do
+describe "sufia/homepage/index.html.erb", type: :view do
   let(:groups) { [] }
-  let(:ability) { instance_double("Ability") }
+  let(:ability) { instance_double("Ability", can?: false) }
   let(:presenter) { Sufia::HomepagePresenter.new(ability) }
 
   describe "share your work button" do
@@ -10,6 +9,7 @@ describe "sufia/homepage/_home_header.html.erb", type: :view do
       allow(controller).to receive(:current_ability).and_return(ability)
       allow(presenter).to receive(:display_share_button?).and_return(display_share_button)
       stub_template "sufia/homepage/_marketing.html.erb" => "marketing"
+      stub_template "sufia/homepage/_home_content.html.erb" => "home content"
       render
     end
     context "when the button always displays" do

data/spec/views/users/_user_util_links.html.erb_spec.rb

@@ -17,7 +17,7 @@ describe '/_user_util_links.html.erb', type: :view do
 
   it 'shows the number of outstanding messages' do
     render
-    expect(rendered).to have_link 'Notifications 0 unread notifications', sufia.notifications_path
+    expect(rendered).to have_link 'Notifications 0 unread notifications', href: sufia.notifications_path
     expect(rendered).to have_selector '.label-default', text: '0 unread notifications'
   end
 end

data/spec/views/users/index.html.erb_spec.rb

@@ -4,7 +4,7 @@ describe 'users/index.html.erb', type: :view do
   before do
     users = []
     (1..25).each { |i| users << stub_model(User, name: "name#{i}", user_key: "user#{i}", created_at: join_date) }
-    allow(User).to receive_message_chain(:all).and_return(users)
+    allow(User).to receive(:all).and_return(users)
     relation = User.all
     allow(relation).to receive(:limit_value).and_return(10)
     allow(relation).to receive(:current_page).and_return(1)
@@ -17,6 +17,7 @@ describe 'users/index.html.erb', type: :view do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_content("Sufia Users")
+    expect(page).to have_content("Works Created")
     (1..10).each do |i|
       expect(page).to have_content("user#{i}")
     end

data/spec/views/users/show.html.erb_spec.rb

@@ -29,7 +29,11 @@ describe 'users/show.html.erb', type: :view do
 
   context "with trophy" do
     let(:trophy_presenter) { Sufia::TrophyPresenter.new(solr_document) }
-    let(:solr_document) { SolrDocument.new(id: 'abc123', has_model_ssim: 'GenericWork') }
+    let(:solr_document) do
+      SolrDocument.new(id: 'abc123',
+                       has_model_ssim: 'GenericWork',
+                       thumbnail_path_ss: '/foo/bar.png')
+    end
 
     before do
       allow(view).to receive(:search_session).and_return({})

data/sufia.gemspec

@@ -18,25 +18,26 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '~> 1.3', '>= 1.3.3'
+  spec.add_dependency 'curation_concerns', '~> 1.6', '>= 1.6.1'
+  # This is not required, but helps bundler resolve a bundle faster:
+  spec.add_dependency 'hydra-head', '>= 10.1'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'
   spec.add_dependency 'browse-everything', '>= 0.10.3'
+  spec.add_dependency 'blacklight', '~> 6.6'
   spec.add_dependency 'blacklight-gallery', '~> 0.1'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
   spec.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
   spec.add_dependency 'daemons', '~> 1.1'
-  spec.add_dependency 'mail_form', '~> 1.5'
   spec.add_dependency 'yaml_db', '~> 0.2'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'select2-rails', '~> 3.5.9'
   spec.add_dependency 'json-schema'
-  spec.add_dependency 'oauth'
   spec.add_dependency 'nest', '~> 2.0'
   spec.add_dependency 'mailboxer', '~> 0.12'
-  spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9'
-  spec.add_dependency 'oauth2', '~> 0.9'
-  spec.add_dependency 'google-api-client', '~> 0.7', '< 0.9'
+  spec.add_dependency 'oauth'
+  spec.add_dependency 'oauth2', '~> 1.2'
+  spec.add_dependency 'signet'
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
@@ -44,8 +45,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'almond-rails', '~> 0.0.1'
   spec.add_dependency 'qa', '~> 0.8' # questioning_authority
+  spec.add_dependency 'flipflop', '~> 2.2'
+  spec.add_dependency 'jquery-datatables-rails', '~> 3.3.0'
+  spec.add_dependency 'rdf-rdfxml'
 
-  spec.add_development_dependency 'engine_cart', '~> 0.8'
+  spec.add_development_dependency 'engine_cart', '~> 1.0'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'solr_wrapper', '~> 0.5'
@@ -58,7 +62,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "factory_girl_rails", '~> 4.4'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "jasmine", '~> 2.3'
-  spec.add_development_dependency 'rubocop', '~> 0.40.0'
+  spec.add_development_dependency 'rubocop', '~> 0.42.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.5'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
+  spec.add_development_dependency 'rails-controller-testing', '~> 0'
 end

data/tasks/controlled_vocabularies.rake

@@ -0,0 +1,9 @@
+namespace :sufia do
+  namespace :controlled_vocabularies do
+    desc "Load the lexvo vocabulary into the database"
+    task language: :environment do
+      require 'sufia/controlled_vocabulary/importer/language'
+      Sufia::ControlledVocabulary::Importer::Language.new.import
+    end
+  end
+end

data/vendor/assets/stylesheets/sharing_buttons.css

@@ -0,0 +1,163 @@
+.resp-sharing-button__link,
+.resp-sharing-button__icon {
+  display: inline-block
+}
+
+.resp-sharing-button__link {
+  text-decoration: none;
+  color: #fff;
+  margin: 0.5em
+}
+
+.resp-sharing-button {
+  border-radius: 5px;
+  transition: 25ms ease-out;
+  padding: 0.5em 0.75em;
+  font-family: Helvetica Neue,Helvetica,Arial,sans-serif
+}
+
+.resp-sharing-button__icon svg {
+  width: 1em;
+  height: 1em
+}
+
+.resp-sharing-button span {
+  padding-left: 0.4em
+}
+
+/* Non solid icons get a stroke */
+.resp-sharing-button__icon {
+  stroke: #fff;
+  fill: none
+}
+
+/* Solid icons get a fill */
+.resp-sharing-button__icon--solid,
+.resp-sharing-button__icon--solidcircle {
+  fill: #fff;
+  stroke: none
+}
+
+.resp-sharing-button--twitter {
+  background-color: #55acee
+}
+
+.resp-sharing-button--twitter:hover {
+  background-color: #2795e9
+}
+
+.resp-sharing-button--pinterest {
+  background-color: #bd081c
+}
+
+.resp-sharing-button--pinterest:hover {
+  background-color: #8c0615
+}
+
+.resp-sharing-button--facebook {
+  background-color: #3b5998
+}
+
+.resp-sharing-button--facebook:hover {
+  background-color: #2d4373
+}
+
+.resp-sharing-button--tumblr {
+  background-color: #35465C
+}
+
+.resp-sharing-button--tumblr:hover {
+  background-color: #222d3c
+}
+
+.resp-sharing-button--reddit {
+  background-color: #5f99cf
+}
+
+.resp-sharing-button--reddit:hover {
+  background-color: #3a80c1
+}
+
+.resp-sharing-button--google {
+  background-color: #dd4b39
+}
+
+.resp-sharing-button--google:hover {
+  background-color: #c23321
+}
+
+.resp-sharing-button--linkedin {
+  background-color: #0077b5
+}
+
+.resp-sharing-button--linkedin:hover {
+  background-color: #046293
+}
+
+.resp-sharing-button--email {
+  background-color: #777
+}
+
+.resp-sharing-button--email:hover {
+  background-color: #5e5e5e
+}
+
+.resp-sharing-button--xing {
+  background-color: #1a7576
+}
+
+.resp-sharing-button--xing:hover {
+  background-color: #114c4c
+}
+
+.resp-sharing-button--whatsapp {
+  background-color: #25D366
+}
+
+.resp-sharing-button--whatsapp:hover {
+  background-color: #1da851
+}
+
+.resp-sharing-button--facebook {
+  background-color: #3b5998;
+  border-color: #3b5998;
+}
+
+.resp-sharing-button--facebook:hover,
+.resp-sharing-button--facebook:active {
+  background-color: #2d4373;
+  border-color: #2d4373;
+}
+
+.resp-sharing-button--twitter {
+  background-color: #55acee;
+  border-color: #55acee;
+}
+
+.resp-sharing-button--twitter:hover,
+.resp-sharing-button--twitter:active {
+  background-color: #2795e9;
+  border-color: #2795e9;
+}
+
+.resp-sharing-button--google {
+  background-color: #dd4b39;
+  border-color: #dd4b39;
+}
+
+.resp-sharing-button--google:hover,
+.resp-sharing-button--google:active {
+  background-color: #c23321;
+  border-color: #c23321;
+}
+
+.resp-sharing-button--tumblr {
+  background-color: #35465C;
+  border-color: #35465C;
+}
+
+.resp-sharing-button--tumblr:hover,
+.resp-sharing-button--tumblr:active {
+  background-color: #222d3c;
+  border-color: #222d3c;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,20 +20,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: hydra-head
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +76,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -118,20 +146,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: mail_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: yaml_db
   requirement: !ruby/object:Gem::Requirement
@@ -188,20 +202,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -231,73 +231,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: acts_as_follower
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
@@ -396,20 +384,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: flipflop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: jquery-datatables-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mida
   requirement: !ruby/object:Gem::Requirement
@@ -590,14 +620,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -626,6 +656,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sufia extends the robust Hydra framework to provide a user interface
   around common repository features and social features. Sufia offers self-deposit
   and proxy deposit workflows with plans to develop one or more mediated deposit workflows
@@ -639,13 +683,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".engine_cart.yml"
+- ".eslintignore"
+- ".eslintrc"
 - ".github/CONTRIBUTING.md"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".scss-lint.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -658,7 +708,6 @@ files:
 - app/assets/images/favicon.ico
 - app/assets/images/hydra/powered_by_hydra.png
 - app/assets/images/loading.gif
-- app/assets/images/old_main_tulips.jpg
 - app/assets/images/orcid.png
 - app/assets/images/progressbar.gif
 - app/assets/images/work.png
@@ -678,9 +727,10 @@ files:
 - app/assets/javascripts/sufia/facets.js
 - app/assets/javascripts/sufia/featured_researcher.js
 - app/assets/javascripts/sufia/featured_works.js
-- app/assets/javascripts/sufia/fileupload.js
+- app/assets/javascripts/sufia/fileupload.js.erb
 - app/assets/javascripts/sufia/flot_stats.js
 - app/assets/javascripts/sufia/ga_events.js
+- app/assets/javascripts/sufia/initialize.js
 - app/assets/javascripts/sufia/notifications.es6
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/permissions/control.es6
@@ -710,7 +760,6 @@ files:
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/sufia/user_search.js
 - app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss
-- app/assets/stylesheets/sufia.scss
 - app/assets/stylesheets/sufia/_batch-edit.scss
 - app/assets/stylesheets/sufia/_browse_everything_overrides.scss
 - app/assets/stylesheets/sufia/_buttons.scss
@@ -721,23 +770,28 @@ files:
 - app/assets/stylesheets/sufia/_file-listing.scss
 - app/assets/stylesheets/sufia/_file-show.scss
 - app/assets/stylesheets/sufia/_file_sets.scss
+- app/assets/stylesheets/sufia/_file_upload.scss
 - app/assets/stylesheets/sufia/_fixedsticky.scss
 - app/assets/stylesheets/sufia/_form-progress.scss
+- app/assets/stylesheets/sufia/_form.scss
 - app/assets/stylesheets/sufia/_header.scss
 - app/assets/stylesheets/sufia/_home-page.scss
 - app/assets/stylesheets/sufia/_modal.scss
 - app/assets/stylesheets/sufia/_multi_value_fields.css.scss
 - app/assets/stylesheets/sufia/_nestable.scss
 - app/assets/stylesheets/sufia/_proxy-rights.scss
+- app/assets/stylesheets/sufia/_representative-media.scss
 - app/assets/stylesheets/sufia/_settings.scss
 - app/assets/stylesheets/sufia/_styles.scss
 - app/assets/stylesheets/sufia/_sufia.scss
 - app/assets/stylesheets/sufia/_tinymce.scss
 - app/assets/stylesheets/sufia/_usage-stats.scss
+- app/assets/stylesheets/sufia/_variables.scss
 - app/assets/stylesheets/sufia/_work-show.scss
+- app/assets/stylesheets/sufia/admin.scss
+- app/assets/stylesheets/sufia/widgets.css
 - app/builders/sufia/bootstrap_breadcrumbs_builder.rb
 - app/builders/sufia/form_builder.rb
-- app/controllers/admin/stats_controller.rb
 - app/controllers/api/items_controller.rb
 - app/controllers/api/zotero_controller.rb
 - app/controllers/batch_edits_controller.rb
@@ -752,6 +806,7 @@ files:
 - app/controllers/concerns/sufia/contact_form_controller_behavior.rb
 - app/controllers/concerns/sufia/controller.rb
 - app/controllers/concerns/sufia/dashboard_controller_behavior.rb
+- app/controllers/concerns/sufia/deny_access_override_behavior.rb
 - app/controllers/concerns/sufia/depositors_controller_behavior.rb
 - app/controllers/concerns/sufia/file_sets_controller_behavior.rb
 - app/controllers/concerns/sufia/homepage_controller_behavior.rb
@@ -768,7 +823,6 @@ files:
 - app/controllers/curation_concerns/permissions_controller.rb
 - app/controllers/dashboard_controller.rb
 - app/controllers/depositors_controller.rb
-- app/controllers/errors_controller.rb
 - app/controllers/featured_work_lists_controller.rb
 - app/controllers/featured_works_controller.rb
 - app/controllers/mailbox_controller.rb
@@ -780,6 +834,12 @@ files:
 - app/controllers/pages_controller.rb
 - app/controllers/static_controller.rb
 - app/controllers/stats_controller.rb
+- app/controllers/sufia/admin/admin_sets_controller.rb
+- app/controllers/sufia/admin/features_controller.rb
+- app/controllers/sufia/admin/stats_controller.rb
+- app/controllers/sufia/admin/strategies_controller.rb
+- app/controllers/sufia/admin_controller.rb
+- app/controllers/sufia/admin_sets_controller.rb
 - app/controllers/sufia/batch_uploads_controller.rb
 - app/controllers/sufia/homepage_controller.rb
 - app/controllers/sufia/resource_sync_controller.rb
@@ -788,6 +848,7 @@ files:
 - app/controllers/tinymce_assets_controller.rb
 - app/controllers/transfers_controller.rb
 - app/controllers/users_controller.rb
+- app/forms/sufia/forms/admin_set_form.rb
 - app/forms/sufia/forms/batch_edit_form.rb
 - app/forms/sufia/forms/batch_upload_form.rb
 - app/forms/sufia/forms/collection_form.rb
@@ -813,6 +874,7 @@ files:
 - app/helpers/sufia/collections_helper.rb
 - app/helpers/sufia/content_block_helper_behavior.rb
 - app/helpers/sufia/dashboard_helper_behavior.rb
+- app/helpers/sufia/permissions_helper.rb
 - app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
 - app/indexers/sufia/work_indexer.rb
@@ -828,11 +890,12 @@ files:
 - app/jobs/create_work_job.rb
 - app/jobs/event_job.rb
 - app/jobs/file_set_attached_event_job.rb
+- app/jobs/inherit_permissions_job.rb
 - app/jobs/user_edit_profile_event_job.rb
-- app/jobs/user_follow_event_job.rb
-- app/jobs/user_unfollow_event_job.rb
+- app/mailers/sufia/contact_mailer.rb
 - app/models/batch_upload_item.rb
 - app/models/concerns/sufia/ability.rb
+- app/models/concerns/sufia/content_block_behavior.rb
 - app/models/concerns/sufia/file_set_behavior.rb
 - app/models/concerns/sufia/proxy_deposit.rb
 - app/models/concerns/sufia/solr_document/characterization.rb
@@ -845,20 +908,20 @@ files:
 - app/models/concerns/sufia/works/featured.rb
 - app/models/concerns/sufia/works/metadata.rb
 - app/models/concerns/sufia/works/trophies.rb
-- app/models/contact_form.rb
 - app/models/content_block.rb
 - app/models/domain_term.rb
 - app/models/featured_work.rb
 - app/models/featured_work_list.rb
 - app/models/file_download_stat.rb
 - app/models/file_view_stat.rb
-- app/models/follow.rb
 - app/models/proxy_deposit_request.rb
 - app/models/proxy_deposit_rights.rb
 - app/models/sufia/avatar_validator.rb
 - app/models/sufia/batch_create_operation.rb
+- app/models/sufia/contact_form.rb
 - app/models/sufia/download.rb
 - app/models/sufia/event.rb
+- app/models/sufia/feature.rb
 - app/models/sufia/orcid_validator.rb
 - app/models/sufia/pageview.rb
 - app/models/sufia/statistic.rb
@@ -868,20 +931,23 @@ files:
 - app/models/user_mailbox.rb
 - app/models/user_stat.rb
 - app/models/work_view_stat.rb
-- app/presenters/file_usage.rb
+- app/presenters/sufia/admin_dashboard_presenter.rb
+- app/presenters/sufia/admin_set_presenter.rb
 - app/presenters/sufia/admin_stats_presenter.rb
-- app/presenters/sufia/characterization_behavior.rb
 - app/presenters/sufia/collection_presenter.rb
 - app/presenters/sufia/file_set_presenter.rb
+- app/presenters/sufia/file_usage.rb
 - app/presenters/sufia/homepage_presenter.rb
 - app/presenters/sufia/presenter_renderer.rb
+- app/presenters/sufia/stats_usage_presenter.rb
 - app/presenters/sufia/trophy_presenter.rb
 - app/presenters/sufia/user_profile_presenter.rb
 - app/presenters/sufia/work_show_presenter.rb
-- app/presenters/work_usage.rb
+- app/presenters/sufia/work_usage.rb
 - app/search_builders/collection_search_builder.rb
 - app/search_builders/deposit_search_builder.rb
 - app/search_builders/parent_collection_search_builder.rb
+- app/search_builders/sufia/admin_set_member_search_builder.rb
 - app/search_builders/sufia/catalog_search_builder.rb
 - app/search_builders/sufia/homepage_search_builder.rb
 - app/search_builders/sufia/my_collections_search_builder.rb
@@ -890,7 +956,9 @@ files:
 - app/search_builders/sufia/my_shares_search_builder.rb
 - app/search_builders/sufia/my_works_search_builder.rb
 - app/search_builders/sufia/search_builder.rb
+- app/search_builders/sufia/single_admin_set_search_builder.rb
 - app/services/sufia/actor_factory.rb
+- app/services/sufia/admin_set_service.rb
 - app/services/sufia/analytics.rb
 - app/services/sufia/audit_failure_service.rb
 - app/services/sufia/batch_create_failure_service.rb
@@ -927,21 +995,6 @@ files:
 - app/views/_masthead.html.erb
 - app/views/_toolbar.html.erb
 - app/views/_user_util_links.html.erb
-- app/views/admin/_menu.html.erb
-- app/views/admin/stats/_date_form.html.erb
-- app/views/admin/stats/_deposits.html.erb
-- app/views/admin/stats/_new_users.html.erb
-- app/views/admin/stats/_stats_by_date.html.erb
-- app/views/admin/stats/_top_data.html.erb
-- app/views/admin/stats/_works.html.erb
-- app/views/admin/stats/index.html.erb
-- app/views/advanced/_advanced_search_facets.html.erb
-- app/views/advanced/_advanced_search_fields.html.erb
-- app/views/advanced/_advanced_search_form.html.erb
-- app/views/advanced/_advanced_search_help.html.erb
-- app/views/advanced/_facet_layout.html.erb
-- app/views/advanced/_facet_limit.html.erb
-- app/views/advanced/index.html.erb
 - app/views/batch_edits/_check_all.html.erb
 - app/views/batch_edits/_delete_selected.html.erb
 - app/views/batch_edits/edit.html.erb
@@ -972,7 +1025,6 @@ files:
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
 - app/views/collections/_media_display.html.erb
-- app/views/collections/_search_collection_dashboard_form.html.erb
 - app/views/collections/_show_actions.html.erb
 - app/views/collections/_show_descriptions.html.erb
 - app/views/collections/_show_document_list.html.erb
@@ -1005,7 +1057,6 @@ files:
 - app/views/curation_concerns/base/_items.html.erb
 - app/views/curation_concerns/base/_metadata.html.erb
 - app/views/curation_concerns/base/_relationships.html.erb
-- app/views/curation_concerns/base/_relationships_member_rows.html.erb
 - app/views/curation_concerns/base/_relationships_parent_row.html.erb
 - app/views/curation_concerns/base/_relationships_parent_row_empty.html.erb
 - app/views/curation_concerns/base/_relationships_parent_rows.html.erb
@@ -1041,13 +1092,13 @@ files:
 - app/views/curation_concerns/file_sets/proxy.html.erb
 - app/views/curation_concerns/file_sets/show.html.erb
 - app/views/curation_concerns/permissions/confirm.html.erb
+- app/views/curation_concerns/permissions/confirm_access.html.erb
 - app/views/dashboard/_index_partials/_contents.html.erb
 - app/views/dashboard/_index_partials/_heading_actions.html.erb
 - app/views/dashboard/_index_partials/_heading_greetings.html.erb
 - app/views/dashboard/_index_partials/_proxy_rights.html.erb
 - app/views/dashboard/_index_partials/_transfers.html.erb
 - app/views/dashboard/index.html.erb
-- app/views/errors/404.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
 - app/views/kaminari/blacklight/_last_page.html.erb
@@ -1057,10 +1108,10 @@ files:
 - app/views/kaminari/blacklight/_prev_page.html.erb
 - app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/layouts/_head_tag_content.html.erb
-- app/views/layouts/error.html.erb
+- app/views/layouts/admin.html.erb
+- app/views/layouts/curation_concerns/1_column.html.erb
 - app/views/layouts/homepage.html.erb
 - app/views/layouts/sufia-dashboard.html.erb
-- app/views/layouts/sufia-one-column.html.erb
 - app/views/mailbox/_notifications.html.erb
 - app/views/mailbox/index.html.erb
 - app/views/my/_batch_edits_actions.html.erb
@@ -1113,19 +1164,43 @@ files:
 - app/views/static/agreement.html.erb
 - app/views/static/help.html.erb
 - app/views/static/mendeley.html.erb
-- app/views/static/subject_libraries.html.erb
 - app/views/static/terms.html.erb
 - app/views/static/zotero.html.erb
 - app/views/stats/file.html.erb
 - app/views/stats/work.html.erb
+- app/views/sufia/admin/_menu.html.erb
+- app/views/sufia/admin/_sidebar.html.erb
+- app/views/sufia/admin/admin_sets/_form.html.erb
+- app/views/sufia/admin/admin_sets/_sort_and_per_page.html.erb
+- app/views/sufia/admin/admin_sets/edit.html.erb
+- app/views/sufia/admin/admin_sets/index.html.erb
+- app/views/sufia/admin/admin_sets/new.html.erb
+- app/views/sufia/admin/admin_sets/show.html.erb
+- app/views/sufia/admin/features/index.html.erb
+- app/views/sufia/admin/show.html.erb
+- app/views/sufia/admin/stats/_date_form.html.erb
+- app/views/sufia/admin/stats/_deposits.html.erb
+- app/views/sufia/admin/stats/_new_users.html.erb
+- app/views/sufia/admin/stats/_stats_by_date.html.erb
+- app/views/sufia/admin/stats/_top_data.html.erb
+- app/views/sufia/admin/stats/_works.html.erb
+- app/views/sufia/admin/stats/show.html.erb
+- app/views/sufia/admin_sets/_admin_set.html.erb
+- app/views/sufia/admin_sets/_document_list.html.erb
+- app/views/sufia/admin_sets/_member_document.html.erb
+- app/views/sufia/admin_sets/_search_form.html.erb
+- app/views/sufia/admin_sets/_sort_and_per_page.html.erb
+- app/views/sufia/admin_sets/index.html.erb
+- app/views/sufia/admin_sets/show.html.erb
 - app/views/sufia/batch_uploads/_form.html.erb
+- app/views/sufia/contact_mailer/contact.html.erb
 - app/views/sufia/homepage/_announcement.html.erb
+- app/views/sufia/homepage/_explore_collections.html.erb
 - app/views/sufia/homepage/_featured.html.erb
 - app/views/sufia/homepage/_featured_fields.html.erb
 - app/views/sufia/homepage/_featured_researcher.html.erb
 - app/views/sufia/homepage/_featured_works.html.erb
 - app/views/sufia/homepage/_home_content.html.erb
-- app/views/sufia/homepage/_home_header.html.erb
 - app/views/sufia/homepage/_marketing.html.erb
 - app/views/sufia/homepage/_recent_document.html.erb
 - app/views/sufia/homepage/_recently_uploaded.html.erb
@@ -1142,8 +1217,6 @@ files:
 - app/views/users/_contributions.html.erb
 - app/views/users/_edit_primary.html.erb
 - app/views/users/_edit_secondary.html.erb
-- app/views/users/_follower_modal.html.erb
-- app/views/users/_following_modal.html.erb
 - app/views/users/_left_sidebar.html.erb
 - app/views/users/_notify_number.html.erb
 - app/views/users/_profile_actions.html.erb
@@ -1160,11 +1233,11 @@ files:
 - app/views/users/index.html.erb
 - app/views/users/notifications_number.json.jbuilder
 - app/views/users/show.html.erb
+- config/features.rb
 - config/initializers/curation_concern_events.rb
 - config/locales/simple_form.en.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
-- db/migrate/20160328222155_acts_as_follower_migration.rb
 - db/migrate/20160328222156_add_social_to_users.rb
 - db/migrate/20160328222157_add_ldap_attrs_to_user.rb
 - db/migrate/20160328222158_add_avatars_to_users.rb
@@ -1188,6 +1261,7 @@ files:
 - db/migrate/20160328222238_change_audit_log_generic_file_id_to_file_set_id.rb
 - db/migrate/20160328222239_change_proxy_deposit_request_generic_file_id_to_work_id.rb
 - db/migrate/20160401142419_create_uploaded_files.rb
+- db/migrate/20160415212015_create_features.rb
 - db/migrate/20160510000007_change_featured_work_generic_file_id_to_work_id.rb
 - db/migrate/20160516190435_add_arkivo_to_users.rb
 - lib/generators/sufia/arkivo_api_generator.rb
@@ -1216,6 +1290,8 @@ files:
 - lib/sufia/arkivo/metadata_munger.rb
 - lib/sufia/arkivo/schema_validator.rb
 - lib/sufia/configuration.rb
+- lib/sufia/controlled_vocabulary/importer/downloader.rb
+- lib/sufia/controlled_vocabulary/importer/language.rb
 - lib/sufia/engine.rb
 - lib/sufia/inflections.rb
 - lib/sufia/redis_event_store.rb
@@ -1246,7 +1322,6 @@ files:
 - spec/actors/sufia/create_with_files_actor_spec.rb
 - spec/actors/sufia/create_with_remote_files_actor_spec.rb
 - spec/config/sufia_events_spec.rb
-- spec/controllers/admin/stats_controller_spec.rb
 - spec/controllers/api/items_controller_spec.rb
 - spec/controllers/api/zotero_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
@@ -1258,6 +1333,7 @@ files:
 - spec/controllers/curation_concerns/audits_controller_spec.rb
 - spec/controllers/curation_concerns/file_sets_controller_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_spec.rb
+- spec/controllers/curation_concerns/permissions_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/depositors_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
@@ -1268,10 +1344,15 @@ files:
 - spec/controllers/my/highlights_controller_spec.rb
 - spec/controllers/my/shares_controller_spec.rb
 - spec/controllers/my/works_controller_spec.rb
-- spec/controllers/my_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/static_controller_spec.rb
 - spec/controllers/stats_controller_spec.rb
+- spec/controllers/sufia/admin/admin_sets_controller_spec.rb
+- spec/controllers/sufia/admin/features_controller_spec.rb
+- spec/controllers/sufia/admin/stats_controller_spec.rb
+- spec/controllers/sufia/admin/strategies_controller_spec.rb
+- spec/controllers/sufia/admin_controller_spec.rb
+- spec/controllers/sufia/admin_sets_controller_spec.rb
 - spec/controllers/sufia/batch_uploads_controller_spec.rb
 - spec/controllers/sufia/homepage_controller_spec.rb
 - spec/controllers/sufia/resource_sync_controller_spec.rb
@@ -1280,6 +1361,7 @@ files:
 - spec/controllers/tinymce_assets_controller_spec.rb
 - spec/controllers/transfers_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
+- spec/factories/admin_sets.rb
 - spec/factories/api_items.rb
 - spec/factories/collections_factory.rb
 - spec/factories/content_blocks.rb
@@ -1289,6 +1371,7 @@ files:
 - spec/factories/operations.rb
 - spec/factories/proxy_deposit_requests.rb
 - spec/factories/users.rb
+- spec/features/admin_admin_set_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
 - spec/features/browse_catalog_spec.rb
@@ -1305,6 +1388,7 @@ files:
 - spec/features/ownership_transfer_spec.rb
 - spec/features/proxy_spec.rb
 - spec/features/search_spec.rb
+- spec/features/user_admin_set_spec.rb
 - spec/features/users_spec.rb
 - spec/features/work_show_spec.rb
 - spec/fixtures/1.5mb-avatar.jpg
@@ -1335,6 +1419,7 @@ files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/forms/curation_concerns/generic_work_form_spec.rb
+- spec/forms/sufia/forms/admin_set_form_spec.rb
 - spec/forms/sufia/forms/batch_edit_form_spec.rb
 - spec/forms/sufia/forms/batch_upload_form_spec.rb
 - spec/forms/sufia/forms/collection_form_spec.rb
@@ -1346,6 +1431,7 @@ files:
 - spec/helpers/sufia/collections_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
+- spec/indexers/sufia/work_indexer_spec.rb
 - spec/javascripts/autocomplete_spec.js.coffee
 - spec/javascripts/checklist_item_spec.js
 - spec/javascripts/deposit_agreement_spec.js
@@ -1356,6 +1442,7 @@ files:
 - spec/javascripts/helpers/test_responses.js
 - spec/javascripts/jasmine_spec.rb
 - spec/javascripts/relationships_table_spec.js.coffee
+- spec/javascripts/required_field_spec.js
 - spec/javascripts/save_work_spec.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
@@ -1370,20 +1457,19 @@ files:
 - spec/jobs/content_restored_version_event_job_spec.rb
 - spec/jobs/content_update_event_job_spec.rb
 - spec/jobs/file_set_attached_event_job_spec.rb
+- spec/jobs/inherit_permissions_job_spec.rb
 - spec/jobs/user_edit_profile_event_job_spec.rb
-- spec/jobs/user_follow_event_job_spec.rb
-- spec/jobs/user_unfollow_event_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/arkivo/actor_spec.rb
 - spec/lib/sufia/arkivo/create_subscription_job_spec.rb
 - spec/lib/sufia/arkivo/metadata_munger_spec.rb
 - spec/lib/sufia/arkivo/schema_validator_spec.rb
 - spec/lib/sufia/configuration_spec.rb
+- spec/lib/sufia/controlled_vocabulary/importer/language_spec.rb
 - spec/lib/sufia/redis_event_store_spec.rb
 - spec/lib/sufia/resource_sync/capability_list_writer_spec.rb
 - spec/lib/sufia/resource_sync/resource_list_writer_spec.rb
 - spec/lib/sufia/resource_sync/source_description_writer_spec.rb
-- spec/lib/sufia/user_stat_importer_spec.rb
 - spec/lib/sufia/zotero/config_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/content_block_spec.rb
@@ -1391,6 +1477,7 @@ files:
 - spec/models/featured_work_spec.rb
 - spec/models/file_download_stat_spec.rb
 - spec/models/file_view_stat_spec.rb
+- spec/models/flipflop_spec.rb
 - spec/models/generic_work_spec.rb
 - spec/models/proxy_deposit_request_spec.rb
 - spec/models/solr_document_spec.rb
@@ -1403,6 +1490,8 @@ files:
 - spec/models/user_mailbox_spec.rb
 - spec/models/user_spec.rb
 - spec/models/work_view_stat_spec.rb
+- spec/presenters/sufia/admin_dashboard_presenter_spec.rb
+- spec/presenters/sufia/admin_set_presenter_spec.rb
 - spec/presenters/sufia/admin_stats_presenter_spec.rb
 - spec/presenters/sufia/collection_presenter_spec.rb
 - spec/presenters/sufia/file_set_presenter_spec.rb
@@ -1423,7 +1512,9 @@ files:
 - spec/routing/stats_route_spec.rb
 - spec/search_builder/sufia/catalog_search_builder_spec.rb
 - spec/search_builder/sufia/my_shares_search_builder_spec.rb
+- spec/search_builder/sufia/single_admin_set_search_builder_spec.rb
 - spec/services/sufia/actor_factory_spec.rb
+- spec/services/sufia/admin_set_service_spec.rb
 - spec/services/sufia/audit_failure_service_spec.rb
 - spec/services/sufia/batch_create_failure_service_spec.rb
 - spec/services/sufia/batch_create_success_service_spec.rb
@@ -1445,6 +1536,7 @@ files:
 - spec/services/sufia/statistics/works/over_time_spec.rb
 - spec/services/sufia/user_stat_importer_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/locations.rb
@@ -1457,12 +1549,11 @@ files:
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/_toolbar.html.erb_spec.rb
-- spec/views/admin/stats/index.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/batch_edits/edit.html.erb_spec.rb
 - spec/views/catalog/_index_list_default.html.erb_spec.rb
+- spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
-- spec/views/catalog/sort_and_per_page.html.erb_spec.rb
 - spec/views/citations/work.html.erb_spec.rb
 - spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_form_for_select_collection.html.erb_spec.rb
@@ -1472,12 +1563,17 @@ files:
 - spec/views/collections/_show_document_list_row.html.erb_spec.rb
 - spec/views/collections/edit.html.erb_spec.rb
 - spec/views/collections/show.html.erb_spec.rb
+- spec/views/curation_concerns/base/_attribute_rows.html.erb_spec.rb
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_child_work_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_progress.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_relationships.html.erb_spec.rb
+- spec/views/curation_concerns/base/_items.html.erb_spec.rb
 - spec/views/curation_concerns/base/_relationships.html.erb_spec.rb
+- spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
+- spec/views/curation_concerns/base/_social_media.html.erb_spec.rb
 - spec/views/curation_concerns/base/edit.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_permission.html.erb_spec.rb
@@ -1486,6 +1582,7 @@ files:
 - spec/views/curation_concerns/file_sets/_show_characterization_details.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_single_use_links.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_versioning.html.erb_spec.rb
+- spec/views/curation_concerns/file_sets/media_display/_default.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
@@ -1493,23 +1590,25 @@ files:
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/records/edit_fields/_based_near.html.erb_spec.rb
+- spec/views/records/edit_fields/_description.html.erb_spec.rb
 - spec/views/records/edit_fields/_in_works_ids.html.erb_spec.rb
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb
+- spec/views/sufia/admin/admin_sets/index.html.erb_spec.rb
+- spec/views/sufia/admin/stats/show.html.erb_spec.rb
 - spec/views/sufia/batch_uploads/_form.html.erb_spec.rb
 - spec/views/sufia/homepage/_announcement.html.erb_spec.rb
 - spec/views/sufia/homepage/_featured_works.html.erb_spec.rb
-- spec/views/sufia/homepage/_home_header.html.erb_spec.rb
 - spec/views/sufia/homepage/_sortable_featured.html.erb_spec.rb
-- spec/views/users/_follower_modal.html.erb_spec.rb
-- spec/views/users/_following_modal.html.erb_spec.rb
+- spec/views/sufia/homepage/index.html.erb_spec.rb
 - spec/views/users/_user_info.html.erb_spec.rb
 - spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/edit.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb
 - sufia.gemspec
+- tasks/controlled_vocabularies.rake
 - tasks/noid.rake
 - tasks/reindex.rake
 - tasks/stats_tasks.rake
@@ -1527,6 +1626,7 @@ files:
 - vendor/assets/javascripts/fixedsticky.js
 - vendor/assets/javascripts/jquery.validate.js
 - vendor/assets/javascripts/nestable.js
+- vendor/assets/stylesheets/sharing_buttons.css
 homepage: http://sufia.io/
 licenses:
 - Apache2
@@ -1557,7 +1657,6 @@ test_files:
 - spec/actors/sufia/create_with_files_actor_spec.rb
 - spec/actors/sufia/create_with_remote_files_actor_spec.rb
 - spec/config/sufia_events_spec.rb
-- spec/controllers/admin/stats_controller_spec.rb
 - spec/controllers/api/items_controller_spec.rb
 - spec/controllers/api/zotero_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
@@ -1569,6 +1668,7 @@ test_files:
 - spec/controllers/curation_concerns/audits_controller_spec.rb
 - spec/controllers/curation_concerns/file_sets_controller_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_spec.rb
+- spec/controllers/curation_concerns/permissions_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/depositors_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
@@ -1579,10 +1679,15 @@ test_files:
 - spec/controllers/my/highlights_controller_spec.rb
 - spec/controllers/my/shares_controller_spec.rb
 - spec/controllers/my/works_controller_spec.rb
-- spec/controllers/my_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/static_controller_spec.rb
 - spec/controllers/stats_controller_spec.rb
+- spec/controllers/sufia/admin/admin_sets_controller_spec.rb
+- spec/controllers/sufia/admin/features_controller_spec.rb
+- spec/controllers/sufia/admin/stats_controller_spec.rb
+- spec/controllers/sufia/admin/strategies_controller_spec.rb
+- spec/controllers/sufia/admin_controller_spec.rb
+- spec/controllers/sufia/admin_sets_controller_spec.rb
 - spec/controllers/sufia/batch_uploads_controller_spec.rb
 - spec/controllers/sufia/homepage_controller_spec.rb
 - spec/controllers/sufia/resource_sync_controller_spec.rb
@@ -1591,6 +1696,7 @@ test_files:
 - spec/controllers/tinymce_assets_controller_spec.rb
 - spec/controllers/transfers_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
+- spec/factories/admin_sets.rb
 - spec/factories/api_items.rb
 - spec/factories/collections_factory.rb
 - spec/factories/content_blocks.rb
@@ -1600,6 +1706,7 @@ test_files:
 - spec/factories/operations.rb
 - spec/factories/proxy_deposit_requests.rb
 - spec/factories/users.rb
+- spec/features/admin_admin_set_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
 - spec/features/browse_catalog_spec.rb
@@ -1616,6 +1723,7 @@ test_files:
 - spec/features/ownership_transfer_spec.rb
 - spec/features/proxy_spec.rb
 - spec/features/search_spec.rb
+- spec/features/user_admin_set_spec.rb
 - spec/features/users_spec.rb
 - spec/features/work_show_spec.rb
 - spec/fixtures/1.5mb-avatar.jpg
@@ -1646,6 +1754,7 @@ test_files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/forms/curation_concerns/generic_work_form_spec.rb
+- spec/forms/sufia/forms/admin_set_form_spec.rb
 - spec/forms/sufia/forms/batch_edit_form_spec.rb
 - spec/forms/sufia/forms/batch_upload_form_spec.rb
 - spec/forms/sufia/forms/collection_form_spec.rb
@@ -1657,6 +1766,7 @@ test_files:
 - spec/helpers/sufia/collections_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
+- spec/indexers/sufia/work_indexer_spec.rb
 - spec/javascripts/autocomplete_spec.js.coffee
 - spec/javascripts/checklist_item_spec.js
 - spec/javascripts/deposit_agreement_spec.js
@@ -1667,6 +1777,7 @@ test_files:
 - spec/javascripts/helpers/test_responses.js
 - spec/javascripts/jasmine_spec.rb
 - spec/javascripts/relationships_table_spec.js.coffee
+- spec/javascripts/required_field_spec.js
 - spec/javascripts/save_work_spec.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
@@ -1681,20 +1792,19 @@ test_files:
 - spec/jobs/content_restored_version_event_job_spec.rb
 - spec/jobs/content_update_event_job_spec.rb
 - spec/jobs/file_set_attached_event_job_spec.rb
+- spec/jobs/inherit_permissions_job_spec.rb
 - spec/jobs/user_edit_profile_event_job_spec.rb
-- spec/jobs/user_follow_event_job_spec.rb
-- spec/jobs/user_unfollow_event_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/arkivo/actor_spec.rb
 - spec/lib/sufia/arkivo/create_subscription_job_spec.rb
 - spec/lib/sufia/arkivo/metadata_munger_spec.rb
 - spec/lib/sufia/arkivo/schema_validator_spec.rb
 - spec/lib/sufia/configuration_spec.rb
+- spec/lib/sufia/controlled_vocabulary/importer/language_spec.rb
 - spec/lib/sufia/redis_event_store_spec.rb
 - spec/lib/sufia/resource_sync/capability_list_writer_spec.rb
 - spec/lib/sufia/resource_sync/resource_list_writer_spec.rb
 - spec/lib/sufia/resource_sync/source_description_writer_spec.rb
-- spec/lib/sufia/user_stat_importer_spec.rb
 - spec/lib/sufia/zotero/config_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/content_block_spec.rb
@@ -1702,6 +1812,7 @@ test_files:
 - spec/models/featured_work_spec.rb
 - spec/models/file_download_stat_spec.rb
 - spec/models/file_view_stat_spec.rb
+- spec/models/flipflop_spec.rb
 - spec/models/generic_work_spec.rb
 - spec/models/proxy_deposit_request_spec.rb
 - spec/models/solr_document_spec.rb
@@ -1714,6 +1825,8 @@ test_files:
 - spec/models/user_mailbox_spec.rb
 - spec/models/user_spec.rb
 - spec/models/work_view_stat_spec.rb
+- spec/presenters/sufia/admin_dashboard_presenter_spec.rb
+- spec/presenters/sufia/admin_set_presenter_spec.rb
 - spec/presenters/sufia/admin_stats_presenter_spec.rb
 - spec/presenters/sufia/collection_presenter_spec.rb
 - spec/presenters/sufia/file_set_presenter_spec.rb
@@ -1734,7 +1847,9 @@ test_files:
 - spec/routing/stats_route_spec.rb
 - spec/search_builder/sufia/catalog_search_builder_spec.rb
 - spec/search_builder/sufia/my_shares_search_builder_spec.rb
+- spec/search_builder/sufia/single_admin_set_search_builder_spec.rb
 - spec/services/sufia/actor_factory_spec.rb
+- spec/services/sufia/admin_set_service_spec.rb
 - spec/services/sufia/audit_failure_service_spec.rb
 - spec/services/sufia/batch_create_failure_service_spec.rb
 - spec/services/sufia/batch_create_success_service_spec.rb
@@ -1756,6 +1871,7 @@ test_files:
 - spec/services/sufia/statistics/works/over_time_spec.rb
 - spec/services/sufia/user_stat_importer_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/locations.rb
@@ -1768,12 +1884,11 @@ test_files:
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/_toolbar.html.erb_spec.rb
-- spec/views/admin/stats/index.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/batch_edits/edit.html.erb_spec.rb
 - spec/views/catalog/_index_list_default.html.erb_spec.rb
+- spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
-- spec/views/catalog/sort_and_per_page.html.erb_spec.rb
 - spec/views/citations/work.html.erb_spec.rb
 - spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_form_for_select_collection.html.erb_spec.rb
@@ -1783,12 +1898,17 @@ test_files:
 - spec/views/collections/_show_document_list_row.html.erb_spec.rb
 - spec/views/collections/edit.html.erb_spec.rb
 - spec/views/collections/show.html.erb_spec.rb
+- spec/views/curation_concerns/base/_attribute_rows.html.erb_spec.rb
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_child_work_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_progress.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_relationships.html.erb_spec.rb
+- spec/views/curation_concerns/base/_items.html.erb_spec.rb
 - spec/views/curation_concerns/base/_relationships.html.erb_spec.rb
+- spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
+- spec/views/curation_concerns/base/_social_media.html.erb_spec.rb
 - spec/views/curation_concerns/base/edit.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_permission.html.erb_spec.rb
@@ -1797,6 +1917,7 @@ test_files:
 - spec/views/curation_concerns/file_sets/_show_characterization_details.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_single_use_links.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_versioning.html.erb_spec.rb
+- spec/views/curation_concerns/file_sets/media_display/_default.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
@@ -1804,17 +1925,18 @@ test_files:
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/records/edit_fields/_based_near.html.erb_spec.rb
+- spec/views/records/edit_fields/_description.html.erb_spec.rb
 - spec/views/records/edit_fields/_in_works_ids.html.erb_spec.rb
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb
+- spec/views/sufia/admin/admin_sets/index.html.erb_spec.rb
+- spec/views/sufia/admin/stats/show.html.erb_spec.rb
 - spec/views/sufia/batch_uploads/_form.html.erb_spec.rb
 - spec/views/sufia/homepage/_announcement.html.erb_spec.rb
 - spec/views/sufia/homepage/_featured_works.html.erb_spec.rb
-- spec/views/sufia/homepage/_home_header.html.erb_spec.rb
 - spec/views/sufia/homepage/_sortable_featured.html.erb_spec.rb
-- spec/views/users/_follower_modal.html.erb_spec.rb
-- spec/views/users/_following_modal.html.erb_spec.rb
+- spec/views/sufia/homepage/index.html.erb_spec.rb
 - spec/views/users/_user_info.html.erb_spec.rb
 - spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/edit.html.erb_spec.rb