sufia 7.0.0.beta2 → 7.0.0.beta3

data/app/views/collections/_show_document_list_row.html.erb

@@ -7,12 +7,12 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to curation_concerns_generic_work_path(document), class: "media-left" do %>
+      <%= link_to document, class: "media-left" do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">
         <h4 class="media-heading">
-          <%= link_to document.title_or_label, curation_concerns_generic_work_path(document), id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %>
+          <%= link_to document.title_or_label, document, id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %>
           <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
         </h4>
         <%= render_collection_links(document) %>
@@ -24,7 +24,7 @@
     <%= render_visibility_link(document) %>
   </td>
   <td class="text-center">
-    <%= render partial: 'show_document_list_menu', locals: { id: id } %>
+    <%= render'show_document_list_menu', document: document %>
   </td>
 </tr>
 <tr id="detail_<%= id %>"> <!--  document detail"> -->

data/app/views/collections/_work_action_menu.html.erb

@@ -13,21 +13,21 @@
     </li>
 
     <li role="menuitem" tabindex="-1">
-      <%= link_to(edit_curation_concerns_generic_work_path(document.id)) do %>
+      <%= link_to [:edit, document] do %>
         <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
         <span> Edit Work </span>
       <% end %>
     </li>
 
     <li role="menuitem" tabindex="-1">
-      <%= link_to(curation_concerns_generic_work_path(document.id), method: :delete, data: { confirm: "Deleting a work from #{application_name} is permanent. Click OK to delete this work from #{application_name}, or Cancel to cancel this operation" }) do %>
+      <%= link_to document, method: :delete, data: { confirm: "Deleting a work from #{application_name} is permanent. Click OK to delete this work from #{application_name}, or Cancel to cancel this operation" } do %>
         <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-        <span> Delete Work </span>
+        <span>Delete Work</span>
       <% end %>
     </li>
 
     <li role="menuitem" tabindex="-1">
-      <%= display_trophy_link(@user, document.id) do |text| %>
+      <%= display_trophy_link @user, document.id do |text| %>
         <i class='glyphicon glyphicon-star'></i> <%= text %>
       <% end %>
     </li>

data/app/views/collections/edit.html.erb

@@ -10,14 +10,14 @@
       <%= render 'collections/form' %>
     </div>
     <div class="col-xs-12 col-sm-2">
-      <%= render 'collections/media_display', collection: @collection %>
+      <%= render 'collections/media_display', presenter: @collection %>
       <%= render 'collections/edit_actions' %>
     </div>
   </div>
 <% end %>
 
 <div class="row m-t-3">
-  <h2 class="col-xs-12 col-sm-6"><%= t('sufia.collection.manage_items') %></h2>
+  <h2 class="col-xs-12 col-sm-6"><%= t('sufia.collection.edit.manage_items') %></h2>
   <div class="col-xs-12 col-sm-6">
     <%= render 'search_form', presenter: @collection %>
   </div>

data/app/views/collections/show.html.erb

@@ -1,35 +1,32 @@
 <% provide :page_title, construct_page_title(@presenter.title) %>
-  <div itemscope itemtype="http://schema.org/CollectionPage" class="row">
-    <div class="col-sm-10 pull-right">
-      <header>
-        <%= render 'collection_title', presenter: @presenter %>
-      </header>
-      <%= render 'collection_description', presenter: @presenter %>
+<div itemscope itemtype="http://schema.org/CollectionPage" class="row">
+  <div class="col-sm-10 pull-right">
+    <header>
+      <%= render 'collection_title', presenter: @presenter %>
+    </header>
+    <%= render 'collection_description', presenter: @presenter %>
 
-      <% unless has_collection_search_parameters? %>
+    <% unless has_collection_search_parameters? %>
       <%= render 'collections/show_descriptions' %>
-      <% end %>
-    </div>
-    <div class="col-sm-2">
-      <%= render 'collections/media_display' %>
-      <% unless has_collection_search_parameters? %>
-      <%= render partial: 'collections/show_actions' %>
-      <% end %>
-    </div>
+    <% end %>
+  </div>
+  <div class="col-sm-2">
+    <%= render 'collections/media_display', presenter: @presenter %>
+    <% unless has_collection_search_parameters? %>
+      <%= render 'collections/show_actions', presenter: @presenter %>
+    <% end %>
   </div>
-
-<% if has_collection_search_parameters? %>
-    <% header_title = "Search Results within this Collection" %>
-<% else %>
-    <% header_title = "Items in this Collection" %>
-<% end %>
-
-<div style="float: right">
-<%= link_to t('sufia.collection.select_works'), sufia.dashboard_works_path %> | <%= link_to t('sufia.collection.add_work'), new_curation_concerns_generic_work_path %>
 </div>
+
 <div class="row">
   <div class="col-xs-12">
-    <h2 class="col-xs-6 col-md-7 col-lg-6"><%= header_title %></h2>
+    <h2 class="col-xs-6 col-md-7 col-lg-6">
+      <% if has_collection_search_parameters? %>
+        Search Results within this Collection
+      <% else %>
+        Items in this Collection
+      <% end %>
+    </h2>
     <div class="col-xs-6 col-md-5 col-lg-6"><%= render 'search_form', presenter: @presenter %></div>
   </div>
 </div>
@@ -38,4 +35,4 @@
 
 <%= render_document_index @member_docs %>
 
-<%= render partial: 'paginate' %>
+<%= render 'paginate' %>

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

@@ -7,7 +7,7 @@
             <%= render_edit_field_partial(term, f: f) %>
           <% end %>
         </div>
-        <%= link_to 'Additional fields',
+        <%= link_to t('sufia.generic_works.edit.additional_fields'),
                     '#extended-terms',
                     class: 'btn btn-default',
                     data: { toggle: 'collapse' },

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

@@ -1,4 +1,4 @@
-<h3>This Work in Collections</h3>
+<h3><%= t("sufia.#{controller_name}.#{action_name}.in_collections") %></h3>
 <div id="collection-widget">
   <%= f.input :collection_ids, as: :select,
       collection: available_collections(nil),

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

@@ -11,7 +11,9 @@
         <% else %>
           <li role="presentation">
         <% end %>
-            <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab"><%= tab.capitalize %></a>
+            <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
+              <%= t("sufia.generic_works.edit.tab.#{tab}") %>
+            </a>
           </li>
       <% end %>
     </ul>

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

@@ -1,7 +1,7 @@
 <div id="descriptions_display" class="tab-pane active">
   <%= simple_form_for [sufia, @form], html: { multipart: true } do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
-    <h1>Description</h1>
+    <h1>Descriptions</h1>
       <% f.object.terms.each do |term| %>
         <%= render_edit_field_partial(term, f: f) %>
       <% end %>

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

@@ -5,7 +5,7 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-4">
-    <%= media_display curation_concern %>
+    <%= media_display curation_concern.to_presenter %>
   </div>
   <div class="col-xs-12 col-sm-8">
     <ul class="nav nav-tabs" role="tablist">

data/app/views/curation_concerns/permissions/confirm.html.erb

@@ -10,6 +10,6 @@
   </div>
   <div class="form-actions panel-footer">
     <%= button_to "Yes please.", main_app.copy_curation_concerns_permission_path(curation_concern), class: 'btn btn-primary' %>
-    <%= link_to "No. I'll update it manually.", main_app.curation_concerns_generic_work_path(curation_concern), class: 'btn' %>
+    <%= link_to "No. I'll update it manually.", [main_app, curation_concern], class: 'btn' %>
   </div>
 </div>

data/app/views/dashboard/_index_partials/_contents.html.erb

@@ -19,7 +19,7 @@
 
 <div class="panel panel-default" id="proxy_management">
   <div class="panel-heading dashboard-panel">
-    <h3 class="panel-title ">Manage Proxies</h3>
+    <h3 class="panel-title "><%= t("sufia.dashboard.manage_proxies") %></h3>
   </div>
   <div class="panel-body">
     <%= render partial: 'dashboard/_index_partials/proxy_rights' %>

data/app/views/dashboard/_index_partials/_proxy_rights.html.erb

@@ -1,13 +1,13 @@
 <div class="clearfix proxy-rights">
 
   <div class="col-xs-6 proxy-search">
-    <h3 class="panel-title">Authorize Proxy</h3>
-    <label class="sr-only" for="user">Proxy User</label>
+    <h3 class="panel-title"><%= t("sufia.dashboard.authorize_proxies") %></h3>
+    <label class="sr-only" for="user"><%= t("sufia.dashboard.proxy_user") %></label>
     <%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
   </div>
 
   <div class="col-xs-6">
-    <h3 class="panel-title">Current Proxies</h3>
+    <h3 class="panel-title"><%= t("sufia.dashboard.current_proxies") %></h3>
     <table class="table table-condensed table-striped" id="authorizedProxies">
       <tbody>
         <% @user.can_receive_deposits_from.each do |depositor| %>

data/app/views/dashboard/_index_partials/_transfers.html.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-xs-12 col-sm-9">
-    <h4>Sent</h4>
+    <h4><%= t("sufia.dashboard.transfers_sent") %></h4>
   </div>
   <div class="col-xs-12 col-sm-3 transfer_link">
     <%= link_to sufia.dashboard_works_path  do %>
@@ -10,5 +10,5 @@
 </div>
 <%= render_sent_transfers %>
 
-<h4>Received</h4>
+<h4><%= t("sufia.dashboard.transfers_received") %></h4>
 <%= render_received_transfers %>

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

@@ -1,24 +1,24 @@
 <div class="btn-group">
   <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true">
-    <span class="sr-only">Press to </span>
-    Select an action <span class="caret" aria-hidden="true"></span>
+    <span class="sr-only"><%= t("sufia.dashboard.my.sr.press_to") %> </span>
+    <%= t("sufia.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 edit_collection_path(id),
                   class: 'itemicon itemedit',
-                  title: 'Edit Collection' do %>
-        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> Edit Collection
+                  title: t("sufia.dashboard.my.action.edit_collection") do %>
+        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i> <%= t("sufia.dashboard.my.action.edit_collection") %>
       <% end %>
     </li>
     <li role="menuitem" tabindex="-1">
       <%= link_to collection_path(id),
                   class: 'itemicon itemtrash',
-                  title: 'Delete Collection',
+                  title: t("sufia.dashboard.my.action.delete_collection"),
                   method: :delete,
                   data: {
-                    confirm: "Deleting a collection from #{application_name} is permanent. Click OK to delete this collection from #{application_name}, or Cancel to cancel this operation" } do %>
-        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i> Delete Collection
+                    confirm: t("sufia.dashboard.my.action.collection_confirmation", application_name: application_name) } do %>
+        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i> <%= t("sufia.dashboard.my.action.delete_collection") %>
       <% end %>
     </li>
   </ul>

data/app/views/my/_index_partials/_default_group.html.erb

@@ -1,13 +1,13 @@
 <table class="table table-striped">
-  <caption class="sr-only">Listing of items you have deposited in <%= application_name %></caption>
+  <caption class="sr-only"><%= t("sufia.dashboard.my.sr.listing") %> <%= application_name %></caption>
 <% unless params[:display_type] == 'list' %>
   <thead>
   <tr>
     <th><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
-    <th>Title</th>
-    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%=params[:sort]== "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort]== "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i>Date Uploaded</th>
-    <th>Visibility</th>
-    <th>Action</th>
+    <th><%= t("sufia.dashboard.my.heading.title") %></th>
+    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%=params[:sort]== "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort]== "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("sufia.dashboard.my.heading.date_uploaded") %></th>
+    <th><%= t("sufia.dashboard.my.heading.visibility") %></th>
+    <th><%= t("sufia.dashboard.my.heading.action") %></th>
   </tr>
   </thead>
   <% end %>

data/app/views/my/_index_partials/_list_collections.html.erb

@@ -1,14 +1,14 @@
 <% id = document.id %>
 <tr id="document_<%= id %>">
-  <td width="3%"></td>
-  <td width="41%">
+  <td></td>
+  <td>
     <div class="media">
       <%= link_to document, class: "pull-left", "aria-hidden" => true do %>
           <span class="fa fa-cubes collection-icon-small"></span>
       <% end %>
       <div class="media-body">
         <div class="media-heading">
-          <%= link_to collection_path(id), id: "src_copy_link#{id}" do %>
+          <%= link_to document, id: "src_copy_link#{id}" do %>
               <span class="sr-only"><%= t("sufia.dashboard.my.sr.show_label") %> </span>
               <%= document.title_or_label %>
           <% end %>
@@ -20,9 +20,9 @@
       </div>
     </div>
   </td>
-  <td width="17%" class="text-center"><%= document.create_date %> </td>
-  <td width="5%" class="text-center visibility-link">
-    <%= render_visibility_label(document) %>
+  <td class="text-center"><%= document.create_date %> </td>
+  <td class="text-center">
+    <%= render_visibility_link(document) %>
   </td>
   <td class="text-center">
     <%= render 'collection_action_menu', id: id %>
@@ -31,15 +31,15 @@
 <tr id="detail_<%= id %>"> <!--  collection detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2">Description:</dt>
-      <dd class="col-xs-9 col-lg-10"> <%= document.description%></dd>
-      <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
+      <dt class="col-xs-3 col-lg-2"><%= t("sufia.dashboard.my.collection_list.description") %></dt>
+      <dd class="col-xs-9 col-lg-10"><%= document.description.first %></dd>
+      <dt class="col-xs-3 col-lg-2"><%= t("sufia.dashboard.my.collection_list.edit_access") %></dt>
       <dd class="col-xs-9 col-lg-10">
       <% if document.edit_groups.present? %>
-            Groups: <%= document.edit_groups.join(', ') %>
-            <br/>
-        <% end %>
-        Users: <%= document.edit_people.join(', ') %>
+        <%= t("sufia.dashboard.my.collection_list.groups") %> <%= document.edit_groups.join(', ') %>
+        <br/>
+      <% end %>
+        <%= t("sufia.dashboard.my.collection_list.users") %> <%= document.edit_people.join(', ') %>
       </dd>
     </dl>
   </td>

data/app/views/my/_index_partials/_list_works.html.erb

@@ -7,14 +7,14 @@
 
   <td>
     <div class='media'>
-      <%= link_to curation_concerns_generic_work_path(document), class: 'media-left', 'aria-hidden' => true do %>
+      <%= link_to document, class: 'media-left', 'aria-hidden' => true do %>
         <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
       <% end %>
 
       <div class='media-body'>
         <div class='media-heading'>
 
-          <%= link_to curation_concerns_generic_work_path(document), id: "src_copy_link#{document.id}", class: 'document-title' do %>
+          <%= link_to document, id: "src_copy_link#{document.id}", class: 'document-title' do %>
             <span class="sr-only">
               <%= t("sufia.dashboard.my.sr.show_label") %>
             </span>

data/app/views/my/_work_action_menu.html.erb

@@ -1,24 +1,27 @@
 <div class="btn-group">
 
   <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= document.id %>" aria-haspopup="true">
-    <span class="sr-only">Press to </span>
-    Select an action
+    <span class="sr-only"><%= t("sufia.dashboard.my.sr.press_to") %> </span>
+    <%= t("sufia.dashboard.my.action.select") %>
     <span class="caret" aria-hidden="true"></span>
   </button>
 
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
     <li role="menuitem" tabindex="-1">
-      <%= link_to(edit_curation_concerns_generic_work_path(document.id)) do %>
+      <%= link_to [:edit, document] do %>
         <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-        <span> Edit Work </span>
+        <span> <%= t("sufia.dashboard.my.action.edit_work") %> </span>
       <% end %>
     </li>
 
     <li role="menuitem" tabindex="-1">
-      <%= link_to(curation_concerns_generic_work_path(document.id), method: :delete, data: { confirm: "Deleting a work from #{application_name} is permanent. Click OK to delete this work from #{application_name}, or Cancel to cancel this operation" }) do %>
+      <%= link_to document,
+                  method: :delete,
+                  data: { 
+                    confirm: t("sufia.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
         <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-        <span> Delete Work </span>
+        <span> <%= t("sufia.dashboard.my.action.delete_work") %> </span>
       <% end %>
     </li>
 
@@ -28,9 +31,9 @@
       <% end %>
     </li>
     <li role="menuitem" tabindex="-1">
-      <%= link_to(sufia.new_generic_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: 'Transfer Ownership of Work') do %>
+      <%= link_to(sufia.new_generic_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t("sufia.dashboard.my.action.transfer")) do %>
         <i aria-hidden="true" class='glyphicon glyphicon-transfer'></i>
-        <span> Transfer Ownership of Work </span>
+        <span> <%= t("sufia.dashboard.my.action.transfer") %> </span>
       <% end %>
     </li>
   </ul>

data/app/views/sufia/homepage/_featured.html.erb

@@ -1,11 +1,11 @@
-<% solr_document = featured.generic_work_solr_document %>
-<li class="featured-item" data-id="<%= solr_document.id %>">
+<% presenter = featured.presenter %>
+<li class="featured-item" data-id="<%= presenter.id %>">
   <div class="main row">
     <div class="col-sm-3">
-      <%= render_thumbnail_tag solr_document, { width: 90 } %>
+      <%= render_thumbnail_tag presenter, { width: 90 } %>
     </div>
     <div class="col-sm-9">
-      <%= render partial: 'sufia/homepage/featured_fields', locals: {featured: solr_document} %>
+      <%= render 'sufia/homepage/featured_fields', featured: presenter %>
     </div>
   </div>
 </li>

data/app/views/sufia/homepage/_featured_fields.html.erb

@@ -1,6 +1,6 @@
 <h3>
   <span class="sr-only">Title</span>
-  <%= link_to truncate(featured.title_or_label, length: 28, separator: ' '), curation_concerns_generic_work_path(featured)  %>
+  <%= link_to truncate(featured.title_or_label, length: 28, separator: ' '), featured  %>
 </h3>
 <div>
   <span class="sr-only">Depositor</span>
@@ -8,7 +8,7 @@
 </div>
 <div>
   <span class="sr-only">Filename</span>
-  <%= link_to truncate(featured.label, length: 25), curation_concerns_generic_work_path(featured), title: featured.label %>
+  <%= link_to truncate(featured.label, length: 25), featured, title: featured.label %>
 </div>
 <div>
   <span class="sr-only">File type</span>

data/app/views/sufia/homepage/_recent_document.html.erb

@@ -1,7 +1,7 @@
     <tr>
       <td class="col-sm-2">
         <%= link_to_profile recent_document.depositor("no depositor value") %>
-        <%= link_to curation_concerns_generic_work_path(recent_document) do %>
+        <%= link_to recent_document do %>
           <%= render_thumbnail_tag recent_document, { width: 45 }, false %>
         <% end %>
       </td>