sufia 6.0.0.beta1 → 6.0.0.rc1

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_text_field(value)
+      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,32 @@
+module WithHelpIcon
+  def label(wrapper_options = nil)
+    "#{super} #{link_to_help}"
+  end
+
+  protected
+    def link_to_help
+      template.link_to '#', id: "#{input_class}_help", rel: 'popover'.freeze,
+              :'data-content' => metadata_help, :'data-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/models/concerns/sufia/solr_document_behavior.rb

@@ -41,7 +41,7 @@ module Sufia
     end
 
     def noid
-      self[Solrizer.solr_name('noid', Sufia::GenericFile::Indexing.noid_indexer)]
+      self[Solrizer.solr_name('noid', Sufia::IndexingService.noid_indexer)]
     end
 
     def date_uploaded

data/app/presenters/sufia/collection_presenter.rb

@@ -0,0 +1,29 @@
+module Sufia
+  class CollectionPresenter
+    include Hydra::Presenter
+    include ActionView::Helpers::NumberHelper
+
+    self.model_class = ::Collection
+    # Terms is the list of fields displayed by app/views/collections/_show_descriptions.html.erb
+    self.terms = [:resource_type, :creator, :contributor, :tag, :rights, :publisher, :date_created,
+                  :subject, :language, :identifier, :based_near, :related_url]
+
+    # Depositor and permissions are not displayed in app/views/collections/_show_descriptions.html.erb
+    # so don't include them in `terms'.
+    # delegate :depositor, :permissions, to: :model
+
+    def terms_with_values
+      terms.select { |t| self[t].present? }
+    end
+
+    def size
+      number_to_human_size(model.bytes)
+    end
+
+    def total_items
+      model.members.count
+    end
+
+  end
+end
+

data/app/presenters/sufia/generic_file_presenter.rb

@@ -0,0 +1,14 @@
+module Sufia
+  class GenericFilePresenter
+    include Hydra::Presenter
+    self.model_class = ::GenericFile
+    # Terms is the list of fields displayed by app/views/generic_files/_show_descriptions.html.erb
+    self.terms = [:resource_type, :title, :creator, :contributor, :description, :tag, :rights,
+       :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
+
+    # Depositor and permissions are not displayed in app/views/generic_files/_show_descriptions.html.erb
+    # so don't include them in `terms'.
+    delegate :depositor, :permissions, to: :model
+
+  end
+end

data/app/presenters/sufia/presenter_renderer.rb

@@ -0,0 +1,53 @@
+module Sufia
+  class PresenterRenderer
+    include ActionView::Helpers::TranslationHelper
+
+    def initialize(presenter, view_context)
+      @presenter = presenter
+      @view_context = view_context
+    end
+
+    def value(field_name, locals={})
+      render_show_field_partial(field_name, locals)
+    end
+
+    def label(field)
+      t(:"#{model_name.param_key}.#{field}", scope: label_scope, default: field.to_s.humanize).presence
+    end
+
+    def fields(terms, &block)
+      @view_context.safe_join(terms.map { |term| yield self, term })
+    end
+
+    protected
+
+      def render_show_field_partial(field_name, locals)
+        partial = find_field_partial(field_name)
+        @view_context.render partial, locals.merge(key: field_name, record: @presenter)
+      end
+
+      def find_field_partial(field_name)
+        ["#{collection_path}/show_fields/_#{field_name}", "records/show_fields/_#{field_name}",
+         "#{collection_path}/show_fields/_default", "records/show_fields/_default"].find do |partial|
+          Rails.logger.debug "Looking for show field partial #{partial}"
+          return partial.sub(/\/_/, '/') if partial_exists?(partial)
+        end
+      end
+
+      def collection_path
+        @collection_path ||= ActiveSupport::Inflector.tableize(model_name)
+      end
+
+      def partial_exists?(partial)
+        @view_context.lookup_context.find_all(partial).any?
+      end
+
+      def label_scope
+        :"simple_form.labels"
+      end
+
+      def model_name
+        @presenter.model_class.model_name
+      end
+  end
+end

data/app/views/batch/_metadata.html.erb

@@ -5,9 +5,8 @@
       <h3>Applies to individual files uploaded</h3>
       <%= content_tag :p, t('sufia.batch.help.title'), class: "help-block" %>
       <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
-        <div class="batch-group">
-          <%= f.label :title, "<span class='required-field'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
-          <%= help_icon(:title) %>
+        <div class="form-group">
+          <%= f.input_label :title, as: :multi_value_with_help, label: "Title #{index + 1}" %>
           <div id="additional_title_clone">
             <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, class: 'form-control', required: true %>
           </div>
@@ -28,50 +27,17 @@
     <div class="row">
       <div class="col-sm-6">
       <h3>Applies to all files just uploaded</h3>
-      <div class="batch-group" id="resources">
-        <%# See if this works: render_edit_field_partial(:type, f:f) %>
-        <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
-        <%= help_icon(:resource_type) %>
-        <%= content_tag :p, t('sufia.batch.help.resource_type'), class: "help-block" %>
-        <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, class: 'form-control', size: 7, "aria-label" => "Rights combo box" } %>
-      </div>
+      <%= f.input :resource_type, as: :select_with_help, collection: Sufia.config.resource_types,
+          input_html: { class: 'form-control', multiple: true, required: true } %>
 
-      <div class="batch-group">
-        <%= f.label :tag, "<span class='required-field'>*</span> Keyword".html_safe, class: "control-label" %>
-        <%= help_icon(:tag) %>
-        <div id="additional_tag_clone" class="input-group">
-          <%= f.text_field :tag, name: "generic_file[tag][]", value: "", class: 'form-control', required: true  %>
-          <span class="input-group-btn field-controls">
-            <button class="adder btn" name="additional_tag" id="additional_tag_submit">
-              <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
-              <span class="sr-only"><%= t('sufia.batch.metadata.add_another_keyword') %></span>
-            </button>
-          </span>
-        </div>
-        <div id="additional_tag_elements"></div>
-      </div>
+      <%= f.input :tag, as: :multi_value_with_help, input_html: { required: true } %>
 
-      <div class="batch-group">
-        <%= f.label :creator, "<span class='required-field'>*</span> Creator".html_safe, class: "control-label" %>
-        <%= help_icon(:creator) %>
-        <div id="additional_creator_clone" class="input-group">
-          <%= f.text_field :creator, name: "generic_file[creator][]", value: "", class: 'form-control', required: true %>
-          <span class="input-group-btn field-controls">
-            <button class="adder btn" name="additional_creator" id="additional_creator_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_creator') %></span></button>
-          </span>
-        </div>
-        <div id="additional_creator_elements"></div>
-      </div>
+      <%= f.input :creator, as: :multi_value_with_help, input_html: { required: true } %>
+
+      <%= f.input :rights, as: :select_with_modal_help, collection: Sufia.config.cc_licenses,
+          input_html: { class: 'form-control', multiple: true, required: true } %>
 
-      <div class="batch-group">
-        <%= f.label :rights, '<span class="required-field">*</span> Rights'.html_safe, class: "control-label" %>
-        <%= help_icon_modal('rightsModal') %>
-        <% f.object[:rights].each_with_index do |v, index| %>
-          <%= render_edit_field_partial(:rights, record: f.object, f: f, v: v, index: index, render_req: true) %>
-        <% end %>
-        <%= render "generic_files/rights_modal" %>
-        <div id="additional_rights_elements"></div>
-      </div>
+      <%= render "generic_files/rights_modal" %>
 
       <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
       <!-- hidden on initial load -->

data/app/views/batch/_more_metadata.html.erb

@@ -1,6 +1,7 @@
 <div id="more_descriptions">
   <button id="hide_addl_descriptions" class="btn btn-default" aria-label="hide additional metadata description fields">Hide Additional Fields</button>
-  <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
-    <%= render "generic_files/field_form", f: f, render_req: false, key: term %>
+  <% (f.object.terms - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
+    <%# <%= f.input term, as: :multi_value_with_help, input_html: { required: false} %>
+    <%= render_edit_field_partial(term, f: f) %>
   <% end %>
 </div> <!-- /more_descriptions -->

data/app/views/batch/edit.html.erb

@@ -8,9 +8,9 @@
   information you provide will be applied <em>to the entire batch of files</em> you have just
   deposited into <%= t('sufia.product_name') %>. You may edit individual files from
   <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %>
-  once this step is finished. <span class="required-field">*</span> indicates required fields.
+  once this step is finished. <span class="required"><abbr title="required">*</abbr></span> indicates required fields.
 </p>
-<%= form_for([sufia, @batch, @generic_file], html: { multipart: true }) do |f| %>
+<%= simple_form_for [sufia, @batch, @form], html: { multipart: true }, builder: Sufia::FormBuilder do |f| %>
 
   <%= render 'metadata', f: f %>
 

data/app/views/batch_edits/edit.html.erb

@@ -15,29 +15,26 @@
     <div class="tab-content">
       <div class="well tab-pane active" id="descriptions_display">
         <% @terms.each do |term| %>
-          <% vals = @generic_file.send(term) %>
           <div class="row">
-            <!-- look into dashboard_actions.js -->
-            <div class="col-sm-2 col-sm-offset-1">
-              <a class="accordion-toggle grey glyphicon-chevron-right-helper" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#" id="expand_link_<%=term.to_s%>">
-                <%= get_label(term) %>
-              </a>
-              <a href="#collapse_<%=term.to_s%>" class="small" id="chevron_link_<%=term.to_s%>"><span id="expand_<%=term.to_s%>" class="glyphicon glyphicon-chevron-right"></span></a>
-            </div>
-            <div id="detail_<%= term.to_s %>" class="col-sm-6">
-              <div class="accordion-body collapse expanded-details scrolly">
-                <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
+            <%= simple_form_for @generic_file, url: batch_edits_path, method: :put, remote: true,
+              builder: Sufia::FormBuilder, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
+              <div class="col-sm-2 col-sm-offset-1">
+                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
+                  <%= f.input_label term %> <span class="chevron"></span>
+                </a>
+              </div>
+              <div id="collapse_<%= term %>" class="collapse scrolly col-sm-6">
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
-                  <%= render "generic_files/field_form", f: f, render_req: false, key: term %>
+                  <%# TODO we don't need to show required %>
+                  <%= render_edit_field_partial(term, f: f) %>
                   <div>
                     <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , id: "#{term.to_s}_save" %>
-                    <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
-                    <div id="status_<%= term.to_s %>" class="status fleft"></div>
+                    <a class="btn btn-default" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
+                    <div class="status fleft"></div>
                   </div>
-                <% end %>
               </div>
-            </div>
+            <% end %>
           </div>
         <% end %>
       </div><!-- /well -->
@@ -49,7 +46,6 @@
            <%= render "generic_files/permission_form", f: f %>
          <div class="row">
             <%= f.submit "Save changes", class: 'btn btn-primary updates-batches', id: 'permissions_save' %>
-            <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
             <div id="status_permissions" class="status fleft"></div>
          </div>
        <% end %>

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

@@ -1,9 +1,9 @@
-<%= form_for [collections, @collection], html: {class: 'form-horizontal editor'} do |f| %>
+<%= simple_form_for [collections, @form], html: {class: 'form-horizontal editor'} do |f| %>
   <div id="descriptions_display">
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
     <div class="well">
-      <% @collection.terms_for_editing.each do |term| %>
-        <%= render partial: "records/edit_field", locals: {record: @collection, f: f, render_req: true, key: term } %>
+      <% f.object.terms.each do |term| %>
+        <%= render_edit_field_partial term, f: f %>
       <% end %>
     </div><!-- /well -->
   </div>
@@ -16,9 +16,9 @@
 
   <div class="primary-actions">
     <% if params[:action] == "new" %>
-      <%= f.button 'Create Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
+      <%= f.submit 'Create Collection', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
     <% else %>
-      <%= f.button 'Update Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
+      <%= f.submit 'Update Collection', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
     <% end %>
     <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
   </div>

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

@@ -1,13 +1,11 @@
 <h2 class="sr-only">Descriptions</h2>
 <dl class="metadata-collections">
-  <dt><%= get_label("total_items") %></dt>
-  <dd><%= @collection.members.count %></dd>
-  <dt><%= get_label("size") %></dt>
-  <dd><%= number_to_human_size(@collection.bytes) %></dd>
-  <% (@collection.terms_for_display).each do |term| %>
-      <% if @collection.send(term).present? %>
-      <dt><%= get_label(term) %></dt>
-      <dd><%= render_show_field_partial_with_action("records", term, {record: @collection}) %></dd>
-      <% end %>
+  <dt><%= t(".total_items") %></dt>
+  <dd><%= @presenter.total_items %></dd>
+  <dt><%= t(".size") %></dt>
+  <dd><%= @presenter.size %></dd>
+  <% present_terms(@presenter, @presenter.terms_with_values) do |r, term| %>
+      <dt><%= r.label(term) %></dt>
+      <dd><%= r.value(term) %></dd>
   <% end %>
-</dl>
+</dl>

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

@@ -5,20 +5,19 @@
 <% unless has_collection_search_parameters? %>
   <div class="row">
     <div class="col-xs-12 col-sm-2">
-      <%= render partial: 'collections/media_display', locals: { collection: @collection } %>
+      <%= render 'collections/media_display', collection: @collection %>
     </div>
     <div class="col-xs-12 col-sm-10"><!-- class="column second"> -->
-      <%= render partial: 'collections/edit_actions' %>
-      <%= render partial: 'collections/form', locals: { record: @collection } %>
+      <%= render 'collections/edit_actions' %>
+      <%= render 'collections/form' %>
     </div><!-- /columns second -->
   </div> <!-- /columns two-b -->
 <% end %>
 
 <h2>Manage Items in this Collection</h2>
-<%= render partial: 'search_collection_dashboard_form'%>
-<%= render partial: 'my/did_you_mean' %>
-<%= render partial: 'my/facet_selected' %>
+<%= render 'search_collection_dashboard_form'%>
+<%= render 'my/did_you_mean' %>
+<%= render 'my/facet_selected' %>
 <%= render 'collections/sort_and_per_page' %>
-<%= render partial:'document_list', locals: { documents: @member_docs, document_list_format: "dashboard" } %>
-
-<%= render partial:'paginate' %>
+<%= render 'document_list', documents: @member_docs, document_list_format: "dashboard" %>
+<%= render 'paginate' %>

data/app/views/collections/edit_fields/_description.html.erb

@@ -1,4 +1,3 @@
 <div>
-  <%= f.text_area :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "form-control", required: record.required?(key)  %>
-  <%= render "records/edit_fields/suffix", key: key, index: index, single: true %>
+  <%= f.input :description, as: :text, input_html: { rows: '14', required: record.required?(key) } %>
 </div>

data/app/views/dashboard/_index_partials/_stats.html.erb

@@ -8,9 +8,9 @@
 
       <td>
         <%= t("sufia.dashboard.stats.files") %>
-        <ul>
-          <li> <%= pluralize(@user.total_file_views, t("sufia.dashboard.stats.file_views")) %> </li>
-          <li> <%= pluralize(@user.total_file_downloads, t("sufia.dashboard.stats.file_downloads")) %> </li>
+        <ul class="views-downloads-dashboard">
+          <li><span class="badge-optional"><%= @user.total_file_views %></span> <%= t("sufia.dashboard.stats.file_views").pluralize(@user.total_file_views) %></li>
+          <li><span class="badge-optional"><%= @user.total_file_downloads %></span> <%= t("sufia.dashboard.stats.file_downloads").pluralize(@user.total_file_downloads) %></li>
         </ul>
       </td>
     </tr>

data/app/views/generic_files/_descriptions.html.erb

@@ -1,19 +1,16 @@
-<%# convert class variable to a local variable if the local hasn't been set %>
-<% generic_file ||= @generic_file %>
-
 <div id="descriptions_display" class="tab-pane active">
-  <%= form_for generic_file, url: sufia.generic_file_path(@generic_file), html: { multipart: true } do |f| %>
+  <%= simple_form_for [sufia, @form], html: { multipart: true } do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
-    <h1>Descriptions <span class="pull-right required-field">* indicates required fields</span></h1>
+    <h1>Descriptions <span class="pull-right required"><abbr title="required">*</abbr> indicates required fields</span></h1>
       <div class="well">
 
-        <% (generic_file.terms_for_editing).each do |term| %>
-          <%= render "records/edit_field", record: generic_file, f: f, render_req: true, key: term %>
+        <% f.object.terms.each do |term| %>
+          <%= render_edit_field_partial(term, f: f) %>
         <% end %>
 
       </div><!-- /well -->
     <div>
-      <%= f.button type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" do %>
+      <%= f.submit class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" do %>
         <i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions
       <% end %>
     </div>