sufia 6.0.0.rc2 → 6.0.0.rc3

data/app/presenters/sufia/version_list_presenter.rb

@@ -9,7 +9,7 @@ module Sufia
     private
 
       def wrapped_list
-        @wrapped_list ||= @raw_list.map { |v| Sufia::VersionPresenter.new(v) }.sort(&:date).tap { |l| l.first.try(:current!) }
+        @wrapped_list ||= @raw_list.map { |v| Sufia::VersionPresenter.new(v) }.sort { |a,b| b.version.created <=> a.version.created }.tap { |l| l.first.try(:current!) }
       end
   end
 end

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

@@ -28,14 +28,14 @@
       <div class="col-sm-6">
       <h3>Applies to all files just uploaded</h3>
       <%= f.input :resource_type, as: :select_with_help, collection: Sufia.config.resource_types,
-          input_html: { class: 'form-control', multiple: true, required: true } %>
+          input_html: { class: 'form-control', multiple: true } %>
 
-      <%= f.input :tag, as: :multi_value_with_help, input_html: { required: true } %>
+      <%= f.input :tag, as: :multi_value_with_help %>
 
-      <%= f.input :creator, as: :multi_value_with_help, input_html: { required: true } %>
+      <%= f.input :creator, as: :multi_value_with_help %>
 
       <%= f.input :rights, as: :select_with_modal_help, collection: Sufia.config.cc_licenses,
-          input_html: { class: 'form-control', multiple: true, required: true } %>
+          input_html: { class: 'form-control', multiple: true } %>
 
       <%= render "generic_files/rights_modal" %>
 

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

@@ -55,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/_action_menu.html.erb

@@ -6,19 +6,18 @@
      <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>
    </li>
    <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
+     <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{id}" %>
    </li>
    <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid), class: 'itemicon itemedit', title: 'Edit File'  %>
+     <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(id), class: 'itemicon itemedit', title: 'Edit File'  %>
    </li>
    <li>
-     <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
+     <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(id), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
    </li>
    <li>
-     <%= display_trophy_link(@user, noid) do |text| %>
+     <%= display_trophy_link(@user, id) do |text| %>
          <i class='glyphicon glyphicon-star'></i> <%= text %>
      <% end %>
    </li>
   </ul>
 </div>
-

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

@@ -1,10 +1,6 @@
 <h2 class="sr-only">Descriptions</h2>
 <dl class="metadata-collections">
-  <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| %>
+  <% present_terms(@presenter, @presenter.terms_with_values - [:title, :description]) do |r, term| %>
       <dt><%= r.label(term) %></dt>
       <dd><%= r.value(term) %></dd>
   <% end %>

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

@@ -13,5 +13,3 @@
     <%= render partial: 'show_document_list_row', collection: documents, as: :document %>
   </tbody>
 </table>
-
-

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

@@ -4,23 +4,22 @@
   <ul class="dropdown-menu dropdown-menu-right">
     <li>
       <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#',
-                  class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
+                  class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{id}" %>
     </li>
     <li>
-      <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid),
+      <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(id),
                   class: 'itemicon itemedit', title: 'Edit File' %>
     </li>
     <li>
-      <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid),
+      <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(id),
                   class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
     </li>
-    <% if current_user %> 
+    <% if current_user %>
       <li>
-        <%= display_trophy_link(current_user, noid) do |text| %>
+        <%= display_trophy_link(current_user, id) 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,10 +1,10 @@
-<% noid = document.noid %>
-<tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
+<% id = document.id %>
+<tr id="document_<%= id %>" class="<%= cycle("", "zebra") %>">
   <% 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 %>"/>
+      <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.id %>"/>
     <% elsif current_user and gf.depositor != current_user.user_key %>
       <i class="glyphicon glyphicon-share-alt"/>
     <% end %>
@@ -16,8 +16,8 @@
       <% end %>
       <div class="media-body">
         <h4 class="media-heading">
-          <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %>
-          <a href="#" class="small" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right"></i></a>
+          <%= link_to document.title_or_label, sufia.generic_file_path(document), id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %>
+          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
         </h4>
         <%= render_collection_list(gf) %>
       </div>
@@ -25,7 +25,7 @@
   </td>
   <td class="text-center"><%= document.date_uploaded %> </td>
   <td class="text-center">
-    <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>" class="visibility-link">
+    <a href="<%= sufia.generic_file_path(document) %>/edit/?tab=permissions" id="permission_<%= id %>" class="visibility-link">
       <% if document.registered? %>
         <span class="label label-info" title="<%= t('sufia.institution_name') %>"><%= t('sufia.institution_name') %></span>
       <% elsif document.public? %>
@@ -36,14 +36,14 @@
     </a>
   </td>
   <td class="text-center">
-    <%= render partial: 'show_document_list_menu', locals: { noid: noid, gf: gf } %>
+    <%= render partial: 'show_document_list_menu', locals: { id: id, gf: gf } %>
   </td>
 </tr>
-<tr id="detail_<%= noid %>"> <!--  document detail"> -->
+<tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
       <dt class="col-xs-3 col-lg-2">File Name:</dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to document.label, sufia.generic_file_path(noid) %></dd>
+      <dd class="col-xs-9 col-lg-4"><%= link_to document.label, sufia.generic_file_path(document) %></dd>
       <dt class="col-xs-3 col-lg-2">File Format:</dt>
       <dd class="col-xs-9 col-lg-4"><%= document.file_format %>JPG</dd>
       <dt class="col-xs-3 col-lg-2">Creator:</dt>

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

@@ -12,7 +12,7 @@
    <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.noid), method: :get, class: 'per_page form-inline' do %>
+        <%= form_tag collections.collection_path(@collection), 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/_view_type_group.html.erb

@@ -3,7 +3,7 @@
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <%  document_index_views.each do |view, config| %>
-      <%= link_to collections.collection_path(Sufia::Noid.noidify(params[:id]), view: view), title: t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), class: "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+      <%= link_to collections.collection_path(params[:id], view: view), title: t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), class: "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
         <%= render_view_type_group_icon view %>
         <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
       <% end %>

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

@@ -5,11 +5,11 @@
   <div itemscope itemtype="http://schema.org/CollectionPage" class="row">
     <div class="col-sm-10 pull-right">
       <header>
-        <h1><%= @collection.title %></h1>
-        <p class="collection_description"><%=@collection.description%></p>
+        <h1><%= @presenter.title %></h1>
+        <p class="collection_description"><%= @presenter.description %></p>
       </header>
       <% unless has_collection_search_parameters? %>
-      <%= render partial: 'collections/show_descriptions', locals: { generic_file: @collection } %>
+      <%= render 'collections/show_descriptions' %>
       <% end %>
     </div>
     <div class="col-sm-2">

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

@@ -1,6 +1,6 @@
 The file(s)
 <% generic_files.first(20).each  do |gf|%>
-<%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
+<%= link_to(gf, generic_file_url(gf)) %><%= ',' unless gf == generic_files.last %>
 <% end %>
 <%= '...' if generic_files.length > 20 %>
  could not be updated.  You do not have sufficient privileges to edit it.

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

@@ -1,6 +1,6 @@
 The file(s)
 <% generic_files.first(20).each do |gf|%>
-<%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
+<%= link_to(gf, generic_file_url(gf)) %><%= ',' unless gf == generic_files.last %>
 <% end %>
 <%= '...' if generic_files.length > 20 %>
 have been saved.

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

@@ -1 +1 @@
-The file <%= link_to(generic_file, sufia.generic_file_url(generic_file.noid)) %> has been updated.
+The file <%= link_to(generic_file, sufia.generic_file_url(generic_file)) %> has been updated.

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

@@ -3,7 +3,7 @@
 <div class="well">
   <%= form_tag(sufia.generic_files_path, id: 'browse_everything_form', method: 'post') do %>
       <%= render partial: 'generic_files/upload/tos_checkbox' %>
-      <%= hidden_field_tag(:batch_id, @batch_noid) %>
+      <%= hidden_field_tag(:batch_id, @batch_id) %>
       <%= button_tag(t('sufia.upload.browse_everything.browse_files_button'), type: 'button', class: 'btn btn-lg btn-success', id: "browse-btn",
         'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
         'data-target' => '#browse_everything_form' ) %>
@@ -16,9 +16,9 @@
   // Update the count in #status element when user selects files.
   $(document).ready(function() {
     $('#browse-btn').browseEverything()
-      .done(function(data) { 
-        $('#status').html(data.length.toString() + " <%= t('sufia.upload.browse_everything.files_selected')%>") 
-        $('#submit-btn').html("Submit "+data.length.toString() + " selected files") 
+      .done(function(data) {
+        $('#status').html(data.length.toString() + " <%= t('sufia.upload.browse_everything.files_selected')%>")
+        $('#submit-btn').html("Submit "+data.length.toString() + " selected files")
       })
   });
 </script>

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

@@ -3,31 +3,31 @@
   <%= render_download_icon "Download the full-sized image" %>
 
 <% elsif @generic_file.video? %>
-  
+
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
-    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'webm') %>" type="video/webm" />
-    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp4') %>" type="video/mp4" />
+    <source src="<%= sufia.download_path(@generic_file, file: 'webm') %>" type="video/webm" />
+    <source src="<%= sufia.download_path(@generic_file, file: 'mp4') %>" type="video/mp4" />
     Your browser does not support the video tag.
   </video>
 
 <% elsif @generic_file.audio? %>
-    
+
   <audio controls="controls" class="audiojs" preload="auto">
-    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'ogg') %>" type="audio/ogg" />
-    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp3') %>" type="audio/mpeg" />
+    <source src="<%= sufia.download_path(@generic_file, file: 'ogg') %>" type="audio/ogg" />
+    <source src="<%= sufia.download_path(@generic_file, file: 'mp3') %>" type="audio/mpeg" />
     Your browser does not support the audio tag.
   </audio>
 
-<% elsif @generic_file.pdf?%>
+<% elsif @generic_file.pdf? %>
 
   <%= render_download_icon "Download the full-sized PDF" %>
 
-<% elsif @generic_file.office_document?%>
+<% elsif @generic_file.office_document? %>
 
     <%= render_download_icon "Download the full-sized Document" %>
 
 <% else %>
 
   <%= render_download_icon %>
-  
+
 <% end %>

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

@@ -108,7 +108,7 @@
         <div class="col-sm-8">
           <%= permission_fields.select :access, Sufia.config.permission_levels, {}, class: 'form-control select_perm' %>
         </div>
-        <button class="btn close remove_perm">X</button>
+        <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">X</button>
       </td>
     </tr>
   <% end %>

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

@@ -24,7 +24,7 @@
       <% end %>
     </p>
     <p>Export to:
-      <%= link_to 'EndNote', sufia.generic_file_path(@generic_file.noid, format: 'endnote') %>
+      <%= link_to 'EndNote', sufia.generic_file_path(@generic_file, format: 'endnote') %>
       &nbsp;|&nbsp;
       <%= link_to 'Zotero', sufia.static_path('zotero'), {id: 'zoteroLink', name: 'zotero', class: 'lightboxLink'} %>
       &nbsp;|&nbsp;

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

@@ -7,8 +7,8 @@
         <tbody>
         <% @generic_file.collections.each do |collection| %>
         <tr class="collection attributes">
-          <%= content_tag :td, class: 'attribute title', data: { noid: collection.noid } do %>
-            <%= link_to collection.title, collections.collection_path(collection.noid) %>
+          <%= content_tag :td, class: 'attribute title', data: { id: collection.id } do %>
+            <%= link_to collection.title, collections.collection_path(collection) %>
           <% end %>
         </tr>
       <% end %>

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

@@ -28,7 +28,7 @@
               <div class="related-files">
                   <dl><dt>
 	              <% @generic_file.related_files.each do |f| %>
-	                <dd><%= link_to(f.label, sufia.generic_file_url(f.noid)) %></dd>
+	                <dd><%= link_to(f.label, sufia.generic_file_url(f)) %></dd>
 	              <% end %>
                   </dt></dl>
               </div>

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

@@ -1,6 +1,7 @@
 <div id="versioning_display" class="tab-pane">
   <h2>Versions</h2>
   <div class="well">
+
     <%= form_for [sufia, @generic_file], html: { multipart: true } do |f| %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>
@@ -8,20 +9,22 @@
           <div class="col-xs-12">
             <p>Upload a new version of this file from your computer.</p>
             <p id="upload_field">
-                <%= file_field_tag "filedata"  %>
+                <%= file_field_tag "filedata", required: 'required' %>
              </p>
             <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn btn-primary" %>
           </div>
         </div>
-    <hr />
+    <% end %>
 
+    <%= form_for [sufia, @generic_file], html: { multipart: true } do |f| %>
     <h3>Restore Previous Version</h3>
     <% @version_list.each do |version| %>
       <div class="form-group">
         <div class="col-xs-12">
-          <label class="radio">
-            <%= radio_button_tag(:revision, version.label, version.current?) %>
-            Restore from <%= version.created %> [by <%= version.committer %>]
+          <label class="radio <%= version.current? ? 'disabled' : '' %>">
+            <%= radio_button_tag(:revision, version.label, false, disabled: version.current?, required: 'required') %>
+            <%= version.current? ? 'Current version:' : 'Restore from' %>
+            <%= version.created %> [by <%= version.committer %>]
           </label>
         </div>
       </div>
@@ -29,5 +32,6 @@
     <div id="save_version_note" class="alert hide">You must click &quot;Save Revision&quot; to revert a previous version of this file</div>
     <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
   <% end %>
+
   </div> <!-- /well -->
 </div> <!-- /row -->

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

@@ -1,7 +1,7 @@
 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.url  "/files/#{generic_file.id}"
   json.thumbnail_url generic_file.id
   json.delete_url "deleteme"
   json.delete_type "DELETE"

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

@@ -1,9 +1,9 @@
 <h2>Upload</h2>
 <%# using partials rather than inlining, so implementers can add or change stuff on this page without much duplication %>
 <ul class="nav nav-tabs" role="tablist" title="Data Source Selectors" id="upload_tabs">
-  <li class="active"  id="computer_tab" title="<%= t('sufia.upload.my_computer.sr_tab_label')+' '+ t('sufia.upload.my_computer.tab_label') %>"><a role="tab" href="#local" data-toggle="tab"><i class="glyphicon glyphicon-folder-open" aria-hidden="true"></i><%= t('sufia.upload.my_computer.tab_label')%></a></li>
+  <li class="active" id="computer_tab" title="<%= t('sufia.upload.my_computer.sr_tab_label')+' '+ t('sufia.upload.my_computer.tab_label') %>"><a role="tab" href="#local" data-toggle="tab"><i class="glyphicon glyphicon-folder-open" aria-hidden="true"></i> <%= t('sufia.upload.my_computer.tab_label')%></a></li>
   <% if Sufia.config.browse_everything %>
-    <li  id="browse_everything_tab" title="<%= t('sufia.upload.browse_everything.sr_tab_label')+' '+ t('sufia.upload.browse_everything.tab_label') %>" aria-activedescendant="browse_everything_link"><a role="tab" href="#browse_everything" data-toggle="tab" id="browse_everything_link" ><i class="glyphicon glyphicon-cloud-download" aria-hidden="true"></i> <%= t('sufia.upload.browse_everything.tab_label')%></a></li>
+    <li id="browse_everything_tab" title="<%= t('sufia.upload.browse_everything.sr_tab_label')+' '+ t('sufia.upload.browse_everything.tab_label') %>" aria-activedescendant="browse_everything_link"><a role="tab" href="#browse_everything" data-toggle="tab" id="browse_everything_link" ><i class="glyphicon glyphicon-cloud-download" aria-hidden="true"></i> <%= t('sufia.upload.browse_everything.tab_label')%></a></li>
   <% end %>
   <% if Sufia.config.enable_local_ingest %>
     <li role="tab" id="local_ingest_tab"><a href="#ingest" data-toggle="tab"><i class="glyphicon glyphicon-hdd" aria-hidden="true"></i> <%= t('sufia.upload.local_ingest.tab_label')%></a></li>
@@ -22,7 +22,6 @@
     </div>
   <% end %>
 
-
   <% if Sufia.config.enable_local_ingest %>
     <div class="tab-pane" id="ingest" aria-labelledby="local_ingest_tab">
       <%= render partial: 'generic_files/local_file_import' %>

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

@@ -1,29 +1,26 @@
 <% content_for(:twitter_meta) do %>
-<%
-   tweeter = User.find_by_user_key(@generic_file.depositor).twitter_handle
-   tweeter = tweeter.present? ? "@#{tweeter}" : t('sufia.product_twitter_handle') %>
   <meta name="twitter:card" content="product">
   <meta name="twitter:site" content="<%= t('sufia.product_twitter_handle') %>"/>
-  <meta name="twitter:creator" content="<%= tweeter %>"/>
+  <meta name="twitter:creator" content="<%= @presenter.tweeter %>"/>
   <meta property="og:site_name" content="<%= t('sufia.product_name') %>"/>
   <meta property="og:type" content="object"/>
-  <meta property="og:title" content="<%= @generic_file.title.first %>"/>
-  <meta property="og:description" content="<%= @generic_file.description.first.truncate(200) rescue @generic_file.title.first %>"/>
-  <meta property="og:image" content="<%= sufia.download_url(@generic_file, datastream_id: 'thumbnail') %>"/>
-  <meta property="og:url" content="<%= sufia.generic_file_url(@generic_file) %>"/>
-  <meta name="twitter:data1" content="<%= @generic_file.tag.join(', ') %>"/>
+  <meta property="og:title" content="<%= @presenter.title.first %>"/>
+  <meta property="og:description" content="<%= @presenter.description.first.truncate(200) rescue @presenter.title.first %>"/>
+  <meta property="og:image" content="<%= sufia.download_url(@presenter, file: 'thumbnail') %>"/>
+  <meta property="og:url" content="<%= sufia.generic_file_url(@presenter) %>"/>
+  <meta name="twitter:data1" content="<%= @presenter.tag.join(', ') %>"/>
   <meta name="twitter:label1" content="Keywords"/>
-  <meta name="twitter:data2" content="<%= @generic_file.rights.first %>"/>
+  <meta name="twitter:data2" content="<%= @presenter.rights.first %>"/>
   <meta name="twitter:label2" content="Rights"/>
 <% end %>
 
 <% content_for(:gscholar_meta) do %>
-  <meta name="citation_title" content="<%= @generic_file.title.first %>"/>
-  <% @generic_file.creator.each do |creator| %>
+  <meta name="citation_title" content="<%= @presenter.title.first %>"/>
+  <% @presenter.creator.each do |creator| %>
   <meta name="citation_author" content="<%= creator %>"/>
   <% end %>
-  <meta name="citation_publication_date" content="<%= @generic_file.date_created.first %>"/>
-  <meta name="citation_pdf_url" content="<%= sufia.download_url(@generic_file) %>"/>
+  <meta name="citation_publication_date" content="<%= @presenter.date_created.first %>"/>
+  <meta name="citation_pdf_url" content="<%= sufia.download_url(@presenter) %>"/>
   <!-- Sufia does not yet support these metadata -->
   <!--
     <meta name="citation_journal_title" content=""/>
@@ -49,8 +46,8 @@
     <%= 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>
+  <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
+    <h1 class="visibility"><%= @presenter %> <%= render_visibility_badge %></h1>
     <%= render 'show_descriptions' %>
     <%= render 'show_details' %>
     <%= render 'users/activity_log', events: @events %>