sufia 6.3.0 → 6.4.0

data/app/views/_logo.html.erb

@@ -1,3 +1 @@
-<a id="logo" href="/"><span class="glyphicon glyphicon-globe"></span></a><a href="/" class="institution_name"><%=t('sufia.product_name') %></a>
-
-
+<a id="logo" href="<%= sufia.root_path %>"><span class="glyphicon glyphicon-globe"></span></a><a href="<%= sufia.root_path %>" class="institution_name"><%=t('sufia.product_name') %></a>

data/app/views/admin/stats/_date_form.html.erb

@@ -0,0 +1,8 @@
+<%= form_for "stats_filters", url: sufia.admin_stats_path, method: "GET" do |f| %>
+  <%= f.label "Start *" %>
+  <input type="date" name="stats_filters[start_date]" value="<%= @presenter.stats_filters[:start_date] %>" placeholder="yyyy-mm-dd" ></input>
+  <%= f.label "end [defaults to now]" %>
+  <input type="date" name="stats_filters[end_date]" value="<%= @presenter.stats_filters[:end_date] %>" placeholder="yyyy-mm-dd" ></input>
+  <%= f.submit "Load Stats" %>
+<%- end %>
+

data/app/views/admin/stats/_deposits.html.erb

@@ -1,14 +1,6 @@
-<h3>Deposits By Users</h3>
-<%= form_for "deposit_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
-  <%= f.label "#{ t("sufia.admin.stats.deposited_form.heading") } #{ t("sufia.admin.stats.deposited_form.start_label") }" %>
-  <input type="date" name="deposit_stats[start_date]" value="<%= @deposit_stats[:start_date] %>"></input>
-  <%= f.label t("sufia.admin.stats.deposited_form.end_label") %>
-  <input type="date" name="deposit_stats[end_date]" value="<%= @deposit_stats[:end_date] %>"></input>
-  <%= f.submit "Load Stats" %>
-<%- end %>
-
+<h3>Deposits By Users (<%= @presenter.date_filter_string %>)</h3>
 <ul>
-  <% @depositors.each do |usr| %>
+  <% @presenter.depositors.each do |usr| %>
     <li>
       <a href="<%= sufia.profile_path(usr[:key]) %>" title="View user's profile"><%= usr[:user].name %></a>
       <% num_files = usr[:deposits]%>

data/app/views/admin/stats/_files.html.erb

@@ -1,16 +1,8 @@
-<h2>File Statistics</h2>
-<%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
-<%= f.label "#{ t("sufia.admin.stats.deposited_form.heading") } #{ t("sufia.admin.stats.deposited_form.start_label") }" %>
-<input type="date" name="users_stats[file_start_date]" value="<%= @users_stats[:file_start_date] %>"></input>
-<%= f.label t("sufia.admin.stats.deposited_form.end_label") %>
-<input type="date" name="users_stats[file_end_date]" value="<%= @users_stats[:file_end_date] %>"></input>
-<%= f.submit "Load Stats" %>
-<h3>Total Files: <%= @files_count[:total] %> </h3>
-<br/>
-<%- end %>
-<h3>Totals by Visibility</h3>
+<h3>File Statistics (<%= @presenter.date_filter_string %>)</h3>
+<h4>Total Files: <%= @presenter.files_count[:total] %> </h4>
+<h4>Totals by Visibility</h4>
 <ul>
-  <li>Open Access <span class="count">(<%= @files_count[:public] %>)</span></li>
-  <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @files_count[:registered] %>)</span></li>
-  <li>Private <span class="count">(<%= @files_count[:private] %>)</span></li>
+  <li>Open Access <span class="count">(<%= @presenter.files_count[:public] %>)</span></li>
+  <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @presenter.files_count[:registered] %>)</span></li>
+  <li>Private <span class="count">(<%= @presenter.files_count[:private] %>)</span></li>
 </ul>

data/app/views/admin/stats/_new_users.html.erb

@@ -1,20 +1,13 @@
-<h3>Newest Users</h3>
-<%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
-  <%= f.label "Display users registered: Start" %>
-  <input type="date" name="users_stats[start_date]" value="<%= @users_stats[:start_date] %>"></input>
-  <%= f.label "end [defaults to now]" %>
-  <input type="date" name="users_stats[end_date]" value="<%= @users_stats[:end_date] %>"></input>
-  <%= f.submit "Load Stats" %>
-<%- end %>
-
-<%- if @users_stats[:start_date] %>
-  <div>Total: <%= @recent_users.count %></div>
+<h3>Newest Users (<%= @presenter.date_filter_string %>)</h3>
+<h4>
+<%- if !@presenter.start_date.blank? %>
+  Total: <%= @presenter.recent_users.count %></div>
 <%- else %>
-  Five most recent users:
+    <%= @presenter.recent_users.count %> most recent users:
 <%- end %>
-
+</h4>
 <ul>
-  <% @recent_users.each do |usr| %>
+  <% @presenter.recent_users.each do |usr| %>
     <li>
       <a href="<%= sufia.profile_path(usr.user_key) %>" title="View user's profile"><%= usr.name %></a>
       <%- if usr.department %>

data/app/views/admin/stats/_stats_by_date.html.erb

@@ -0,0 +1,8 @@
+<h2>Statistics By Date</h2>
+<h3>Statistics in this section are filtered by the dates entered in the form below.
+  The data is unfiltered unless the date form has been filled in. Start date is required and the deafult end is now.
+</h3>
+<%= render "admin/stats/date_form" %>
+<%= render "admin/stats/files" %>
+<%= render "admin/stats/new_users" %>
+<%= render "admin/stats/deposits" %>

data/app/views/admin/stats/_top_data.html.erb

@@ -0,0 +1,24 @@
+<h2>Top File Formats and Users</h2>
+<h3>Statistics in this section shows the top <%= @presenter.limit %> items for each category</h3>
+<% if @presenter.limit == 5 %>
+  <p><%= link_to "View top 20", Sufia::Engine.routes.url_for(controller: "admin/stats", action:"index", limit: "20", only_path: true) %> </p>
+<% else %>
+  <p><%= link_to "View top 5", Sufia::Engine.routes.url_for(controller: "admin/stats", action:"index", only_path: true) %> </p>
+<% end %>
+
+<h3>Top File Formats (top <%= @presenter.top_formats.count %>)</h3>
+<ul>
+  <% @presenter.top_formats.each do |k, v| %>
+    <li><%= k %> <span class="count">(<%= v %>)</span></li>
+  <% end %>
+</ul>
+
+<br/>
+<h3>Most Active Users (top <%= @presenter.active_users.count %>)</h3>
+<ul>
+  <% @presenter.active_users.each do |k, v| %>
+    <li>
+      <%= link_to_profile(k) %> <span class="count">(<%= v %>)</span>
+    </li>
+  <% end %>
+</ul>

data/app/views/admin/stats/index.html.erb

@@ -1,36 +1,10 @@
 <div class="stats">
   <h1>Statistics for <%= application_name %>
     <%= Sufia::VERSION %></h1>
-  <br/>
 
-  <%= render "admin/stats/files" %>
-
-  <h3>Top File Formats</h3>
-  <ul>
-    <% @top_formats.each do |k, v| %>
-      <li><%= k %> <span class="count">(<%= v %>)</span></li>
-    <% end %>
-  </ul>
-
-  <br/>
-
-  <h2>Total <%= application_name %> Users:&nbsp; <%= @users_count %> </h2>
-  <br/>
-
-  <%= render "admin/stats/new_users" %>
-
-  <br/>
-  <h3>Most Active Users (top <%= @active_users.count %>)</h3>
-  <ul>
-    <% @active_users.each do |k, v| %>
-      <li>
-        <%= link_to_profile(k) %> <span class="count">(<%= v %>)</span>
-      </li>
-    <% end %>
-    <% if !params[:dep_count] %>
-      <p><%= link_to "View top 20", sufia.admin_stats_path, controller: "stats", dep_count: "20" %> </p>
-    <% end %>
-  </ul>
-
-  <%= render "admin/stats/deposits" %>
+  <h2>Total <%= application_name %> Users:&nbsp; <%= @presenter.users_count %> </h2>
+  <hr/>
+  <%= render "admin/stats/stats_by_date" %>
+  <hr/>
+  <%= render "admin/stats/top_data" %>
 </div>

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

@@ -13,9 +13,10 @@
               <fieldset>
                 <legend><%= t("sufia.collection.select_form.select_heading") %></legend>
               <ul>
-                <% user_collections.sort { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }.each do |collection|  %>
+                <% user_collections.sort { |c1,c2| c2[CatalogController.uploaded_field] <=> c1[CatalogController.uploaded_field] }.each_with_index do |collection,index|  %>
                   <li>
-                    <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %>
+                    <% selected = (collection.id == @add_files_to_collection) || (@add_files_to_collection.blank? && index == 0) %>
+                    <%= radio_button_tag(:id, collection.id, selected, class: "collection-selector") %>
                     <%= label_tag(:collection, collection.title, for: "id_#{collection.id}") %>
                   </li>
                 <% end %>
@@ -28,10 +29,10 @@
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("sufia.collection.select_form.close")%></button>
           <% if user_collections.blank? %>
             <%= button_for_create_collection t("sufia.collection.select_form.create") %>
-          <% else %> 
+          <% else %>
             <%= button_for_update_collection t("sufia.collection.select_form.update") %>
             <%= button_for_create_collection t("sufia.collection.select_form.create_new") %>
-          <% end %> 
+          <% end %>
         </div>
       </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->

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

@@ -1,7 +1,12 @@
 <h2 class="sr-only">Actions</h2>
 <div class="actions-controls-collections">
   <% if can? :edit, @collection %>
-      <span class="label label-default"><%= link_to "Edit", collections.edit_collection_path, title: "Edit this Collection" %></span> &nbsp;&nbsp;
-      <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_files_path, title: "Add files to this Collection" %></span>
+      <span class="label label-default"><%= link_to t("sufia.collection.show.edit.label"), collections.edit_collection_path, title: t("sufia.collection.show.edit.label") %></span> &nbsp;&nbsp;
+      <span class="label label-default"><%= link_to t("sufia.collection.show.add_files.label"),  sufia.dashboard_files_path( add_files_to_collection: @collection.id ), title: t("sufia.collection.show.add_files.label") %></span>
+      <% if Sufia.config.upload_to_collection %>
+          <div class="actions-controls-collections-line2">
+            <span class="label label-default"><%= link_to t("sufia.collection.show.upload_files.label"),  sufia.new_generic_file_path( collection: @collection.id ), title: t("sufia.collection.show.upload_files.desc") %></span>
+          </div>
+      <%end %>
   <%end %>
 </div>

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

@@ -25,15 +25,7 @@
   </td>
   <td class="text-center"><%= document.date_uploaded %> </td>
   <td class="text-center">
-    <a href="<%= sufia.generic_file_path(document) %>/edit/?tab=permissions" id="permission_<%= id %>" class="visibility-link">
-      <% if document.registered? %>
-        <span class="label label-info" title="<%= t('sufia.institution_name') %>"><%= t('sufia.institution_name') %></span>
-      <% elsif document.public? %>
-        <span class="label label-success" title="<%= t('sufia.visibility.open_title_attr') %>"><%= t('sufia.visibility.open') %></span>
-      <% else %>
-        <span class="label label-danger" title="<%= t('sufia.visibility.private_title_attr') %>"><%= t('sufia.visibility.private') %></span>
-      <% end %>
-    </a>
+    <%= render_visibility_link(document) %>
   </td>
   <td class="text-center">
     <%= render partial: 'show_document_list_menu', locals: { id: id, gf: gf } %>

data/app/views/generic_files/_browse_everything.html.erb

@@ -4,6 +4,9 @@
 </div>
 <div class="well">
   <%= form_tag(sufia.generic_files_path, id: 'browse_everything_form', method: 'post') do %>
+      <% if Sufia.config.upload_to_collection %>
+          <%= render partial: 'generic_files/upload/to_collection' %>
+      <% end %>
       <%= render partial: 'generic_files/upload/tos_checkbox' %>
       <%= hidden_field_tag(:batch_id, @batch_id) %>
       <%= button_tag(t('sufia.upload.browse_everything.browse_files_button'), type: 'button', class: 'btn btn-lg btn-success', id: "browse-btn",

data/app/views/generic_files/_descriptions.html.erb

@@ -10,7 +10,7 @@
 
       </div><!-- /well -->
     <div>
-      <%= f.submit class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" do %>
+      <%= button_tag class: 'btn btn-primary btn-lg', id: "upload_submit", name: "update_descriptions" do %>
         <i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions
       <% end %>
     </div>

data/app/views/generic_files/_generic_file.html.erb

@@ -9,7 +9,7 @@
     </div>
     <div class="col-sm-9">
       <%= render 'shared/attributes', work: generic_file %>
-    </table>
+    </div>
   </div>
 </li>
 

data/app/views/generic_files/_local_file_import.html.erb

@@ -1,2 +1,5 @@
+<% if Sufia.config.upload_to_collection %>
+  <%= render partial: 'generic_files/upload/to_collection' %>
+<% end %>
 <%= render partial: 'generic_files/upload/agreement' %>
 <%= render partial: 'generic_files/upload/local_file_import_chooser' %>

data/app/views/generic_files/_show_actions.html.erb

@@ -6,6 +6,10 @@
          | 
         <%= link_to "Analytics", sufia.stats_generic_file_path(@generic_file), id: 'stats' %>
       <% end %>
+      <% if Sufia.config.citations %>
+        &nbsp;|&nbsp;
+        <%= link_to "Citations", sufia.citation_generic_file_path(@generic_file), id: 'citations' %>
+      <% end %>
       <% if can? :edit, @generic_file %>
           &nbsp;|&nbsp;
           <% if @generic_file.processing? %>

data/app/views/generic_files/upload/_form.html.erb

@@ -6,6 +6,9 @@
     </div>
   <% end %>
   <div class="well">
+    <% if Sufia.config.upload_to_collection %>
+        <%= render partial: 'generic_files/upload/to_collection' %>
+    <% end %>
     <%= render partial: 'generic_files/upload/form_fields' %>
   </div>
 <% end %>

data/app/views/generic_files/upload/_to_collection.html.erb

@@ -0,0 +1,5 @@
+<p>
+  <label><%= t("sufia.upload.collection.select_label") %></label>
+  <%= select_tag 'collection', options_from_collection_for_select(@user_collections, "id", "title", @collection_id) %>
+</p>
+<p>&nbsp;</p>

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

@@ -11,13 +11,7 @@
         <h3>
           <span class="sr-only">Title</span><%= link_to truncate(recent_document.title_or_label, length: 28, separator: ' '), sufia.generic_file_path(recent_document)  %>
           <% if display_access %>
-              <% if recent_document.registered? %>
-                 <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span>
-              <% elsif recent_document.public? %>
-                <span class="label label-success">Open Access</span>
-              <% else %>
-                <span class="label label-danger">Private</span>
-              <% end %>
+            <%= render_visibility_label(recent_document) %>
           <% end %>
         </h3>
         <p>

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

@@ -5,7 +5,7 @@
   <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="date_uploaded_dtsi" class="<%=params[:sort]== "date_uploaded_dtsi desc" ? 'caret' : params[:sort]== "date_uploaded_dtsi asc" ? 'caret up' : ''%>"></i>Date Uploaded</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>
   </tr>

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

@@ -21,16 +21,9 @@
       </div>
     </div>
   </td>
-  <td width="17%"><%= document.date_uploaded %> </td>
-  <td width="5%" class="text-center">
-      <% if document.registered? %>
-     <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
-    <% elsif document.public? %>
-      <span class="label label-success" title="Open Access">Open Access</span></a>
-    <% else %>
-      <span class="label label-danger" title="Private">Private</span></a>
-    <% end %>
-
+  <td width="17%" class="text-center"><%= document.create_date %> </td>
+  <td width="5%" class="text-center visibility-link">
+    <%= render_visibility_label(document) %>
   </td>
   <td class="text-center">
     <%= render partial:'collection_action_menu', locals: { id: id } %>

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

@@ -6,32 +6,23 @@
     <%= batch_edit_select(document) %>&nbsp;
     <%# This block is for adding/removing the magic wand while batch updates are processing %>
     <% if gf.processing? %>
-        <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.id %>"/>
+        <span class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.id %>"></span>
     <% elsif gf.depositor != @user.user_key %>
-        <i class="glyphicon glyphicon-share-alt"/>
+        <span class="glyphicon glyphicon-share-alt"></span>
     <% end %>
   </td>
-  <td>
-    <div class="media">
-      <%= link_to sufia.generic_file_path(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 sufia.generic_file_path(document), id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" do %>
-              <span class="sr-only"><%= t("sufia.dashboard.my.sr.show_label") %> </span>
-              <%= document.title_or_label %>
-          <% end %>
-          <a href="#" class="small" title="Click for more details">
-            <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"  aria-hidden="true"></i>
-            <span class="sr-only"> <%= "#{t("sufia.dashboard.my.sr.detail_label")} #{document.title_or_label}" %></span>
-          </a>
-        </div>
-        <%= render_collection_list(gf) %>
-      </div>
-    </div>
+  <td class="file-listing-links">
+    <%= link_to sufia.generic_file_path(document), id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" do %>
+        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail pull-left" }, { suppress_link: true } %>
+        <div class="file-listing-title"><span class="sr-only"><%= t("sufia.dashboard.my.sr.show_label") %> </span> <%= document.title_or_label %></div>
+    <% end %>
+    <a href="#" class="small" title="Click for more details">
+      <span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"  aria-hidden="true"></span>
+      <span class="sr-only"> <%= "#{t("sufia.dashboard.my.sr.detail_label")} #{document.title_or_label}" %></span>
+    </a>
+    <div class="part_of_collection"><%= render_collection_list(gf) %></div>
   </td>
-  <td class="text-center"><%= document.date_uploaded %> </td>
+  <td class="text-center"><%= document.create_date %> </td>
   <td class="text-center">
     <%= render_visibility_link document %>
   </td>

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

@@ -1,4 +1,4 @@
-<div class="batch-info"> 
+<div class="batch-info">
   <div>
     <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections}  %>
   </div>
@@ -17,7 +17,7 @@
 
   <div class="sort-toggle">
     <% unless @response.response['numFound'] < 2 %>
-      <%= form_tag sufia.dashboard_files_path, method: :get, class: 'per_page form-inline' do %>
+      <%= form_tag search_action_for_dashboard, method: :get, class: 'per_page form-inline' do %>
             <fieldset class="col-xs-12">
               <legend class="sr-only"><%= t('sufia.sort_label') %></legend>
               <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
@@ -35,5 +35,5 @@
       <% end %>
     <% end unless sort_fields.empty? %>
   </div>
-  
+
 </div>

data/app/views/records/edit_fields/_rights.html.erb

@@ -1,3 +1,4 @@
-<%= f.input :rights, as: :select, collection: Sufia.config.cc_licenses,
+<%= f.input :rights, as: :select_with_modal_help, collection: Sufia.config.cc_licenses,
     input_html: { class: 'form-control', multiple: true }
   %>
+<%= render "generic_files/rights_modal" %>

data/app/views/static/terms.html.erb

@@ -49,7 +49,7 @@
 <ul>
   <li>
 A. Copyright Complaints: We respect the intellectual property rights of others. If you believe your copyright has been violated on the Site, please notify us through <%= t('sufia.institution_name') %>'s designated agent under the Digital Millennium Copyright Act (see 17 U.S.C. Â&sect;512(c)(3).</li>
-  <li> B. Other Site Issues: Please direct all other communications to <a href="/contact/">contact form</a>.</ul>
+  <li> B. Other Site Issues: Please direct all other communications to <a href="<%= sufia.contact_path %>">contact form</a>.</ul>
 </ul>
 </p>
 

data/config/locales/sufia.en.yml

@@ -54,6 +54,9 @@ en:
         partial_fail_html: "One or more files did not upload successfully. To continue using the files that uploaded %{metadata_href}. <br /> Use the %{contact_href} to report the error if it persists."
         partial_fail_metadata_href_text: "edit their metadata"
       cloud_timeout_message: "Please note that if you upload a large number of files within a short period of time, the cloud provider may not be able to accommodate your request. If you experience any errors uploading from the cloud, let us know via the %{contact_href}."
+      collection:
+        select_label: "Upload to:"
+        select_default_option: "Select collection..."
     homepage:
       featured_works:
         tab_label:          'Featured Works'
@@ -160,6 +163,16 @@ en:
         add_another_keyword: "add another Keyword"
         add_another_creator: "add another Creator"
         add_another_rights: "add another Rights"
+      show:
+        edit:
+          label: "Edit"
+          desc: "Edit metadata for this Collection"
+        add_files:
+          label: "Add files"
+          desc: "Add files to this Collection"
+        upload_files:
+          label: "Upload files"
+          desc: "Upload files to this Collection"
     mailbox:
       date:     'Date'
       subject:  'Subject'