sufia 5.0.0 → 6.0.0.beta1

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

@@ -12,7 +12,7 @@
             <%= t("sufia.collection.select_form.select_heading") %>
             <div class="collection-list">
               <ul>
-                <% user_collections.sort! { |c1,c2| c1['desc_metadata__date_modified_dtsi'] <=> c2['desc_metadata__date_modified_dtsi'] }  %>
+                <% user_collections.sort! { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }  %>
                 <% user_collections.each do |collection| %>
                   <li> <label for="<%= collection.id %>" class="sr-only">Add to <%=collection.title%></label>
                     <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %>

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

@@ -14,11 +14,13 @@
       <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid),
                   class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
     </li>
-    <li>
-      <%= display_trophy_link(@user, noid) do |text| %>
-        <i class='glyphicon glyphicon-star'></i> <%= text %>
-      <% end %>
-    </li>
+    <% if current_user %> 
+      <li>
+        <%= display_trophy_link(current_user, noid) do |text| %>
+          <i class='glyphicon glyphicon-star'></i> <%= text %>
+        <% end %>
+      </li>
+    <% end %>
   </ul>
 </div>
 

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

@@ -1,11 +1,11 @@
 <% noid = document.noid %>
 <tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
-  <% gf = GenericFile.load_instance_from_solr(document.id) %>
+  <% gf = document.to_model%>
   <td>&nbsp;
     <%# This block is for adding/removing the magic wand while batch updates are processing %>
     <% if gf.processing? %>
       <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.noid %>"/>
-    <% elsif gf.depositor != @user.user_key %>
+    <% elsif current_user and gf.depositor != current_user.user_key %>
       <i class="glyphicon glyphicon-share-alt"/>
     <% end %>
   </td>

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

@@ -1,6 +1,5 @@
 <% @page_title = "Edit Collection #{display_title(@collection)} - #{application_name}" %>
 <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
-
 <h1>Edit Collection: <%= display_title(@collection) %></h1>
 
 <% unless has_collection_search_parameters? %>

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

@@ -0,0 +1,4 @@
+<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 %>
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+  <%= 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: record.required?(key)  %>
+</div>

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

@@ -34,7 +34,6 @@
   <%= render partial: 'search_form'%>
 </div>
 
-<% @user ||= current_user %>
 <%= render_document_index @member_docs %>
 
 <%= render partial: 'paginate' %>

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

@@ -8,9 +8,9 @@
 
       <td>
         <%= t("sufia.dashboard.stats.files") %>
-        <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>
+          <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>
       </td>
     </tr>

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

@@ -2,19 +2,19 @@
 <% generic_file ||= @generic_file %>
 
 <div id="descriptions_display" class="tab-pane active">
-  <%= simple_form_for generic_file, url: sufia.generic_file_path(@generic_file), html: { multipart: true } do |f| %>
+  <%= 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">
 
-    <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>
+        <% (generic_file.terms_for_editing).each do |term| %>
+          <%= render "records/edit_field", record: generic_file, f: f, render_req: true, key: term %>
+        <% end %>
 
-    <div class="action-button">
-      <%= 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 %>
+      </div><!-- /well -->
+    <div>
+      <%= f.button type: '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>
   <% end %>

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

@@ -1,34 +1,20 @@
-<% render_req ||= true # render_req is true for single file edit, false for batch edit %>
-
-<% record = generic_file %>
-
+<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
 <div class="batch-group">
-  <% required = render_req && record.required?(key) %>
-  <% single = f.object.class.unique?(key) %>
-
+  <% vals = f.object[key] %>
   <% if render_req && required?(key) %>
-    <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
-    <%= f.label key, tmp.html_safe  %>
+    <%= f.label key do %>
+      <span class="required-field">*</span><%= get_label(key) %>
+    <% end %>
   <% else %>
     <%= f.label key, get_label(key) %>
   <% end %>
   <%= help_icon(key) %>
-
-  <% 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) %>
+  <% if key == :resource_type %>
+    <%# resource_type is a multiselect box, so don't render one row for each %>
+    <%= render_edit_field_partial(key, record: f.object, f: f, render_req: render_req) %>
   <% else %>
-    <% 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 %>
+    <% vals.to_ary.each_with_index do |v, index| %>
+      <%= render_edit_field_partial(key, record: f.object, f: f,  v: v, index: index, render_req: render_req) %>
     <% end %>
-
   <% end %>
-</div>
+ </div><!-- /.batch-group -->

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

@@ -1,9 +1,11 @@
   <div id="permissions_display" class="tab-pane">
-    <%= form_for @generic_file, url: sufia.generic_file_path(@generic_file), html: {multipart: true, class: 'form-horizontal', id: 'permission'} do |f| %>
+    <%= form_for generic_file, url: sufia.generic_file_path(generic_file), html: {multipart: true, class: 'form-horizontal', id: 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
-      <%= render partial: "generic_files/permission_form", locals: { gf: @generic_file, f: f } %>
-      <div class="action-button" id="permissions_submit">
-        <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
+      <%= render "generic_files/permission_form", f: f %>
+      <div class="row" id="permissions_submit">
+        <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
+          <i class="glyphicon glyphicon-floppy-disk"></i> Save
+        <% end %>
       </div>
   <% end %>
 </div><!-- /#permissions_display -->

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

@@ -1,11 +1,7 @@
-<% depositor = gf.depositor || batch.generic_files.first.depositor %>
-<% public_perm = gf.permissions.map { |perm| perm[:access] if perm[:name] == "public"}.compact.first %>
+<% depositor = f.object.depositor || batch.generic_files.first.depositor %>
+<% public_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "public"}.compact.first %>
 <% public_perm = true if params[:controller] == 'batch' %>
-<% registered_perm = gf.permissions.map { |perm| perm[:access] if perm[:name] == "registered"}.compact.first %>
-
-
-<input type="hidden" name="generic_file[permissions][group][public]" value="1" />
-<input type="hidden" name="generic_file[permissions][group][registered]" value="2" />
+<% registered_perm = f.object.permissions.map { |perm| perm.access if perm.agent_name == "registered"}.compact.first %>
 
 <h2><% if params[:controller] == 'batch' %>Bulk <% end %>Permissions <% if params[:controller] == 'batch' %>
       <small>(applied to all files just uploaded)</small><% end %>
@@ -53,10 +49,12 @@
   <div class="form-group">
     <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).  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>
+      <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>
       <div class="col-sm-5">
-        <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 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>
       </div>
       <div class="col-sm-4">
         <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
@@ -101,23 +99,23 @@
   <tr id="file_permissions">
     <td>
       <%= label_tag :owner_access, class: "control-label" do %>
-        Depositor (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>) 
+        Depositor (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
       <% end %>
     </td>
     <td>
       <%= Sufia.config.owner_permission_levels.keys[0] %>
     </td>
   </tr>
-  <% gf.permissions.each do |permission| %>
+  <%= f.fields_for :permissions do |permission_fields| %>
     <%# skip the public, penn state (aka registered), and depositor perms as they are displayed first at the top %>
-    <% next if permission[:name].downcase == 'public' %>
-    <% next if permission[:name].downcase == 'registered' %>
-    <% next if permission[:name].downcase == depositor %>
+    <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
     <tr>
-      <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", user_display_name_and_key(permission[:name]), class: "control-label" %></td>
+      <td><%= permission_fields.label :agent_name, class: "control-label" do %>
+        <%= permission_fields.object.agent_name %>
+      <% end %></td>
       <td>
         <div class="col-sm-8">
-          <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia.config.permission_levels, permission[:access]), class: 'form-control select_perm' %>
+          <%= permission_fields.select :access, Sufia.config.permission_levels, {}, class: 'form-control select_perm' %>
         </div>
         <button class="btn close remove_perm">X</button>
       </td>

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

@@ -19,17 +19,7 @@
         </tr>
         <tr>
           <th>Audit Status</th>
-          <%- stat = @generic_file.audit_stat(false)
-              audit = case stat
-                      when 0
-                        'failing'
-                      when 1
-                        'passing'
-                      else
-                        stat
-                      end
-           -%>
-          <td><%= audit %></td>
+          <td><%= @audit_status %></td>
         </tr>
 <% unless @generic_file.related_files.empty? %>
         <tr>

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

@@ -1,7 +1,7 @@
 <div id="versioning_display" class="tab-pane">
   <h2>Versions</h2>
   <div class="well">
-    <%= form_for @generic_file, url: sufia.generic_file_path(@generic_file), html: {multipart: true, class: 'form-horizontal'} do |f| %>
+    <%= form_for [sufia, @generic_file], html: { multipart: true } do |f| %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>
         <div class="form-group">
@@ -14,14 +14,14 @@
           </div>
         </div>
     <hr />
+
     <h3>Restore Previous Version</h3>
-    <% @generic_file.content.versions.each_with_index do |version, index| %>
+    <% @version_list.each do |version| %>
       <div class="form-group">
         <div class="col-xs-12">
           <label class="radio">
-            <%= radio_button_tag(:revision, version.versionID, index == 0) %>
-          <%# label_tag("revision_#{version.versionID}".to_sym, "Restore from #{version.dsCreated.localtime.to_formatted_s(:long_ordinal)} [by #{@generic_file.content.version_committer(version)}]") %>
-          Restore from <%= version.dsCreateDate.localtime.to_formatted_s(:long_ordinal) %> [by <%= @generic_file.content.version_committer(version) %>]
+            <%= radio_button_tag(:revision, version.label, version.current?) %>
+            Restore from <%= version.created %> [by <%= version.committer %>]
           </label>
         </div>
       </div>

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

@@ -10,6 +10,7 @@
     <%= 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>
@@ -22,9 +23,9 @@
       </li>
     </ul>
     <div class="tab-content">
-      <%= render partial: "descriptions", locals: { generic_file: @generic_file } %>
-      <%= render partial: "permission", locals: { gf: @generic_file} %>
-      <%= render partial: "versioning", locals: { generic_file: @generic_file } %>
+      <%= render "descriptions",  generic_file: @generic_file %>
+      <%= render "permission", generic_file: @generic_file %>
+      <%= render "versioning", generic_file: @generic_file  %>
     </div>
-  </div> <!-- /.col-sm-9 -->
+  </div> <!-- /.col-sm-8 -->
 </div><!-- /.row -->

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

@@ -45,15 +45,15 @@
 <div class="container-fluid">
 <div class="row">
   <div class="col-xs-12 col-sm-4">
-    <%= render partial: 'generic_files/media_display' %>
-    <%= render partial: 'show_actions' %>
-    <%= render partial: 'show_collections' %>
+    <%= render 'generic_files/media_display' %>
+    <%= render 'show_actions' %>
+    <%= render 'show_collections' %>
   </div>
   <div itemscope itemtype="<%= @generic_file.itemtype %>" class="col-xs-12 col-sm-8">
     <h1 class="visibility"><%= @generic_file %> <%= render_visibility_badge %></h1>
-    <%= render partial: 'show_descriptions' %>
-    <%= render partial: 'show_details' %>
-    <%= render partial: 'users/activity_log', locals: {events: @events} %>
+    <%= render 'show_descriptions' %>
+    <%= render 'show_details' %>
+    <%= render 'users/activity_log', events: @events %>
   </div><!-- /columns second -->
 </div> <!-- /.row -->
 </div><!-- /.container-fluid -->

data/app/views/homepage/_featured_fields.html.erb

@@ -12,9 +12,9 @@
 </div>
 <div> 
   <span class="sr-only">File type</span>
-  <%= link_to_facet_list(featured.resource_type, 'desc_metadata__resource_type', 'no resource specified') %>
+  <%= link_to_facet_list(featured.resource_type, 'resource_type', 'no resource specified') %>
 </div>
 <div> 
   <span class="sr-only">Keywords</span>
-  <%= link_to_facet_list(featured.tags, 'desc_metadata__tag', 'no keywords specified') %>
+  <%= link_to_facet_list(featured.tags, 'tag', 'no keywords specified') %>
 </div>

data/app/views/homepage/_recent_document.html.erb

@@ -23,7 +23,7 @@
         <p>
           <span class="sr-only">Filename</span><%= link_to truncate(recent_document.label, length: 25),
               sufia.generic_file_path(recent_document.noid), title: recent_document.label %><br />
-          <span class="sr-only">Keywords</span><%= link_to_facet_list(recent_document.tags, 'desc_metadata__tag', 'no keywords specified').html_safe %>
+          <span class="sr-only">Keywords</span><%= link_to_facet_list(recent_document.tags, 'tag', 'no keywords specified').html_safe %>
         </p>
       </td>
     </tr>

data/app/views/layouts/_head_tag_content.html.erb

@@ -14,11 +14,9 @@
 
 <!-- application css -->
 <%= stylesheet_link_tag 'application' %>
-<%= yield(:css_head) %>
 
 <!-- application js -->
 <%= javascript_include_tag 'application' %>
-<%= yield(:js_head) %>
 
 <!-- Google Analytics -->
 <%= render partial: '/ga', formats: [:html] %>

data/app/views/layouts/error.html.erb

@@ -6,7 +6,6 @@
     <title><%= h(application_name) %>: System Error</title>
     <!-- application css -->
     <%= stylesheet_link_tag 'application' %>
-    <%= yield(:css_head) %>
 
     <!-- application js -->
     <%= javascript_include_tag 'application' %>

data/app/views/my/_index_partials/_default_group.html.erb

@@ -5,7 +5,7 @@
   <tr>
     <th><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th>Title</th>
-    <th class="sorts-dash"><i id="desc_metadata__date_uploaded_dtsi" class="<%=params[:sort]== "desc_metadata__date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "desc_metadata__date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
+    <th class="sorts-dash"><i id="date_uploaded_dtsi" class="<%=params[:sort]== "date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
     <th>Visibility</th>
     <th>Action</th>
   </tr>

data/app/views/my/_index_partials/_list_files.html.erb

@@ -1,6 +1,6 @@
 <% noid = document.noid %>
 <tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
-  <% gf = GenericFile.load_instance_from_solr(document.id) %>
+  <% gf = document.to_model %>
   <td>
     <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("sufia.dashboard.my.sr.batch_checkbox")%></label>
     <%= batch_edit_select(document) %>&nbsp;

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

@@ -1,7 +1,7 @@
 <% current_tab = @selected_tab.to_s %>
 <% content_for :head do %>
-    <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
-    <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
+  <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
+  <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
 <% end %>
 
 <%= javascript_tag do %>

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

@@ -1,24 +1,22 @@
-<% render_req ||= true # render_req is true for single file edit, false for batch edit %>
-
+<%# 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%>
 <div class="form-group">
-  <% required = render_req && record.required?(key) %>
-  <% lbl = get_label(key) %>
-  <% single = f.object.class.unique?(key) %>
-
-  <% if partial_exists?("records/edit_fields/_#{key}") %>
-    <%= render_edit_field_partial(key, f: f, record: record, required: required, label_for_field: lbl, single: single) %>
+  <% 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 %>
-    <% opts = { label: lbl, required: required } %>
+    <%= f.label key, get_label(key) %>
+  <% end %>
 
-    <% 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 %>
+  <% 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) %>
+  <% else %>
+    <% Array(vals).each_with_index do |v, index| %>
+      <%= render_edit_field_partial(key, record: record, f: f,  v: v, index: index, render_req: render_req) %>
     <% end %>
-
   <% end %>
-</div>
+</div><!-- /.form-group -->