curation_concerns 0.3.0 → 0.4.0

data/app/forms/curation_concerns/upload_set_form.rb

@@ -0,0 +1,43 @@
+module CurationConcerns
+  class UploadSetForm
+    include HydraEditor::Form
+
+    self.terms = CurationConcerns::GenericWorkForm.terms
+
+    delegate :creator, :human_readable_type, :open_access?, :authenticated_only_access?,
+             :open_access_with_embargo_release_date?, :private_access?,
+             :embargo_release_date, :lease_expiration_date, :member_ids, to: :exemplar_work
+
+    def initialize(upload_set, current_ability)
+      @current_ability = current_ability
+      super(upload_set)
+      # TODO: instead of using GenericWorkForm, this should be an UploadSetForm
+      # work = ::GenericWork.new(creator: [creator_display], title: titles)
+    end
+
+    def exemplar_work
+      @exemplar_work ||= GenericWork.new(creator: [creator_display])
+    end
+
+    # @return [Array] a list of the first titles for each of the works.
+    def works
+      @works ||= model.works.sort { |w1, w2| w1.title.first.downcase <=> w2.title.first.downcase }
+    end
+
+    def self.model_attributes(attrs)
+      CurationConcerns::GenericWorkForm.model_attributes(attrs)
+    end
+
+    def self.multiple?(attrs)
+      CurationConcerns::GenericWorkForm.multiple?(attrs)
+    end
+
+    private
+
+      # Override this method if you want the creator to display something other than
+      # the user_key, e.g. "current_user.name"
+      def creator_display
+        @current_ability.current_user.user_key
+      end
+  end
+end

data/app/helpers/curation_concerns/ability_helper.rb

@@ -12,9 +12,9 @@ module CurationConcerns
 
     def visibility_options(variant)
       options = [
-        ['Open Access', Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC],
-        [t('curation_concerns.institution_name'), Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED],
-        ['Private', Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE]
+        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED,
+        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
       ]
       case variant
       when :restrict
@@ -23,24 +23,18 @@ module CurationConcerns
       when :loosen
         options.delete_at(2)
       end
-      options
+      options.map { |value| [visibility_text(value), value] }
     end
 
     def visibility_badge(value)
-      case value
-      when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        content_tag :span, "Open Access", class: "label label-success"
-      when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        content_tag :span, t('curation_concerns.institution_name'), class: "label label-info"
-      when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        content_tag :span, "Private", class: "label label-danger"
-      when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO
-        content_tag :span, "Embargo", class: "label label-warning"
-      when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE
-        content_tag :span, "Lease", class: "label label-warning"
-      else
-        content_tag :span, value, class: "label label-info"
-      end
+      klass = t("curation_concerns.visibility.#{value}.class", default: 'label-info')
+      content_tag :span, visibility_text(value), class: "label #{klass}"
     end
+
+    private
+
+      def visibility_text(value)
+        t("curation_concerns.visibility.#{value}.text", default: value)
+      end
   end
 end

data/app/helpers/curation_concerns/file_set_helper.rb

@@ -3,7 +3,7 @@ module CurationConcerns::FileSetHelper
     if parent.is_a?(Collection)
       main_app.collection_path(parent)
     else
-      polymorphic_path([main_app, :curation_concerns, parent])
+      polymorphic_path([main_app, parent])
     end
   end
 

data/app/helpers/curation_concerns/main_app_helpers.rb

@@ -8,4 +8,5 @@ module CurationConcerns::MainAppHelpers
   include CurationConcerns::EmbargoHelper
   include CurationConcerns::LeaseHelper
   include CurationConcerns::CollectionsHelper
+  include CurationConcerns::PermissionsHelper
 end

data/app/helpers/curation_concerns/permissions_helper.rb

@@ -0,0 +1,20 @@
+module CurationConcerns
+  module PermissionsHelper
+    def help_link(file, title, aria_label)
+      link_to help_icon, '#', 'data-toggle': 'popover', 'data-content': capture_content(file),
+                              'data-original-title': title, 'aria-label': aria_label
+    end
+
+    private
+
+      def capture_content(file)
+        capture do
+          render file
+        end
+      end
+
+      def help_icon
+        content_tag 'i', '', 'aria-hidden': true, class: 'help-icon'
+      end
+  end
+end

data/app/helpers/curation_concerns/url_helper.rb

@@ -6,22 +6,14 @@ module CurationConcerns
       if doc.collection?
         doc
       else
-        polymorphic_path([main_app, :curation_concerns, doc])
+        polymorphic_path([main_app, doc])
       end
     end
 
-    def track_collection_path(*args)
-      main_app.track_solr_document_path(*args)
-    end
-
-    def track_file_set_path(*args)
-      main_app.track_solr_document_path(*args)
-    end
-
     # generated new GenericWork models get registered as curation concerns and need a
     # track_model_path to render Blacklight-related views
-    CurationConcerns.config.registered_curation_concern_types.each do |concern|
-      define_method("track_#{concern.underscore}_path") { |*args| main_app.track_solr_document_path(*args) }
+    (['FileSet', 'Collection'] + CurationConcerns.config.registered_curation_concern_types).each do |concern|
+      define_method("track_#{concern.constantize.model_name.singular_route_key}_path") { |*args| main_app.track_solr_document_path(*args) }
     end
   end
 end

data/app/inputs/multi_value_with_help_input.rb

@@ -0,0 +1,8 @@
+class MultiValueWithHelpInput < MultiValueInput
+  include WithHelpIcon
+
+  # Overriding this so that the class is correct and the javascript for multivalue will work on this.
+  def input_type
+    'multi_value'.freeze
+  end
+end

data/app/inputs/select_with_help_input.rb

@@ -0,0 +1,3 @@
+class SelectWithHelpInput < SimpleForm::Inputs::CollectionSelectInput
+  include WithHelpIcon
+end

data/app/inputs/select_with_modal_help_input.rb

@@ -0,0 +1,36 @@
+class SelectWithModalHelpInput < MultiValueWithHelpInput
+  def link_to_help
+    template.link_to "##{attribute_name}Modal", id: "#{input_class}_help_modal", rel: 'button',
+                                                data: { toggle: 'modal' }, 'aria-label': aria_label do
+      help_icon
+    end
+  end
+
+  private
+
+    def select_options
+      @select_options ||= begin
+        collection = options.delete(:collection) || self.class.boolean_collection
+        collection.respond_to?(:call) ? collection.call : collection.to_a
+      end
+    end
+
+    def build_field(value, _index)
+      html_options = input_html_options.dup
+
+      if @rendered_first_element
+        html_options[:id] = nil
+        html_options[:required] = nil
+      else
+        html_options[:id] ||= input_dom_id
+      end
+      html_options[:class] ||= []
+      html_options[:class] += ["#{input_dom_id} form-control multi-text-field"]
+      html_options[:'aria-labelledby'] = label_id
+      html_options.delete(:multiple)
+      @rendered_first_element = true
+
+      html_options.merge!(options.slice(:include_blank))
+      template.select_tag(attribute_name, template.options_for_select(select_options, value), html_options)
+    end
+end

data/app/inputs/with_help_icon.rb

@@ -0,0 +1,34 @@
+module WithHelpIcon
+  def label(wrapper_options = nil)
+    "#{super} #{link_to_help}"
+  end
+
+  protected
+
+    def link_to_help
+      template.link_to '#', id: "#{input_class}_help",
+                            data: { toggle: 'popover'.freeze,
+                                    content: metadata_help,
+                                    'original-title': raw_label_text },
+                            'aria-label': aria_label do
+        help_icon
+      end
+    end
+
+    def help_icon
+      template.content_tag 'i', nil, "aria-hidden": true, class: "help-icon"
+    end
+
+    def metadata_help
+      translate_from_namespace(:metadata_help) || attribute_name.to_s.humanize
+    end
+
+    def aria_label
+      translate_from_namespace(:aria_label) || default_aria_label
+    end
+
+    def default_aria_label
+      I18n.t("#{i18n_scope}.aria_label.#{lookup_model_names.join('.')}.default",
+             title: attribute_name.to_s.humanize)
+    end
+end

data/app/presenters/curation_concerns/collection_presenter.rb

@@ -2,6 +2,7 @@ module CurationConcerns
   class CollectionPresenter
     include ModelProxy
     include PresentsAttributes
+    include ActionView::Helpers::NumberHelper
     attr_accessor :solr_document, :current_ability
 
     # @param [SolrDocument] solr_document
@@ -18,5 +19,13 @@ module CurationConcerns
     # Metadata Methods
     delegate :title, :description, :creator, :contributor, :subject, :publisher, :language,
              :embargo_release_date, :lease_expiration_date, :rights, to: :solr_document
+
+    def size
+      number_to_human_size(@solr_document['bytes_is'])
+    end
+
+    def total_items
+      @solr_document['member_ids_ssim'].length
+    end
   end
 end

data/app/presenters/curation_concerns/file_set_presenter.rb

@@ -21,7 +21,8 @@ module CurationConcerns
     # Metadata Methods
     delegate :title, :description, :creator, :contributor, :subject, :publisher,
              :language, :date_uploaded, :rights,
-             :embargo_release_date, :lease_expiration_date, to: :solr_document
+             :embargo_release_date, :lease_expiration_date,
+             :depositor, :tags, :title_or_label, to: :solr_document
 
     def page_title
       Array(solr_document['label_tesim']).first

data/app/presenters/curation_concerns/presents_attributes.rb

@@ -21,5 +21,21 @@ module CurationConcerns
     def permission_badge_class
       PermissionBadge
     end
+
+    def display_microdata?
+      CurationConcerns.config.display_microdata
+    end
+
+    def microdata_type_to_html
+      return "" unless display_microdata?
+      value = I18n.t(microdata_type_key, default: CurationConcerns.config.microdata_default_type)
+      " itemscope itemtype=\"#{value}\"".html_safe
+    end
+
+    private
+
+      def microdata_type_key
+        "curation_concerns.schema_org.resource_type.#{human_readable_type}"
+      end
   end
 end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -20,8 +20,9 @@ module CurationConcerns
              to: :solr_document
 
     # Metadata Methods
-    delegate :title, :description, :creator, :contributor, :subject, :publisher, :language,
-             :embargo_release_date, :lease_expiration_date, :rights, to: :solr_document
+    delegate :title, :date_created, :date_modified, :date_uploaded, :description,
+             :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
+             :lease_expiration_date, :rights, to: :solr_document
 
     def file_presenters
       @file_sets ||= PresenterFactory.build_presenters(ordered_ids,

data/app/renderers/curation_concerns/attribute_renderer.rb

@@ -1,7 +1,12 @@
+require "rails_autolink/helpers"
+
 module CurationConcerns
   class AttributeRenderer
     include ActionView::Helpers::UrlHelper
     include ActionView::Helpers::TranslationHelper
+    include ActionView::Helpers::TextHelper
+    include ConfiguredMicrodata
+
     attr_reader :field, :values, :options
 
     # @param [Symbol] field
@@ -19,8 +24,9 @@ module CurationConcerns
 
       return markup if !values.present? && !options[:include_empty]
       markup << %(<tr><th>#{label}</th>\n<td><ul class='tabular'>)
+      attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
       Array(values).each do |value|
-        markup << %(<li class="attribute #{field}">#{attribute_value_to_html(value)}</li>\n)
+        markup << "<li#{html_attributes(attributes)}>#{attribute_value_to_html(value)}</li>"
       end
       markup << %(</ul></td></tr>)
       markup.html_safe
@@ -38,17 +44,29 @@ module CurationConcerns
         if field == :rights
           rights_attribute_to_html(value)
         else
-          li_value(value)
+          "<span#{html_attributes(microdata_value_attributes(field))}>#{li_value(value)}</span>"
         end
       end
 
+      def html_attributes(attributes)
+        buffer = ""
+        attributes.each do |k, v|
+          buffer << " #{k}"
+          buffer << %(="#{v}") unless v.blank?
+        end
+        buffer
+      end
+
       def search_field
         options.fetch(:search_field, field)
       end
 
       def li_value(value)
-        link_to_if(options[:catalog_search_link], ERB::Util.h(value),
-                   search_path(value))
+        if options[:catalog_search_link]
+          link_to(ERB::Util.h(value), search_path(value))
+        else
+          auto_link(value)
+        end
       end
 
       def search_path(value)

data/app/renderers/curation_concerns/configured_microdata.rb

@@ -0,0 +1,40 @@
+module CurationConcerns
+  module ConfiguredMicrodata
+    def microdata?(field)
+      return false unless CurationConcerns.config.display_microdata
+      key = "curation_concerns.schema_org.#{field}.property"
+      t(key, default: false)
+    end
+
+    def microdata_object?(field)
+      return false unless CurationConcerns.config.display_microdata
+      key = "curation_concerns.schema_org.#{field}.type"
+      t(key, default: false)
+    end
+
+    def microdata_object_attributes(field)
+      if microdata_object?(field)
+        { itemprop: microdata_property(field), itemscope: '', itemtype: microdata_type(field) }
+      else
+        {}
+      end
+    end
+
+    def microdata_property(field)
+      t("curation_concerns.schema_org.#{field}.property")
+    end
+
+    def microdata_type(field)
+      t("curation_concerns.schema_org.#{field}.type")
+    end
+
+    def microdata_value_attributes(field)
+      if microdata?(field)
+        key = microdata_object?(field) ? :value : :property
+        { itemprop: t("curation_concerns.schema_org.#{field}.#{key}") }
+      else
+        {}
+      end
+    end
+  end
+end

data/app/services/curation_concerns/parent_service.rb

@@ -1,6 +1,6 @@
 module CurationConcerns
   class ParentService
-    # @param [String] the id of a child GenericFile
+    # @param [String] the id of a child FileSet
     # @return [ActiveFedora::Base] the parent object
     def self.parent_for(id)
       ids = ordered_by_ids(id)

data/app/views/catalog/_action_menu_partials/_default.html.erb

@@ -4,14 +4,14 @@
     <ul class="dropdown-menu">
       <% if can? :edit, document %>
         <li>
-          <%= link_to [:edit, :curation_concerns, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
+          <%= link_to [:edit, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
           <% end %>
         </li>
         <li>
           <% if @collection || (@presenter and @presenter.collection?) # We're on the view page for @collection. -%>
             <%= link_to_remove_from_collection(document) %>
           <% else %>
-            <%= link_to [:curation_concerns, document], class: 'itemicon itemtrash',
+            <%= link_to document, class: 'itemicon itemtrash',
                         title: "Delete #{document.human_readable_type}", method: :delete,
                         data: {
                           confirm: "Deleting a #{document.human_readable_type} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this #{document.human_readable_type} from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>

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

@@ -1,25 +1,24 @@
-<%= simple_form_for [collections, @collection] do |f| %>
+<%= simple_form_for [collections, @form] do |f| %>
 
-  <% if f.error_notification -%>
+  <% if f.error_notification %>
     <div class="alert alert-danger fade in">
       <strong>Wait don't go!</strong> There was a problem with your submission. Please review the errors below:
       <a class="close" data-dismiss="alert" href="#">&times;</a>
     </div>
-  <% end -%>
+  <% end %>
 
-  <%= render 'form_descriptive_fields', curation_concern: @collection, f: f %>
+  <%= render 'form_descriptive_fields', f: f %>
   <%= render 'form_permission', f: f %>
-
   <%= render "curation_concerns/base/form_media", f: f %>
 
   <div class="row">
     <div class="col-md-12 form-actions">
       <%= f.submit class: 'btn btn-primary require-contributor-agreement' %>
-      <%- if @collection.new_record? -%>
+      <% if action_name == 'new' %>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>
-      <%- else -%>
-        <%= link_to 'Cancel', collections.collection_path(@collection), class: 'btn btn-link' %>
-      <%- end -%>
+      <% else %>
+        <%= link_to 'Cancel', collections.collection_path(@form), class: 'btn btn-link' %>
+      <% end %>
     </div>
   </div>
 

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

@@ -1,29 +1,31 @@
 <div class="batch-info">
   <div>
-    <%= render partial: 'collections/form_for_select_collection', locals: { user_collections: @user_collections }  %>
+    <%= render 'collections/form_for_select_collection', user_collections: @user_collections %>
   </div>
 
-  <% if  params[:action] == "edit" %>
-  <div class="batch-toggle">
-     <% session[:batch_edit_state] = "on" %>
-    <%= button_for_remove_selected_from_collection @presenter %>
-   </div>
-  <%end %>
-   <div class="sort-toggle">
-     <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-     <% unless @response.response['numFound'] < 2 %>
-        <%= form_tag collections.collection_path(@presenter), method: :get, class: 'per_page form-inline' do %>
-          <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
-          <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
-          &nbsp;&nbsp;&nbsp;
-          <%= label_tag(:per_page) do %>
-            Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %> per page
-            <% end %>
-            <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
-            &nbsp;&nbsp;&nbsp;
-            <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
-            <%= render 'view_type_group' %>
-         <% end %>
-      <% end unless sort_fields.empty? %>
+  <% if action_name == "edit" %>
+    <div class="batch-toggle">
+      <% session[:batch_edit_state] = "on" %>
+      <%= button_for_remove_selected_from_collection collection %>
+    </div>
+  <% end %>
+  <div class="sort-toggle">
+    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
+    <% unless @response.response['numFound'] < 2 %>
+      <%= form_tag collections.collection_path(collection), method: :get, class: 'per_page form-inline' do %>
+        <%= label_tag :sort do %>
+          <span>Sort By:</span>
+        <% end %>
+        <%= select_tag :sort, options_for_select(sort_fields, h(params[:sort])) %>
+        &nbsp;&nbsp;&nbsp;
+        <%= label_tag :per_page do %>
+          Show <%= select_tag :per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page" %> per page
+        <% end %>
+        <%= render_hash_as_hidden_fields params_for_search.except(:per_page, :sort) %>
+        &nbsp;&nbsp;&nbsp;
+        <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
+        <%= render 'view_type_group' %>
+      <% end %>
+    <% end unless sort_fields.empty? %>
    </div>
 </div>

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

@@ -12,7 +12,7 @@
 <% end %>
 
 <%= render 'search_form' %>
-<%= render 'sort_and_per_page' %>
+<%= render 'sort_and_per_page', collection: @presenter %>
 
 <% if has_collection_search_parameters? %>
   <h2>Search Results within this Collection</h2>

data/app/views/curation_concerns/base/_attributes.html.erb

@@ -1,4 +1,4 @@
-<table class="table table-striped <%= dom_class(@presenter) %> attributes">
+<table class="table table-striped <%= dom_class(@presenter) %> attributes" <%= @presenter.microdata_type_to_html %>>
   <caption class="table-heading"><h2>Attributes</h2></caption>
   <thead>
     <tr><th>Attribute Name</th><th>Values</th></tr>

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

@@ -1,11 +1,11 @@
-<%= simple_form_for [main_app, :curation_concerns, curation_concern],
+<%= simple_form_for [main_app, @form],
                     wrapper_mappings: { multifile: :horizontal_file_input } do |f| %>
   <% if f.error_notification -%>
     <div class="alert alert-danger fade in">
       <strong>Wait don't go!</strong> There was a problem with your submission. Please review the errors below:
       <a class="close" data-dismiss="alert" href="#">&times;</a>
     </div>
-  <% end -%>
+  <% end %>
 
   <%= render 'form_descriptive_fields', f: f %>
   <%= render 'form_supplementary_fields', f: f %>
@@ -13,12 +13,11 @@
   <div class="row">
     <div class="col-md-12 form-actions">
       <%= f.submit class: 'btn btn-primary require-contributor-agreement' %>
-      <%- if curation_concern.new_record? -%>
+      <% if curation_concern.new_record? %>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>
-      <%- else -%>
-        <%= link_to 'Cancel', polymorphic_path([main_app, :curation_concerns, curation_concern]), class: 'btn btn-link' %>
-      <%- end -%>
+      <% else %>
+        <%= link_to 'Cancel', polymorphic_path([main_app, curation_concern]), class: 'btn btn-link' %>
+      <% end %>
     </div>
   </div>
-
 <% end %>

data/app/views/curation_concerns/base/_form_permission.html.erb

@@ -8,6 +8,9 @@
     <legend>
       Visibility
       <small>Who should be able to view or download this content?</small>
+      <span id="visibility_tooltip" class="h5">
+        <%= help_link 'visibility', 'Visibility', 'Usage information for visibility' %>
+      </span>
     </legend>
 
     <%= render "form_permission_note" %>

data/app/views/curation_concerns/base/_multiple_upload.html.erb

@@ -0,0 +1,3 @@
+<%= render 'curation_concerns/file_sets/upload/alerts', presenter: @presenter %>
+<%= render 'curation_concerns/file_sets/upload/form', presenter: @presenter %>
+<%= render 'curation_concerns/file_sets/upload/script_templates', presenter: @presenter %>

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

@@ -1,9 +1,9 @@
 <% if collector || editor %>
   <div class="form-actions">
     <% if editor %>
-      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default' %>
+      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default' %>
       <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
-      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, :curation_concerns, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
+      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>
   </div>
 <% end %>

data/app/views/curation_concerns/base/_versioning.html.erb

@@ -2,7 +2,7 @@
   <h2>Versions</h2>
   <div class="well">
 
-    <%= form_for [main_app, :curation_concerns, curation_concern], html: { multipart: true } do |f| %>
+    <%= form_for [main_app, curation_concern], html: { multipart: true } do |f| %>
     <h3>Restore Previous Version</h3>
     <% @version_list.each do |version| %>
       <div class="form-group">

data/app/views/curation_concerns/base/_visibility.html.erb

@@ -0,0 +1,17 @@
+<p>This setting will determine who can view your file, and the associated metadata. Setting
+  the visibility to <span class='label label-success'>Open Access</span> will allow your
+  content to be discovered in Google and viewed by anyone. The visibility setting
+  <span class='label label-info'><%=t('curation_concerns.institution_name') %></span> will only allow
+  users who are logged into <%=t('curation_concerns.product_name') %> (via WebAccess) to view the content.
+  Files that are marked <span class='label label-danger'>Private</span> are only able to be viewed
+  by users and/or groups that have been given specific access in the &quot;Share With&quot; section.
+</p>
+
+<p>
+  Permissions in <%=t('curation_concerns.product_name') %> are hierarchical. This means that you cannot set
+  the visibility of a file to <span class='label label-success'>Open Access</span> or
+  <span class='label label-info'><%=t('curation_concerns.institution_name') %></span> and simultaneously
+  try to restrict the access of a single user. However, you may mark the visibility of
+  a file as <span class='label label-danger'>Private</span> and then grant access to
+  particular users and/or groups for that file in the &quot;Share With&quot; section.
+</p>

data/app/views/curation_concerns/base/show.html.erb

@@ -10,7 +10,7 @@
 <%= render 'attributes', curation_concern: @presenter %>
 <%= render 'related_files', presenter: @presenter %>
 <% if editor %>
-    <%= render partial: 'curation_concerns/file_sets/multiple_upload', presenter: @presenter %>
+  <%= render 'multiple_upload', presenter: @presenter %>
 <% end %>
 
 <%= render "show_actions", collector: collector, editor: editor%>