hyrax 2.1.0.beta1 → 2.1.0.beta2

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

@@ -1,6 +1,6 @@
 <% if !subfacet ||= false %>
   <ul class="dropdown-menu pivot-facet list-unstyled">
-<%end %>
+<% end %>
 
   <% display_facet.items.each do |item| -%>
     <li>

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

@@ -1,6 +1,6 @@
 <% if @response.total_pages > 1 %>
  <div class="row record-padding">
-  <div class="col-md-9"> 
+  <div class="col-md-9">
     <div class="pagination">
       <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: hyrax %>
     </div>

data/app/views/hyrax/my/collections/_facets.html.erb

@@ -1,5 +1,5 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?  %>
+<% if has_facet_values? %>
   <div class="list-filters" role="group">
     <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.collections") %></span>
     <%= render_facet_partials %>

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -1,4 +1,4 @@
-<% id = collection_presenter.id%>
+<% id = collection_presenter.id %>
 
 <%# Data attributes referenced by the javascript for row actions %>
 <tr id="document_<%= id %>"
@@ -35,14 +35,14 @@
       <div class="expanded-details">
         <p>
           <strong><%= t("hyrax.dashboard.my.collection_list.description") %></strong>
-          <br><%= collection_presenter.description.first %>
+          <br /><%= collection_presenter.description.first %>
         </p>
         <p>
           <strong><%= t("hyrax.dashboard.my.collection_list.edit_access") %></strong>
-          <br>
+          <br />
           <% if collection_presenter.edit_groups.present? %>
             <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= collection_presenter.edit_groups.join(', ') %>
-            <br/>
+            <br />
           <% end %>
           <%= t("hyrax.dashboard.my.collection_list.users") %> <%= collection_presenter.edit_people.join(', ') %>
         </p>
@@ -54,7 +54,7 @@
   </td>
   <td><%= collection_presenter.permission_badge %></td>
   <td><%= collection_presenter.total_viewable_items %></td>
-  <td class="date"><%=collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td class="date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
   <td>
     <% if collection_presenter.solr_document.admin_set? %>
       <%= render '/hyrax/my/admin_set_action_menu', admin_set_presenter: collection_presenter %>

data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb

@@ -11,18 +11,19 @@
       <div class="modal-body">
         <div class="modal-ajax-alert"></div>
         <label><%= t('hyrax.collection.actions.nest_collections.select_label') %></label>
-        <input type="hidden" name="source" value="<%= source %>"></input>
+        <input type="hidden" name="source" value="<%= source %>" /><input />
         <select name="child_id">
           <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
           <% colls = Hyrax::Collections::NestedCollectionQueryService.available_child_collections(parent: collection, scope: controller, limit_to_id: nil) %>
           <% colls.each {|coll| %>
-            <option  value="<%= coll.id %>"><%= coll.title.first %></option>
+            <option value="<%= coll.id %>"><%= coll.title.first %></option>
           <% } %>
         </select>
       </div>
 
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
+        <% # '.modal-add-button' and '.modal-submit-button' classes applied below are used for JavaScript targeting %>
         <button
           disabled
           type="button"

data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb

@@ -8,9 +8,11 @@
       </div>
 
       <div class="modal-body">
+        <!-- Any alert messaging mounts to this element -->
         <div class="modal-ajax-alert"></div>
+
         <label><%= t('hyrax.collection.actions.nested_subcollection.select_label') %></label>
-        <input type="hidden" name="source" value="<%= source %>"></input>
+        <input type="hidden" name="source" value="<%= source %>" /><input />
         <select name="parent_id">
           <option value="none"><%= t("hyrax.dashboard.my.action.select") %></option>
         </select>

data/app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb

@@ -3,7 +3,7 @@
     <div class="modal-content">
       <div class="modal-body">
         <p><%= t('hyrax.dashboard.my.action.nesting_permission_denied') %></p>
-      </div> 
+      </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" data-dismiss="modal"><%= t('helpers.action.close') %></button>
       </div>

data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb

@@ -17,7 +17,7 @@
                   data-path="<%= new_admin_admin_set_path %>"
                 <% else %>
                   data-path="<%= "#{new_dashboard_collection_path}&collection_type_id=#{row_presenter.id}" %>"
-                <% end %>>
+                <% end %> />
                 <h4><%= row_presenter.title %></h4>
                 <p><%= row_presenter.description %></p>
               </label>
@@ -28,7 +28,7 @@
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.collection_type_actions.close') %>
           </button>
-          <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.collection_type_actions.create_collection') %>">
+          <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.collection_type_actions.create_collection') %>" />
         </div>
       </form>
     </div><!-- ./modal-content -->

data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb

@@ -11,8 +11,7 @@
           data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
         <button type="button"
           class="btn btn-danger modal-delete-button"
-          title="<%= t("hyrax.dashboard.my.action.delete_collection") %>"
-          ><%= t('helpers.action.delete') %></button>
+          title="<%= t("hyrax.dashboard.my.action.delete_collection") %>"><%= t('helpers.action.delete') %></button>
       </div>
     </div>
   </div>

data/app/views/hyrax/my/collections/_modal_delete_deny.html.erb

@@ -11,4 +11,4 @@
       </form>
     </div>
   </div>
-</div>
+</div>

data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb

@@ -7,11 +7,11 @@
         <div class="modal-footer">
           <div style="text-align: right; display: inline-block">
             <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
-            <div style="float: right; margin-left: 10px;" >
+            <div style="float: right; margin-left: 10px;">
               <%= render 'hyrax/dashboard/collections/button_for_batch_delete_collection', label: t('helpers.action.delete') %>
             </div>
           </div>
         </div>
     </div>
   </div>
-</div>
+</div>

data/app/views/hyrax/my/collections/_tabs.html.erb

@@ -1,9 +1,9 @@
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <span class="sr-only">You are currently listing your collections.  You have <%= @response.docs.count %> <%= 'collection'.pluralize(@response.docs.count)%> </span>
+  <span class="sr-only">You are currently listing your collections.  You have <%= @response.docs.count %> <%= 'collection'.pluralize(@response.docs.count) %> </span>
     <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_collections_path(locale: nil)) %>>
       <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.collections"), hyrax.dashboard_collections_path %>
     </li>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_collections_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.my.collections'), hyrax.my_collections_path %>
+    <%= link_to t('hyrax.dashboard.my.your_collections'), hyrax.my_collections_path %>
   </li>
 </ul>

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

@@ -4,9 +4,13 @@
   <%= atom_feed_link_tag route_set: hyrax %>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
+//<![CDATA[
+
   <%= render partial: 'scripts', formats: [:js] %>
-<% end %>
+
+//]]>
+</script>
 
 <% provide :page_header do %>
   <h1><span class="fa fa-folder-open"></span> <%= t("hyrax.admin.sidebar.collections") %></h1>
@@ -25,7 +29,7 @@
           data-toggle="modal"
           data-target="#collectiontypes-to-create"
           data-behavior="select-collection">
-          <%= t(:'helpers.action.collection.new')%>
+          <%= t(:'helpers.action.collection.new') %>
         </button>
       <% else @collection_type_list_presenter.any? %>
         <% # link directly to create collection form with type %>

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

@@ -11,7 +11,7 @@
   <%= render_facet_limit(@display_facet, layout: false) %>
   </div>
 </div>
-  
+
 <div class="modal-footer">
 
   <div class="facet_pagination bottom">

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

@@ -5,9 +5,13 @@
   <%= atom_feed_link_tag route_set: hyrax %>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
+//<![CDATA[
+
   <%= render partial: 'scripts', formats: [:js] %>
-<% end %>
+
+//]]>
+</script>
 
 <% provide :page_header do %>
   <h1><span class="fa fa-file"></span> <%= t("hyrax.admin.sidebar.works") %></h1>

data/app/views/hyrax/my/works/_facets.html.erb

@@ -1,5 +1,5 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?  %>
+<% if has_facet_values? %>
   <div class="list-filters" role="group">
     <span class="list-filters-label"><%= t("hyrax.dashboard.my.facet_label.works") %></span>
     <%= render_facet_partials %>

data/app/views/hyrax/my/works/_list_works.html.erb

@@ -1,7 +1,7 @@
 <tr id="document_<%= document.id %>">
 
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("hyrax.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= document.id %>" class="sr-only"><%= t("hyrax.dashboard.my.sr.batch_checkbox") %></label>
     <%= render 'hyrax/batch_select/add_button', document: document %>&nbsp;
   </td>
 

data/app/views/hyrax/my/works/_tabs.html.erb

@@ -1,9 +1,9 @@
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <span class="sr-only">You are currently listing your works.  You have <%= @response.docs.count %> <%= 'work'.pluralize(@response.docs.count)%> </span>
+  <span class="sr-only">You are currently listing your works.  You have <%= @response.docs.count %> <%= 'work'.pluralize(@response.docs.count) %> </span>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
     <%= link_to t("hyrax.dashboard.#{current_ability.admin? ? 'all' : 'managed'}.works"), hyrax.dashboard_works_path, data: { turbolinks: false } %>
   </li>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.my_works_path(locale: nil)) %>>
-    <%= link_to t('hyrax.dashboard.my.works'), hyrax.my_works_path, data: { turbolinks: false } %>
+    <%= link_to t('hyrax.dashboard.my.your_works'), hyrax.my_works_path, data: { turbolinks: false } %>
   </li>
 </ul>

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

@@ -5,9 +5,13 @@
   <%= atom_feed_link_tag route_set: hyrax %>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
+//<![CDATA[
+
   <%= render partial: 'scripts', formats: [:js] %>
-<% end %>
+
+//]]>
+</script>
 
 <% provide :page_header do %>
   <h1><span class="fa fa-file"></span> <%= t("hyrax.admin.sidebar.works") %></h1>

data/app/views/hyrax/notifications/_notifications.html.erb

@@ -12,7 +12,7 @@
       <tbody>
         <% messages.each do |msg| %>
           <tr>
-            <td>
+            <td data-sort="<%= msg.last_message.created_at.getutc.iso8601(5) %>">
               <relative-time datetime="<%= msg.last_message.created_at.getutc.iso8601 %>" title="<%= msg.last_message.created_at.to_formatted_s(:standard) %>">
                 <%= msg.last_message.created_at.to_formatted_s(:long_ordinal) %>
               </relative-time>

data/app/views/hyrax/pages/_form.html.erb

@@ -19,13 +19,13 @@
         <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)) do |f| %>
           <div class="panel-body">
             <div class="field form-group">
-                <%= f.label :about %><br>
+                <%= f.label :about %><br />
                 <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
           <div class="panel-footer">
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-            <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
           </div>
         <% end %>
       </div>
@@ -35,13 +35,13 @@
         <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)) do |f| %>
           <div class="panel-body">
             <div class="field form-group">
-                <%= f.label :help %><br>
+                <%= f.label :help %><br />
                 <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
           <div class="panel-footer">
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-            <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
           </div>
         <% end %>
       </div>
@@ -51,13 +51,13 @@
         <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)) do |f| %>
           <div class="panel-body">
             <div class="field form-group">
-                <%= f.label :agreement %><br>
+                <%= f.label :agreement %><br />
                 <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
           <div class="panel-footer">
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-            <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
           </div>
         <% end %>
       </div>
@@ -67,13 +67,13 @@
         <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)) do |f| %>
           <div class="panel-body">
             <div class="field form-group">
-                <%= f.label :terms %><br>
+                <%= f.label :terms %><br />
                 <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
           <div class="panel-footer">
-            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right'%>
-            <%= f.button :submit, class: 'btn btn-primary pull-right'%>
+            <%= link_to t(:'hyrax.pages.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
           </div>
         <% end %>
       </div>

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

@@ -1,3 +1,3 @@
-<% provide :page_title, t("hyrax.pages.tabs.#{@page.name}")  %>
+<% provide :page_title, t("hyrax.pages.tabs.#{@page.name}") %>
 
 <%= displayable_content_block @page, class: 'row', id: 'content_block_page' %>

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

@@ -1,4 +1,4 @@
-<div >
+<div>
   <h1 class="lower"><%= @presenter %></h1>
     <h2 class="non lower">Actions</h2>
     <p>

data/app/views/hyrax/stats/file.html.erb

@@ -1,7 +1,11 @@
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
-<%= javascript_tag do %>
+<script>
+//<![CDATA[
+
   var hyrax_item_stats = <%= @stats.to_flot.to_json.html_safe %>;
-<% end %>
+
+//]]>
+</script>
 
 <%= content_tag :h1, @file_set, class: "lower" %>
 

data/app/views/hyrax/stats/work.html.erb

@@ -1,7 +1,11 @@
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
-<%= javascript_tag do %>
+<script>
+//<![CDATA[
+
   var hyrax_item_stats = <%= @stats.to_flot.to_json.html_safe %>;
-<% end %>
+
+//]]>
+</script>
 
 <%= content_tag :h1, @stats, class: "lower" %>
 

data/app/views/hyrax/transfers/_received.html.erb

@@ -13,12 +13,12 @@
     <% unless req.sending_user.blank? %>
     <tr>
       <td> <%= show_transfer_request_title(req) %> </td>
-      <td>
+      <td data-sort="<%= req.created_at.getutc.iso8601(5) %>">
         <relative-time datetime="<%= req.created_at.getutc.iso8601 %>" title="<%= req.created_at.to_formatted_s(:standard) %>">
           <%= req.created_at.to_formatted_s(:long_ordinal) %>
         </relative-time>
       </td>
-      <td><%= link_to req.sending_user.name, hyrax.user_path(req.sending_user)  %></td>
+      <td><%= link_to req.sending_user.name, hyrax.user_path(req.sending_user) %></td>
       <td>
         <% if req.pending? %>
             <div class="btn-group">
@@ -26,7 +26,7 @@
               <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="caret"></span></button>
               <ul class="dropdown-menu">
                 <li>
-                  <%= link_to 'Allow depositor to retain edit access', hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: 'Accept the file and allow the original depositor to retain access to edit the file and metadat'  %>
+                  <%= link_to 'Allow depositor to retain edit access', hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: 'Accept the file and allow the original depositor to retain access to edit the file and metadat' %>
                 </li>
                 <li>
                   <%= link_to 'Remove depositor access', hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'accept-reset', title: 'Accept the file remove access from the original depositor.' %>
@@ -37,9 +37,9 @@
               </ul>
             </div>
 
-          <%#= button_to "Accept and allow depositor to retain edit access", hyrax.accept_transfer_path(req), method: :put, class: 'btn btn-primary' %>
-          <%#= button_to "Accept and reset access", hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'btn btn-primary' %>
-          <%#= button_to "Accept & Authorize Proxy", hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'btn btn-primary' %>
+          <%# = button_to "Accept and allow depositor to retain edit access", hyrax.accept_transfer_path(req), method: :put, class: 'btn btn-primary' %>
+          <%# = button_to "Accept and reset access", hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'btn btn-primary' %>
+          <%# = button_to "Accept & Authorize Proxy", hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'btn btn-primary' %>
           <%= button_to "Reject", hyrax.reject_transfer_path(req), method: :put, class: 'btn btn-sm btn-danger', data: {confirm: "Are you sure you want to reject this request?"} %>
         <% else %>
           <%= req.status.capitalize %>

data/app/views/hyrax/transfers/_sent.html.erb

@@ -13,13 +13,13 @@
       <% unless req.receiving_user.blank? %>
         <tr>
           <td> <%= show_transfer_request_title(req) %> </td>
-          <td>
+          <td data-sort="<%= req.created_at.getutc.iso8601(5) %>">
             <relative-time datetime="<%= req.created_at.getutc.iso8601 %>" title="<%= req.created_at.to_formatted_s(:standard) %>">
               <%= req.created_at.to_formatted_s(:long_ordinal) %>
             </relative-time>
           </td>
 
-          <td><%= link_to req.receiving_user.name, hyrax.user_path(req.receiving_user)  %></td>
+          <td><%= link_to req.receiving_user.name, hyrax.user_path(req.receiving_user) %></td>
 
           <td>
             <% if req.pending? %>