curation_concerns 0.1.0 → 0.2.0

data/app/views/curation_concerns/base/_related_files.html.erb

@@ -1,4 +1,4 @@
-<% if curation_concern.generic_files.present? %>
+<% if presenter.file_presenters.present? %>
 <div class="panel panel-default related_files">
   <div class="panel-heading">
     <h2>Files</h2>
@@ -14,11 +14,11 @@
       </tr>
     </thead>
     <tbody>
-      <%= render curation_concern.generic_files %>
+      <%= render presenter.file_presenters %>
     </tbody>
   </table>
 </div>
-<% elsif can? :edit, curation_concern %>
+<% elsif can? :edit, presenter.id %>
   <h2>Files</h2>
-  <p class="center"><em>This <%= curation_concern.human_readable_type %> has no files associated with it. You can add one using the "Attach a File" button below.</em></p>
+  <p class="center"><em>This <%= presenter.human_readable_type %> has no files associated with it. You can add one using the "Attach a File" button below.</em></p>
 <% end %>

data/app/views/curation_concerns/base/_representative_media.html.erb

@@ -1,7 +1,5 @@
-<% if work.representative.present? && (gf = ::GenericFile.load_instance_from_solr(work.representative)) %>
-  <%= render partial: 'curation_concerns/generic_files/media_display', locals: {generic_file: gf, dom_class_name: 'representative_image'} %>
-<% elsif work.representative.present? %>
-  <%= image_tag download_path(work.representative, {:datastream_id => 'thumbnail'}), class: 'representative_image' %>
+<% if work.representative_id.present? && (fs = ::FileSet.load_instance_from_solr(work.representative_id)) %>
+  <%= media_display fs %>
 <% else %>
   <%= image_tag 'nope.png', class: "canonical-image" %>
 <% end %>

data/app/views/curation_concerns/base/_versioning.html.erb

@@ -0,0 +1,23 @@
+<div id="versioning_display" class="tab-pane">
+  <h2>Versions</h2>
+  <div class="well">
+
+    <%= form_for [main_app, :curation_concerns, curation_concern], 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 <%= 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>
+    <% end %>
+    <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/curation_concerns/base/show.html.erb

@@ -1,21 +1,24 @@
-<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_title, @presenter.page_title %>
 <% provide :page_header do %>
-  <h1><%= curation_concern %> <span class="human_readable_type">(<%= curation_concern.human_readable_type %>)</span></h1>
+  <h1><%= @presenter %> <span class="human_readable_type">(<%= @presenter.human_readable_type %>)</span></h1>
 <% end %>
 
-<%= render 'representative_media', work: curation_concern %>
-<%= render 'attributes', curation_concern: curation_concern %>
-<%= render 'related_files', curation_concern: curation_concern %>
+<% collector = can?(:collect, @presenter.id) %>
+<% editor    = can?(:edit,    @presenter.id) %>
 
-<% collector = can?(:collect, curation_concern) %>
-<% editor    = can?(:edit,    curation_concern) %>
+<%= render 'representative_media', work: @presenter %>
+<%= render 'attributes', curation_concern: @presenter %>
+<%= render 'related_files', presenter: @presenter %>
+<% if editor %>
+    <%= render partial: 'curation_concerns/file_sets/multiple_upload', presenter: @presenter %>
+<% end %>
 
 <% if collector || editor %>
   <div class="form-actions">
     <% if editor %>
-      <%= link_to "Edit This #{curation_concern.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, curation_concern]), class: 'btn btn-primary' %>
-      <%= link_to "Delete This #{curation_concern.human_readable_type}", [main_app, :curation_concerns, curation_concern], class: 'btn btn-primary', data: { confirm: "Delete this #{curation_concern.human_readable_type}?" }, method: :delete %>
-      <%= link_to "Attach a File", main_app.new_curation_concerns_generic_file_path(curation_concern), class: 'btn btn-primary' %>
+      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default' %>
+      <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
+      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, :curation_concerns, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>
   </div>
 <% end %>

data/app/views/curation_concerns/base/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}

data/app/views/curation_concerns/base/versions.html.erb

@@ -0,0 +1,6 @@
+<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_header do %>
+  <h2>Manage Your Work</h2>
+<% end%>
+<%#= curation_concern.to_json %>
+<%= render 'versioning' %>

data/app/views/curation_concerns/file_sets/_actions.html.erb

@@ -0,0 +1,16 @@
+<% if can?(:edit, file_set.id) %>
+  <%= link_to( 'Edit', edit_polymorphic_path([main_app, :curation_concerns, file_set]),
+    { class: 'btn btn-default', title: "Edit #{file_set}" }) %>
+  <%= link_to( 'Rollback', main_app.versions_curation_concerns_file_set_path(file_set),
+    { class: 'btn btn-default', title: "Rollback to previous version" }) %>
+<% end %>
+<% if can?(:destroy, file_set.id) %>
+  <%= link_to( 'Delete', polymorphic_path([main_app, :curation_concerns, file_set]),
+    class: 'btn btn-default', method: :delete, title: "Delete #{file_set}",
+    data: {confirm: "Deleting #{file_set} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation"}
+  )%>
+<% end %>
+<% if can?(:read, file_set.id) %>
+  <%= link_to 'Download', main_app.download_path(file_set),
+    class: 'btn btn-default', title: "Download #{file_set.to_s.inspect}", target: "_blank" %>
+<% end %>

data/app/views/curation_concerns/file_sets/_file_set.html.erb

@@ -0,0 +1,12 @@
+<tr class="<%= dom_class(file_set) %> attributes">
+  <td class="thumbnail">
+    <%= render_thumbnail_tag file_set %>
+  </td>
+  <td class="attribute filename"><%= link_to(file_set.link_name, main_app.curation_concerns_file_set_path(file_set)) %></td>
+  <td class="attribute date_uploaded"><%= file_set.date_uploaded %></td>
+  <td class="attribute permission"><%= file_set.permission_badge %></td>
+  <td>
+    <%= render 'curation_concerns/file_sets/actions', file_set: file_set %>
+  </td>
+</tr>
+

data/app/views/curation_concerns/{generic_files → file_sets}/_form.html.erb

@@ -1,25 +1,25 @@
-<%= simple_form_for [main_app, :curation_concerns, curation_concern], html: { multipart: true } do |f| %>
+<%= simple_form_for [main_app, :curation_concerns, curation_concern],
+                    html: { multipart: true },
+                    wrapper_mappings: { multifile: :horizontal_file_input } do |f| %>
   <div class="row">
     <div class="col-md-6">
       <fieldset class="required">
         <legend>Your File&#8217;s Title</legend>
         <span class="control-label">
-          <%= label_tag 'generic_file[title][]', 'Title',  class: "string optional" %>
+          <%= label_tag 'file_set[title][]', 'Title',  class: "string optional" %>
         </span>
-        <%= text_field_tag 'generic_file[title][]', curation_concern.title.first, class: 'form-control' %>
+        <%= text_field_tag 'file_set[title][]', curation_concern.title.first, class: 'form-control' %>
       </fieldset>
       <fieldset class="required">
         <legend>
           Attach Your File
-          <small>A PDF copy is preferred.</small>
         </legend>
-          <%= label_tag 'files[]', 'Upload a file' %>
-          <%= file_field_tag "files[]" %>
+        <%= f.input :files, as: :multifile %>
       </fieldset>
     </div>
 
     <div class="col-md-6">
-      <%= render "form_permission", curation_concern: curation_concern, f: f %>
+      <%= render "form_permission", f: f %>
     </div>
   </div>
 

data/app/views/curation_concerns/file_sets/_multiple_upload.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: 'curation_concerns/file_sets/upload/alerts', presenter: @presenter %>
+<%= render partial: 'curation_concerns/file_sets/upload/form', presenter: @presenter %>
+<%= render partial: 'curation_concerns/file_sets/upload/script_templates', presenter: @presenter %>

data/app/views/curation_concerns/file_sets/jq_upload.json.jbuilder

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

data/app/views/curation_concerns/file_sets/media_display/_audio.html.erb

@@ -0,0 +1,6 @@
+  <audio controls="controls" class="audiojs" preload="auto">
+    <source src="<%= main_app.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
+    <source src="<%= main_app.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+    Your browser does not support the audio tag.
+  </audio>
+

data/app/views/curation_concerns/file_sets/media_display/_default.html.erb

@@ -0,0 +1,4 @@
+  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
+    <%= image_tag "default.png", alt: "No preview available", class: "img-responsive" %>
+  <% end %>
+

data/app/views/curation_concerns/file_sets/media_display/_image.html.erb

@@ -0,0 +1,8 @@
+   <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized image" do %>
+     <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
+                   class: "img-responsive",
+                   alt: "Download the full-sized image of #{file_set.to_s}"
+                  ) %>
+     Download the full-sized image
+   <% end %>
+

data/app/views/curation_concerns/file_sets/media_display/_office_document.html.erb

@@ -0,0 +1,7 @@
+   <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
+     <%= image_tag(main_app.download_path(file_set, file: 'thumbnail'),
+                   class: "img-responsive",
+                   alt: "Download the document \"#{file_set.to_s}\""
+                  ) %>
+     Download the document
+   <% end %>

data/app/views/curation_concerns/file_sets/media_display/_pdf.html.erb

@@ -0,0 +1,7 @@
+  <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized PDF" do%>
+    <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+                  class: "img-responsive",
+                  alt: "Download the full-sized PDF of #{file_set.to_s}" %>
+    Download the full-sized PDF
+  <% end %>
+

data/app/views/curation_concerns/file_sets/media_display/_video.html.erb

@@ -0,0 +1,6 @@
+  <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
+    <source src="<%= main_app.download_path(file_set, file: 'webm') %>" type="video/webm" />
+    <source src="<%= main_app.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+    Your browser does not support the video tag.
+  </video>
+

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -0,0 +1,15 @@
+<% provide :page_title, @presenter.page_title %>
+<% provide :page_header do %>
+  <h1>File Details</h1>
+<% end %>
+<%= media_display @presenter %>
+<%= render "attributes", curation_concern: @presenter %>
+
+  <div class="form-actions">
+    <%= link_to "Download this File", main_app.download_path(@presenter), class: 'btn btn-primary' %>
+    <% if can? :edit, @presenter.id %>
+      <%= link_to "Edit this File", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-primary'  %>
+    <% end %>
+
+    <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-primary' %>
+  </div>

data/app/views/curation_concerns/file_sets/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @file_set, *[:id] + @file_set.class.fields.select {|f| ![:has_model].include? f}

data/app/views/curation_concerns/file_sets/upload/_alerts.html.erb

@@ -0,0 +1,19 @@
+
+<div class="alert alert-info hide" id="success">
+  You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
+  <p>
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+  </p>
+</div>
+
+<div class="alert hide" id="fail">
+  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', edit_polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+</div>
+
+<div class="alert hide" id="partial_fail">
+  One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
+  <%= link_to 'Add Descriptions', edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn' %>
+</div>
+
+<div class="alert hide" id="errmsg"> </div>
+

data/app/views/curation_concerns/file_sets/upload/_form.html.erb

@@ -0,0 +1,6 @@
+<%= form_for(FileSet.new, url: main_app.curation_concerns_file_sets_path(parent_id: @presenter.id), html: { multipart: true, id: 'fileupload' }) do |f| %>
+  <div class="well">
+    <%= render partial: 'curation_concerns/file_sets/upload/form_fields', presenter: @presenter, locals: { upload_set_id: ActiveFedora::Noid::Service.new.mint } %>
+  </div>
+<% end %>
+

data/app/views/curation_concerns/file_sets/upload/_form_fields.html.erb

@@ -0,0 +1,45 @@
+    <!-- The file upload form used as target for the file upload widget -->
+      <%= hidden_field_tag(:total_upload_size, 0) %>
+      <%= hidden_field_tag(:relative_path) %>
+      <%= hidden_field_tag(:upload_set_id, upload_set_id) %>
+      <%= hidden_field_tag "file_coming_from", "local" %>
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+        <div class="row fileupload-buttonbar">
+            <div class="col-md-7">
+                <!-- The fileinput-button span is used to style the file input field as button -->
+                <span class="btn btn-success fileinput-button">
+                    <i class="glyphicon glyphicon-plus"></i>
+                    <span>Select files...</span>
+                    <input type="file" name="file_set[files][]" multiple />
+                </span>
+                <% ua = request.env['HTTP_USER_AGENT'] %>
+                <% if !!(ua =~ /Chrome/) %>
+                <span class="btn btn-success fileinput-button">
+                    <i class="glphicon glyphicon-plus"></i>
+                    <span>Select folder...</span>
+                    <input type="file" name="file_set[files][]" directory webkitdirectory mozdirectory />
+                </span>
+                <% end %>
+                <button type="submit" class="activate-submit btn btn-primary start" id="main_upload_start">
+                    <i class="glyphicon glyphicon-upload"></i>
+                    <span>Start upload</span>
+                </button>
+                </span>
+                <button type="reset" class="btn btn-warning cancel">
+                    <i class="glyphicon glyphicon-ban-circle"></i>
+                    <span>Cancel upload</span>
+                </button>
+            </div>
+            <div class="col-md-5 fileupload-progress">
+                <!-- The global progress bar -->
+                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+                    <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+                </div>
+            </div>
+        </div>
+        <!-- The loading indicator is shown during image processing -->
+        <div class="fileupload-loading"></div>
+        <br />
+        <!-- The table listing the files available for upload/download -->
+        <table id="file-table" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
+

data/app/views/curation_concerns/file_sets/upload/_script_templates.html.erb

@@ -0,0 +1,61 @@
+<div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
+  <%-# Script redirects here once the uploads are complete %>
+  <%= polymorphic_path([main_app, :curation_concerns, @presenter]) %>
+</div>
+
+<!-- The template to display files available for upload -->
+<script id="template-upload" type="text/x-jquery-tmpl">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+    <tr class="template-upload fade">
+        <td>
+            <span class="preview"></span>
+        </td>
+        <td>
+            <p class="name">{%=file.name%}</p>
+            <strong class="error text-danger"></strong>
+        </td>
+        <td>
+            <p class="size">Processing...</p>
+            <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
+        </td>
+        <td>
+            {% if (!i && !o.options.autoUpload) { %}
+                <button class="btn btn-primary start hide" disabled>
+                    <i class="glyphicon glyphicon-upload"></i>
+                    <span>Start</span>
+                </button>
+            {% } %}
+            {% if (!i) { %}
+                <button class="btn btn-warning cancel">
+                    <i class="glyphicon glyphicon-ban-circle"></i>
+                    <span>Cancel</span>
+                </button>
+            {% } %}
+        </td>
+    </tr>
+{% } %}
+</script>
+<!-- The template to display files available for download -->
+<script id="template-download" type="text/x-jquery-tmpl">
+{% for (var i=0, file; file=o.files[i]; i++) { %}
+    <tr class="template-download fade">
+        {% if (file.error) { %}
+            <td><span></span></td>
+            <td class="name"><span>{%=file.name%}</span></td>
+            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
+        {% } else { %}
+            <td class="preview">
+              {% if (file.thumbnail_url) { %} <span class="label label-success">Success</span> {% } %}
+            </td>
+            <td class="name">
+                {%=file.name%}
+                <!--a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}" target="_blank">{%=file.name%}</a-->
+            </td>
+            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+            <td colspan="2"></td>
+        {% } %}
+    </tr>
+{% } %}
+</script>
+

data/app/views/curation_concerns/single_use_links/new_download.html.erb

@@ -0,0 +1,5 @@
+<div class="single-use-link">
+<h1>Single Use Link</h1>
+<p>Anyone can use the following link once to download the file</p>
+<%= link_to @asset, @link, class: 'download-link', data: { 'no-turbolink' => ''}, target: '_blank' %>
+</div>

data/app/views/curation_concerns/single_use_links/new_show.html.erb

@@ -0,0 +1,5 @@
+<div class="single-use-link">
+<h1>Single Use Link</h1>
+<p>Anyone can use the following link once to view the file metadata</p>
+<%= link_to @asset, @link, target: '_blank' %>
+</div>

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

@@ -0,0 +1,10 @@
+<div >
+  <h1 class="lower"><%= @asset %></h1>
+    <h2 class="non lower">Actions</h2>
+    <p>
+      <%= link_to "Download (can only be used once)", @download_link, target: '_blank', data: { 'no-turbolink' => ''} %>
+    </p>
+  <h2> Descriptions:</h2>
+
+  <%= render 'attributes' %>
+</div>

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

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="<%= t("curation_concerns.document_language") %>">
+  <head>
+    <title>Single use link Not Found</title>
+  </head>
+  <body>
+    <div class="columns two-a">
+      <div class="column second">
+        <h1>Single Use Link Expired or Not Found</h1>
+        <p>
+          <%= t('curation_concerns.product_name') %> could not locate the single use link.
+          This link either expired or had been used previously.  We apologize
+          for the inconvenience. You might be interested in using
+          <a href="/help/">the help page</a> for looking up
+          solutions.
+        </p>
+      </div>
+  </body>
+</html>

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

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="<%= t("curation_concerns.document_language") %>">
+  <head>
+    <meta charset="utf-8" />
+
+    <title><%= h(application_name) %>: System Error</title>
+    <!-- application css -->
+    <%= stylesheet_link_tag 'application' %>
+
+    <!-- application js -->
+    <%= javascript_include_tag 'application' %>
+
+    <%= render partial: 'shared/ga', formats: [:html] %>
+  </head>
+
+<body>
+<div  id="wrapper">
+  <div class="container-fluid">
+    <div id="page-positioner">
+      <div id="content-wrapper">
+        <div id="content" class="row">
+            <div class="col-sm-8 col-md-8 col-lg-8">
+              <%= yield %>
+            </div>
+        </div><!-- /#content -->
+      </div><!-- /#content-wrapper -->
+      <%= render partial: 'shared/footer' %>
+    </div><!-- /#page-positioner -->
+  </div><!-- /.container -->
+</div><!-- /#wrapper -->
+</body>
+
+</html>

data/app/views/leases/_list_expired_active_leases.html.erb

@@ -21,7 +21,7 @@
         </tr>
       </thead>
       <tbody>
-      <% assets_with_expired_leases.each do |curation_concern| %>
+      <% assets_with_expired_leases.each_with_index do |curation_concern, i| %>
         <tr>
           <td><%= button_for_add_to_batch curation_concern%></td>
           <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
@@ -31,6 +31,11 @@
           <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
           <td class="actions"><%= link_to 'Deactivate Lease', embargo_path(curation_concern), method: :delete, class: 'btn btn-primary' %></td>
         </tr>
+        <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-lease-info">
+          <td></td>
+          <td colspan=5>
+            <%= check_box_tag "leases[#{i}][copy_visibility]", curation_concern.id, true %> Change all files within <%= curation_concern %> to <%= visibility_badge(curation_concern.visibility_after_lease) %>?</td>
+        </tr>
       <% end %>
       </tbody>
     </table>

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

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

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

@@ -0,0 +1,5 @@
+<% 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/show_fields/_default.html.erb

@@ -0,0 +1,6 @@
+<% Array(record[key]).each do |v| %>
+  <span itemprop="<%= key %>" itemscope itemtype="http://schema.org/Thing">
+    <%= v %>
+  </span>
+  <br />
+<% end %>

data/app/views/shared/_add_content.html.erb

@@ -3,24 +3,12 @@
 <% if include_works_link || include_collections_link %>
   <div class="btn-group add-content">
     <%= link_to curation_concerns.new_classify_concern_path, id: "add-content", class: "btn btn-primary dropdown-toggle", data: { toggle: "dropdown"} do %>
-      <span class="icon icon-white glyphicon-plus"></span><span class="visuallyhidden">Add</span>
+      <span class="glyphicon glyphicon-plus"></span><span class="visuallyhidden">Add</span>
     <% end %>
     <ul class="dropdown-menu quick-create">
       <% if include_works_link %>
         <li>
-          <strong class="menu-heading item-with-options">Add a Work</strong>
-          <ul class="item-options quick-classify">
-            <% CurationConcerns::QuickClassificationQuery.each_for_context(current_user) do |concern| %>
-              <li><%= link_to(
-                    "New #{concern.human_readable_type}",
-                    main_app.new_polymorphic_path([:curation_concerns, concern]),
-                    class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
-                    role: 'menuitem'
-                  ) %>
-              </li>
-            <% end %>
-            <li><%= link_to 'More Options', curation_concerns.new_classify_concern_path, class: 'item-option link-to-full-list', role: 'menuitem' %></li>
-          </ul>
+          <%= render 'shared/add_works' %>
         </li>
         <li class="divider"></li>
       <% end %>

data/app/views/shared/_add_works.html.erb

@@ -0,0 +1,14 @@
+          <strong class="menu-heading item-with-options">Add a Work</strong>
+          <ul class="item-options quick-classify">
+            <% CurationConcerns::QuickClassificationQuery.each_for_context(current_user) do |concern| %>
+              <li><%= link_to(
+                    "New #{concern.human_readable_type}",
+                    main_app.new_polymorphic_path([:curation_concerns, concern]),
+                    class: "item-option contextual-quick-classify #{dom_class(concern, 'new').gsub('_', '-')}",
+                    role: 'menuitem'
+                  ) %>
+              </li>
+            <% end %>
+            <li><%= link_to 'More Options', curation_concerns.new_classify_concern_path, class: 'item-option link-to-full-list', role: 'menuitem' %></li>
+          </ul>
+

data/app/views/shared/_my_actions.html.erb

@@ -1,6 +1,6 @@
 <div class="btn-group my-actions">
   <a class="btn btn-primary dropdown-toggle user-display-name" data-toggle="dropdown" href="#">
-    <%= current_user.name.blank? ? 'Me' : current_user.name %>
+    <%= current_user.user_key %>
     <span class="caret"></span>
   </a>
   <ul class="dropdown-menu">
@@ -12,6 +12,14 @@
     <% if include_collections_link %>
       <li><%= link_to 'My Collections', search_path_for_my_collections, class: 'my-collections', role: 'menuitem' %></li>
     <% end %>
+
+    <% if can? :discover, Hydra::AccessControls::Embargo %>
+      <li><%= link_to 'Embargos', main_app.embargoes_path, role: 'menuitem' %></li>
+    <% end %>
+    <% if can? :discover, Hydra::AccessControls::Lease %>
+      <li><%= link_to 'Leases', main_app.leases_path, role: 'menuitem' %></li>
+    <% end %>
+
     <% if include_works_link || include_collections_link %>
       <li class="divider"></li>
     <% end %>

data/app/views/shared/_site_actions.html.erb

@@ -2,6 +2,6 @@
   <%= render 'shared/add_content' %>
   <%= render 'shared/my_actions' %>
 <% else %>
-  <%= link_to 'Log In', new_user_session_path, class: 'btn btn-primary login', role: 'menuitem' %>
+  <%= link_to 'Log In', main_app.new_user_session_path, class: 'btn btn-primary login', role: 'menuitem' %>
 <% end %>
 

data/app/views/shared/_site_search.html.erb

@@ -1,12 +1,12 @@
-<%= form_tag main_app.catalog_index_path, :method => :get, :class => "search-form" do %>
+<%= form_tag main_app.catalog_index_path, method: :get, class: "search-form" do %>
   <fieldset>
-    <legend class="accessible-hidden">Search <%=t('curation_concerns.product_name')%></legend>
-    <%= label_tag :catalog_search, t('curation_concerns.search.form.q.label'), :class => "accessible-hidden" %>
-    <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
-    <%= text_field_tag(:q, params[:q], :class => "q search-query", :id => "catalog_search",
-                       :placeholder => t('curation_concerns.search.form.q.placeholder'), :size => "30", :tabindex => "1", :type => "search") %>
+    <legend class="accessible-hidden">Search <%= t('curation_concerns.product_name') %></legend>
+    <%= label_tag :catalog_search, t('curation_concerns.search.form.q.label'), class: "accessible-hidden" %>
+    <%= render_hash_as_hidden_fields(params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+    <%= text_field_tag(:q, params[:q], class: "q search-query", id: "catalog_search",
+                       placeholder: t('curation_concerns.search.form.q.placeholder'), tabindex: "1", type: "search") %>
                       <button type="submit" class="search-submit btn btn-primary" id="keyword-search-submit" tabindex="2">
-      <i class="glyphicon glyphicon-search icon-white"></i><span class="accessible-hidden">Search</span>
+      <i class="glyphicon glyphicon-search"></i><span class="accessible-hidden">Search</span>
     </button>
   </fieldset>
 <% end %>