hyrax 2.1.0.beta1 → 2.1.0.beta2

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

@@ -4,42 +4,54 @@
   <h1><%= t('.manage_embargoes_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.embargo_release_date %>
-          <%= t('.embargo_true_html',  cc: cc_type) %>
-        <% else %>
-          <%= t('.embargo_false_html', cc: cc_type) %>
-        <% end %>
-      </p>
-    </section>
+<div class="panel panel-default tabs">
+  <div class="panel-heading">
+    <h2 class="panel-title"><%= t('.header.current') %></h2>
+  </div>
+  <div class="panel-body">
+    <%= simple_form_for [main_app, curation_concern] do |f| %>
+      <fieldset class="set-access-controls">
+        <section class="help-block">
+          <p>
+            <% if curation_concern.embargo_release_date %>
+              <%= t('.embargo_true_html',  cc: cc_type) %>
+            <% else %>
+              <%= t('.embargo_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_EMBARGO %>" />
-      <%= render 'hyrax/base/form_permission_embargo', curation_concern: curation_concern, f: f  %>
-    </div>
-  </fieldset>
+        <div class="form-group">
+          <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>" />
+          <%= render 'hyrax/base/form_permission_embargo', curation_concern: curation_concern, f: f  %>
+        </div>
+      </fieldset>
 
-  <div class="row">
-    <div class="col-md-12 form-actions">
-      <% if curation_concern.embargo_release_date %>
-        <%= f.submit t('.embargo_update'), class: 'btn btn-primary' %>
-        <%= link_to t('.embargo_deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
-      <% else %>
-        <%= f.submit t('.embargo_apply'), class: 'btn btn-primary' %>
-      <% end %>
-      <%= link_to t('.embargo_cancel'), embargoes_path, class: 'btn btn-default' %>
-      <%= link_to t('.embargo_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
-    </div>
+      <div class="row">
+        <div class="col-md-12 form-actions">
+          <% if curation_concern.embargo_release_date %>
+            <%= f.submit t('.embargo_update'), class: 'btn btn-primary' %>
+            <%= link_to t('.embargo_deactivate'), embargo_path(curation_concern), method: :delete, class: 'btn btn-danger' %>
+          <% else %>
+            <%= f.submit t('.embargo_apply'), class: 'btn btn-primary' %>
+          <% end %>
+          <%= link_to t('.embargo_cancel'), embargoes_path, class: 'btn btn-default' %>
+          <%= link_to t('.embargo_return', cc: cc_type), edit_polymorphic_path([main_app, curation_concern]), class: 'btn btn-default' %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>
 
-<h2><%= t('.header.past') %></h2>
-<% if curation_concern.embargo_history.empty? %>
-  <%= t('.history_empty', cc: cc_type) %>
-<% else %>
-  <%= render partial: "embargo_history", object: curation_concern.embargo_history %>
-<% end %>
+<div class="panel panel-default tabs">
+  <div class="panel-heading">
+    <h2 class="panel-title"><%= t('.header.past') %></h2>
+  </div>
+  <div class="panel-body">
+    <% if curation_concern.embargo_history.empty? %>
+      <%= t('.history_empty', cc: cc_type) %>
+    <% else %>
+      <%= render partial: "embargo_history", object: curation_concern.embargo_history %>
+    <% end %>
+  </div>
+</div>

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

@@ -2,13 +2,13 @@
   <h1><span class="fa fa-sitemap"></span><%= t('.manage_embargoes') %></h1>
 <% end %>
 
-<div class="panel panel-default">
+<div class="panel panel-default tabs">
+  <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="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_embargoes" %>
@@ -22,4 +22,3 @@
     </div>
   </div>
 </div>
-

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

@@ -29,8 +29,12 @@
 
   <% if can?(:download, file_set.id) %>
     <li role="menuitem" tabindex="-1">
-      <%= link_to 'Download', hyrax.download_path(file_set),
-        title: "Download #{file_set.to_s.inspect}", target: "_blank" %>
+      <%= link_to 'Download',
+                  hyrax.download_path(file_set),
+                  title: "Download #{file_set.to_s.inspect}",
+                  target: "_blank",
+                  id: "file_download",
+                  data: { label: file_set.id } %>
     </li>
   <% end %>
 

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

@@ -1,14 +1,14 @@
 <div class="modal-div extra_tag">
 <% label = name.to_s.titleize %>
 <!-- Button to trigger modal -->
-<a href="#extraFieldsModal_<%=name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal">Additional <%= label %> <i class="glyphicon glyphicon-plus large-icon"></i></a>
+<a href="#extraFieldsModal_<%= name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal">Additional <%= label %> <i class="glyphicon glyphicon-plus large-icon"></i></a>
 <!-- Modal -->
-<div class="modal fade" id="extraFieldsModal_<%=name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="extraFieldsModal_<%= name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-        <h2 id="extraFieldsModal_<%=name %>_Label">Additional <%= label %>(s)</h2>
+        <h2 id="extraFieldsModal_<%= name %>_Label">Additional <%= label %>(s)</h2>
       </div>
       <div class="modal-body">
         <%= values.join("<br />").html_safe %>

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

@@ -1,2 +1 @@
 <p><%= t('.description_html', institution_name: institution_name, application_name: application_name) %></p>
-

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

@@ -26,8 +26,8 @@
 
 <div class="form-group row">
   <div id="new-user">
-    <p class="col-sm-12">Enter <%=t('hyrax.account_label') %> (one at a time)</p>
-    <p class="sr-only">Use the add button to give access to one <%=t('hyrax.account_label') %> at a time (it will be added to the list below).  Select the user, by name or <%=t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this <%= t('hyrax.account_label') %> to complete adding the permission.</p>
+    <p class="col-sm-12">Enter <%= t('hyrax.account_label') %> (one at a time)</p>
+    <p class="sr-only">Use the add button to give access to one <%= t('hyrax.account_label') %> at a time (it will be added to the list below).  Select the user, by name or <%= t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this <%= t('hyrax.account_label') %> to complete adding the permission.</p>
     <div class="col-sm-5">
       <label for="new_user_name_skel" class="sr-only"><%= t('hyrax.account_label') %> (without the <%= t('hyrax.directory.suffix') %> part)</label>
       <%= text_field_tag 'new_user_name_skel', nil %>
@@ -47,7 +47,7 @@
 </div>
 
 <div class="form-group row">
-  <div id="new-group" >
+  <div id="new-group">
     <p class="sr-only">Use the add button to give access to one group at a time (it will be added to the list below).</p>
     <div class="col-sm-5">
       <label for="new_group_name_skel" class="sr-only">Group</label>

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

@@ -8,24 +8,28 @@
     <%= media_display curation_concern.to_presenter %>
   </div>
   <div class="col-xs-12 col-sm-8">
-    <ul class="nav nav-tabs" role="tablist">
-      <li id="edit_descriptions_link" class="active">
-        <a href="#descriptions_display" data-toggle="tab"><i class="fa fa-tags"></i> Descriptions</a>
-      </li>
-      <li id="edit_versioning_link">
-        <a href="#versioning_display" data-toggle="tab"><i class="fa fa-sitemap"></i> Versions</a>
-      </li>
-      <li id="edit_permissions_link">
-        <a href="#permissions_display" data-toggle="tab"><i class="fa fa-key"></i> Permissions</a>
-      </li>
-    </ul>
-    <div class="tab-content">
-      <div id="descriptions_display" class="tab-pane active">
-        <h2>Descriptions </h2>
-        <%= render "form" %>
+    <div class="panel panel-default tabs">
+      <ul class="nav nav-tabs" role="tablist">
+        <li id="edit_descriptions_link" class="active">
+          <a href="#descriptions_display" data-toggle="tab"><i class="fa fa-tags"></i> Descriptions</a>
+        </li>
+        <li id="edit_versioning_link">
+          <a href="#versioning_display" data-toggle="tab"><i class="fa fa-sitemap"></i> Versions</a>
+        </li>
+        <li id="edit_permissions_link">
+          <a href="#permissions_display" data-toggle="tab"><i class="fa fa-key"></i> Permissions</a>
+        </li>
+      </ul>
+      <div class="panel-body">
+        <div class="tab-content">
+          <div id="descriptions_display" class="tab-pane active">
+            <h2>Descriptions </h2>
+            <%= render "form" %>
+          </div>
+          <%= render "permission", file_set: curation_concern %>
+          <%= render "versioning", file_set: curation_concern %>
+        </div>
       </div>
-      <%= render "permission", file_set: curation_concern %>
-      <%= render "versioning", file_set: curation_concern %>
-    </div>
-  </div><!-- /.col-sm-8 -->
-</div><!-- /.row -->
+    </div><!-- /.col-sm-8 -->
+  </div><!-- /.row -->
+</div>

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

@@ -1,6 +1,23 @@
-  <audio controls="controls" class="audiojs" preload="auto">
-    <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
-    <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
-    Your browser does not support the audio tag.
-  </audio>
-
+<% if Hyrax.config.display_media_download_link? %>
+    <div>
+      <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
+      <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        Your browser does not support the audio tag.
+      </audio>
+      <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'),
+                  hyrax.download_path(file_set),
+                  data: { turbolinks: false, label: file_set.id },
+                  target: :_blank,
+                  id: "file_download" %>
+    </div>
+<% else %>
+    <div>
+      <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
+        <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp3') %>" type="audio/mpeg" />
+        Your browser does not support the audio tag.
+      </audio>
+    </div>
+<% end %>

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

@@ -1,7 +1,7 @@
 <div class="no-preview">
   <%= t('hyrax.works.show.no_preview') %>
   <% if Hyrax.config.display_media_download_link? %>
-    <p/><%= link_to t('hyrax.file_set.show.download'),
+    <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",
       data: { label: file_set.id },

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

@@ -1,6 +1,23 @@
-  <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
-    <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
-    <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
-    Your browser does not support the video tag.
-  </video>
-
+<% if Hyrax.config.display_media_download_link? %>
+    <div>
+      <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
+      <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
+        <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+        Your browser does not support the video tag.
+      </video>
+      <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'),
+                  hyrax.download_path(file_set),
+                  data: { turbolinks: false, label: file_set.id },
+                  target: :_blank,
+                  id: "file_download" %>
+    </div>
+<% else %>
+    <div>
+      <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
+        <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />
+        <source src="<%= hyrax.download_path(file_set, file: 'mp4') %>" type="video/mp4" />
+        Your browser does not support the video tag.
+      </video>
+    </div>
+<% end %>

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

@@ -31,7 +31,7 @@
         <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="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>

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

@@ -4,42 +4,54 @@
     <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="panel panel-default tabs">
+  <div class="panel-heading">
+    <h2 class="panel-title"><%= t('.header.current') %></h2>
+  </div>
+  <div class="panel-body">
+    <%= 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="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 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 %>
   </div>
-<% end %>
+</div>
 
-<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 %>
+<div class="panel panel-default tabs">
+  <div class="panel-heading">
+    <h2 class="panel-title"><%= t('.header.past') %></h2>
+  </div>
+  <div class="panel-body">
+    <% if curation_concern.lease_history.empty? %>
+      <%= t('.history_empty', cc: cc_type) %>
+    <% else %>
+      <%= render partial: 'lease_history', object: curation_concern.lease_history %>
+    <% end %>
+  </div>
+</div>

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

@@ -2,13 +2,13 @@
   <h1><span class="fa fa-sitemap"></span><%= t('.manage_leases') %></h1>
 <% end %>
 
-<div class="panel panel-default">
+<div class="panel panel-default tabs">
+  <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="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" %>

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

@@ -18,7 +18,7 @@
       <li role="menuitem" tabindex="-1">
         <%= link_to hyrax.edit_dashboard_collection_path(id),
                     class: 'itemicon itemedit',
-                    title: t("hyrax.dashboard.my.action.edit_collection") do %>
+                    title: t("hyrax.dashboard.my.action.edit_collection")  do %>
           <%= t("hyrax.dashboard.my.action.edit_collection") %>
         <% end %>
       </li>

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

@@ -1,7 +1,6 @@
   <%# 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.
-  -%>
+      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 %>

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

@@ -3,20 +3,20 @@
        <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
      <% end %>
       <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} do %>
-       
+
        <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
       <% end %>
-     
+
     </div>
- 
+
   <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
-      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), 
+      <span class="active az btn btn-default"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
         Hyrax::Engine.routes.url_for(@pagination.params_for_resort_url('count', search_state.to_h).symbolize_keys.merge(only_path: true)),
         class: "sort_change numeric btn btn-default",
         data: {ajax_modal: "preserve"}) %>
     <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to(t('blacklight.search.facets.sort.index'), Hyrax::Engine.routes.url_for(@pagination.params_for_resort_url('index', search_state.to_h).symbolize_keys.merge(only_path: true)),
+      <%= link_to(t('blacklight.search.facets.sort.index'), Hyrax::Engine.routes.url_for(@pagination.params_for_resort_url('index', search_state.to_h).symbolize_keys.merge(only_path: true)),
         class: "sort_change az btn btn-default",  data: {ajax_modal: "preserve"}) %><span class="active numeric btn btn-default"><%= t('blacklight.search.facets.sort.count') %></span>
-    <% end -%>    
+    <% end -%>
   </div>