sufia 6.0.0.beta1 → 6.0.0.rc1

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

@@ -17,12 +17,8 @@
 
 <div class="well">
 
-  <!-- Visibility -->
-  <% visibility_text = capture do %>
-    <%= render partial: 'generic_files/visibility' %>
-  <% end %>
   <h3>Visibility - <small>who should have the ability to read and download</small>
-    <span id="visibility_tooltip" class="h5"><%= help_icon('visibility', visibility_text) %></span>
+    <span id="visibility_tooltip" class="h5"><%= visibility_help %></span>
   </h3>
   <div class="radio">
     <label>
@@ -37,24 +33,19 @@
   </div>
 
   <!-- Share With -->
-  <% share_with_text = capture do %>
-    <%= render partial: 'generic_files/share_with' %>
-  <% end %>
   <div class="row">
     <h3 class="col-sm-12">Share With <small>(optional)</small>
-      <span id="share_with_tooltip" class="h5"><%= help_icon('share_with', share_with_text) %></span>
+      <span id="share_with_tooltip" class="h5"><%= share_with_help %></span>
     </h3>
   </div>
 
-  <div class="form-group">
+  <div class="form-group row">
     <div id="new-user">
       <p class="col-sm-12">Enter <%=t('sufia.account_label') %> (one at a time)</p>
-      <p class="sr-only">Use the add button to give access to one <%=t('sufia.account_label') %> at a time (it will be added to the list below).</p>
+      <p class="sr-only">Use the add button to give access to one <%=t('sufia.account_label') %> at a time (it will be added to the list below).  Select the user, by name or <%=t('sufia.account_label') %>. Then select the access level you wish to grant and click on Add this <%= t('sufia.account_label') %> to complete adding the permission.</p>
       <div class="col-sm-5">
-        <div class="input-group">
-          <label for="new_user_name_skel" class="sr-only"><%= t('sufia.account_label') %> (without the <%= t('sufia.directory.suffix') %> part)</label>
-          <%= text_field_tag 'new_user_name_skel', nil, class: "form-control" %><span class="input-group-addon"><%=t('sufia.directory.suffix') %></span>
-        </div>
+        <label for="new_user_name_skel" class="sr-only"><%= t('sufia.account_label') %> (without the <%= t('sufia.directory.suffix') %> part)</label>
+        <%= text_field_tag 'new_user_name_skel', nil %>
       </div>
       <div class="col-sm-4">
         <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
@@ -70,7 +61,7 @@
     </div>
   </div>
 
-  <div class="form-group">
+  <div class="form-group row">
     <div id="new-group" >
       <p class="sr-only">Use the add button to give access to one group at a time (it will be added to the list below).</p>
       <div class="col-sm-5">
@@ -111,7 +102,7 @@
     <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
     <tr>
       <td><%= permission_fields.label :agent_name, class: "control-label" do %>
-        <%= permission_fields.object.agent_name %>
+        <%= user_display_name_and_key(permission_fields.object.agent_name) %>
       <% end %></td>
       <td>
         <div class="col-sm-8">

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

@@ -1,12 +1,11 @@
-<% generic_file ||= @generic_file %>
 
 <h2 class="non lower">Descriptions</h2>
 <table class="table table-striped"><!-- class="verticalheadings"> -->
   <tbody>
-  <% (generic_file.terms_for_display).each do |term| %>
+  <% present_terms(@presenter) do |r, term| %>
       <tr>
-        <th><%= get_label(term) %></th>
-        <td><%= render_show_field_partial_with_action("records", term, {record: generic_file}) %></td>
+        <th><%= r.label(term) %></th>
+        <td><%= r.value(term) %></td>
       </tr>
   <% end %>
   </tbody>

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>
@@ -23,7 +22,7 @@
       </li>
     </ul>
     <div class="tab-content">
-      <%= render "descriptions",  generic_file: @generic_file %>
+      <%= render "descriptions", form: @form %>
       <%= render "permission", generic_file: @generic_file %>
       <%= render "versioning", generic_file: @generic_file  %>
     </div>

data/app/views/generic_files/jq_upload.json.jbuilder

@@ -0,0 +1,8 @@
+json.array! [@generic_file] do |generic_file|
+  json.name generic_file.title.first
+  json.size generic_file.file_size.first
+  json.url  "/files/#{generic_file.noid}"
+  json.thumbnail_url generic_file.id
+  json.delete_url "deleteme"
+  json.delete_type "DELETE"
+end

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

@@ -1,10 +1,5 @@
-      <div <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %> class="input-group">
-        <% required = render_req && (index == 0) && record.required?(key) %>
-        <% if f.object.class.multiple?(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: "form-control", required: required  %>
-        <% else %>
-          <%= 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: "form-control", required: required  %>
-        <% end %>
-        <%= render "records/edit_fields/suffix", key: key, index: index, single: f.object.class.unique?(key) %>
-      </div>
-      <div id="additional_<%= key %>_elements"></div>
+<% if f.object.class.multiple? key %>
+  <%= f.input key, as: :multi_value_with_help, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
+<% else %>
+  <%= f.input key, required: f.object.required?(key) %>
+<% end %>

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

@@ -1,10 +1,5 @@
-      <div <% if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <% required = render_req && (index == 0) && f.object.required?(key) %>
-        <% if f.object.class.multiple?(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: "form-control", required: required %>
-        <% else %>
-          <%= 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: "form-control", required: required  %>
-        <% end %>
-        <%= render "records/edit_fields/suffix", key: key, index: index, single: f.object.class.unique?(key) %>
-      </div>
-      <div id="additional_<%= key %>_elements"></div>
+<% if f.object.class.multiple? key %>
+  <%= f.input :description, as: :multi_value_with_help, input_html: { rows: '14', type: 'textarea'}, required: false %>
+<% else %>
+  <%= f.input :description, as: :text, input_html: { rows: '14' } %>
+<% end %>

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

@@ -1,5 +1,2 @@
-<%# convert class variable to a local variable if the local hasn't been set %>
-<div>
-  <%= f.select :resource_type, Sufia.config.resource_types.keys, {}, { multiple: true, size: 7, class: 'form-control' } %>
-  <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
-</div>
+<%= f.input :resource_type, as: :select_with_help, collection: Sufia.config.resource_types,
+    input_html: { class: 'form-control', multiple: true, required: true } %>

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

@@ -1,9 +1,3 @@
-      <div <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %> class="input-group">
-        <% if f.object.class.multiple?(key) %>
-          <%= select_tag "rights", options_for_select(Sufia.config.cc_licenses, v), name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", class: 'form-control' %>
-        <% else %>
-          <%= f.select :rights, Sufia.config.cc_licenses, class: 'form-control' %>
-        <% end %>
-        <%= render "records/edit_fields/suffix", key: key, index: index %>
-      </div>
-      <div id="additional_<%= key %>_elements"></div>
+<%= f.input :rights, as: :select, collection: Sufia.config.cc_licenses,
+    input_html: { class: 'form-control', multiple: true }
+  %>

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

@@ -7,21 +7,15 @@
   <h2> Descriptions:</h2>
 
   <div class="well active" id="descriptions_display">
-      <table class="table table-striped"><!-- class="verticalheadings"> -->
+    <table class="table table-striped">
       <tbody>
-      <% @terms.each do |term| %>
-        <% vals = Array(@asset.send(term)) %>
-            <tr id='row_<%=term.to_s%>' class="expandable">
-              <th width="20%">
-                <%=get_label(term)%>
-              </th>
-              <td>
-                <% vals.each do |val| %>
-                  <%= val %><br />
-                <% end %>
-              </td>
-            </tr>
-       <% end %>
-        </tbody></table> <!-- class="verticalheadings"> -->
-    </div><!-- /well -->
+      <% present_terms(@presenter) do |r, term| %>
+          <tr id='row_<%= term %>' class="expandable">
+            <th width="20%"><%= r.label(term) %></th>
+            <td><%= r.value(term) %></td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div><!-- /well -->
 </div>

data/app/views/users/_profile.html.erb

@@ -1,7 +1,6 @@
         <div class="tab-pane" id="profile">
           <h2>User Info</h2>
-             <dl id="user_info"> 
-                <%= render partial: 'social_media_info', locals: {user: @user} %>
+             <dl id="user_info">
                 <%= render partial: 'user_info', locals: {user: @user} %>
              </dl>
         </div>

data/app/views/users/_user_info.html.erb

@@ -1,14 +1,31 @@
 <dl id="user_info" class="row">
+
+<% if user.orcid.present? %>
+  <dt class="col-xs-5"><%= orcid_label('orcid') %></dt>
+  <dd class="col-xs-7"><%= link_to user.orcid, user.orcid, { target: '_blank' } %></dd>
+<% end %>
+
+<% if user.facebook_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-facebook"></i> Facebook Handle</dt>
   <dd class="col-xs-7"><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
+<% end %>
 
+<% if user.twitter_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-twitter"></i> Twitter Handle</dt>
   <dd class="col-xs-7"><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
- 
+<% end %>
+
+<% if user.googleplus_handle.present? %>
   <dt class="col-xs-5"><i class="fa fa-google-plus"></i> Google+ Handle</dt>
   <dd class="col-xs-7"><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
- 
-  <dt class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>
+<% end %>
+
+<% if user.linkedin_handle.present? %>
+  <dt class="col-xs-5"><i class="fa fa-linkedin"></i> LinkedIn</dt>
+  <dd class="col-xs-7"><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", { target: '_blank' } %></dd>
+<% end %>
+
+  <dt class="col-xs-5"><i class="fa fa-envelope"></i> Email</dt>
   <dd class="col-xs-7"><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>

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

@@ -1,5 +1,5 @@
 <h1>Edit Profile</h1>
-<div class="col-xs-12 col-sm-5">
+<div class="col-xs-12 col-sm-5 profile">
   <div class="well">
   <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
     <div class="form-group">
@@ -29,6 +29,15 @@
       </div>
     </div>
 
+    <div class="form-group">
+      <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
+        <%= orcid_label %>
+      <% end %>
+      <div class="col-xs-8">
+         <%= f.text_field :orcid, class: "form-control" %>
+      </div>
+    </div><!-- .form-group -->
+
     <div class="form-group">
       <%= f.label :twitter_handle, '<i class="fa fa-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
@@ -60,7 +69,7 @@
   </div>
 </div><!-- .col-xs-5 /well-->
 
-<div class="col-xs-12 col-sm-offset-1 col-sm-6 well">
+<div class="col-xs-12 col-sm-offset-1 col-sm-6 well profile">
   <h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', class: 'btn btn-mini btn-primary' %></h3>
   <%= render partial: 'user_info', locals: {user: @user} %>
 

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

@@ -1,7 +1,7 @@
 <%= javascript_tag do %>
 <% end %>
 
-<div class="col-xs-12">
+<div class="col-xs-12 profile">
   <div class="pull-right">
     <%= render 'profile_actions' %>
   </div>

data/config/locales/sufia.en.yml

@@ -47,11 +47,6 @@ en:
         tab_label: "Network/Server Location"
       processing: "File is being processed; you may edit when processing has completed"
     field_label:
-      based_near:       "Location"
-      description:      "Abstract or Summary"
-      tag:              "Keyword"
-      date_created:     "Date Created"
-      related_url:      "Related URL"
       total_items:      "Total Items"
       size:             "Size"
     homepage:
@@ -119,27 +114,6 @@ en:
           tag: "could not be updated. You do not have sufficient privileges to edit them."
         title:  "Files failed"
         subject: "Batch upload permission denied"
-    metadata_help:
-      resource_type: "Pre-defined categories to describe the type of file content being uploaded, such as \"article\" or \"dataset.\"  More than one type may be selected."
-      title: "A name for the file to aid in identifying it. Defaults to the file name, though a more descriptive title is encouraged. <em>This is a required field</em>."
-      tag: "Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>."
-      subject: "Headings or index terms describing what the file is about; these <em>do</em> need to conform to an existing vocabulary. Currently supports Library of Congress Subject Headings."
-      creator: "The person or group responsible for the file being uploaded. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. \"Smith, John.\" <em>This is a required field</em>."
-      related_url: "A link to a website or other specific content (audio, video, PDF document) related to the file. An example is the URL of a research project from which the file was derived."
-      based_near: "A place name related to the file, such as its site of publication, or the city, state, or country the file's contents are about. Calls upon the GeoNames web service (<a href=\"http://www.geonames.org\">http://www.geonames.org</a>)."
-      contributor: "A person or group you want to recognize for playing a role in the creation of the file, but not the primary role. If there is a specific role you would like noted, include it in parentheses, e.g. \"Jones, Mary (advisor).\""
-      date_created: "The date on which the file was generated. Dates are accepted in the form YYYY-MM-DD, e.g. 1776-07-04."
-      description: "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs."
-      identifier: "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
-      language: "The language of the file content."
-      publisher: "The person or group making the file available. Generally this is the institution."
-      rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
-    aria_label:
-      default: "Usage information for %{title}"
-      based_near: "Usage information for location"
-      description: "Usage information for abstract or summary"
-      tag: "Usage information for keyword"
-      rightsModal: "Usage information for rights"
     background_attribution: "Background image courtesy of Penn State University"
     bread_crumb:
       search_results: "Back to search results"
@@ -149,6 +123,9 @@ en:
     user_profile:
       no_followers: "No one is following you."
       no_following: "You are not following anyone."
+      orcid:
+        alt: "ORCID icon"
+        label: "ORCID Profile"
     batch:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
@@ -171,3 +148,46 @@ en:
       subject:  'Subject'
       message:  'Message'
       delete:   'Delete Message'
+    generic_file:
+      browse_view: "Browse View"
+
+  simple_form:
+    labels:
+      generic_file:
+        based_near:       "Location"
+        description:      "Abstract or Summary"
+        tag:              "Keyword"
+        date_created:     "Date Created"
+        related_url:      "Related URL"
+      collection:
+        based_near:       "Location"
+        description:      "Abstract or Summary"
+        tag:              "Keyword"
+        date_created:     "Date Created"
+        related_url:      "Related URL"
+
+    metadata_help:
+      generic_file:
+        resource_type_html: "Pre-defined categories to describe the type of file content being uploaded, such as &quot;article&quot; or &quot;dataset.&quot;  More than one type may be selected."
+        title: "A name for the file to aid in identifying it. Defaults to the file name, though a more descriptive title is encouraged. &lt;em&gt;This is a required field&lt;/em&gt;."
+        tag: "Words or phrases you select to describe what the file is about. These are used to search for content. &lt;em&gt;This is a required field&lt;/em&gt;."
+        subject: "Headings or index terms describing what the file is about; these &lt;em&gt;do&lt;/em&gt; need to conform to an existing vocabulary. Currently supports Library of Congress Subject Headings."
+        creator_html: "The person or group responsible for the file being uploaded. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. &quot;Smith, John.&quot; &lt;em&gt;This is a required field&lt;/em&gt;."
+        related_url: "A link to a website or other specific content (audio, video, PDF document) related to the file. An example is the URL of a research project from which the file was derived."
+        based_near_html: "A place name related to the file, such as its site of publication, or the city, state, or country the file's contents are about. Calls upon the GeoNames web service (&lt;a href=&quot;http://www.geonames.org&quot;&gt;http://www.geonames.org&lt;/a&gt;)."
+        contributor_html: "A person or group you want to recognize for playing a role in the creation of the file, but not the primary role. If there is a specific role you would like noted, include it in parentheses, e.g. &quot;Jones, Mary (advisor).&quot;"
+        date_created: "The date on which the file was generated. Dates are accepted in the form YYYY-MM-DD, e.g. 1776-07-04."
+        description: "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs."
+        identifier: "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
+        language: "The language of the file content."
+        publisher: "The person or group making the file available. Generally this is the institution."
+        rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. &lt;em&gt;This is a required field&lt;/em&gt;."
+
+    aria_label:
+      generic_file:
+        default: "Usage information for %{title}"
+        based_near: "Usage information for location"
+        description: "Usage information for abstract or summary"
+        tag: "Usage information for keyword"
+        rights: "Usage information for rights"
+

data/config/routes.rb

@@ -99,7 +99,7 @@ Sufia::Engine.routes.draw do
 
   # Batch edit routes
   get 'batches/:id/edit' => 'batch#edit', as: :batch_edit
-  post 'batches/:id' => 'batch#update', as: :batch_generic_file
+  post 'batches/:id' => 'batch#update', as: :batch_generic_files
 
   # Contact form routes
   post 'contact' => 'contact_form#create', as: :contact_form_index

data/lib/generators/sufia/install_generator.rb

@@ -23,6 +23,10 @@ module Sufia
       generate "sufia:models:install"
     end
 
+    def banner
+      say_status("warning", "GENERATING SUFIA", :yellow)
+    end
+
     def insert_abilities
       insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
         "\n  include Sufia::Ability\n"

data/lib/sufia.rb

@@ -17,6 +17,10 @@ require 'tinymce-rails-imageupload'
 module Sufia
   extend ActiveSupport::Autoload
 
+  eager_autoload do
+    autoload :FormBuilder
+  end
+
   class Engine < ::Rails::Engine
     engine_name 'sufia'
 

data/lib/sufia/form_builder.rb

@@ -0,0 +1,16 @@
+module Sufia
+  class FormBuilder < SimpleForm::FormBuilder
+    def input_label(attribute_name, options = {})
+      options = options.dup
+      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
+      options = @defaults.deep_dup.deep_merge(options) if @defaults
+
+      input      = find_input(attribute_name, options)
+      wrapper    = find_wrapper(input.input_type, options)
+      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS) + [:input]
+      components = components.map { |component| SimpleForm::Wrappers::Leaf.new(component) }
+
+      input.label.html_safe
+    end
+  end
+end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.0.0.beta1"
+  VERSION = "6.0.0.rc1"
 end

data/spec/actors/generic_file/actor_spec.rb

@@ -73,8 +73,7 @@ describe Sufia::GenericFile::Actor do
 
     it "should be removed if document is not public" do
       # Switch document from public to restricted
-      attributes = {'permissions'=>{'group' =>{'public' => '1', 'registered'=>'2'}}}
-      expect { actor.update_metadata(attributes, 'restricted') }.to change { FeaturedWork.count }.by(-1)
+      expect { actor.update_metadata({}, 'restricted') }.to change { FeaturedWork.count }.by(-1)
     end
   end