hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

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

@@ -29,12 +29,12 @@
     </div>
   </td>
 
-  <td class="date"><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_uploaded %></td>
   <td class='text-center'>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>
-  <td><%= render_visibility_link document %></td>
+  <td class='text-center'><%= render_visibility_link document %></td>
 
-  <td>
+  <td class='text-center'>
     <%= render 'work_action_menu', document: document %>
   </td>
 </tr>

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

@@ -65,7 +65,7 @@
       </div> 
       <div class="panel-body">
         <%= render 'search_header' %>
-        <h2 class="sr-only">Works listing</h2>
+        <h2 class="sr-only"><%= t('hyrax.my.count.works.works_listing') %></h2>
         <%= render 'document_list' %>
 
         <%= render 'results_pagination' %>

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

@@ -4,7 +4,7 @@
               method: :delete,
               class: 'btn btn-danger pull-right',
               title: 'Delete all user notifications' do %>
-    <i class="glyphicon glyphicon-trash"></i> Delete All
+    <i class="glyphicon glyphicon-trash"></i> <%= t('hyrax.admin.sidebar.delete_all') %>
   <% end %>
 <% end %>
 

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

@@ -1,6 +1,6 @@
 <% provide :page_title, 'Operations' %>
 <% provide :page_header do %>
-  <h1>Operations</h1>
+  <h1><%= t('.title') %></h1>
 <% end %>
 
 <div class="row">
@@ -8,9 +8,9 @@
     <%= page_entries_info @operations %>
     <table class="table">
       <thead>
-        <th>Operation Type</th>
-        <th>Status</th>
-        <th>Updated</th>
+        <th><%= t('.operation_type') %></th>
+        <th><%= t('.status') %></th>
+        <th><%= t('.updated') %></th>
       </thead>
       <tbody>
         <% @operations.each do |op| %>

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

@@ -1,82 +1,83 @@
+<%= render "shared/nav_safety_modal" %>
 <div class="panel panel-default tabs">
   <ul class="nav nav-tabs" role="tablist">
     <li class="active">
-      <a href="#about" role="tab" data-toggle="tab"><%= t(:'hyrax.pages.tabs.about_page') %></a>
+      <a href="#about" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.about_page') %></a>
     </li>
     <li>
-      <a href="#help" role="tab" data-toggle="tab"><%= t(:'hyrax.pages.tabs.help_page') %></a>
+      <a href="#help" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.help_page') %></a>
     </li>
     <li>
-      <a href="#agreement" role="tab" data-toggle="tab"><%= t(:'hyrax.pages.tabs.agreement_page') %></a>
+      <a href="#agreement" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.agreement_page') %></a>
     </li>
     <li>
-      <a href="#terms" role="tab" data-toggle="tab"><%= t(:'hyrax.pages.tabs.terms_page') %></a>
+      <a href="#terms" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.pages.tabs.terms_page') %></a>
     </li>
   </ul>
   <div class="tab-content">
-    <div id="about" class="tab-pane active">
-      <div class="panel panel-default labels">
-        <%= 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.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
-            </div>
+  <div id="about" class="tab-pane active">
+    <div class="panel panel-default labels">
+      <%= simple_form_for ContentBlock.for(:about), url: hyrax.page_path(ContentBlock.for(:about)), html: { class: 'nav-safety' } do |f| %>
+        <div class="panel-body">
+          <div class="field form-group">
+              <%= f.label :about %><br />
+              <%= f.text_area :about, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
           </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' %>
-          </div>
-        <% end %>
-      </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' %>
+        </div>
+      <% end %>
     </div>
-    <div id="help" class="tab-pane">
-      <div class="panel panel-default labels">
-        <%= 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.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' %>
+  </div>
+  <div id="help" class="tab-pane">
+    <div class="panel panel-default labels">
+      <%= simple_form_for ContentBlock.for(:help), url: hyrax.page_path(ContentBlock.for(:help)), html: { class: 'nav-safety' } do |f| %>
+        <div class="panel-body">
+          <div class="field form-group">
+              <%= f.label :help %><br />
+              <%= f.text_area :help, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
           </div>
-        <% end %>
-      </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' %>
+        </div>
+      <% end %>
     </div>
-    <div id="agreement" class="tab-pane">
-      <div class="panel panel-default labels">
-        <%= 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.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' %>
+  </div>
+  <div id="agreement" class="tab-pane">
+    <div class="panel panel-default labels">
+      <%= simple_form_for ContentBlock.for(:agreement), url: hyrax.page_path(ContentBlock.for(:agreement)), html: { class: 'nav-safety' } do |f| %>
+        <div class="panel-body">
+          <div class="field form-group">
+              <%= f.label :agreement %><br />
+              <%= f.text_area :agreement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
           </div>
-        <% end %>
-      </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' %>
+        </div>
+      <% end %>
     </div>
-    <div id="terms" class="tab-pane">
-      <div class="panel panel-default labels">
-        <%= 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.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' %>
+  </div>
+  <div id="terms" class="tab-pane">
+    <div class="panel panel-default labels">
+      <%= simple_form_for ContentBlock.for(:terms), url: hyrax.page_path(ContentBlock.for(:terms)), html: { class: 'nav-safety' } do |f| %>
+        <div class="panel-body">
+          <div class="field form-group">
+              <%= f.label :terms %><br />
+              <%= f.text_area :terms, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
           </div>
-        <% end %>
-      </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' %>
+        </div>
+      <% end %>
     </div>
   </div>
 </div>
+<%= tinymce :content_block %>

data/app/views/hyrax/permissions/confirm_access.html.erb

@@ -1,6 +1,6 @@
 <div class="panel panel-default permissions-confirm">
   <div class="panel-heading">
-    <h4>Apply changes to contents?<h4>
+    <h4><%= I18n.t("hyrax.upload.change_access_title_html") %><h4>
   </div>
   <div class="panel-body">
       <%= sanitize I18n.t("hyrax.upload.change_access_message_html", curation_concern: curation_concern) %>

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

@@ -1,18 +1,14 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale.to_s %>">
   <head>
-    <title>Single use link Not Found</title>
+    <title><%= t('.link_not_found') %></title>
   </head>
   <body>
     <div class="columns two-a">
       <div class="column second">
-        <h1>Single Use Link Expired or Not Found</h1>
+        <h1><%= t('.link_expired_not_found') %></h1>
         <p>
-          <%= application_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.
+          <%= t('.help', application_name: application_name) %> 
         </p>
       </div>
   </body>

data/app/views/hyrax/static/mendeley.html.erb

@@ -1,6 +1,4 @@
-<h1>Export to Mendeley</h1>
+<h1><%= t('.export_to_mendeley') %></h1>
 <p>
-Exporting to Mendeley is supported via embedded metadata.  If Mendeley
-does not automatically pick up metadata for deposited files, please
-report the issue via the  <%= link_to 'Contact Form', hyrax.contact_form_index_path %>.
+<%= t('.export_to_mendeley_details') %> <%= link_to t('.contact_form'), hyrax.contact_form_index_path %>.
 </p>

data/app/views/hyrax/static/zotero.html.erb

@@ -1,6 +1,4 @@
-<h1>Export to Zotero</h1>
+<h1><%= t('.export_to_zotero') %></h1>
 <p>
-Exporting to Zotero is supported via embedded metadata.  If Zotero
-does not automatically pick up metadata for deposited files, please
-report the issue via the  <%= link_to 'Contact Form', hyrax.contact_form_index_path %>.
+<%= t('.export_to_zotero_details') %> <%= link_to t('.contact_form'), hyrax.contact_form_index_path %>.
 </p>

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

@@ -1,11 +1,11 @@
 <table class="table table-striped" id="incoming-transfers">
   <thead>
     <tr>
-      <th>Title</th>
-      <th>Date</th>
-      <th>From</th>
-      <th>Status</th>
-      <th>Comments</th>
+      <th>t(".title")</th>
+      <th>t(".date")</th>
+      <th>t(".from")</th>
+      <th>t(".status")</th>
+      <th>t(".comments")</th>
     </tr>
   </thead>
   <tbody>
@@ -22,17 +22,17 @@
       <td>
         <% if req.pending? %>
             <div class="btn-group">
-              <button class="btn btn-sm btn-primary" href="#">Accept</button>
+              <button class="btn btn-sm btn-primary" href="#">t(".accept")</button>
               <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 t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>
                 </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.' %>
+                  <%= link_to t(".remove_depositor_access"), hyrax.accept_transfer_path(req, reset: true), method: :put, class: 'accept-reset', title: t(".accept_the_file_remove_access_from_the_original_depositor") %>
                 </li>
                 <li>
-                  <%= link_to 'Authorize depositor as proxy', hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'accept-stick', title: 'Accept the file and allow the original depositor to retain access and authorize the original depositor as a proxy to deposit file on your behalf.' %>
+                  <%= link_to t(".authorize_depositor_as_proxy"), hyrax.accept_transfer_path(req, sticky: true), method: :put, class: 'accept-stick', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_and_authorize") %>
                 </li>
               </ul>
             </div>
@@ -40,7 +40,7 @@
           <%# = 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?"} %>
+          <%= button_to t(".reject"), hyrax.reject_transfer_path(req), method: :put, class: 'btn btn-sm btn-danger', data: {confirm: t(".are_you_sure_you_want_to_reject_this_request")} %>
         <% else %>
           <%= req.status.capitalize %>
         <% end %>

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

@@ -1,11 +1,11 @@
 <table class="table table-striped" id="outgoing-transfers">
   <thead>
     <tr>
-      <th>Title</th>
-      <th>Date</th>
-      <th>To</th>
-      <th>Status</th>
-      <th>Comments</th>
+      <th>t(".title")</th>
+      <th>t(".date")</th>
+      <th>t(".from")</th>
+      <th>t(".status")</th>
+      <th>t(".comments")</th>
     </tr>
   </thead>
   <tbody>
@@ -23,7 +23,7 @@
 
           <td>
             <% if req.pending? %>
-              <%= button_to "Cancel", hyrax.transfer_path(req), method: :delete, class:'btn btn-sm btn-danger', data: {confirm: "Are you sure you want to cancel this request?"} %>
+              <%= button_to t(".cancel"), hyrax.transfer_path(req), method: :delete, class:'btn btn-sm btn-danger', data: {confirm: t(".are_you_sure_you_want_to_cancel_this_request")} %>
             <% else %>
               <%= req.status.capitalize %>
             <% end %>

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -18,13 +18,13 @@
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <i class="glyphicon glyphicon-upload"></i>
-                    <span>Start</span>
+                    <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
                     <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel</span>
+                    <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
         </td>
@@ -68,14 +68,14 @@
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
               <button class="btn btn-sm btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
                   <i class="glyphicon glyphicon-trash"></i>
-                  <span>Delete</span>
+                  <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
           </div>
           <div class="row">
             <div class="col-sm-12 form-horizontal">
               <div class="form-group">
-                <label for="title_{%=file.id%}" class="col-sm-5 control-label">Display label</label>
+                <label for="title_{%=file.id%}" class="col-sm-5 control-label"><%= t('.display_label') %></label>
                 <div class="col-sm-7 padding-bottom">
                   <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
                 </div>
@@ -84,7 +84,7 @@
                   <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
                     <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
                   </select>
-                  <button class="btn btn-default pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;">Set all to this Resource Type</button>
+                  <button class="btn btn-default pull-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
                 </div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                 <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
             </p>
             {% if (file.error) { %}
-                <div><span class="label label-danger">Error</span> {%=file.error%}</div>
+                <div><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</div>
             {% } %}
         </td>
         <td>
@@ -125,7 +125,7 @@
         <td class="text-right">
             <button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
                 <i class="glyphicon glyphicon-trash"></i>
-                Delete
+                <%= t('helpers.action.delete') %>
             </button>
         </td>
     </tr>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -46,17 +46,17 @@
                   <input type="hidden" name="banner_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger">Error</span> {%=file.error%}</span>
+                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
               <div class="col-sm-2">
                 <button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
                   <span class="glyphicon glyphicon-remove"></span>
-                  <span class="controls-remove-text">Remove</span>
+                  <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
-                    previous
-                    <span class="controls-field-name-text">Remove New Banner</span>
+                    <%= t('.previous') %>
+                    <span class="controls-field-name-text"><%= t('.remove_new_banner') %></span>
                   </span>
                 </button>
               </div> <!-- end col-sm-2 -->
@@ -93,10 +93,10 @@
               </div>
 
               <div class="col-sm-4 branding-logo-input">
-                <label for="linkurl">Link URL:
+                <label for="linkurl"><%= t('.link_url') %>
                   <input id="linkurl" class="branding-logo-input" type="text" name="linkurl[]"></input>
                 </label>
-                <label for="alttext">Alt Text:
+                <label for="alttext"><%= t('.alt_text') %>
                   <input id="alttext" class="branding-logo-input" type="text" name="alttext[]"></input>
                 </label>
               </div>
@@ -107,8 +107,8 @@
                     <span class="glyphicon glyphicon-remove"></span>
                     <span class="controls-remove-text">Remove</span>
                     <span class="sr-only">
-                      previous
-                      <span class="controls-field-name-text">Remove New Logo</span>
+                      <%= t('.previous') %>
+                      <span class="controls-field-name-text"><%= t('.remove_new_logo') %></span>
                     </span>
                   </button>
                 </span>

data/app/views/hyrax/users/_activity_log.html.erb

@@ -1,22 +1,25 @@
-<table id="activity" class="table table-striped table-bordered">
-  <thead>
-    <tr>
-      <th>User Activity</th>
-      <th>Date</th>
-    </tr>
-  </thead>
-  <tbody>
-  <% events.each do |event| %>
-    <% next if event[:action].blank? or event[:timestamp].blank? %>
-    <tr>
-      <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
-      <% time = Time.zone.at(event[:timestamp].to_i) %>
-      <td data-sort="<%= time.getutc.iso8601(5) %>">
-        <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
-          <%= time.to_formatted_s(:long_ordinal) %>
-        </relative-time>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<div  class="activity-display">
+  <table id="activity" class="table table-striped table-bordered">
+    <thead>
+      <tr>
+        <th><%= t('.user_activity') %></th>
+        <th class="activity-date"><%= t('.date') %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% events.each do |event| %>
+      <% next if event[:action].blank? or event[:timestamp].blank? %>
+      <tr>
+        <td class="ensure-wrapped"><%= sanitize event[:action] %></td>
+        <% time = Time.zone.at(event[:timestamp].to_i) %>
+        <td data-sort="<%= time.getutc.iso8601(5) %>">
+          <relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
+            <%= time.to_formatted_s(:long_ordinal) %>
+          </relative-time>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+