sufia 4.0.0.beta2 → 4.0.0.beta3

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

@@ -19,20 +19,28 @@
         </tr>
         <tr>
           <th>Audit Status</th>
-          <%- stat= @generic_file.audit_stat(false)  %>
-          <td> <%= (stat == 1 ? 'passing' : (stat == 0 ? 'failing' : stat)) %></td>
+          <%- stat = @generic_file.audit_stat(false)
+              audit = case stat
+                      when 0
+                        'failing'
+                      when 1
+                        'passing'
+                      else
+                        stat
+                      end
+           -%>
+          <td><%= audit %></td>
         </tr>
 <% unless @generic_file.related_files.empty? %>
-  <tr>
-          
+        <tr>
           <th>Related Files</th>
           <td>
               <div class="related-files">
-                  <dl><dt>         
+                  <dl><dt>
 	              <% @generic_file.related_files.each do |f| %>
 	                <dd><%= link_to(f.label, sufia.generic_file_url(f.noid)) %></dd>
 	              <% end %>
-                  </dt></dl>         
+                  </dt></dl>
               </div>
           </td>
         </tr>
@@ -55,10 +63,10 @@
                 <% values[0..length].each_with_index do |value, idx| %>
                   <% next if value.empty? %>
                   <%= "#{label}: #{value.truncate(250)}" %>
-                  <%= "<br />".html_safe unless idx == length %> 
+                  <%= "<br />".html_safe unless idx == length %>
                 <% end %>
                 <% if length != values.length %>
-                   <%= render :partial => "generic_files/extra_fields_modal", :locals=>{:name=>term, :values=> values, :start=>Sufia.config.fits_message_length}%>
+                   <%= render partial: "generic_files/extra_fields_modal", locals: {name: term, values: values, start: Sufia.config.fits_message_length}%>
                 <% end %>
               <% else %>
                 <%= "#{label}: #{values.truncate(250)}" %><br />
@@ -69,4 +77,3 @@
         </tr>
       </tbody>
     </table> <!-- /verticalheadings -->
-

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

@@ -1,7 +1,7 @@
 <div id="versioning_display" class="tab-pane">
   <h2>Versions</h2>
   <div class="well">
-    <%= 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', 'versions') %>
     <h3>Upload New Version</h3>
         <div class="form-group">
@@ -10,7 +10,7 @@
             <p id="upload_field">
                 <%= file_field_tag "filedata"  %>
              </p>
-            <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, :name => "update_versioning", :id => "upload_submit", :onclick => "confirmation_needed = false;", :class => "btn-primary btn-mini" %>
+            <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, name: "update_versioning", id: "upload_submit", onclick: "confirmation_needed = false;", class: "btn-primary btn-mini" %>
           </div>
         </div>
     <hr />
@@ -27,7 +27,7 @@
       </div>
     <% end %>
     <div id="save_version_note" class="alert hide">You must click &quot;Save Revision&quot; to revert a previous version of this file</div>
-    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, :type => 'submit', :class => 'btn-primary btn-mini', :onclick => "confirmation_needed = false;", :name => "revert_submit", :id => "revert_submit" %>
+    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, type: 'submit', class: 'btn-primary btn-mini', onclick: "confirmation_needed = false;", name: "revert_submit", id: "revert_submit" %>
   <% end %>
   </div> <!-- /well -->
 </div> <!-- /row -->

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

@@ -11,12 +11,12 @@ $('input[name=revision]:radio').on('click', function() {
 confirmation_needed = false;
 window.onbeforeunload = confirmExit;
 function confirmExit(){
-      if(confirmation_needed){ 
+      if(confirmation_needed){
       // if you return a string it will be displayed in between "don't navigate away"
       // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
          return "Your metadata has not been saved.";
       }
- }  
+ }
 // only valid for perm tab
 set_access_levels();
 
@@ -25,12 +25,12 @@ $("a[rel=popover]").popover({ html: true });
 
 <% end %>
 
-    <%= render :partial => 'breadcrumbs' %>
+    <%= render partial: 'breadcrumbs' %>
     <h1 class="lower">Edit <%= @generic_file %></h1>
 
 <div class="row">
   <div class="col-xs-12 col-sm-4">
-    <%= render :partial => 'media_display' %>
+    <%= render partial: 'media_display' %>
   </div>
   <div class="col-xs-12 col-sm-8">
     <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path(@generic_file) %>
@@ -40,9 +40,9 @@ $("a[rel=popover]").popover({ html: true });
       <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="glyphicon glyphicon-key"></i> Permissions</a></li>
     </ul>
     <div class="tab-content">
-      <%= render :partial => "descriptions", :locals => { :generic_file => @generic_file } %>
-        <%= render :partial => "permission", :locals => { :gf => @generic_file} %>
-      <%= render :partial => "versioning", :locals => { :generic_file => @generic_file } %>
+      <%= render partial: "descriptions", locals: { generic_file: @generic_file } %>
+      <%= render partial: "permission", locals: { gf: @generic_file} %>
+      <%= render partial: "versioning", locals: { generic_file: @generic_file } %>
     </div>
   </div> <!-- /.col-sm-9 -->
 </div><!-- /.row -->

data/app/views/generic_files/edit_fields/_default.html.erb

@@ -1,7 +1,6 @@
       <div class="col-sm-9" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
         <% required = render_req && (index == 0) && required?(key) %>
-        <%= f.text_field :title, :name=>"generic_file[#{key.to_s}][]", :id => "generic_file_"+key.to_s, :value=>v, :class => "input-large", :required => required  %>
-        <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>
-      </div><!-- /controls -->              
+        <%= f.text_field :title, name: "generic_file[#{key.to_s}][]", id: "generic_file_#{key.to_s}", value: v, class: "input-large", required: required  %>
+        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
+      </div><!-- /controls -->
       <div id="additional_<%= key %>_elements"></div>
-

data/app/views/generic_files/edit_fields/_description.html.erb

@@ -1,6 +1,5 @@
       <div class="col-sm-9" <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <%= f.text_area :description, :name=>"generic_file[#{key.to_s}][]", :id => "generic_file_"+key.to_s, :value=>v, :class => "input-large" %>
-        <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>
-      </div><!-- /controls -->              
+        <%= f.text_area :description, name:"generic_file[#{key.to_s}][]", id: "generic_file_{key.to_s}", value: v, class: "input-large" %>
+        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
+      </div><!-- /controls -->
       <div id="additional_<%= key %>_elements"></div>
-

data/app/views/generic_files/edit_fields/_resource_type.html.erb

@@ -1,8 +1,6 @@
 <%# convert class variable to a local variable if the local hasn't been set %>
 <% generic_file = @generic_file unless generic_file  %>
-
         <div class="col-sm-9">
-          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, {:multiple=>true, :size=>7} %>
+          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, { multiple: true, size: 7 } %>
           <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
         </div>
-

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

@@ -1,8 +1,6 @@
       <div class="col-sm-9" <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-              <% choices = Sufia.config.cc_licenses %>
-              <% choices = {""=>""}.merge(choices) %>
+              <% choices = {"" => ""}.merge(Sufia.config.cc_licenses) %>
               <%= f.select "rights", options_for_select(choices, v) %>
-        <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>
-      </div><!-- /controls -->              
+        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
+      </div><!-- /controls -->
       <div id="additional_<%= key %>_elements"></div>
-

data/app/views/generic_files/edit_fields/_suffix.html.erb

@@ -2,7 +2,7 @@
           <%= add_field(key) %>
           &nbsp;
           <%= help_icon(key) %>
-          <%= render :partial => "generic_files/rights_modal" if key == "rights" %>
+          <%= render partial: "generic_files/rights_modal" if key == "rights" %>
         <% else %>
           <%= subtract_field(key) %>
         <% end %>

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

@@ -9,18 +9,18 @@
   initialize_audio();
 <% end %>
 
-<%= render :partial => 'generic_files/breadcrumbs' %>
+<%= render partial: 'generic_files/breadcrumbs' %>
 <div class="container-fluid">
 <div class="row">
   <div class="col-xs-12 col-sm-4">
-    <%= render :partial => 'generic_files/media_display' %>
+    <%= render partial: 'generic_files/media_display' %>
     <%= render partial: 'show_actions' %>
   </div>
   <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12 col-sm-8">
     <h1><%= @generic_file %></h1>
     <%= render partial: 'show_descriptions' %>
     <%= render partial: 'show_details' %>
-    <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
+    <%= render partial: 'users/activity_log', locals: {events: @events} %>
   </div><!-- /columns second -->
 </div> <!-- /.row -->
 </div><!-- /.container-fluid -->

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

@@ -1,135 +1,19 @@
-<%= render :partial => 'generic_files/breadcrumbs' %>
+<%= render partial: 'generic_files/breadcrumbs' %>
 
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
 <!--[if lte IE 8]><%= javascript_include_tag 'excanvas' %><![endif]-->
-<script type="text/javascript">
-$(function() {
+<%= javascript_tag do %>
+  <%= render partial: 'generic_files/flot_stats', formats: [:js] %>
+<% end %>
 
-  var d = <%= @stats_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", [d], 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>Views: " + 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", [d], {
-    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"
-    }
-  });
-
-  $("#usage-stats").bind("plotselected", function(event, ranges) {
-    plot = $.plot("#usage-stats", [d], $.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);
-  });
-});
-</script>
-
-<h1 class="lower"><%= @generic_file %></h1>
+<%= content_tag :h1, @generic_file, class: "lower" %>
 
 <div class="row">
   <div class="span110">
-    <h2>Usage Statistics</h2>
+    <%= content_tag :h2, "Analytics" %>
     <div class="alert alert-info">
-      <i class="icon-bar-chart icon-large"></i> <strong><%= @pageviews %></strong> views since <%= @created.strftime("%B %-d, %Y") %>
+      <i class="icon-bar-chart icon-large"></i>
+      <%= content_tag :strong, @stats.total_pageviews %> views and <%= content_tag :strong, @stats.total_downloads %> downloads since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">
         <div id="usage-stats" class="stats-placeholder"></div>

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

@@ -1,8 +1,7 @@
-
 <div class="alert alert-info hide" id="success">
   You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
   <p>
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), :class=>'btn' %>
+  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), class: 'btn' %>
   </p>
 </div>
 
@@ -12,8 +11,7 @@
 
 <div class="alert hide" id="partial_fail">
   One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), :class=>'btn' %>
+  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_noid), class: 'btn' %>
 </div>
 
 <div class="alert hide" id="errmsg"> </div>
-

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

@@ -1,4 +1,4 @@
-<%= form_for(@generic_file, :url => sufia.generic_files_path, :html => {:multipart => true, :id => 'fileupload'}) do |f| %>
+<%= form_for(@generic_file, url: sufia.generic_files_path, html: {multipart: true, id: 'fileupload'}) do |f| %>
   <div class="well">
     <%= render partial: 'generic_files/upload/form_fields' %>
   </div>

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

@@ -1,7 +1,7 @@
 <% if current_user.directory.present? %>
   <div class="well">
     <%= render partial: 'generic_files/upload/tos_checkbox' %>
-    <%= form_for @generic_file, :url => sufia.generic_files_path, :html => { :class => 'form-horizontal well'} do |f| %>
+    <%= form_for @generic_file, url: sufia.generic_files_path, html: { class: 'form-horizontal well'} do |f| %>
       <table class="table table-striped">
         <caption>Select files to deposit from your user directory on the server.</caption>
         <thead>

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

@@ -1,3 +1,3 @@
 <label class="checkbox"> 
-  <%= check_box_tag 'terms_of_service', 1, nil, {"data-activate" => 'activate-submit'} %> I have read and do agree to <%= link_to t('sufia.deposit_agreement'), '/agreement/', :target => "_blank" %>.  
+  <%= check_box_tag 'terms_of_service', 1, nil, {"data-activate" => 'activate-submit'} %> I have read and do agree to <%= link_to t('sufia.deposit_agreement'), '/agreement/', target: "_blank" %>.  
 </label>

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

@@ -2,7 +2,9 @@
 <li class="featured-item" data-id="<%= solr_document.noid %>">
   <div class="main row">
     <div class="col-sm-3">
-      <%= render partial: 'dashboard/_index_partials/thumbnail_display', locals: {document: solr_document, width: 90} %>
+      <%= link_to sufia.generic_file_path(solr_document) do %>
+        <%= render_thumbnail_tag solr_document, {width: 90} %>
+      <% end %>
     </div>
     <div class="col-sm-9">
       <%= render partial: 'homepage/featured_fields', locals: {featured: solr_document} %>

data/app/views/{catalog → homepage}/_home.html.erb

@@ -4,3 +4,4 @@
 <div id="home_content" class="row">
   <%= render partial: 'home_content' %>
 </div>
+<%= tiny_mce_stuff if can? :update, ContentBlock%>

data/app/views/{catalog → homepage}/_home_content.html.erb

@@ -5,10 +5,10 @@
   </ul>
   <div class="tab-content">
     <div class="tab-pane fade in" id="highlighted_resources">
-      <%= render :partial=>'/homepage/featured_works' %>
+      <%= render partial: '/homepage/featured_works' %>
     </div>
      <div class="tab-pane fade" id="recently_uploaded">
-       <%= render :partial=>'/catalog/recents', :locals => {:recent_documents=>@recent_documents, :msg=>"No public work has been contributed.", :display_thumbs=>true, :display_access=>false} %>
+       <%= render partial: 'recents', locals: { recent_documents: @recent_documents, msg: "No public work has been contributed.", display_thumbs: true, display_access: false } %>
      </div>
   </div>
 </div><!-- /.col-xs-6 -->
@@ -17,12 +17,12 @@
     <%- if blacklight_config.respond_to?(:tag_cloud_field_name) && blacklight_config.tag_cloud_field_name %>
         <div class="row">
           <h2 class="heading1 pull-left">Explore</h2>
-          <%= render partial:'catalog/tagcloud', locals:{tag_cloud_field_name:blacklight_config.tag_cloud_field_name}%>
+          <%= render partial: 'tagcloud', locals: { tag_cloud_field_name: blacklight_config.tag_cloud_field_name } %>
         </div>
     <%- end %>
   </div>
   <div>
-    <%= render :partial=>'/catalog/featured_researcher' %>
+    <%= render partial: 'featured_researcher' %>
   </div>
 </div>
 <script>

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

@@ -0,0 +1,12 @@
+<div class="home_call_action col-xs-12 col-sm-4 pull-right">
+  <div class="home_share_work">
+    <%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
+    <p class="text-center"><a href="/terms/">Terms of Use</a></p>
+  </div><!-- /.home_share_work -->
+</div><!-- /.col-xs-3 -->
+<div class="col-xs-12 col-sm-8">
+  <%= render partial: "marketing" %>
+</div>
+
+
+