curation_concerns 0.1.0 → 0.2.0

data/app/services/curation_concerns/embargo_service.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
-  module EmbargoService
+  class EmbargoService < RestrictionService
     class << self
       #
       # Methods for Querying Repository to find Embargoed Objects
@@ -7,20 +7,42 @@ module CurationConcerns
 
       # Returns all assets with embargo release date set to a date in the past
       def assets_with_expired_embargoes
-        ActiveFedora::Base.where('embargo_release_date_dtsi:[* TO NOW]')
+        builder = CurationConcerns::ExpiredEmbargoSearchBuilder.new(self)
+        presenters(builder)
       end
 
       # Returns all assets with embargo release date set
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_embargo
-        ActiveFedora::Base.where('embargo_release_date_dtsi:*')
+        builder = CurationConcerns::EmbargoSearchBuilder.new(self)
+        presenters(builder)
       end
 
       # Returns all assets that have had embargoes deactivated in the past.
       def assets_with_deactivated_embargoes
-        ActiveFedora::Base.where('embargo_history_ssim:*')
+        builder = CurationConcerns::DeactivatedEmbargoSearchBuilder.new(self)
+        presenters(builder)
       end
+
+      private
+
+        def presenter_class
+          CurationConcerns::EmbargoPresenter
+        end
+
+        def presenters(builder)
+          response = repository.search(builder)
+          response.documents.map { |d| presenter_class.new(d) }
+        end
+
+        def repository
+          config.repository
+        end
+
+        def config
+          @config ||= ::CatalogController.new
+        end
     end
   end
 end

data/app/services/curation_concerns/lease_service.rb

@@ -1,23 +1,32 @@
 module CurationConcerns
-  module LeaseService
+  class LeaseService < RestrictionService
     class << self
       # Returns all assets with lease expiration date set to a date in the past
       def assets_with_expired_leases
-        ActiveFedora::Base.where('lease_expiration_date_dtsi:[* TO NOW]')
+        # ActiveFedora::Base.where('lease_expiration_date_dtsi:[* TO NOW]')
+        builder = CurationConcerns::ExpiredLeaseSearchBuilder.new(self)
+        presenters(builder)
       end
 
       # Returns all assets with lease expiration date set
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_lease
-        ActiveFedora::Base.where('lease_expiration_date_dtsi:*')
+        builder = CurationConcerns::LeaseSearchBuilder.new(self)
+        presenters(builder)
       end
 
       # Returns all assets that have had embargoes deactivated in the past.
       def assets_with_deactivated_leases
-        ActiveFedora::Base.where('lease_history_ssim:*')
+        builder = CurationConcerns::DeactivatedLeaseSearchBuilder.new(self)
+        presenters(builder)
       end
+
+      private
+
+        def presenter_class
+          CurationConcerns::LeasePresenter
+        end
     end
   end
 end
-

data/app/services/curation_concerns/parent_service.rb

@@ -0,0 +1,19 @@
+module CurationConcerns
+  class ParentService
+    # @param [String] the id of a child GenericFile
+    # @return [ActiveFedora::Base] the parent object
+    def self.parent_for(id)
+      ids = ordered_by_ids(id)
+      ActiveFedora::Base.find(ordered_by_ids(id).first) if ids.present?
+    end
+
+    def self.ordered_by_ids(id)
+      if id.present?
+        ActiveFedora::SolrService.query("{!join from=proxy_in_ssi to=id}ordered_targets_ssim:#{id}")
+          .map { |x| x["id"] }
+      else
+        []
+      end
+    end
+  end
+end

data/app/services/curation_concerns/restriction_service.rb

@@ -0,0 +1,24 @@
+module CurationConcerns
+  class RestrictionService
+    class << self
+      private
+
+        def presenter_class
+          raise "RestrictionService is an Abstract class and should be extended. Implement presenter_class in the subclass"
+        end
+
+        def presenters(builder)
+          response = repository.search(builder)
+          response.documents.map { |d| presenter_class.new(d) }
+        end
+
+        def repository
+          config.repository
+        end
+
+        def config
+          @config ||= ::CatalogController.new
+        end
+    end
+  end
+end

data/app/services/rights_service.rb

@@ -0,0 +1,14 @@
+module RightsService
+  mattr_accessor :authority
+  self.authority = Qa::Authorities::Local.subauthority_for('rights')
+
+  def self.select_options
+    authority.all.map do |element|
+      [element[:label], element[:id]]
+    end
+  end
+
+  def self.label(id)
+    authority.find(id).fetch('term')
+  end
+end

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

@@ -11,7 +11,7 @@
           <%= button_for_remove_from_collection(document) %>
         <% else %>
           <%= link_to [collections, document], class: 'itemicon itemtrash', title: 'Delete Collection', method: :delete, data: {
-                          confirm: "Deleting a collection from #{t('sufia.product_name')} is permanent. Click OK to delete this collection from #{t('sufia.product_name')}, or Cancel to cancel this operation" } do %>
+                          confirm: "Deleting a collection from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this collection from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
                           <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
           <% end %>
         <% end %>

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

@@ -7,11 +7,13 @@
         <% end %>
       </li>
       <li>
-        <% if @collection # We're on the view page for @collection. -%>
+        <% 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', title: 'Delete Collection', method: :delete, data: {
-                          confirm: "Deleting a collection from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this collection from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
+          <%= link_to [:curation_concerns, 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 %>
                           <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
           <% end %>
         <% end %>

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

@@ -1,5 +1,5 @@
 <h3 id="document-list-heading" class="accessible-hidden">List of files deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
 <ol id="documents" class="container-fluid search-results-list" start="<%= document_counter_with_offset(0) %>" aria-labeled-by="document-list-heading">
   <%= render documents, as: :document %>
-</ul>
+</ol>
 

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

@@ -9,39 +9,5 @@
 <% end %>
 
 <div id="content">
-
-    <% unless has_search_parameters? %>
-	    <%# if there are no input/search related params, display the "home" partial -%>
-	    <%= render 'home' %>
-    <% else %>
-
-      <h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
-
-      <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
-
-
-      <% provide(:head) do -%>
-        <%= render_opensearch_response_metadata %>
-        <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
-        <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>
-      <% end -%>
-
-
-      <%= render 'search_header' %>
-
-      <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
-
-      <%- if @response.empty? %>
-        <%= render "zero_results" %>
-      <%- elsif render_grouped_response? %>
-        <%= render_grouped_document_index %>
-      <%- else %>
-        <%= render_document_index %>
-      <%- end %>
-
-	    <%= render 'results_pagination' %>
-
-
-    <% end %>
-
+  <%= render 'search_results' %>
 </div>

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

@@ -1,4 +1,4 @@
-<%# This mimics the generic_files/descriptions partial & re-uses some of its sub-partials %>
+<%# This mimics the file_sets/descriptions partial & re-uses some of its sub-partials %>
 <div id="descriptions_display" class="tab-pane active">
   <%= form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
@@ -6,13 +6,12 @@
       <div class="well">
 
         <% (collection.terms_for_editing).each do |term| %>
-          <%= render partial: "generic_files/field_form", locals: { generic_file: collection, f: f, render_req: true, key: term } %>
+          <%= render partial: "file_sets/field_form", locals: { file_set: collection, f: f, render_req: true, key: term } %>
         <% end %>
-   
       </div><!-- /well -->
     <div class="row">
       <div class="form-actions">
-        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', 
+        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary',
           onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
       </div>
     </div>

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

@@ -10,7 +10,7 @@
   <%= render 'form_descriptive_fields', curation_concern: @collection, f: f %>
   <%= render 'form_permission', f: f %>
 
-  <%= render "form_representative_image", curation_concern: @collection, f: f %>
+  <%= render "curation_concerns/base/form_representative_image", f: f %>
 
   <div class="row">
     <div class="col-md-12 form-actions">

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

@@ -24,7 +24,7 @@
       </label>
       <label class="radio">
         <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> />
-        <span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users.
+        <span class="label label-info"><%=t('curation_concerns.institution_name') %></span> Visible to all <%=t('curation_concerns.institution_name') %> users.
       </label>
       <label class="radio">
         <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if @collection.private_access? %> checked="true"<% end %>/>

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

@@ -0,0 +1,10 @@
+<div style="float: right;" >
+  <%= form_for [collections, @presenter], method: :get, class: "well form-search" do |f| %>
+
+      <label class="accessible-hidden">Search Collection <%= @presenter.title %></label>
+      <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
+      <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
+      <%= render_hash_as_hidden_fields(params_for_search.except(:cq, :sort, :qt, :page)).html_safe %>
+      <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
+  <% end %>
+</div>

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

@@ -1,8 +1,8 @@
-<% if can? :edit, @collection %>
+<% if can? :edit, @presenter.id %>
   <h2 class="non lower">Actions</h2>
   <p>
-      <%= link_to "Edit", collections.edit_collection_path, class: 'btn btn-primary' %> &nbsp;&nbsp;
-      <%= link_to "Add files from your dashboard",  search_path_for_my_works, class: 'btn btn-primary' %>
+      <%= link_to "Edit", collections.edit_collection_path, class: 'btn btn-default' %> &nbsp;&nbsp;
+      <%= link_to "Add files from your dashboard",  search_path_for_my_works, class: 'btn btn-default' %>
   </p>
 <%end %>
 

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

@@ -6,13 +6,13 @@
   <% if  params[:action] == "edit" %>
   <div class="batch-toggle">
      <% session[:batch_edit_state] = "on" %>
-    <%= button_for_remove_selected_from_collection @collection %>
+    <%= 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(@collection), method: :get, class: 'per_page form-inline' do %>
+        <%= 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;

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

@@ -1,17 +1,17 @@
-<% @page_title = "#{@collection.title} - #{application_name}" %>
+<% @page_title = "#{@presenter.title} - #{application_name}" %>
 
-<h1 class="lower"><%= @collection.title %></h1>
+<h1 class="lower"><%= @presenter.title %></h1>
 
-<%= render partial: 'curation_concerns/base/representative_media', locals: {work: @collection} %>
+<%= render 'curation_concerns/base/representative_media', work: @presenter %>
 
-<h3><%=@collection.description%> </h3>
+<h3><%= @presenter.description %> </h3>
 
 <% unless has_collection_search_parameters? %>
   <%= render partial: 'collections/show_actions' %>
-  <%= render 'attributes', curation_concern: @collection %>
+  <%= render 'attributes', curation_concern: @presenter %>
 <% end %>
 
-<%= render partial: 'search_form'%>
+<%= render 'search_form' %>
 <%= render 'sort_and_per_page' %>
 
 <% if has_collection_search_parameters? %>

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

@@ -0,0 +1,7 @@
+  <%= @presenter.attribute_to_html(:description) %>
+  <%= @presenter.attribute_to_html(:creator, catalog_search_link: true ) %>
+  <%= @presenter.attribute_to_html(:contributor, label: 'Contributors', catalog_search_link: true) %>
+  <%= @presenter.attribute_to_html(:subject, catalog_search_link: true) %>
+  <%= @presenter.attribute_to_html(:publisher) %>
+  <%= @presenter.attribute_to_html(:language) %>
+

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

@@ -1,25 +1,18 @@
-<table class="table table-striped <%= dom_class(curation_concern) %> attributes">
+<table class="table table-striped <%= dom_class(@presenter) %> attributes">
   <caption class="table-heading"><h2>Attributes</h2></caption>
   <thead>
     <tr><th>Attribute Name</th><th>Values</th></tr>
   </thead>
   <tbody>
-  <%= curation_concern_attribute_to_html(curation_concern, :description, 'Abstract') %>
-  <%= curation_concern_attribute_to_html(curation_concern, :creator, 'Creator', { catalog_search_link: true }) %>
-  <%= curation_concern_attribute_to_html(curation_concern, :contributor, 'Contributors', { catalog_search_link: true }) %>
-  <%= curation_concern_attribute_to_html(curation_concern, :subject, "Subject", { catalog_search_link: true }) %>
-  <%= curation_concern_attribute_to_html(curation_concern, :publisher, "Publisher") %>
-  <%#= curation_concern_attribute_to_html(curation_concern, :bibliographic_citation, "Bibliographic Citation") %>
-  <%#= curation_concern_attribute_to_html(curation_concern, :source, "Source") %>
-  <%= curation_concern_attribute_to_html(curation_concern, :language, "Language") %>
+    <%= render 'attribute_rows' %>
   <tr>
     <th>Access Rights</th>
     <td>
-      <%= permission_badge_for(curation_concern) %>
+      <%= @presenter.permission_badge %>
     </td>
   </tr>
-  <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
-  <%= curation_concern_attribute_to_html(curation_concern, :lease_expiration_date, "Lease Expiration Date") %>
-  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
+  <%= @presenter.attribute_to_html(:embargo_release_date) %>
+  <%= @presenter.attribute_to_html(:lease_expiration_date) %>
+  <%= @presenter.attribute_to_html(:rights) %>
   </tbody>
 </table>

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

@@ -1,5 +1,5 @@
-<%= simple_form_for [main_app, :curation_concerns, curation_concern] do |f| %>
-  
+<%= simple_form_for [main_app, :curation_concerns, curation_concern],
+                    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:
@@ -7,9 +7,8 @@
     </div>
   <% end -%>
 
-  <%= render 'form_descriptive_fields', curation_concern: curation_concern, f: f %>
-
-  <%= render 'form_supplementary_fields', curation_concern: curation_concern, f: f %>
+  <%= render 'form_descriptive_fields', f: f %>
+  <%= render 'form_supplementary_fields', f: f %>
 
   <div class="row">
     <div class="col-md-12 form-actions">

data/app/views/curation_concerns/base/_form_descriptive_fields.erb

@@ -1,11 +1,9 @@
 <div class="row">
   <div class="col-md-6" id="required-information">
-    <%= render "form_required_information", curation_concern: curation_concern, f: f %>
+    <%= render "form_required_information", f: f %>
   </div>
 
-  <%# render 'form_editors', f: f %>
-
   <div class="col-md-6" id="additional-information">
-    <%= render "form_additional_information", curation_concern: curation_concern, f: f %>
+    <%= render "form_additional_information", f: f %>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<% unless curation_concern.persisted? %>
+<% unless f.object.persisted? %>
   <fieldset id="work-contents">
     <div class="row with-headroom">
       <div class="span12">
@@ -7,17 +7,15 @@
         </legend>
 
         <p class="help-block">
-          The subject of your <%= curation_concern.human_readable_type.downcase %> can either be a file <em>or</em> a URL.
+          The subject of your <%= f.object.human_readable_type.downcase %> can either be a file <em>or</em> a URL.
         </p>
       </div>
     </div>
 
     <div class="row">
-
       <fieldset class="col-md-5">
-        <%= f.input :files, as: :file, label: 'Upload a file', hint: 'A PDF is preferred.'%>
+        <%= f.input :files, as: :multifile %>
       </fieldset>
-
     </div>
   </fieldset>
 <% end %>

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

@@ -1,7 +1,8 @@
-<% if curation_concern.embargo_release_date %>
-  <%= render 'form_permission_under_embargo', curation_concern: curation_concern, f: f %>
-<% elsif curation_concern.lease_expiration_date %>
-  <%= render 'form_permission_under_lease', curation_concern: curation_concern, f: f %>
+<% # This is used by works and by FileSet and the layout (col-6 vs col-12) is different for both %>
+<% if f.object.embargo_release_date %>
+  <%= render 'form_permission_under_embargo', f: f %>
+<% elsif f.object.lease_expiration_date %>
+  <%= render 'form_permission_under_lease', f: f %>
 <% else %>
   <fieldset id="set-access-controls">
     <legend>
@@ -9,41 +10,27 @@
       <small>Who should be able to view or download this content?</small>
     </legend>
 
-    <section class="help-block">
-      <p>
-        <strong>Please note</strong>, making something visible to the world (i.e.
-        marking this as <span class="label label-success">Open Access</span>) may be
-        viewed as publishing which could impact your ability to:
-      </p>
-      <ul>
-        <li>Patent your work</li>
-        <li>Publish your work in a journal</li>
-      </ul>
-      <p>
-        Check out <a href="http://www.sherpa.ac.uk/romeo/">SHERPA/RoMEO</a> for more
-        information about publisher copyright policies.
-      </p>
-    </section>
+    <%= render "form_permission_note" %>
 
     <div class="form-group">
       <label class="radio">
-        <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if curation_concern.open_access? %> checked="true"<% end %>/>
+        <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if f.object.open_access? %> checked="true"<% end %>/>
         <span class="label label-success">Open Access</span> Visible to the world.
       </label>
       <label class="radio">
-        <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if curation_concern.authenticated_only_access? %> checked="true"<% end %> />
+        <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if f.object.authenticated_only_access? %> checked="true"<% end %> />
         <span class="label label-info"><%=t('curation_concerns.institution.name') %></span> Visible to all <%=t('curation_concerns.institution.name') %> users.
       </label>
       <label class="radio">
-        <input type="radio" id="visibility_embargo" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>" <% if curation_concern.open_access_with_embargo_release_date? %> checked="true"<% end %>/>
-        <%= render "form_permission_embargo", curation_concern: curation_concern, f: f  %>
+        <input type="radio" id="visibility_embargo" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>" <% if f.object.open_access_with_embargo_release_date? %> checked="true"<% end %>/>
+        <%= render "form_permission_embargo", f: f  %>
       </label>
       <label class="radio">
-        <input type="radio" id="visibility_lease" name="<%= f.object_name %>[visibility]" value="lease" <% if curation_concern.open_access_with_embargo_release_date? %> checked="true"<% end %>/>
-        <%= render "form_permission_lease", curation_concern: curation_concern, f: f  %>
+        <input type="radio" id="visibility_lease" name="<%= f.object_name %>[visibility]" value="lease" <% if f.object.open_access_with_embargo_release_date? %> checked="true"<% end %>/>
+        <%= render "form_permission_lease", f: f  %>
       </label>
       <label class="radio">
-        <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if curation_concern.private_access? %> checked="true"<% end %>/>
+        <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if f.object.private_access? %> checked="true"<% end %>/>
         <span class="label label-danger">Private</span> Only visible to you and your delegates.
       </label>
     </div>

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

@@ -0,0 +1,15 @@
+    <section class="help-block">
+      <p>
+        <strong>Please note</strong>, making something visible to the world (i.e.
+        marking this as <span class="label label-success">Open Access</span>) may be
+        viewed as publishing which could impact your ability to:
+      </p>
+      <ul>
+        <li>Patent your work</li>
+        <li>Publish your work in a journal</li>
+      </ul>
+      <p>
+        Check out <a href="http://www.sherpa.ac.uk/romeo/">SHERPA/RoMEO</a> for more
+        information about publisher copyright policies.
+      </p>
+    </section>

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

@@ -6,11 +6,11 @@
 
   <section class="help-block">
     <p>
-      <strong>This work is under embargo.</strong>  You can change the settings of the embargo here, or you can visit the <%= link_to 'Embargo Management Page', main_app.edit_embargo_path(curation_concern) %> to deactivate it.
+      <strong>This work is under embargo.</strong>  You can change the settings of the embargo here, or you can visit the <%= link_to 'Embargo Management Page', main_app.edit_embargo_path(f.object) %> to deactivate it.
     </p>
   </section>
 
     <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>" />
-    <%= render "form_permission_embargo", curation_concern: curation_concern, f: f  %>
+    <%= render "form_permission_embargo", f: f %>
 
 </fieldset>

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

@@ -6,13 +6,13 @@
 
   <section class="help-block">
     <p>
-      <strong>This work is under lease.</strong>  You can change the settings of the lease here, or you can visit the <%= link_to 'Lease Management Page', main_app.edit_lease_path(curation_concern) %> to deactivate it.
+      <strong>This work is under lease.</strong>  You can change the settings of the lease here, or you can visit the <%= link_to 'Lease Management Page', main_app.edit_lease_path(f.object) %> to deactivate it.
     </p>
   </section>
 
   <div class="form-group">
     <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE %>" />
-    <%= render "form_permission_lease", curation_concern: curation_concern, f: f  %>
+    <%= render "form_permission_lease", f: f %>
   </div>
 
 </fieldset>

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

@@ -1,12 +1,24 @@
-<% if curation_concern.persisted? && curation_concern.generic_files.present? %>
+<% if f.object.persisted? && f.object.member_ids.present? %>
+  <div class="row">
+    <div class="col-md-12">
+      <fieldset id="representative-media">
+        <legend>
+          Representative Media
+        </legend>
+        <p>Select the file with media that represents this <%= f.object.human_readable_type %>.</p>
+        <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
+      </fieldset>
+    </div>
+  </div>
+
   <div class="row">
     <div class="col-md-12">
       <fieldset id="representative-image">
         <legend>
-          Assign a Thumbnail
+           Thumbnail
         </legend>
-        <p>Select the file whose thumbnail should represent this <%= curation_concern.human_readable_type %>.</p>
-        <%= f.select( :representative, Hash[ curation_concern.generic_files.map {|file| [file.title.first, file.id] } ],{}, { class: 'form-control' } ) %>
+        <p>Select the file to be used as the thumbnail for this <%= f.object.human_readable_type %>.</p>
+        <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
       </fieldset>
     </div>
   </div>

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

@@ -0,0 +1,17 @@
+<div class="row with-headroom">
+  <div class="col-md-12">
+    <fieldset id="set-license">
+      <legend>Choose a License for your Content</legend>
+      <p>
+        What do you want others to be able to do with your work?
+      </p>
+      <p>
+        <a href="http://creativecommons.org/licenses/" target="_blank">Here's some help</a> if you don't know which license to choose.
+      </p>
+
+      <%= f.input :rights, as: :select,
+        collection: RightsService.select_options,
+        input_html: { class: 'form-control' } %>
+    </fieldset>
+  </div>
+</div>

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

@@ -1,15 +1,10 @@
-<%= render "form_files_and_links", curation_concern: curation_concern, f: f %>
-
-<%= render "form_representative_image", curation_concern: curation_concern, f: f %>
+<%= render "form_files_and_links", f: f %>
+<%= render "form_representative_image", f: f %>
 
 <div class="row with-headroom">
   <div class="col-md-12">
-    <%= render "form_permission", curation_concern: curation_concern, f: f %>
+    <%= render "form_permission", f: f %>
   </div>
 </div>
 
-<div class="row with-headroom">
-  <div class="col-md-12">
-    <%= render "form_content_license", curation_concern: curation_concern, f: f %>
-  </div>
-</div>
+<%= render "form_rights", f: f %>