sufia 4.0.0.beta2 → 4.0.0.beta3

data/app/views/dashboard/lists/index.html.erb

@@ -0,0 +1,59 @@
+<% content_for :head do %>
+    <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
+    <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
+<% end %>
+
+<% content_for :local_js do %>
+
+    initialize_audio();
+
+    // hide or show the batch update buttons on page startup
+    window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
+    window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
+    window.result_set_size = <%= @result_set_size %>;
+    window.document_list_count = <%= @document_list.count %>;
+    toggleButtons(<%= !@empty_batch %>);
+
+    // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
+    $('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
+
+<% end %>
+
+<% @page_title = application_name + " Dashboard" %>
+
+<% if params.has_key?("q") %>
+    <div class="alert alert-info"><i class="glyphicon glyphicon-search icon-large"></i> You searched for:
+      <strong><%= params[:q] %></strong></div>
+<% end %>
+
+<ul class="nav nav-tabs">
+  <li class="<%= "active" if @selected_tab == :files %>">
+    <%= link_to "Files", sufia.dashboard_files_path %>
+  </li>
+  <li class="<%= "active" if @selected_tab == :collections %>">
+    <%= link_to "Collections", sufia.dashboard_collections_path %>
+  </li>
+  <li class="<%= "active" if @selected_tab == :highlighted %>">
+    <%= link_to "Highlighted", sufia.dashboard_highlights_path %>
+  </li>
+  <li class="<%= "active" if @selected_tab == :shared %>">
+    <%= link_to "Shared with Me", sufia.dashboard_shares_path %>
+  </li>
+</ul>
+
+<%= render partial: 'did_you_mean' %>
+<%= render partial: 'facet_selected' %>
+
+<%= render 'constraints', localized_params: params %>
+
+<%= render 'sort_and_per_page' %>
+
+<%= render partial: 'dashboard/document_list' %>
+<% content_for :sidebar do %>
+    <%= render partial: 'facets' %>
+<% end %>
+
+<%= render 'results_pagination' %>
+<% if @events.present? %>
+    <%= render partial: 'users/activity_log', locals: {events: @events} %>
+<% end %>

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

@@ -1,19 +1,19 @@
 <%# convert class variable to a local variable if the local hasn't been set %>
 <% generic_file = @generic_file unless generic_file  %>
+<% include_file ||= true %>
 
 <div class="breadcrumbs">
   <%
-     include_file = true if include_file.blank?
      crumbs = []
      crumbs << link_to('Home', root_path)
 
      case request.referer
      when /dashboard/
-       crumbs << link_to('Dashboard', sufia.dashboard_index_path)
+       crumbs << link_to(t('sufia.bread_crumb.file_list'), sufia.dashboard_files_path)
      when /files/
-       crumbs << link_to('Back to previous', request.referer)
+       crumbs << link_to(t('sufia.bread_crumb.previous'), request.referer)
      when /catalog/
-       crumbs << link_to('Back to search results', request.referer)
+       crumbs << link_to(t('sufia.bread_crumb.search_results'), request.referer)
      end
 
      crumbs << generic_file.title.first if include_file

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

@@ -2,19 +2,19 @@
 <% generic_file ||= @generic_file %>
 
 <div id="descriptions_display" class="tab-pane active">
-  <%= form_for generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
+  <%= form_for generic_file, url: sufia.generic_file_path(@generic_file), html: { multipart: true, class: 'form-horizontal' } do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h1>Descriptions <span class="pull-right required-field">* indicates required fields</span></h1>
       <div class="well">
 
         <% (generic_file.terms_for_editing).each do |term| %>
-          <%= render :partial => "generic_files/field_form", :locals => { generic_file: generic_file, f: f, render_req: true, key: term } %>
+          <%= render partial: "generic_files/field_form", locals: { generic_file: generic_file, f: f, render_req: true, key: term } %>
         <% end %>
-   
+
       </div><!-- /well -->
     <div class="row">
       <div class="form-actions">
-        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, :type => 'submit', :class => 'btn-primary', :onclick => "confirmation_needed = false;", :id => "upload_submit", :name => "update_descriptions" %>
+        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
       </div>
     </div>
   <% end %>

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

@@ -1,19 +1,19 @@
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
 <div class="form-group">
-  <% vals =  generic_file[key] %>
+  <% vals = generic_file[key] %>
   <% if render_req && required?(key) %>
     <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
-    <%= f.label key, tmp.html_safe, :class=>"col-sm-3 control-label"  %>
+    <%= f.label key, tmp.html_safe, class: "col-sm-3 control-label"  %>
   <% else %>
-    <%= f.label key, get_label(key), :class=>"col-sm-3 control-label"%>
+    <%= f.label key, get_label(key), class: "col-sm-3 control-label" %>
   <% end %>
 
   <% if key == :resource_type %>
     <%# resource_type is a multiselect box, so don't render one row for each %>
-    <%= render_edit_field_partial(key, record: generic_file, f:f, render_req: render_req) %>
+    <%= render_edit_field_partial(key, record: generic_file, f: f, render_req: render_req) %>
   <% else %>
     <% vals.to_ary.each_with_index do |v, index| %>
-      <%= render_edit_field_partial(key, record: generic_file, f:f,  v: v, index: index, render_req: render_req) %>
+      <%= render_edit_field_partial(key, record: generic_file, f: f,  v: v, index: index, render_req: render_req) %>
     <% end %>
   <% end %>
  </div><!-- /.form-group -->

data/app/views/generic_files/_flot_stats.js.erb

@@ -0,0 +1,120 @@
+$(function() {
+
+  var stats = <%= @stats.to_flot.to_json.html_safe %>;
+
+  function weekendAreas(axes) {
+    var markings = [],
+      d = new Date(axes.xaxis.min);
+
+    // go to the first Saturday
+    d.setUTCDate(d.getUTCDate() - ((d.getUTCDay() + 1) % 7))
+    d.setUTCSeconds(0);
+    d.setUTCMinutes(0);
+    d.setUTCHours(0);
+
+    var i = d.getTime();
+
+    // when we don't set yaxis, the rectangle automatically
+    // extends to infinity upwards and downwards
+
+    do {
+      markings.push({ xaxis: { from: i, to: i + 2 * 24 * 60 * 60 * 1000 } });
+      i += 7 * 24 * 60 * 60 * 1000;
+    } while (i < axes.xaxis.max);
+
+    return markings;
+  }
+
+  var options = {
+    xaxis: {
+      mode: "time",
+      tickLength: 5
+    },
+    yaxis: {
+      tickDecimals: 0,
+      min: 0
+    },
+    series: {
+      lines: {
+        show: true,
+        fill: true
+      },
+      points: {
+        show: true,
+        fill: true
+      }
+    },
+    selection: {
+      mode: "x"
+    },
+    grid: {
+      hoverable: true,
+      clickable: true,
+      markings: weekendAreas
+    }
+  };
+
+  var plot = $.plot("#usage-stats", stats, options);
+
+  $("<div id='tooltip'></div>").css({
+    position: "absolute",
+    display: "none",
+    border: "1px solid #bce8f1",
+    padding: "2px",
+    "background-color": "#d9edf7",
+    opacity: 0.80
+  }).appendTo("body");
+
+  $("#usage-stats").bind("plothover", function (event, pos, item) {
+    if (item) {
+      date = new Date(item.datapoint[0]);
+      months = ["January", "February", "March", "April", "May", "June",
+        "July", "August", "September", "October", "November", "December"]
+      $("#tooltip").html("<strong>" + item.series.label + ": " + item.datapoint[1] + "</strong><br/>" + months[date.getMonth()] + " " + date.getDate() + ", " + date.getFullYear())
+            .css({top: item.pageY+5, left: item.pageX+5})
+            .fadeIn(200);
+    } else {
+      $("#tooltip").fadeOut(100)
+    }
+  });
+
+  var overview = $.plot("#overview", stats, {
+    series: {
+      lines: {
+        show: true,
+        lineWidth: 1
+      },
+      shadowSize: 0
+    },
+    xaxis: {
+      ticks: [],
+      mode: "time",
+      minTickSize: [1, "day"]
+    },
+    yaxis: {
+      ticks: [],
+      min: 0,
+      autoscaleMargin: 0.1
+    },
+    selection: {
+      mode: "x"
+    },
+    legend: {
+      show: false
+    }
+  });
+
+  $("#usage-stats").bind("plotselected", function(event, ranges) {
+    plot = $.plot("#usage-stats", stats, $.extend(true, {}, options, {
+      xaxis: {
+        min: ranges.xaxis.from,
+        max: ranges.xaxis.to
+      }
+    }));
+    overview.setSelection(ranges, true);
+  });
+
+  $("#overview").bind("plotselected", function(event, ranges) {
+    plot.setSelection(ranges);
+  });
+});

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

@@ -1,19 +1,29 @@
 <% if @generic_file.image? %>
-  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{class:"img-responsive", alt:"Download the full-sized image of #{@generic_file.title.first}"})+"Download the full-sized image", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized image"}%>
+
+  <%= render_download_icon "Download the full-sized image" %>
+
 <% elsif @generic_file.video? %>
+  
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'webm') %>" type="video/webm" />
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp4') %>" type="video/mp4" />
     Your browser does not support the video tag.
   </video>
+
 <% elsif @generic_file.audio? %>
-    <audio controls="controls" class="audiojs" preload="auto">
+    
+  <audio controls="controls" class="audiojs" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'ogg') %>" type="audio/ogg" />
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp3') %>" type="audio/mpeg" />
     Your browser does not support the audio tag.
   </audio>
+
 <% elsif @generic_file.pdf?%>
-  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{class:"img-responsive", alt:"Download the full-sized PDF of #{@generic_file.title.first}"})+"Download the full-sized PDF", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized PDF"}%>
+
+  <%= render_download_icon "Download the full-sized PDF" %>
+
 <% else %>
-  <%= link_to image_tag("default.png", {alt:"No preview available", class:"img-responsive"}),  sufia.download_path(@generic_file), { target:"_new", title:"Download the document"} %>
+
+  <%= render_download_icon %>
+  
 <% end %>

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

@@ -1,9 +1,9 @@
   <div id="permissions_display" class="tab-pane">
-    <%= form_for @generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal', :id => 'permission'} do |f| %>
+    <%= form_for @generic_file, url: sufia.generic_file_path(@generic_file), html: {multipart: true, class: 'form-horizontal', id: 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
-      <%= render :partial => "generic_files/permission_form", :locals => { :gf => @generic_file, :f=> f } %>
+      <%= render partial: "generic_files/permission_form", locals: { gf: @generic_file, f: f } %>
       <div class="row form-actions" id="permissions_submit">
-              <%= button_tag '<i class="icon-save"></i> Save'.html_safe, :type => 'submit', :class => 'btn-primary btn-large', :onclick => "confirmation_needed = false;", :id => "upload_submit", :name => "update_permission" %>
+              <%= button_tag '<i class="icon-save"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
       </div>
   <% end %>
 </div><!-- /#permissions_display -->

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

@@ -2,7 +2,7 @@
 <% public_perm = gf.permissions.map { |perm| perm[:access] if perm[:name] == "public"}.compact.first %>
 <% public_perm = true if params[:controller] == 'batch' %>
 <% registered_perm = gf.permissions.map { |perm| perm[:access] if perm[:name] == "registered"}.compact.first %>
- 
+
 
 <input type="hidden" name="generic_file[permissions][group][public]" value="1" />
 <input type="hidden" name="generic_file[permissions][group][registered]" value="2" />
@@ -22,7 +22,7 @@
   </div>
   <div class="modal-body">
     <h3>Visibility</h3>
-    <p>This setting will determine who can view your file, and the associated metadata. Setting 
+    <p>This setting will determine who can view your file, and the associated metadata. Setting
     the visibility to <span class="label label-success">Open Access</span> will allow your content to be discovered in Google and viewed by anyone.
     The visibility setting <span class="label label-info"><%=t('sufia.institution_name') %></span> will only allow users who are logged into <%=t('sufia.product_name') %>
     (via WebAccess) to view the content.  Files that are marked <span class="label label-important">Private</span> are only able to be viewed
@@ -30,15 +30,15 @@
     </p>
 
     <p>
-    Permissions in <%=t('sufia.product_name') %> are hierarchical.  This means that you cannot set the visibility of a file to <span class="label label-success">Open Access</span> or 
+    Permissions in <%=t('sufia.product_name') %> are hierarchical.  This means that you cannot set the visibility of a file to <span class="label label-success">Open Access</span> or
     <span class="label label-info"><%=t('sufia.institution_name') %></span> and simultaneously try to restrict the access of a single user. However, you may mark the visibility of
     a file as <span class="label label-danger">Private</span> and then grant access to particular users and/or groups for that file in the &quot;Share With&quot;
     section.
     </p>
 
     <h3>Share With</h3>
-    <p>You may grant &quot;View/Download&quot; or &quot;Edit&quot;  access for specific users and/or groups to files. Enter 
-    a valid <%=t('sufia.account_name') %>, one at a time, select the access level for that user and click 
+    <p>You may grant &quot;View/Download&quot; or &quot;Edit&quot;  access for specific users and/or groups to files. Enter
+    a valid <%=t('sufia.account_name') %>, one at a time, select the access level for that user and click
     <button class="btn btn-mini btn-inverse" onclick="return false;"><i class="icon-plus-sign" ></i>Add</button>.
     </p>
 
@@ -47,7 +47,7 @@
     <h3>Permission Definitions</h3>
     <p>
     <strong>View/Download:</strong> this file (both contents and metadata) is accessible from within <%=t('sufia.product_name') %>.<br />
-    <strong>Edit:</strong> this file (both contents and metadata) can be edited.  You may only grant this permission to <%=t('sufia.institution_name') %> users and/or groups. 
+    <strong>Edit:</strong> this file (both contents and metadata) can be edited.  You may only grant this permission to <%=t('sufia.institution_name') %> users and/or groups.
     </p>
   </div>
   <div class="modal-footer">
@@ -63,45 +63,45 @@
           <input type="radio" id="visibility_open" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_psu" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users. 
+          <input type="radio" id="visibility_psu" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users.
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any. 
+          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any.
         </label>
     </div><!-- /.controls -->
-  </div><!-- /.control-group --> 
+  </div><!-- /.control-group -->
   <div class="row">
       <h3>Share With <small>(optional)</small></h3>
   </div>
   <div class="row control-group">
-    <div id="new-user"> 
+    <div id="new-user">
       <div class="input-append">
         <p class="help-block">Enter <%=t('sufia.account_label') %> (one at a time)</p>
-        <%= text_field_tag 'new_user_name_skel', nil, :class => "span29" %><span class="add-on"><%=t('sufia.directory.suffix') %></span>
-        <%= select_tag 'new_user_permission_skel', options_for_select(Sufia.config.permission_levels), :class=> 'span17' %>
+        <%= text_field_tag 'new_user_name_skel', nil, class: "span29" %><span class="add-on"><%=t('sufia.directory.suffix') %></span>
+        <%= select_tag 'new_user_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="icon-plus-sign"></i> Add</button>
-        <br /> <span id="directory_user_result"></span> 
+        <br /> <span id="directory_user_result"></span>
       </div>
     </div>
   </div>
   <div class="row control-group">
     <div id="new-group" >
       <div class="input-append">
-        <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), :class => 'span38' %>
-        <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), :class => 'span17' %>
+        <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'span38' %>
+        <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="icon-plus-sign"></i> Add</button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>
   </div>
 </div><!-- /.well -->
-<table class="table table-bordered"> 
-  <tr> 
+<table class="table table-bordered">
+  <tr>
     <th width="60%">Person/Group</th>
     <th width="40%">Access Level</th>
   </tr>
   <tr id="file_permissions">
-    <td><%= label_tag :owner_access, "Depositor (<span id=\"file_owner\">#{link_to_profile depositor}</span>)".html_safe, :class=>"control-label" %></td>
+    <td><%= label_tag :owner_access, "Depositor (<span id=\"file_owner\">#{link_to_profile depositor}</span>)".html_safe, class: "control-label" %></td>
     <td>
     <%= Sufia.config.owner_permission_levels.keys[0] %>
     </td>
@@ -112,12 +112,11 @@
     <% next if permission[:name].downcase == 'registered' %>
     <% next if permission[:name].downcase == depositor %>
     <tr>
-      <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", permission[:name], :class=>"control-label" %></td>
+      <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", permission[:name], class: "control-label" %></td>
       <td>
-      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia.config.permission_levels, permission[:access]), :class=>'span20 select_perm' %>
+      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia.config.permission_levels, permission[:access]), class: 'span20 select_perm' %>
       <button class="btn close remove_perm">X</button>
       </td>
     </tr>
   <% end %>
 </table>
-

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

@@ -1,16 +1,19 @@
     <h2 class="non lower">Actions</h2>
     <p>
-      <%= link_to "Download", sufia.download_path(@generic_file.noid) %>
-      <% if Sufia.config.usage_statistics %>
+      <%= render_download_link %>
+      <% if Sufia.config.analytics %>
         &nbsp;|&nbsp;
-        <%= link_to "Statistics", sufia.stats_generic_file_path(@generic_file), id: 'stats' %>
+        <%= link_to "Analytics", sufia.stats_generic_file_path(@generic_file), id: 'stats' %>
       <% end %>
       <% if can? :edit, @generic_file %>
           &nbsp;|&nbsp;
-          <%= link_to "Edit", sufia.edit_generic_file_path(@generic_file) unless @generic_file.processing?   %>
-          <%= "File is being processed you may edit once it is complete" if @generic_file.processing?   %>
-      <%end %>
-      <% if can?(:create, FeaturedWork) %>
+          <% if @generic_file.processing? %>
+            <%= "File is being processed you may edit once it is complete" %>
+          <% else %>
+            <%= link_to "Edit", sufia.edit_generic_file_path(@generic_file) %>
+          <% end %>
+      <% end %>
+      <% if can?(:create, FeaturedWork) && @generic_file.public? %>
         <% if FeaturedWork.can_create_another? && !@generic_file.featured?%>
           &nbsp;|&nbsp;
           <%= link_to "Feature", sufia.featured_work_path(@generic_file, format: :json), data: {behavior: 'feature'} %>
@@ -21,11 +24,11 @@
       <% end %>
     </p>
     <p>Export to:
-      <%= link_to 'EndNote', sufia.generic_file_path(@generic_file.noid, :format => 'endnote') %>
+      <%= link_to 'EndNote', sufia.generic_file_path(@generic_file.noid, format: 'endnote') %>
       &nbsp;|&nbsp;
-      <%= link_to 'Zotero', sufia.static_path('zotero'), {:id => 'zoteroLink', :name =>    'zotero', :class => 'lightboxLink'} %>
+      <%= link_to 'Zotero', sufia.static_path('zotero'), {id: 'zoteroLink', name: 'zotero', class: 'lightboxLink'} %>
       &nbsp;|&nbsp;
-      <%= link_to 'Mendeley', sufia.static_path('mendeley'), {:id => 'mendeleyLink', :name =>    'mendeley', :class => 'lightboxLink'} %>
+      <%= link_to 'Mendeley', sufia.static_path('mendeley'), {id: 'mendeleyLink', name: 'mendeley', class: 'lightboxLink'} %>
     </p>
     <!-- AddThis Button BEGIN -->
     <div class="addthis_toolbox addthis_default_style">