hyrax 1.1.1 → 2.0.0.beta1

data/app/views/hyrax/file_sets/_file_set_title.erb

@@ -0,0 +1,9 @@
+<% presenter.title.each_with_index do |title, index| %>
+    <% if index == 0 %>
+        <h1>
+            <%= title %> <%= presenter.permission_badge %>
+        </h1>
+    <% else %>
+        <h1><%= title %></h1>
+    <% end %>
+<% end %>

data/app/views/hyrax/file_sets/_permission_form.html.erb

@@ -34,7 +34,7 @@
     </div>
     <div class="col-sm-4">
       <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
-      <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_levels), class: 'form-control' %>
+      <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
     </div>
     <div class="col-sm-3">
       <button class="btn btn-default" id="add_new_user_skel">
@@ -55,7 +55,7 @@
     </div>
     <div class="col-sm-4">
       <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
-      <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_levels), class: 'form-control' %>
+      <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
     </div>
     <div class="col-sm-3">
       <span class="sr-only">Add this group</span>

data/app/views/hyrax/file_sets/_show_characterization_details.html.erb

@@ -1,7 +1,7 @@
 <% @presenter.characterization_metadata.keys.each do |term| %>
   <div>
     <% additional_values = @presenter.secondary_characterization_values(term) %>
-    <%= @presenter.label_for_term(term) %>: <%= sanitize @presenter.primary_characterization_values(term).join("<br />") %>
+    <%= @presenter.label_for_term(term) %>: <%= @presenter.primary_characterization_values(term).join("<br />").html_safe %>
     <% unless additional_values.empty? %>
       <%= render partial: "extra_fields_modal", locals: { name: term, values: additional_values } %>
     <% end %>

data/app/views/hyrax/file_sets/_show_details.html.erb

@@ -6,8 +6,8 @@
   <dd itemprop="datePublished"><%= @presenter.date_uploaded %></dd>
   <dt>Date Modified</dt>
   <dd itemprop="dateModified"><%= @presenter.date_modified %></dd>
-  <dt>Audit Status</dt>
-  <dd><%= @presenter.audit_status %></dd>
+  <dt>Fixity Check</dt>
+  <dd><%= @presenter.fixity_check_status %></dd>
   <dt>Characterization</dt>
   <dd>
     <% if @presenter.characterized? %>

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

@@ -6,10 +6,9 @@
                     alt: "",
                     role: "presentation" %>
       <%= link_to hyrax.download_path(file_set),
-                  data: { turbolinks: false },
+                  data: { turbolinks: false, label: file_set.id },
                   target: :_blank,
                   id: "file_download",
-                  data: { label: file_set.id },
                   class: "btn btn-default" do %>
           <%= t('hyrax.file_set.show.downloadable_content.image_link') %>
       <% end %>

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

@@ -1,5 +1,3 @@
-<%= render 'shared/citations' %>
-
 <div class="container-fluid">
   <div class="row">
     <div class="col-xs-12 col-sm-4">
@@ -9,10 +7,10 @@
     </div>
     <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
       <header>
-        <%= render 'work_title', presenter: @presenter %>
+        <%= render 'file_set_title', presenter: @presenter %>
       </header>
 
-      <%# TODO: render 'show_descriptions' See https://github.com/projecthydra/hyrax/issues/1481 %>
+      <%# TODO: render 'show_descriptions' See https://github.com/samvera/hyrax/issues/1481 %>
       <%= render 'show_details' %>
       <%= render 'hyrax/users/activity_log', events: @presenter.events %>
     </div><!-- /columns second -->

data/app/views/hyrax/homepage/_announcement.html.erb

@@ -1,5 +1,5 @@
-<% if display_editable_content_block? @announcement_text %>
+<% if display_content_block? @announcement_text %>
   <div id="announcement" class="row">
-    <%= editable_content_block @announcement_text %>
+    <%= displayable_content_block @announcement_text, class: 'row', id: 'announcement' %>
   </div>
 <% end %>

data/app/views/hyrax/homepage/_explore_collections.html.erb

@@ -1,16 +1,16 @@
 <table class="table table-striped collection-highlights">
   <tbody>
-    <% @admin_sets.each do |admin_set| %>
+    <% collections.each do |collection| %>
       <tr>
         <td>
           <div class="media">
-            <%= link_to [hyrax, admin_set], class: 'media-left', 'aria-hidden' => true do %>
-              <%= render_thumbnail_tag admin_set, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
+            <%= link_to [hyrax, collection], class: 'media-left', 'aria-hidden' => true do %>
+              <%= render_thumbnail_tag collection, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
             <% end %>
             <div class="media-body">
               <div class="media-heading">
-                <%= link_to [hyrax, admin_set] do %>
-                  <%= admin_set.title_or_label %>
+                <%= link_to [hyrax, collection] do %>
+                  <%= collection.title_or_label %>
                 <% end %>
               </div>
             </div>
@@ -22,7 +22,8 @@
 </table>
 <ul class="list-inline collection-highlights-list">
   <li>
-    <%= link_to t('hyrax.homepage.admin_sets.link'), hyrax.admin_sets_path, class: 'btn btn-default' %>
+    <%= link_to t('hyrax.homepage.admin_sets.link'),
+                main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
+                class: 'btn btn-default' %>
   </li>
 </ul>
-

data/app/views/hyrax/homepage/_featured_researcher.html.erb

@@ -1,7 +1,5 @@
-<%= editable_content_block @featured_researcher, true %>
-
-<ul class="list-inline collection-highlights-list">
-  <li>
-    <%= link_to t('hyrax.homepage.featured_researcher.view_more'), hyrax.featured_researchers_path, class: 'btn btn-default' %>
-  </li>
-</ul>
+<% if @featured_researcher.value.present? %>
+  <%= displayable_content_block @featured_researcher %>
+<% else %>
+  <%= t('hyrax.homepage.featured_researcher.missing') %>
+<% end %>

data/app/views/hyrax/homepage/_home_content.html.erb

@@ -15,23 +15,19 @@
 
 <div class="col-xs-12 col-sm-6">
 
-  <% if Flipflop.assign_admin_set? %>
-    <ul class="nav nav-tabs" role="tablist">
-      <li class="active"><a aria-expanded="true" href="#tab-col2-first" role="tab" data-toggle="tab"><%= t('hyrax.homepage.admin_sets.title') %></a></li>
-      <li class=""><a aria-expanded="false" href="#tab-col2-second" role="tab" data-toggle="tab"><%= t('hyrax.homepage.featured_researcher.tab_label') %></a></li>
-    </ul>
-    <div class="tab-content">
-      <div class="tab-pane active" id="tab-col2-first">
-        <h2 class="sr-only"><%= t('hyrax.homepage.admin_sets.title') %></h2>
-        <%= render 'explore_collections' %>
-      </div>
-      <div class="tab-pane" id="tab-col2-second">
-        <h2 class="sr-only"><%= t('hyrax.homepage.featured_researcher.title') %></h2>
-        <%= render 'featured_researcher' %>
-      </div>
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="active"><a aria-expanded="true" href="#tab-col2-first" role="tab" data-toggle="tab"><%= t('hyrax.homepage.admin_sets.title') %></a></li>
+    <li class=""><a aria-expanded="false" href="#tab-col2-second" role="tab" data-toggle="tab"><%= t('hyrax.homepage.featured_researcher.tab_label') %></a></li>
+  </ul>
+
+  <div class="tab-content">
+    <div class="tab-pane active" id="tab-col2-first">
+      <h2 class="sr-only"><%= t('hyrax.homepage.admin_sets.title') %></h2>
+      <%= render 'explore_collections', collections: @presenter.collections %>
     </div>
-  <% else %>
-    <h2><%= t('hyrax.homepage.featured_researcher.title') %></h2>
-    <%= render 'featured_researcher' %>
-  <% end %>
+    <div class="tab-pane" id="tab-col2-second">
+      <h2 class="sr-only"><%= t('hyrax.homepage.featured_researcher.title') %></h2>
+      <%= render 'featured_researcher' %>
+    </div>
+  </div>
 </div>

data/app/views/hyrax/homepage/_marketing.html.erb

@@ -1,6 +1,5 @@
-<% if display_editable_content_block? @marketing_text %>
+<% if display_content_block? @marketing_text %>
   <div class="home_marketing_text">
-    <%= editable_content_block @marketing_text %>
+    <%= displayable_content_block @marketing_text, class: 'col-sm-offset-2 col-sm-9 col-md-offset-1 home_marketing_text' %>
   </div>
 <% end %>
-

data/app/views/hyrax/homepage/index.html.erb

@@ -17,12 +17,12 @@
           <% end %>
         <% end %>
       <% else %>
-        <%= link_to hyrax.dashboard_index_path,
+        <%= link_to hyrax.dashboard_path,
           class: "btn btn-primary btn-lg" do %>
           <i class="glyphicon glyphicon-upload"></i> <%= t('hyrax.share_button') %>
         <% end %>
       <% end %>
-      <p><%= link_to t(:'hyrax.controls.terms'), hyrax.terms_path %></p>
+      <p><%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path %></p>
     </div>
   </div>
 <% end %>

data/app/views/hyrax/leases/_lease_history.html.erb

@@ -0,0 +1,8 @@
+<%# To render this view pass `lease_history` (e.g. `object: curation_concern.lease_history`) %>
+<ul>
+  <% lease_history.each do |entry| %>
+    <% unless entry.empty? %>
+      <li><%= entry %></li>
+    <% end %>
+  <% end %>
+</ul>

data/app/views/hyrax/leases/_list_active_leases.html.erb

@@ -0,0 +1,18 @@
+<table class="leases table">
+  <thead>
+    <tr>
+      <%= render partial: 'table_headers' %>
+    </tr>
+  </thead>
+  <tbody>
+  <% assets_under_lease.each do |curation_concern| %>
+    <tr>
+      <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
+      <td class="title"><%= link_to curation_concern, edit_lease_path(curation_concern) %></td>
+      <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
+      <td class="lease-expiration-date"><%= curation_concern.lease_expiration_date %></td>
+      <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

data/app/views/hyrax/leases/_list_deactivated_leases.html.erb

@@ -0,0 +1,4 @@
+<% assets_with_deactivated_leases.each do |curation_concern| %>
+  <%= link_to curation_concern, edit_lease_path(curation_concern) %> <%= visibility_badge(curation_concern.visibility) %>
+  <%= render partial: 'lease_history', object: curation_concern.lease_history %>
+<% end %>

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

@@ -0,0 +1,53 @@
+<% if assets_with_expired_leases.blank? %>
+  <table class="leases table">
+    <thead>
+      <tr>
+        <%= render partial: 'table_headers' %>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td colspan="5" class="text-center">
+          <p><%= t('.missing') %></p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+<% else %>
+
+  <%= form_tag leases_path, method: :patch do %>
+    <%= submit_tag t('.deactivate_selected'), class: 'btn btn-primary' %>
+    <table class="leases table">
+      <thead>
+        <tr>
+          <th></th>
+          <%= render partial: 'table_headers' %>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% assets_with_expired_leases.each_with_index do |curation_concern, i| %>
+        <tr>
+          <td><%= render 'hyrax/batch_select/add_button', document: curation_concern %></td>
+          <td class="human-readable-type"><%= curation_concern.human_readable_type %></td>
+          <td class="title"><%= link_to curation_concern, edit_lease_path(curation_concern)  %></td>
+          <td class="current-visibility"><%= visibility_badge(curation_concern.visibility) %></td>
+          <td class="lease-release-date"><%= curation_concern.lease_expiration_date %></td>
+          <td class="visibility-after-lease"><%= visibility_badge(curation_concern.visibility_after_lease) %></td>
+          <td class="actions"><%= link_to t('.deactivate'), lease_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 %>
+            <%= t('.change_all', cc: curation_concern) %>
+            <%= visibility_badge(curation_concern.visibility_after_lease) %>?
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% end %>
+
+<% end %>

data/app/views/hyrax/leases/_table_headers.html.erb

@@ -0,0 +1,5 @@
+    <th><%= t('.type') %></th>
+    <th><%= t('.title') %></th>
+    <th><%= t('.viz_current') %></th>
+    <th><%= t('.release_date') %></th>
+    <th><%= t('.viz_after') %></th>

data/app/views/hyrax/leases/edit.html.erb

@@ -0,0 +1,45 @@
+<% cc_type = curation_concern.human_readable_type %>
+
+<% provide :page_header do %>
+    <h1><%= t('.manage_leases_html', cc: curation_concern, cc_type: cc_type) %></h1>
+<% end %>
+
+<h2><%= t('.header.current') %></h2>
+<%= simple_form_for [main_app, curation_concern] do |f| %>
+  <fieldset class="set-access-controls">
+    <section class="help-block">
+      <p>
+        <% if curation_concern.lease_expiration_date %>
+          <%= t('.lease_true_html',  cc: cc_type) %>
+        <% else %>
+          <%= t('.lease_false_html', cc: cc_type) %>
+        <% end %>
+      </p>
+    </section>
+
+    <div class="form-group">
+      <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE %>" />
+      <%= render 'hyrax/base/form_permission_lease', curation_concern: curation_concern, f: f  %>
+    </div>
+  </fieldset>
+
+  <div class="row">
+    <div class="col-md-12 form-actions">
+      <% if curation_concern.lease_expiration_date %>
+        <%= f.submit t('.lease_update'), class: 'btn btn-primary' %>
+        <%= link_to t('.lease_deactivate'), lease_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
+      <% else %>
+        <%= f.submit t('.lease_apply'), class: 'btn btn-primary' %>
+      <% end %>
+      <%= link_to t('.lease_cancel'), leases_path, class: 'btn btn-default' %>
+      <%= link_to t('.lease_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
+    </div>
+  </div>
+<% end %>
+
+<h2><%= t('.header.past') %></h2>
+<% if curation_concern.lease_history.empty? %>
+  <%= t('.history_empty', cc: cc_type) %>
+<% else %>
+  <%= render partial: 'lease_history', object: curation_concern.lease_history %>
+<% end %>

data/app/views/hyrax/leases/index.html.erb

@@ -0,0 +1,24 @@
+<% provide :page_header do %>
+  <h1><span class="fa fa-sitemap"></span><%= t('.manage_leases') %></h1>
+<% end %>
+
+<div class="panel panel-default">
+  <div class="panel-body">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#active" data-toggle="tab"><%= t('.active') %></a></li>
+      <li><a href="#expired" data-toggle="tab"><%= t('.expired') %></a></li>
+      <li><a href="#deactivated" data-toggle="tab"><%= t('.deactivated') %></a></li>
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active" id="active">
+        <%= render "list_active_leases" %>
+      </div>
+      <div class="tab-pane" id="expired">
+        <%= render "list_expired_active_leases" %>
+      </div>
+      <div class="tab-pane" id="deactivated">
+        <%= render "list_deactivated_leases" %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/hyrax/my/_collection_action_menu.html.erb

@@ -1,18 +1,18 @@
 <div class="btn-group">
-  <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
+  <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
   </button>
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
     <li role="menuitem" tabindex="-1">
-      <%= link_to hyrax.edit_collection_path(id),
+      <%= link_to hyrax.edit_dashboard_collection_path(id),
                   class: 'itemicon itemedit',
                   title: t("hyrax.dashboard.my.action.edit_collection") do %>
         <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> <%= t("hyrax.dashboard.my.action.edit_collection") %>
       <% end %>
     </li>
     <li role="menuitem" tabindex="-1">
-      <%= link_to hyrax.collection_path(id),
+      <%= link_to hyrax.dashboard_collection_path(id),
                   class: 'itemicon itemtrash',
                   title: t("hyrax.dashboard.my.action.delete_collection"),
                   method: :delete,

data/app/views/hyrax/my/_constraints.html.erb

@@ -1,11 +1,13 @@
 <% if query_has_constraints? %>
-
-      <div id="appliedParams" class="clearfix constraints-container">
-        <div class="pull-right">
-          <%= link_to t('blacklight.search.start_over'), start_over_path, 
-              class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" %>
-        </div>
-        <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
-        <%= render_constraints(params.merge(route_set: hyrax)) %>
-      </div>
+  <div id="appliedParams" class="clearfix constraints-container">
+    <div class="pull-right">
+      <%= link_to start_over_path,
+          class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" do %>
+          <span class="btn btn-sm btn-danger start-over"><span class="glyphicon glyphicon-remove"></span></span>
+          <%= t('blacklight.search.start_over') %>
+      <% end %>
+    </div>
+    <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
+    <%= render_constraints(params.merge(route_set: hyrax)) %>
+  </div>
 <% end %>

data/app/views/hyrax/my/_document_list.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
 <div class="table-responsive" id="documents">
-  <%= render 'hyrax/my/_index_partials/default_group', docs: @response.docs %>
+  <%= render 'default_group', docs: @response.docs %>
 </div>

data/app/views/hyrax/my/_facet_layout.html.erb

@@ -1,12 +1,7 @@
-<div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
-  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h4 class="panel-title">
-      <%= link_to facet_field_label(facet_field.field), "#", :"data-no-turbolink" => true %>
-    </h4>
-  </div>
-  <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
-    <div class="panel-body">
-      <%= yield %>
-    </div>
-  </div>
+<div class="btn-group">
+  <button class="btn btn-default dropdown-toggle" type="button" id="<%= facet_field.field.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+    <%= facet_field_label(facet_field.field) %>
+    <span class="caret"></span>
+  </button>
+  <%= yield %>
 </div>

data/app/views/hyrax/my/_facet_limit.html.erb

@@ -1,4 +1,8 @@
-  <ul class="dropdown-menu facet-values" aria-labelledby="<%= facet_field.field.parameterize %>">
+  <%# This template is used to render the initial facet list (#index action)
+      and a paginated facet list in a modal (#facet action). The `dropdown-menu`
+      class in only necessary for the former and causes display issues in the latter.
+  -%>
+  <ul class="<%= 'dropdown-menu ' if action_name == 'index' %>facet-values" aria-labelledby="<%= facet_field.field.parameterize %>">
     <% paginator = facet_paginator(facet_field, display_facet) %>
     <%= render_facet_limit_list paginator, facet_field.key %>