sufia 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e25d6a2061799097aceb639c5c6a2cb2b441a9d
-  data.tar.gz: b85a69100f5df8ab5e5feaebcdd13b1e1d128e4c
+  metadata.gz: 94cde4a9af3ac74adc4d40c93d00ac09089e722a
+  data.tar.gz: b7e76559cbb876f120f28298fa5c5da6066d7f45
 SHA512:
-  metadata.gz: 71e4fd203970d9dac7cacdba50650a85dced73234304f8f413ce27efc27d3795a0ec2b3b9e4a113209dc75bb5f5ba497ff2371d02e6764b820a6f1e86be2482a
-  data.tar.gz: 1100a5c6297ee9bf8a00fef6a7c7cc8d8adc18007521f3b0286041e1297af65e567b4332c32301144bd4ca14f4234723c4d092919baa128f7a21f95db83a4c21
+  metadata.gz: 48198ddc422d252123001f9298356fcd40a73c9417edc4df8852cfc1fa3beafb12c16422a5e7958e9918f9977e85fd1b00418864d585dda20337fb12ed8a84ad
+  data.tar.gz: b9c83e7291e8a25a7621d884bb69ae3b8efd849b21a9318c292e43fc6d13b30c4d3c0a8c368670a1b0f9e4d8a23e62557c621f78eb4dc107f06fff2db6bebacb

data/README.md

@@ -57,16 +57,19 @@ We'd love to accept your contributions.  Please see our guide to [contributing t
 If you have questions or need help, please email [the Hydra community development list](mailto:hydra-tech@googlegroups.com).
 
 ## Creating an application
+
 ### Generate base Rails install
+
 ```rails new my_app```
+
 ### Add gems to Gemfile
+
 ```
-gem 'sufia'
+gem 'sufia', '~> 4.0.0'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
-Then `bundle install`
 
-Note the line with kaminari listed as a dependency.  This is a temporary fix to address a problem in the current release of kaminari. Technically you should not have to list kaminari, which is a dependency of blacklight and sufia.
+Then `bundle install`
 
 ### Run the sufia generator
 ```
@@ -112,6 +115,30 @@ Add this line at the bottom of the file:
 
 Turbolinks does not mix well with Blacklight.
 
+### Install Notes
+
+#### Kaminari
+
+The line with kaminari listed as a dependency in Gemfile is a temporary fix to address a 
+[problem](https://github.com/amatsuda/kaminari/pull/322) in the current release of kaminari. 
+Technically you should not have to list kaminari, which is a dependency of blacklight and sufia.
+
+#### Bundler
+
+Users have reported problems with the initial `bundle install` command, seeing an error such as:
+
+```
+Bundler could not find compatible versions for gem "bootstrap-sass":
+  In Gemfile:
+    sufia (~> 4.0.0) ruby depends on
+      bootstrap-sass (< 3.2) ruby
+
+    sufia (~> 4.0.0) ruby depends on
+      bootstrap-sass (3.2.0.2)
+```
+
+The solution is to update your bundler gem to the latest version.
+
 ### Analytics
 
 Sufia provides support for capturing usage information via Google Analytics and for displaying usage stats in the UI.
@@ -184,7 +211,7 @@ config.browse_everything = BrowseEverything.config
         * OR
     1. By adding/changing config/initializers/sufia.rb to point to your fits location:   `config.fits_path = "/<your full path>/fits.sh"`
 1. You may additionally need to chmod the fits.sh (chmod a+x fits.sh)
-1. You may need to restart your shell to pick up the changes to you path
+1. You may need to restart your shell to pick up the changes to your path
 1. You should be able to run "fits.sh" from the command line and see a help message
 
 ### Start background workers

data/SUFIA_VERSION

@@ -1 +1 @@
-4.0.0
+4.0.1

data/app/assets/javascripts/sufia.js

@@ -48,6 +48,7 @@
 //= require hydra_collections
 //= require browse_everything
 //= require jquery.blacklightTagCloud
+//= require sufia/tagcloud
 //= require nestable
 
 // this needs to be after batch_select so that the form ids get setup correctly
@@ -100,15 +101,6 @@ Blacklight.onLoad(function() {
 
   $("a[rel=popover]").click(function() { return false;});
 
-  /*
-   *  Tag cloud(s)
-   */
-  $(".tagcloud").blacklightTagCloud({
-    size: {start: 0.9, end: 2.5, unit: 'em'},
-    cssHooks: {granularity: 15},
-    color: {start: '#0F0', end: '#F00'}
-  });
-
 
   /*
    * facets lists

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

@@ -39,7 +39,7 @@ function batch_edit_init () {
                     requests.splice($.inArray(opt, requests), 1);
             },
             runNow: function () {
-                clearTimeout(self.tid);
+                clearTimeout(this.tid);
                 if (!running) {
                     this.run();
                 }
@@ -104,7 +104,7 @@ function batch_edit_init () {
     function after_ajax(form_id) {
         var key = form_id.replace("form_", "");
         var save_button = "#" + key + "_save";
-        var outer_div = "#collapse_" + key;
+        var outer_div = "#detail_" + key;
         $("#status_" + key).html("Changes Saved");
         $(save_button).removeAttr("disabled");
         $(outer_div).removeClass("loading");
@@ -114,7 +114,7 @@ function batch_edit_init () {
     function before_ajax(form_id) {
         var key = form_id.replace("form_", "");
         var save_button = "#" + key + "_save";
-        var outer_div = "#collapse_" + key;
+        var outer_div = "#detail_" + key;
         $(save_button).attr("disabled", "disabled");
         $(outer_div).addClass("loading");
         $('#' + form_id).children([".form-group"]).addClass('hidden')

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

@@ -12,13 +12,15 @@
       var cloneElem = $('#'+cloneId).clone();
       // change the add button to a remove button
       var plusbttn = cloneElem.find('#'+this.id);
-      plusbttn.html('-<span class="sr-only">remove this '+ this.name.replace("_", " ") +'</span>');
+      var sr_hidden = '<span aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></span>';
+      var sr_only = '<span class="sr-only">remove this ' + this.name.replace("_", " ") + '</span>';
+      var remove_button = sr_hidden + sr_only; 
+      plusbttn.html(remove_button);
       plusbttn.on('click',removeField);
 
 
       // remove the help tag on subsequent added fields
       cloneElem.find('.formHelp').remove();
-      cloneElem.find('i').remove();
       cloneElem.find('.modal-div').remove();
 
       //clear out the value for the element being appended

data/app/assets/javascripts/sufia/{single_use_link.js → single_use_link.js.erb}

@@ -10,7 +10,7 @@ function getSingleUse(id) {
 }
 
 Blacklight.onLoad(function() {
-    ZeroClipboard.setDefaults({ moviePath: "/assets/ZeroClipboard.swf" });
+    ZeroClipboard.setDefaults({ moviePath: "<%= asset_path 'ZeroClipboard.swf' %>" });
     $.each($(".copypaste"), function(idx, item) {
         var clip = new ZeroClipboard();
         clip.on("dataRequested", function(client, args) {

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

@@ -0,0 +1,12 @@
+Blacklight.onLoad(function () {
+    /*
+     *  Tag cloud(s)
+     */
+    $(".tagcloud").blacklightTagCloud({
+        size: {start: 0.9, end: 2.5, unit: 'em'},
+        cssHooks: {granularity: 15},
+        color: {start: '#0F0', end: '#F00'}
+    });
+
+
+});

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

@@ -4,12 +4,7 @@
  *= require video-js
  *= require jquery-ui
  *= require sufia-audio-overrides
- *= require home-page
- *= require tagcloud
- *= require featured
- *= require usage-stats
  *= require nestable
- *= require catalog
 */
 
 @import 'bootstrap';
@@ -18,12 +13,8 @@
 
 // Use import here instead of require so we can use the Sass variables defined in Bootstrap and Blacklight
 // TODO: Probably should use import throughout and move all of Sufia's stylesheets into a single named directory.
-@import 'settings';
-@import 'header';
-@import 'styles';
-@import 'file-listing';
-@import 'collections';
-@import 'batch-edit';
+@import 'sufia/settings','sufia/header','sufia/styles','sufia/file-listing','sufia/collections','sufia/batch-edit',
+'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons';
 
 #browse-everything {
   top:10%;
@@ -57,4 +48,4 @@
 
 .button_to-inline {
   display: inline-block;
-}
+}

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

@@ -0,0 +1,8 @@
+.btn-raised {
+  box-shadow: 1px 2px 2px 0 rgba(0, 0, 0, 0.15);
+}
+
+.btn-raised:active {
+  box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.1);
+  transition-delay: 0s;
+}

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

@@ -0,0 +1,112 @@
+.dashboard {
+  background-color: $content-wrapper-background-color;
+  padding-bottom: 2em;
+  #content-header {
+    padding-top: 0;
+  }
+  #content {
+    padding-top: 1em;
+  }
+  h1 {
+    font-size: 1.65em;
+  }
+  h2 {
+    font-size: 1.35em;
+    padding-top: .15em;
+  }
+  .badge {
+    background-color: $badge-background-color;
+    color: $badge-font-color;
+  }
+  .panel-default > .panel-heading {
+    background-color: $panel-background-color;
+  }
+  .panel-default > .dashboard-panel {
+    background-color: $panel-dashboard-background-color;
+    color: $panel-dashboard-font-color;
+  }
+  .user-info {
+    padding-left: 0;
+    word-break: break-word;
+  }
+  .sort-toggle, #documents, .batch-toggle {
+    border-left: 1px solid $dashboard-border-color;
+    border-right: 1px solid $dashboard-border-color;
+  }
+}
+
+.heading-tile {
+  border: none;
+}
+.heading-row {
+  border: none;
+}
+
+#content-header .heading-row:nth-child(2) {
+  padding-top: .5em;
+  a:link, a:visited {
+    color: $icon-link-color;
+  }
+  a:hover {
+    color: $icon-link-hover-color;
+    text-decoration: none;
+  }
+}
+
+div.heading-tile .glyphicon {
+  background: $icon-background-color;
+  color: $icon-font-color;
+  display: block;
+  width: 2em;
+  height: 2em;
+  line-height: 1.75em;
+  margin: 0 auto;
+  border-radius: 50%;
+  border: 2px solid $icon-border-color;
+  overflow: hidden;
+}
+
+.proxy-search h3 {
+  margin-bottom: 20px;
+}
+
+.batch-info, #documents {
+  background-color: $dashboard-background-color;
+}
+
+#my_nav {
+  margin-bottom: 0;
+}
+
+.sort-toggle, .batch-toggle {
+  padding: 1.5em 0 1.5em 1em;
+}
+
+#footer {
+  margin-top: 0;
+}
+
+.transfer_link {
+  margin-top: 8px;
+}
+
+// making sure the tables that still exist in the system do not overflow thier bounds
+#notifications_table {
+  table-layout:fixed;
+  column-width: auto;
+  word-wrap:break-word
+}
+#notifications_table th:nth-child(1){
+  width: 10%
+}
+#notifications_table th:nth-child(2){
+  width: 20%
+}
+#notifications_table th:nth-child(3){
+  width: 60%
+}
+
+#activity .panel-body{
+  overflow: scroll;
+  max-height: 20em;
+}

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

@@ -0,0 +1,37 @@
+// Settings
+//
+// Variables, colors, etc. that are used in Sufia.
+// Some are unique or override other variables from Bootstrap.
+
+$basic-black: #000;
+$blue-dark: #036;
+$blue-medium: #1C5798;
+$blue-medium-bright: #2674CA;
+$brown-dark: #7D5D55;
+$brown-medium-dark: #A78352;
+$brown-medium: #B89972;
+$brown-light: #D2B48C;
+$classic-white: #FFF;
+$cream-light: #FCFBF7;
+$gray-dark: #333;
+$gray-medium: #CECDCD;
+$gray-light: #DDD;
+$gray-lighter: #E1E1E1;
+$gray-lightish: #bbb;
+$highlight-yellow: #F0CA00;
+$teal: #2CAEB7;
+$vermilion: #F30;
+
+$badge-background-color: $highlight-yellow;
+$badge-font-color: $classic-white;
+$content-wrapper-background-color: $cream-light;
+$dashboard-background-color: $classic-white;
+$dashboard-border-color: $gray-light;
+$icon-background-color: $vermilion;
+$icon-border-color: $classic-white;
+$icon-font-color: $classic-white;
+$icon-link-color: $basic-black;
+$icon-link-hover-color: $blue-medium-bright;
+$panel-background-color: $classic-white;
+$panel-dashboard-background-color: $teal;
+$panel-dashboard-font-color: $classic-white;

data/app/assets/stylesheets/{styles.css.scss → sufia/_styles.scss}

@@ -1,6 +1,6 @@
 body {
   margin: 0;
-  padding: 0;
+  padding: 0 !important;
 }
 
 #wrapper {

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

@@ -37,7 +37,7 @@ module Sufia::Controller
     return if action_name == "index" && controller_name == "mailbox"
     if user_signed_in?
       @notify_number = current_user.mailbox.inbox(unread: true).count
-      @batches = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span class="batchid ui-helper-hidden">(.*)<\/span>The file(.*)/,1] }.select{ |val| !val.blank? }
+      @batches = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span id="(.*)"><a (href=|data-content=)(.*)/,1] }.select{ |val| !val.blank? }
     end
   end
 

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

@@ -32,7 +32,7 @@ module Sufia
     # in your dashboard view.  You'll need to alter dashboard/index.html.erb accordingly.
     def gather_dashboard_information
       @user = current_user
-      @activity = current_user.get_all_user_activity(params[:since].blank? ? DateTime.now.to_i - 8640 : params[:since].to_i)
+      @activity = current_user.get_all_user_activity(params[:since].blank? ? DateTime.now.to_i - Sufia.config.activity_to_show_default_seconds_since_now : params[:since].to_i)
       @notifications = current_user.mailbox.inbox
     end
 

data/app/helpers/sufia/records_helper_behavior.rb

@@ -41,16 +41,22 @@ module Sufia
     private
 
     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.
-      content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
-        (sr_hidden(symbol) + content_tag('span', class: 'sr-only') do
-          "add another #{key.to_s}"
-        end).html_safe
+      icon = (symbol == "-") ? "remove" : "plus" 
+      content_tag "button", class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}" do
+        sr_hidden(icon) + sr_only(key.to_s)
       end
     end
 
-    def sr_hidden text
-      content_tag :span, text, "aria-hidden" => true
+    def sr_hidden icon
+      content_tag "span", "aria-hidden" => true do 
+        content_tag "i", "", class: "glyphicon glyphicon-#{icon}" 
+      end
+    end
+
+    def sr_only text
+      content_tag "span", class: "sr-only" do 
+        "add another #{text}"
+      end
     end
 
     def default_aria_label text

data/app/views/batch/_metadata.html.erb

@@ -39,7 +39,7 @@
       <%= help_icon(:tag) %>
       <div id="additional_tag_clone">
         <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
-        <button class="adder btn" name="additional_tag" id="additional_tag_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Keyword</span></button>
+        <button class="adder btn" name="additional_tag" id="additional_tag_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_keyword') %></span></button>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
@@ -49,7 +49,7 @@
       <%= help_icon(:creator) %>
       <div id="additional_creator_clone">
         <%= f.text_field :creator, name: "generic_file[creator][]", value: "", required: true %>
-        <button class="adder btn" name="additional_creator" id="additional_creator_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Creator</span></button>
+        <button class="adder btn" name="additional_creator" id="additional_creator_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_creator') %></span></button>
       </div>
       <div id="additional_creator_elements"></div>
     </div>
@@ -59,7 +59,7 @@
       <%= help_icon_modal('rightsModal') %>
       <div id="additional_rights_clone">
         <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), required: true %>
-        <button class="adder btn" name="additional_rights" id="additional_rights_submit"><span aria-hidden="true">+</span><span class="sr-only">add another Rights</span></button>
+        <button class="adder btn" name="additional_rights" id="additional_rights_submit"><span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span><span class="sr-only"><%= t('sufia.batch.metadata.add_another_rights') %></span></button>
         <%= render partial: "generic_files/rights_modal" %>
       </div>
       <div id="additional_rights_elements"></div>