hyrax 2.9.6 → 3.0.0.pre.beta1

data/app/services/hyrax/contextual_path.rb

@@ -10,7 +10,7 @@ module Hyrax
 
     def show
       if parent_presenter
-        polymorphic_path([:hyrax, :parent, presenter.model_name.singular.to_sym],
+        polymorphic_path([:hyrax, :parent, presenter.model_name.singular],
                          parent_id: parent_presenter.id,
                          id: presenter.id)
       else

data/app/services/hyrax/database_migrator.rb

@@ -57,8 +57,6 @@ module Hyrax
       end
 
       def migration_version
-        # Don't use AR migration versioning in Rails 4
-        return if Rails.version < '5.0.0'
         # Specify the current major.minor version of Rails for AR migrations
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end

data/app/services/hyrax/default_middleware_stack.rb

@@ -3,10 +3,8 @@ module Hyrax
     # rubocop:disable Metrics/MethodLength
     def self.build_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
-        # Used to wrap everything in a database transaction, if the save of the resource
-        # failed then rolled back any database AdminSetChangeSet
-        # This was problematic, is removed in v3.0, and is currently a no-op
-        # Backport of https://github.com/samvera/hyrax/pull/3482
+        # Wrap everything in a database transaction, if the save of the resource
+        # fails then roll back any database AdminSetChangeSet
         middleware.use Hyrax::Actors::TransactionalRequest
 
         # Ensure you are mutating the most recent version

data/app/services/hyrax/file_set_csv_service.rb

@@ -1,4 +1,3 @@
-require 'csv'
 module Hyrax
   #
   # Generates CSV from a FileSet

data/app/services/hyrax/file_set_fixity_check_service.rb

@@ -62,13 +62,6 @@ module Hyrax
       results.flatten.group_by(&:file_id)
     end
 
-    # Return current fixity status for this FileSet based on
-    # ChecksumAuditLog records on file.
-    def logged_fixity_status
-      Deprecation.warn(self, "logged_fixity_status is deprecated, use FixityStatusPresenter instead")
-      FixityStatusPresenter.new(file_set.id).render_file_set_status
-    end
-
     private
 
       # Retrieve or generate the fixity check for a file

data/app/services/hyrax/fixity_check_failure_service.rb

@@ -15,11 +15,11 @@ module Hyrax
     def message
       uri = file_set.original_file.uri.to_s
       file_title = file_set.title.first
-      "The fixity check run at #{log_date} for #{file_title} (#{uri}) failed."
+      I18n.t('hyrax.notifications.fixity_check_failure.message', log_date: log_date, file_title: file_title, uri: uri)
     end
 
     def subject
-      'Failing Fixity Check'
+      I18n.t('hyrax.notifications.fixity_check_failure.subject')
     end
   end
 end

data/app/services/hyrax/import_url_failure_service.rb

@@ -5,7 +5,7 @@ module Hyrax
     end
 
     def subject
-      'File Import Error'
+      I18n.t('hyrax.notifications.import_url_failure.subject')
     end
   end
 end

data/app/services/hyrax/versioning_service.rb

@@ -22,14 +22,5 @@ module Hyrax
       return if version.nil?
       VersionCommitter.create(version_id: version.uri, committer_login: user_key)
     end
-
-    # @param [ActiveFedora::File | Hyrax::FileMetadata] content
-    def self.versioned_file_id(file)
-      versions = file.versions.all
-
-      return ActiveFedora::Base.uri_to_id(versions.last.uri) if versions.present?
-
-      file.id
-    end
   end
 end

data/app/services/hyrax/workflow/changes_required_notification.rb

@@ -4,11 +4,13 @@ module Hyrax
       private
 
         def subject
-          'Your deposit requires changes'
+          I18n.t('hyrax.notifications.workflow.changes_required.subject')
         end
 
         def message
-          "#{title} (#{link_to work_id, document_path}) requires additional changes before approval.\n\n '#{comment}'"
+          I18n.t('hyrax.notifications.workflow.changes_required.message', title: title,
+                                                                          link: (link_to work_id, document_path),
+                                                                          comment: comment)
         end
 
         def users_to_notify

data/app/services/hyrax/workflow/deposited_notification.rb

@@ -4,11 +4,12 @@ module Hyrax
       private
 
         def subject
-          'Deposit has been approved'
+          I18n.t('hyrax.notifications.workflow.deposited.subject')
         end
 
         def message
-          "#{title} (#{link_to work_id, document_path}) was approved by #{user.user_key}. #{comment}"
+          I18n.t('hyrax.notifications.workflow.deposited.message', title: title, link: (link_to work_id, document_path),
+                                                                   user: user.user_key, comment: comment)
         end
 
         def users_to_notify

data/app/services/hyrax/workflow/pending_review_notification.rb

@@ -4,11 +4,13 @@ module Hyrax
       private
 
         def subject
-          'Deposit needs review'
+          I18n.t('hyrax.notifications.workflow.pending_review.subject')
         end
 
         def message
-          "#{title} (#{link_to work_id, document_path}) was deposited by #{user.user_key} and is awaiting approval #{comment}"
+          I18n.t('hyrax.notifications.workflow.pending_review.message', title: title,
+                                                                        link: (link_to work_id, document_path),
+                                                                        user: user.user_key, comment: comment)
         end
 
         def users_to_notify

data/app/services/hyrax/workflow/workflow_schema.rb

@@ -14,107 +14,47 @@ module Hyrax
     # @see Sipity::Notification
     # @see Sipity::Method
     # @see ./lib/generators/hyrax/templates/workflow.json.erb
-
-    # If using dry-validation < 1, create a Dry::Validation::Schema for backwards-compatibility.
-    # This schema should never ever change.  If you need to modify it, upgrade to dry-validation >= 1
-    # and use the Dry::Validation::Contract subclass below.
-    if defined? Dry::Validation::Schema
-      Deprecation.warn(self, 'The Dry::Validation::Schema implemenation of Hyrax::Workflow::WorkflowSchema is deprecated. ' \
-                       'Please upgrade to dry-validation >= 1 to use the Dry::Validation::Contract implementation which will be part of Hyrax 3.0')
-      WorkflowSchema = Dry::Validation.Schema do
-        configure do
-          def self.messages
-            Dry::Validation::Messages.default.merge(
-              en: { errors: { constant_name?: 'must be an initialized Ruby constant' } }
-            )
-          end
-
-          def constant_name?(value)
-            value.constantize
-            true
-          rescue NameError
-            false
-          end
+    WorkflowSchema = Dry::Validation.Schema do
+      configure do
+        def self.messages
+          Dry::Validation::Messages.default.merge(
+            en: { errors: { constant_name?: 'must be an initialized Ruby constant' } }
+          )
         end
 
-        required(:workflows).each do
-          required(:name).filled(:str?) # Sipity::Workflow#name
-          optional(:label).filled(:str?) # Sipity::Workflow#label
-          optional(:description).filled(:str?) # Sipity::Workflow#description
-          optional(:allows_access_grant).filled(:bool?) # Sipity::Workflow#allows_access_grant?
-          required(:actions).each do
-            schema do
-              required(:name).filled(:str?) # Sipity::WorkflowAction#name
-              required(:from_states).each do
-                schema do
-                  required(:names) { array? { each(:str?) } } # Sipity::WorkflowState#name
-                  required(:roles) { array? { each(:str?) } } # Sipity::Role#name
-                end
-              end
-              optional(:transition_to).filled(:str?) # Sipity::WorkflowState#name
-              optional(:notifications).each do
-                schema do
-                  required(:name).value(:constant_name?) # Sipity::Notification#name
-                  required(:notification_type).value(included_in?: Sipity::Notification.valid_notification_types)
-                  required(:to) { array? { each(:str?) } }
-                  optional(:cc) { array? { each(:str?) } }
-                  optional(:bcc) { array? { each(:str?) } }
-                end
-              end
-              optional(:methods) { array? { each(:str?) } } # See it_behaves_like "a Hyrax workflow method"
-            end
-          end
+        def constant_name?(value)
+          value.constantize
+          true
+        rescue NameError
+          false
         end
       end
-    elsif defined? Dry::Validation::Contract
-      # For dry-validation >= 1
-      class WorkflowSchema < Dry::Validation::Contract
-        class Types
-          include Dry::Types()
-
-          Constant = Types::Class.constructor do |v|
-            begin
-              v.constantize
-            rescue NameError => _err
-              v
-            end
-          end
-        end
 
-        # Wrap the result for backwards-compatibility. This will be removed in Hyrax 3.0.
-        class ResultWrapper < SimpleDelegator
-          def messages(opts = {})
-            errors(opts)
-          end
-        end
-
-        # Provide a class method for backwards-compatibility. This will be removed in Hyrax 3.0.
-        def self.call(data)
-          ResultWrapper.new(new.call(data))
-        end
-
-        params do
-          required(:workflows).array(:hash) do
-            required(:name).filled(:string) # Sipity::Workflow#name
-            optional(:label).filled(:string) # Sipity::Workflow#label
-            optional(:description).filled(:string) # Sipity::Workflow#description
-            optional(:allows_access_grant).filled(:bool) # Sipity::Workflow#allows_access_grant?
-            required(:actions).array(:hash) do
-              required(:name).filled(:string) # Sipity::WorkflowAction#name
-              required(:from_states).array(:hash) do
-                required(:names) { array? { each(:string) } } # Sipity::WorkflowState#name
-                required(:roles) { array? { each(:string) } } # Sipity::Role#name
+      required(:workflows).each do
+        required(:name).filled(:str?) # Sipity::Workflow#name
+        optional(:label).filled(:str?) # Sipity::Workflow#label
+        optional(:description).filled(:str?) # Sipity::Workflow#description
+        optional(:allows_access_grant).filled(:bool?) # Sipity::Workflow#allows_access_grant?
+        required(:actions).each do
+          schema do
+            required(:name).filled(:str?) # Sipity::WorkflowAction#name
+            required(:from_states).each do
+              schema do
+                required(:names) { array? { each(:str?) } } # Sipity::WorkflowState#name
+                required(:roles) { array? { each(:str?) } } # Sipity::Role#name
               end
-              optional(:transition_to).filled(:string) # Sipity::WorkflowState#name
-              optional(:notifications).array(:hash) do
-                required(:name).value(Types::Constant) # Sipity::Notification#name
+            end
+            optional(:transition_to).filled(:str?) # Sipity::WorkflowState#name
+            optional(:notifications).each do
+              schema do
+                required(:name).value(:constant_name?) # Sipity::Notification#name
                 required(:notification_type).value(included_in?: Sipity::Notification.valid_notification_types)
-                required(:to) { array? { each(:string) } }
-                optional(:cc) { array? { each(:string) } }
-                optional(:bcc) { array? { each(:string) } }
+                required(:to) { array? { each(:str?) } }
+                optional(:cc) { array? { each(:str?) } }
+                optional(:bcc) { array? { each(:str?) } }
               end
             end
-            optional(:methods) { array? { each(:string) } } # See it_behaves_like "a Hyrax workflow method"
+            optional(:methods) { array? { each(:str?) } } # See it_behaves_like "a Hyrax workflow method"
           end
         end
       end

data/app/views/catalog/_search_form.html.erb

@@ -35,9 +35,9 @@
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          </ul>
-        <% end %>
+          <% end %>
 
+        </ul>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,4 +1,3 @@
 <div class="col-md-2">
-  <%= render_thumbnail_tag document, {}, suppress_link: true %>
-</div> 
-
+  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search" aria-hidden="true"></span>
+</div>

data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb

@@ -16,9 +16,9 @@
                           <td><%= g.agent_type.titleize %></td>
                           <td>
                             <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
                             <% else %>
-                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger' %>
+                              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
                             <% end %>
                           </td>
                         </tr>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -1,68 +1,73 @@
           <div id="participants" class="tab-pane">
-            <div class="panel panel-default labels">
+            <div class="panel panel-default labels edit-sharing-tab">
               <div class="panel-body">
-                <h2><%= t('.add_participants') %></h2>
-                <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
-                <%= simple_form_for @form.permission_template,
-                                    url: [hyrax, :admin, @form, :permission_template],
-                                    html: { id: 'group-participants-form' } do |f| %>
-                  <div class="clearfix spacer">
-                  <%= f.fields_for 'access_grants_attributes',
-                                   f.object.access_grants.build(agent_type: 'group'),
-                                   index: 0 do |builder| %>
-                    <div class="form-inline">
-                      <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %></label>
+                <section class="section-add-sharing clearfix">
+                  <h3><%= t('.add_participants') %></h3>
+                  <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
+                  <div class="sharing-row-form">
+                    <%= simple_form_for @form.permission_template,
+                        url: [hyrax, :admin, @form, :permission_template],
+                        html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
 
-                      <div class="col-md-10 col-xs-8 form-group">
-                        <%= builder.hidden_field :agent_type %>
-                        <%= builder.text_field :agent_id,
-                                         placeholder: "Search for a group...",
-                                         class: 'form-control' %>
-                        as
-                        <%= builder.select :access,
-                                     access_options,
-                                     { prompt: "Select a role..." },
-                                     class: 'form-control' %>
+                        <%= f.fields_for 'access_grants_attributes',
+                            f.object.access_grants.build(agent_type: 'group'),
+                            index: 0 do |builder| %>
+                          <div class="form-group">
+                            <label><%= t('.add_group') %></label>
+                            <%= builder.hidden_field :agent_type %>
+                            <%= builder.text_field :agent_id,
+                                placeholder: "Search for a group...",
+                                class: 'form-control' %>
+                          </div>
+                          <div class="form-group">
+                            <label>as</label>
+                            <%= builder.select :access,
+                                access_options,
+                                { prompt: "Select a role..." },
+                                class: 'form-control' %>
+                          </div>
+                        <% end %>
+                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
 
-                                   <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
-                      </div>
-                    </div>
-                  <% end %>
+                    <% end %>
                   </div>
-                <% end %>
 
-                <%= simple_form_for @form.permission_template,
-                                    url: [hyrax, :admin, @form, :permission_template],
-                                    html: { id: 'user-participants-form' } do |f| %>
-                  <%= f.fields_for 'access_grants_attributes',
-                                   f.object.access_grants.build(agent_type: 'user'),
-                                   index: 0 do |builder| %>
-                    <div class="form-inline add-users">
-                      <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %></label>
+                  <div class="sharing-row-form">
+                    <%= simple_form_for @form.permission_template,
+                        url: [hyrax, :admin, @form, :permission_template],
+                        html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
 
-                      <div class="col-md-10 col-xs-8 form-group">
-                        <%= builder.hidden_field :agent_type %>
-                        <%= builder.text_field :agent_id,
-                                         placeholder: "Search for a user..." %>
-                        as
-                        <%= builder.select :access,
-                                     access_options,
-                                     { prompt: "Select a role..." },
-                                     class: 'form-control' %>
+                      <%= f.fields_for 'access_grants_attributes',
+                                      f.object.access_grants.build(agent_type: 'user'),
+                                      index: 0 do |builder| %>
+                        <div class="form-group">
+                          <label><%= t('.add_user') %></label>
+                          <%= builder.hidden_field :agent_type %>
+                          <%= builder.text_field :agent_id,
+                                            placeholder: "Search for a user..." %>
+                        </div>
+                        <div class="form-group">
+                          <label>as</label>
+                          <%= builder.select :access,
+                                      access_options,
+                                      { prompt: "Select a role..." },
+                                      class: 'form-control' %>
+                        </div>
+                      <% end %>
+                      <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+                    <% end %>
+                  </div>
 
-                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
-                        <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
-                      </div>
-                    </div>
-                  <% end %>
-                <% end %>
+                  <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+                </section>
 
-                <fieldset class="admin-set-participants">
+                <fieldset class="admin-set-participants section-collection-sharing">
                   <legend><%= t(".current_participants") %></legend>
                   <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
                   <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
                   <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
                 </fieldset>
-              </div>
+
+              </div><!-- /.panel-body -->
             </div>
           </div>

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -12,4 +12,4 @@
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:source, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
-
+<%= presenter.attribute_to_html(:license, render_as: :license, html_dl: true) %>

data/app/views/hyrax/base/_form.html.erb

@@ -16,10 +16,10 @@
   <% end %>
   <% if Flipflop.batch_upload? && f.object.new_record? %>
     <% provide :metadata_tab do %>
-      <p class="switch-upload-type">To create a separate work for each of the files, go to <%= link_to "Batch upload", hyrax.new_batch_upload_path %></p>
+      <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path %></p>
     <% end %>
   <% end %>
-  <%= render 'hyrax/base/guts4form', f: f, tabs: form_tabs_for(form: f.object) %>
+  <%= render 'hyrax/base/guts4form', f: f %>
 <% end %>
 
 <script type="text/javascript">

data/app/views/hyrax/base/_form_child_work_relationships.html.erb

@@ -24,7 +24,7 @@ HTML Properties:
   </div>
   <div class="message has-warning hidden"></div>
   <div style="margin-top: 10px">
-    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
+    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
   </div>
   <table class="table table-striped">
     <caption><%= t('.caption') %></caption>

data/app/views/hyrax/base/_form_progress.html.erb

@@ -26,10 +26,6 @@
           <%= f.input :on_behalf_of, collection: current_user.can_make_deposits_for.map(&:user_key), prompt: "Yourself" %>
         </div>
     <% end %>
-
-    <% form_progress_sections_for(form: f.object).each do |section| %>
-      <%= render "form_progress_#{section}", f: f %>
-    <% end %>
   </div>
   <div class="panel-footer text-center">
     <% if ::Flipflop.show_deposit_agreement? %>

data/app/views/hyrax/base/_form_visibility_error.html.erb

@@ -1,5 +1,3 @@
 <%= f.full_error(:visibility) %>
 <%= f.full_error(:embargo_release_date) %>
 <%= f.full_error(:visibility_after_embargo) %>
-<%= f.full_error(:lease_expiration_date) %>
-<%= f.full_error(:visibility_after_lease) %>

data/app/views/hyrax/base/_guts4form.html.erb

@@ -1,11 +1,5 @@
 <% # we will yield to content_for for each tab, e.g. :files_tab %>
-<%# Not passing tabs local param to this partial is deprecated and the tabs param will be required in Hyrax 3.0 %>
-<% unless defined?(tabs) %>
-  <% Deprecation.warn(self, "Passing the tabs local param to the _guts4form partial will be required in Hyrax 3.0.  " \
-                            "Consider removing overriding view partials and customizing the tab list " \
-                            "by overriding the new form_tabs_for(form:) helper.") %>
-  <% tabs = form_tabs_for(form: f.object) # default tab order %>
-<% end %>
+<% tabs ||= %w[metadata files relationships] # default tab order %>
 <div class="row">
   <div class="col-xs-12 col-sm-8">
     <div class="panel panel-default tabs" role="main">

data/app/views/hyrax/base/_items.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t('.header') %></h2>
+
 <%  array_of_ids = presenter.list_of_item_ids_to_display %>
 <%  members = presenter.member_presenters_for(array_of_ids) %>
 <% if members.present? %>

data/app/views/hyrax/base/_metadata.html.erb

@@ -1,6 +1,5 @@
-<dl class="work-show <%= dom_class(presenter) %>" <%= presenter.microdata_type_to_html %>> 
+<dl class="work-show <%= dom_class(presenter) %>" <%= presenter.microdata_type_to_html %>>
     <%= render 'attribute_rows', presenter: presenter %>
     <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date, html_dl: true) %>
     <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date, html_dl: true) %>
-    <%= presenter.attribute_to_html(:license, render_as: :license, html_dl: true) %>
- </dl> 
+ </dl>

data/app/views/hyrax/base/_relationships.html.erb

@@ -1,4 +1,3 @@
-<h2><%= t('.header') %></h2>
 <dl class="work-show">
 <%= render 'relationships_parent_rows', presenter: presenter %>
-</dl>
+</dl>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -1,10 +1,28 @@
-<div class="show-actions">
-  <% if Hyrax.config.analytics? %>
-    <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
-  <% end %>
-  <% if presenter.editor? %>
+<div class="row show-actions button-row-top-two-column">
+  <div class="col-sm-6">
+    <% if presenter.show_deposit_for?(collections: @user_collections) %>
+      <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+      <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
+                    class: 'btn btn-default submits-batches submits-batches-add',
+                    data: { toggle: "modal", target: "#collection-list-container" } %>
+    <% end %>
+    <% if presenter.work_featurable? %>
+      <%= link_to "Feature", hyrax.featured_work_path(presenter, format: :json),
+          data: { behavior: 'feature' },
+          class: presenter.display_unfeature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+
+      <%= link_to "Unfeature", hyrax.featured_work_path(presenter, format: :json),
+          data: { behavior: 'unfeature' },
+          class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+    <% end %>
+    <% if Hyrax.config.analytics? %>
+      <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+    <% end %>
+  </div>
+
+  <div class="col-sm-6 text-right">
+    <% if presenter.editor? %>
       <%= link_to "Edit", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
-      <%= link_to "Delete", [main_app, presenter], class: 'btn btn-danger', data: { confirm: "Delete this #{presenter.human_readable_type}?" }, method: :delete %>
       <% if presenter.member_presenters.size > 1 %>
           <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
       <% end %>
@@ -15,28 +33,15 @@
             <ul class="dropdown-menu">
               <% presenter.valid_child_concerns.each do |concern| %>
                 <li>
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
+                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
                 </li>
               <% end %>
             </ul>
         </div>
       <% end %>
-  <% end %>
-  <% if presenter.show_deposit_for?(collections: @user_collections) %>
-      <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
-      <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
-                     class: 'btn btn-default submits-batches submits-batches-add',
-                     data: { toggle: "modal", target: "#collection-list-container" } %>
-  <% end %>
-  <% if presenter.work_featurable? %>
-      <%= link_to "Feature", hyrax.featured_work_path(presenter, format: :json),
-          data: { behavior: 'feature' },
-          class: presenter.display_unfeature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
-
-      <%= link_to "Unfeature", hyrax.featured_work_path(presenter, format: :json),
-          data: { behavior: 'unfeature' },
-          class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
-  <% end %>
+      <%= link_to "Delete", [main_app, presenter], class: 'btn btn-danger', data: { confirm: "Delete this #{presenter.human_readable_type}?" }, method: :delete %>
+    <% end %>
+  </div>
 </div>
 
 <!-- COinS hook for Zotero -->