sufia 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c996c5fa4051c743da19c5d5f6bb7a9cc68d696e
-  data.tar.gz: 6254959c903a88cfb98bd79cad26bbd34a9c6d6d
+  metadata.gz: 5ad309d6c3fa30869b2f0924d74a036d13711336
+  data.tar.gz: 11696006de86c1fc1e1d382c11476aa731d6b374
 SHA512:
-  metadata.gz: a53f0c3971b91c537eb2df04cc6bd007936aedb42369ea39eab11c3257f8ecdd64be4e7ccb4b16dc20c0aa3b119e7fefbcaf7d32c4553e380192b4374093f4d2
-  data.tar.gz: dc0110f641efaf867351a92ca8377b1af250faedf4bf4923560df235cb05b5424eb3837849f04485eeb0175341bce4b6e44c0b298f6010d0febbc652a057938f
+  metadata.gz: e829d3786073cc52aeff34a888d320734f147bdacc5c83a8f664b34e5b6db15dbb1235dd35530667f0f0f39e754720c7038e52310b20d13195c31d79ce35a311
+  data.tar.gz: ce151f41d016ac992461ca7dcdc2e926e4270c10ba58140b0cea06428c7c8bce27216eb45b308efe8cecb7356b0584a802848f204370126cd97274f9a8aeb5e9

data/.gitignore

@@ -14,9 +14,6 @@ ruby-gemset
 .rvmrc
 Gemfile.lock
 
-# This file is generated automatically by: rake scholarsphere:generate_secret
-config/initializers/secret_token.rb
-
 ## MAC OS
 .DS_Store
 

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 # Required for doing pagination inside an engine. See https://github.com/amatsuda/kaminari/pull/322
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
+gem 'sufia-models', path: './sufia-models'
 
 group :development, :test do
   gem 'activerecord-import', '0.3.0'

data/Releasing_sufia.md

@@ -0,0 +1,3 @@
+Update /SUFIA_VERSION
+
+rake all:release

data/SUFIA_VERSION

@@ -0,0 +1 @@
+2.0.0

data/app/assets/javascripts/sufia.js

@@ -38,7 +38,7 @@ limitations under the License.
 
 //= require batch_edit
 //= require terms_of_service
-//= require fileupload
+//= require sufia/fileupload
 //= require sufia/permissions
 //= require sufia/trophy
 //= require sufia/batch_select_all
@@ -123,31 +123,29 @@ $(function() {
   /*
    * facets lists
    */
-    $("li.expandable").click(function(){
-       $(this).next("ul").slideToggle();
-
-       $(this).find('i').toggleClass("icon-chevron-down");
-    });
-
-    $("li.expandable_new").click(function(){
-       $(this).find('i').toggleClass("icon-chevron-down");
-    });
+  $("li.expandable").click(function(){
+    $(this).next("ul").slideToggle();
+    $(this).find('i').toggleClass("icon-chevron-down");
+  });
 
-    $(".sorts-dash").click(function(){
-       var itag =$(this).find('i');
-       toggle_icon(itag);
-       sort = itag.attr('class') == "icon-caret-down" ? itag.attr('id')+' desc':  itag.attr('id') +' asc';
-       $('#sort').val(sort).selected = true;
-       $(".icon-refresh").parent().click();
-    });
-    $(".sorts").click(function(){
-       var itag =$(this).find('i');
-       toggle_icon(itag);
-        sort = itag.attr('class') == "icon-caret-down" ? itag.attr('id')+' desc':  itag.attr('id');
-        $('input[name="sort"]').attr('value', sort);
-        $(".icon-search").parent().click();
-    });
+  $("li.expandable_new").click(function(){
+    $(this).find('i').toggleClass("icon-chevron-down");
+  });
 
+  $(".sorts-dash").click(function(){
+    var itag =$(this).find('i');
+    toggle_icon(itag);
+    sort = itag.attr('class') == "icon-caret-down" ? itag.attr('id')+' desc':  itag.attr('id') +' asc';
+    $('#sort').val(sort).selected = true;
+    $(".icon-refresh").parent().click();
+  });
+  $(".sorts").click(function(){
+    var itag =$(this).find('i');
+    toggle_icon(itag);
+    sort = itag.attr('class') == "icon-caret-down" ? itag.attr('id')+' desc':  itag.attr('id');
+    $('input[name="sort"]').attr('value', sort);
+    $(".icon-search").parent().click();
+  });
 }); //closing function at the top of the page
 
 

data/app/assets/javascripts/sufia/batch_select_all.js

@@ -4,9 +4,11 @@
     otherPage = typeof otherPage !== 'undefined' ? otherPage : !window.batch_part_on_other_page;
     var n = $(".batch_document_selector:checked").length;
     if ((n>0) || (forceOn)) {
+        $('.batch-toggle').show();
         $('.batch-select-all').show();
         $('#batch-edit').show();
     } else if ( otherPage){
+        $('.batch-toggle').hide();
         $('.batch-select-all').hide();
         $('#batch-edit').hide();
     }

data/app/assets/javascripts/sufia/fileupload.js

@@ -0,0 +1,6 @@
+//= require sufia/uploader
+// This file is the default initialization of the fileupload.  If you want to call
+// sufiaUploader with other options (like afterSubmit), then override this file.
+$(function() {
+  $('#fileupload').sufiaUploader();
+});

data/app/assets/javascripts/sufia/uploader.js

@@ -0,0 +1,165 @@
+//= require fileupload/tmpl
+//= require fileupload/jquery.iframe-transport
+//= require fileupload/jquery.fileupload.js
+//= require fileupload/jquery.fileupload-ui.js
+//= require fileupload/locale.js
+//
+/*jslint nomen: true */
+/*global $ */
+
+
+//200 MB  max file size 
+var max_file_size = 200000000;
+var max_file_size_str = "200 MB";
+//500 MB max total upload size
+var max_total_file_size = 500000000;
+var max_file_count = 100;
+var max_total_file_size_str = "500 MB";
+var first_file_after_max = ''; 
+var filestoupload =0;      
+
+(function( $ ){
+  'use strict';
+
+  $.fn.sufiaUploader = function( options ) {  
+
+    // Create some defaults, extending them with any options that were provided
+    // option afterSubmit: function(form, event, data)
+    var settings = $.extend( { }, options);
+    var files_done =0;      
+    var error_string ='';      
+
+    function uploadStopped() {
+      if (files_done == filestoupload && (files_done >0)){
+         var loc = $("#redirect-loc").html()
+         $(location).attr('href',loc);
+      } else if (error_string.length > 0){
+        // an error occured       
+         if (files_done == 0) {
+            $("#fail").fadeIn('slow')
+         } else {
+            $("#partial_fail").fadeIn('slow')
+         }          
+         $("#errmsg").html(error_string);
+         $("#errmsg").fadeIn('slow');
+      }
+    } 
+
+    function uploadAdd(e, data) {
+      filestoupload++;
+      if ( $('#terms_of_service').is(':checked') )
+        $('#main_upload_start').attr('disabled', false);
+    }
+
+    function uploadAdded(e, data) {
+      if (data.files[0].error == 'acceptFileTypes'){
+        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click(); 
+      }
+      var total_sz = parseInt($('#total_upload_size').val()) + data.files[0].size;
+      // is file size too big
+      if (data.files[0].size > max_file_size) {
+        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click(); 
+        $("#errmsg").html(data.files[0].name + " is too big. No files over " + max_file_size_str + " can be uploaded.");
+        $("#errmsg").fadeIn('slow');
+      }
+      // cumulative upload file size is too big
+      else if( total_sz > max_total_file_size) {
+        if (first_file_after_max == '') first_file_after_max = data.files[0].name;
+        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click(); 
+        $("#errmsg").html("All files selected from " + first_file_after_max + " and after will not be uploaded because your total upload is too big. You may not upload more than " + max_total_file_size_str + " in one upload.");
+        $("#errmsg").fadeIn('slow');
+      }
+      else if( filestoupload > max_file_count) {
+        if (first_file_after_max == '') first_file_after_max = data.files[0].name;
+        $($('#fileupload .files .cancel button')[data.context[0].rowIndex]).click(); 
+        $("#errmsg").html("All files selected from " + first_file_after_max + " and after will not be uploaded because your total number of files is too big. You may not upload more than " + max_file_count + " files in one upload.");
+        $("#errmsg").fadeIn('slow');
+      }
+      else {
+        $('#total_upload_size').val( parseInt($('#total_upload_size').val()) + data.files[0].size );
+      }
+    }
+
+
+    function uploadDone(e, data) {
+      var file = ($.isArray(data.result) && data.result[0]) || {error: 'emptyResult'};
+      if (!file.error) {
+        files_done++;     
+      } else {
+        if (error_string.length > 0) {
+          error_string += '<br/>';
+        }
+        error_string += file.error;
+      }
+    }
+
+    // Takes the contextual values in the file you're uploading
+    // and assign them to a value in the form that is being uploaded:
+    // based off of https://github.com/blueimp/jQuery-File-Upload/wiki/How-to-submit-additional-Form-Data
+    function uploadSubmit(e, data) {
+      $('#relative_path').val(data.files[0].webkitRelativePath)
+      if (settings.afterSubmit) {
+        settings.afterSubmit(this, e, data)
+      }
+    }
+
+    function uploadFail(e, data) {
+      if (data.errorThrown == 'abort') {
+         filestoupload--;
+         if ((files_done == filestoupload)&&(files_done >0)){
+             var loc = $("#redirect-loc").html()+"?file_count="+filestoupload
+             $(location).attr('href',loc);
+         }
+         $('#total_upload_size').val( parseInt($('#total_upload_size').val()) - data.files[0].size );
+         
+      } else {
+       if (error_string.length > 0) {
+          error_string += '<br/>';
+       }
+       error_string += data.errorThrown + ": " + data.textStatus;
+      }
+    }
+
+    var $container = this;
+    return this.each(function() {        
+      // Initialize the jQuery File Upload widget:
+      $(this).fileupload();
+
+      // Enable iframe cross-domain access via redirect option:
+      $('#fileupload').fileupload(
+          'option',
+          'redirect',
+          window.location.href.replace(
+              /\/[^\/]*$/,
+              '/cors/result.html?%s'
+          )
+      );
+
+      $('#fileupload').fileupload(
+          'option',
+          'acceptFileTypes',
+          /^[^\.].*$/i
+      );
+
+      $('#fileupload').bind("fileuploadstop", uploadStopped);
+
+      // count the number of uploaded files to send to edit
+      $('#fileupload').bind("fileuploadadd", uploadAdd);
+      
+      
+      // check the validation on if the file type is not accepted just click cancel for the user as we do not want them to see all the hidden files
+      $('#fileupload').bind("fileuploadadded", uploadAdded);
+
+      // count the number of files completed and ready to send to edit                          
+      $('#fileupload').bind("fileuploaddone", uploadDone);
+
+      $('#fileupload').bind('fileuploadsubmit', uploadSubmit);
+
+
+      // on fail if abort (aka cancel) decrease the number of uploaded files to send
+      $('#fileupload').bind("fileuploadfail", uploadFail);
+
+    });
+
+  };
+})( jQuery );  

data/app/assets/javascripts/terms_of_service.js

@@ -1,35 +1,41 @@
 jQuery.fn.exists = function(){return this.length>0;}
 
 $(function () {
-    if (!$('#terms_of_service').exists()) {
-      // deactivate if there is no checkbox, which allows installations to skip the agreement.
-      return;
-    }
-    
-    $('#main_upload_start').attr('disabled', true);
-    $("#upload_tooltip").hide();
-    $("#main_upload_start_span").mousemove(function(e){
-       if ( !$('#terms_of_service').is(':checked') ){
-           $('#main_upload_start').attr('disabled', true);
-        $("#upload_tooltip").show();
-        $("#upload_tooltip").css({
-            top: (e.clientY+5)+ "px",
-            left: (e.clientX+5) + "px"
-        });
-       } else {
-         if (filestoupload > 0) $('#main_upload_start').attr('disabled', false);
-         $("#upload_tooltip").hide();
-       }
-    });
-    $("#main_upload_start_span").mouseout(function(e){
-        $("#upload_tooltip").hide();
-    });
-    $("#main_upload_start_span").mouseleave(function(e){
-        $("#upload_tooltip").hide();
+  // all activate-submit buttons are disabled by default
+  $('.activate-submit').each(function() {
+    $(this).prop('disabled', true);
+  });
+  // set up tooltip
+  $('.activate-container').tooltip({
+    'placement': 'bottom',
+    'delay': {show: 500, hide: 100}
     });
-    $('#terms_of_service').click(function () {
-        $('#main_upload_start').attr('disabled', !((this.checked) && (filestoupload > 0)));
-        $("#upload_tooltip").hide();
-    });
-});
 
+  // when data-activate checkbox is clicked, change the
+  // disable state of all activate-submit buttons
+  $('input[data-activate]').on("click", function () {
+    // get the checked state of the checkbox clicked and 
+    // set  all other tos checkboxes to same state
+    var bool = $(this).is(":checked");
+    // if box is checked - enable submit, otherwise disable 
+    var disable = (bool) ? false : true;
+    $('input[data-activate]').attr('checked', bool);
+    $('.activate-submit').attr('disabled', disable);
+  })
+
+  // show/hide the tooltip depending if the agreement is already checked
+  $('.activate-container').mousemove(function(e){
+    if ($('input[data-activate]').is(':checked')) {
+      $('.activate-container').tooltip('hide')
+    }
+    else {
+      $('.activate-container').tooltip('show')
+    }
+  });
+  $('.activate-container').mouseout(function(e){
+      $('.activate-container').tooltip('hide')
+  });
+  $('.activate-container').mouseleave(function(e){
+      $('.activate-container').tooltip('hide')
+  });
+});

data/app/assets/stylesheets/sufia.css.scss

@@ -1,7 +1,7 @@
 /* ...
  *= require_self
  *= require bootstrap.min
- *= require scholarsphere-bootstrap
+ *= require application-bootstrap
  *= require trophy
  *= require blacklight_more_facets
  *= require batch_edit

data/app/controllers/batch_controller.rb

@@ -16,6 +16,7 @@ class BatchController < ApplicationController
   include Hydra::Controller::ControllerBehavior
   include Hydra::Controller::UploadBehavior
   include Sufia::Noid # for normalize_identifier method
+  layout "sufia-one-column"
 
   before_filter :has_access?
   prepend_before_filter :normalize_identifier, :only=>[:edit, :show, :update, :destroy]

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -2,6 +2,7 @@ module Sufia::UsersControllerBehavior
   extend ActiveSupport::Concern
 
   included do
+    layout "sufia-one-column"
     prepend_before_filter :find_user, :except => [:index, :search, :notifications_number]
     before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
     before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
@@ -63,7 +64,7 @@ module Sufia::UsersControllerBehavior
 
   def toggle_trophy    
      id = params[:file_id]
-     id = "#{Sufia::Engine.config.id_namespace}:#{id}" unless id.include?(":")
+     id = "#{Sufia.config.id_namespace}:#{id}" unless id.include?(":")
      unless current_user.can? :edit, id
        redirect_to root_path, alert: "You do not have permissions to the file"
        return false

data/app/helpers/generic_file_helper.rb

@@ -53,6 +53,10 @@ module GenericFileHelper
   def render_batch_edit_field_partial(key, locals)
     render_edit_field_partial_with_action('batch_edit', key, locals)
   end
+  
+  def render_show_field_partial(key, locals)
+    render_show_field_partial_with_action('generic_files', key, locals)
+  end
 
  private 
 
@@ -67,6 +71,19 @@ module GenericFileHelper
       end
     end
   end
+  
+  def render_show_field_partial_with_action(action, key, locals)
+    ["#{action}/show_fields/#{key}", "#{action}/show_fields/default"].each do |str|
+      # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
+      # for determining if a partial template exists..
+      begin
+        return render :partial => str, :locals=>locals.merge({key: key})
+      rescue ActionView::MissingTemplate
+        nil
+      end
+    end
+  end
+  
 
  def more_or_less_button(key, html_class, symbol)
    # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.