sufia 4.3.1 → 5.0.0.rc1

data/app/controllers/concerns/sufia/breadcrumbs.rb

@@ -20,11 +20,10 @@
       case request.referer
       when /catalog/
         add_breadcrumb I18n.t('sufia.bread_crumb.search_results'), request.referer
-      when /dashboard/
-        default_trail
-        add_breadcrumb_for_controller    
       else
         default_trail
+        add_breadcrumb_for_controller
+        add_breadcrumb_for_action
       end
     end
 
@@ -37,5 +36,11 @@
       end
     end
 
+    def add_breadcrumb_for_action
+      if /edit|stats/ =~ action_name && controller_name == "generic_files"
+        add_breadcrumb I18n.t("sufia.generic_file.browse_view"), sufia.generic_file_path(Sufia::Noid.noidify params["id"])
+      end
+    end
+
   end
 end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -49,7 +49,7 @@ module Sufia::UsersControllerBehavior
   def update
     if params[:user]
       @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
-      @user.populate_attributes if ActiveRecord::ConnectionAdapters::Column.value_to_boolean(params[:user][:update_directory])
+      @user.populate_attributes if update_directory?
     end
 
     unless @user.save
@@ -65,6 +65,10 @@ module Sufia::UsersControllerBehavior
     redirect_to sufia.profile_path(@user.to_param), notice: "Your profile has been updated"
   end
 
+  def update_directory?
+    ['1', 'true'].include? params[:user][:update_directory]
+  end
+
   def toggle_trophy
      id = Sufia::Noid.namespaceize params[:file_id]
      unless current_user.can? :edit, id

data/app/helpers/generic_file_helper.rb

@@ -64,15 +64,6 @@ module GenericFileHelper
     end
   end
 
-  def more_or_less_button(key, html_class, symbol)
-    # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
-    content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
-      (symbol + content_tag('span', class: 'sr-only') do
-        "add another #{key.to_s}"
-      end).html_safe
-    end
-  end
-
   def download_image_tag title = nil
     if title.nil?
       image_tag "default.png", { alt: "No preview available", class: "img-responsive" }

data/app/helpers/sufia/records_helper_behavior.rb

@@ -1,12 +1,5 @@
 module Sufia
   module RecordsHelperBehavior
-    def add_field(key)
-      more_or_less_button(key, 'adder', '+')
-    end
-
-    def subtract_field(key)
-     more_or_less_button(key, 'remover', '-')
-    end
 
     def help_icon(key, content = nil, title = nil)
       content = content || metadata_help(key)
@@ -40,13 +33,6 @@ module Sufia
   
     private
 
-    def more_or_less_button(key, html_class, symbol)
-      icon = (symbol == "-") ? "remove" : "plus" 
-      content_tag "button", class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}" do
-        sr_hidden(icon) + sr_only(key.to_s)
-      end
-    end
-
     def sr_hidden icon
       content_tag "span", "aria-hidden" => true do 
         content_tag "i", "", class: "glyphicon glyphicon-#{icon}" 

data/app/inputs/multi_value_input.rb

@@ -0,0 +1,84 @@
+class MultiValueInput < SimpleForm::Inputs::CollectionInput
+
+  def input(wrapper_options)
+    @rendered_first_element = false
+    input_html_classes.unshift("string")
+    input_html_options[:name] ||= "#{object_name}[#{attribute_name}][]"
+
+    markup = <<-HTML
+        <ul class="listing">
+    HTML
+
+    collection.each_with_index do |value, i|
+      unless value.to_s.strip.blank?
+        markup << <<-HTML
+          <li class="field-wrapper">
+            #{build_field(value)}
+          </li>
+        HTML
+      end
+    end
+
+    markup << <<-HTML
+          <li class="field-wrapper">
+            #{build_field('')}
+          </li>
+        </ul>
+
+    HTML
+  end
+
+
+  private
+
+  def build_field(value)
+    select_opts = options[:collection]
+    options = build_options(value)
+
+    @rendered_first_element = true
+
+    type = options.delete(:type)
+    if type == 'textarea'.freeze
+      @builder.text_area(attribute_name, options)
+    elsif type == 'select'.freeze
+      selected = value.blank? ? :blank : value
+      opts = options.merge(selected: selected)
+      @builder.collection_select(attribute_name, select_opts, :last, :first, opts, opts)
+    else
+      @builder.text_field(attribute_name, options)
+    end
+  end
+
+  def build_options(value)
+    options  = input_html_options.dup
+
+    options[:value] = value
+    if @rendered_first_element
+      options[:id] = nil
+      options[:required] = nil
+    else
+      options[:id] ||= input_dom_id
+    end
+    options[:class] ||= []
+    options[:class] += ["#{ input_dom_id } form-control multi-text-field"]
+    options[:'aria-labelledby'] = label_id
+    return options
+  end
+
+
+  def label_id
+    input_dom_id + '_label'
+  end
+
+  def input_dom_id
+    input_html_options[:id] || "#{object_name}_#{attribute_name}"
+  end
+
+  def collection
+    @collection ||= Array(object.send(attribute_name))
+  end
+
+  def multiple?
+    true
+  end
+end

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

@@ -37,32 +37,20 @@
     <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">
-        <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
-        <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>
-      </div>
-      <div id="additional_tag_elements"></div>
+      <%= f.input :tag, label: false, as: :multi_value  %>
     </div>
 
     <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">
-        <%= f.text_field :creator, name: "generic_file[creator][]", value: "", required: true %>
-        <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>
-      </div>
-      <div id="additional_creator_elements"></div>
+      <%= f.input :creator, label: false, as: :multi_value  %>
     </div>
 
     <div class="batch-group">
       <%= f.label :rights, '<span class="required-field">*</span> Rights'.html_safe, class: "control-label" %>
       <%= help_icon_modal('rightsModal') %>
-      <div id="additional_rights_clone">
-        <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), required: true %>
-        <button class="adder btn" name="additional_rights" id="additional_rights_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_rights') %></span></button>
-        <%= render partial: "generic_files/rights_modal" %>
-      </div>
-      <div id="additional_rights_elements"></div>
+      <%= f.input :rights, label: false, as: :multi_value, collection: Sufia.config.cc_licenses, include_blank: true, input_html: { type: 'select', class: 'select optional form-control' } %>
+      <%= render partial: "generic_files/rights_modal" %>
     </div>
 
     <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>

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

@@ -10,7 +10,7 @@
   <%= 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.
 </p>
-<%= form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
+<%= simple_form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
 
   <%= render partial: 'metadata', formats: [:html], locals: {f: f} %>
 

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

@@ -19,24 +19,21 @@
           <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 class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
+                <%= get_label(term) %> <span class="chevron"></span>
               </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| %>
+            <div id="collapse_<%= term.to_s %>" class="collapse scrolly col-sm-6">
+                <%= simple_form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
                   <%= render partial: "generic_files/field_form", locals: { generic_file: @show_file, f: f, render_req: false, key: term } %>
                   <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>
+                    <a class="btn btn-default" 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>
                   </div>
                 <% end %>
-              </div>
             </div>
           </div>
         <% end %>
@@ -49,7 +46,6 @@
            <%= render partial: "generic_files/permission_form", locals: { gf: @show_file } %>
          <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 %>
@@ -59,4 +55,4 @@
 <!-- Ajax call to clear the batch before page uload. -->
 <%= button_to "Clear Batch", { controller: :batch_edits, action: :clear }, form_class: 'hidden', remote: true, id: 'clear_batch' %>
 
-</div><!-- descriptions_display -->
+</div><!-- descriptions_display -->

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

@@ -1,6 +1,6 @@
 <%# This mimics the generic_files/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| %>
+  <%= simple_form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
       <div class="well">

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

@@ -1,4 +1,4 @@
-<%= form_for [collections, @collection], html: {class: 'form-horizontal editor'} do |f| %>
+<%= simple_form_for [collections, @collection], 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">
@@ -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.button_button 'Create Collection', type: 'submit', 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.button_button 'Update Collection', type: 'submit', 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/generic_files/_descriptions.html.erb

@@ -2,18 +2,20 @@
 <% 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 generic_file, url: sufia.generic_file_path(@generic_file), html: { multipart: true } do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h1>Descriptions <span class="pull-right required-field">* indicates required fields</span></h1>
-      <div class="well">
 
-        <% (generic_file.terms_for_editing).each do |term| %>
-          <%= render partial: "records/edit_field", locals: { record: generic_file, f: f, render_req: true, key: term } %>
-        <% end %>
+    <div class="well">
+      <% (generic_file.terms_for_editing).each do |term| %>
+        <%= render partial: "records/edit_field", locals: { record: generic_file, f: f, render_req: true, key: term } %>
+      <% end %>
+    </div>
 
-      </div><!-- /well -->
     <div class="action-button">
-      <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
+      <%= f.button_button :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'.html_safe %>
+      <% end %>
     </div>
   <% end %>
 </div>

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

@@ -1,6 +1,11 @@
-<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
+<% render_req ||= true # render_req is true for single file edit, false for batch edit %>
+
+<% record = generic_file %>
+
 <div class="batch-group">
-  <% vals = generic_file[key] %>
+  <% required = render_req && record.required?(key) %>
+  <% single = f.object.class.unique?(key) %>
+
   <% if render_req && required?(key) %>
     <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
     <%= f.label key, tmp.html_safe  %>
@@ -8,12 +13,22 @@
     <%= f.label key, get_label(key) %>
   <% end %>
   <%= help_icon(key) %>
-  <% if key == :resource_type %>
-    <%# resource_type is a multiselect box, so don't render one row for each %>
-    <%= render_edit_field_partial(key, record: generic_file, f: f, render_req: render_req) %>
+
+  <% if partial_exists?("generic_files/edit_fields/_#{key}") ||
+        partial_exists?("records/edit_fields/_#{key}") %>
+    <%= render_edit_field_partial(key, f: f, record: record, required: required, label_for_field: false, single: single) %>
   <% else %>
-    <% vals.to_ary.each_with_index do |v, index| %>
-      <%= render_edit_field_partial(key, record: generic_file, f: f,  v: v, index: index, render_req: render_req) %>
+    <% opts = { label: false, required: required } %>
+
+    <% if single %>
+      <% opts = opts.merge(input_html: { class: 'listing' }) %>
+      <div class='single_value'>
+        <%= f.input key, opts %>
+      </div>
+    <% else %>
+      <% opts = opts.merge(as: :multi_value) %>
+      <%= f.input key, opts %>
     <% end %>
+
   <% end %>
- </div><!-- /.batch-group -->
+</div>

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

@@ -10,7 +10,6 @@
     <%= render partial: 'media_display' %>
   </div>
   <div class="col-xs-12 col-sm-8">
-    <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path(@generic_file) %>
     <ul class="nav nav-tabs">
       <li id="edit_descriptions_link" class="active">
         <a href="#descriptions_display" data-toggle="tab"><i class="glyphicon glyphicon-tags"></i> Descriptions</a>

data/app/views/records/_edit_field.html.erb

@@ -1,22 +1,24 @@
-<%# Overriding hydra-editor so that we can replace the call to 'render_edit_field_partial'
-  # With render_edit_field_partial_with_action because there is also a 
-  # 'render_edit_field_partial' in sufia that uses 'generic_file' as the action. %>
-<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
+<% render_req ||= true # render_req is true for single file edit, false for batch edit %>
+
 <div class="form-group">
-  <% vals = record[key] %>
-  <% if render_req && record.required?(key) %>
-    <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
-    <%= f.label key, tmp.html_safe  %>
-  <% else %>
-    <%= f.label key, get_label(key) %>
-  <% end %>
+  <% required = render_req && record.required?(key) %>
+  <% lbl = get_label(key) %>
+  <% single = f.object.class.unique?(key) %>
 
-  <% if key == :resource_type %>
-    <%# resource_type is a multiselect box, so don't render one row for each %>
-    <%= render_edit_field_partial(key, record: record, f: f, render_req: render_req) %>
+  <% if partial_exists?("records/edit_fields/_#{key}") %>
+    <%= render_edit_field_partial(key, f: f, record: record, required: required, label_for_field: lbl, single: single) %>
   <% else %>
-    <% vals.to_ary.each_with_index do |v, index| %>
-      <%= render_edit_field_partial(key, record: record, f: f,  v: v, index: index, render_req: render_req) %>
+    <% opts = { label: lbl, required: required } %>
+
+    <% if single %>
+      <% opts = opts.merge(input_html: { class: 'listing' }) %>
+      <div class='single_value'>
+        <%= f.input key, opts %>
+      </div>
+    <% else %>
+      <% opts = opts.merge(as: :multi_value) %>
+      <%= f.input key, opts %>
     <% end %>
+
   <% end %>
-</div><!-- /.form-group -->
+</div>

data/app/views/records/_rights_modal.html.erb

@@ -0,0 +1 @@
+<%= render partial: "generic_files/rights_modal" %>

data/app/views/records/edit_fields/_default.html.erb

@@ -1,6 +1,12 @@
-      <div <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <% required = render_req && (index == 0) && record.required?(key) %>
-        <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "input-large", required: required  %>
-        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key) } %>
-      </div>
-      <div id="additional_<%= key %>_elements"></div>
+<div>
+  <% required = render_req && record.required?(key) %>
+  <% lbl = get_label(key) %>
+  <% single = f.object.class.unique?(key) %>
+
+  <% opts = { label: lbl, required: required } %>
+  <% opts = opts.merge(as: :multi_value) unless single %>
+
+  <%= f.input key, opts %>
+
+  <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key) } %>
+</div>

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

@@ -1,6 +1,3 @@
-      <div  <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <% required = render_req && (index == 0) && f.object.required?(key) %>
-        <%= f.text_area :description, name:"#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "input-large", required: required %>
-        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key)} %>
-      </div>
-      <div id="additional_<%= key %>_elements"></div>
+<% render_req ||= false %>
+<% required = render_req && record.required?(key) %>
+<%= f.input key, label: label_for_field, as: :multi_value, required: required, input_html: { rows: '5', type: 'textarea'} %>