sufia 6.0.0.rc3 → 6.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67f16943a8f2a6992d93cd1b9a2f55a983864f9
-  data.tar.gz: a1ded0b6d953e9821b63b8662e4ade6d28444e93
+  metadata.gz: 8e0e2744f7b799d2b4a2d090e260e66c6ed2cc5d
+  data.tar.gz: 142e115791a129a7b013773cd20993909f4e3f86
 SHA512:
-  metadata.gz: dbc993658fa74c21bf7413c5339aed88aa1235f7b3d964005182a1395d3c767dfa06679225f7ae964c75086b076837e064d0b0288c8d5dbd84768d8700c4a0de
-  data.tar.gz: 182feec8e0a68c2a11eecfbcd3f896d43018e891151be4b491e23b127c49511e7efe6bbdd39a095f18aeaef2391a68a5924f34b936f16f0222dcd916c3986320
+  metadata.gz: 15e992259c723cf8cd267b89e1a3a1008650a009165cf8490d0cdb7c86bd577e6db0c298e7b7ea99301af325a7f76925e4339724ee015c2fda6c1457ba51b2c2
+  data.tar.gz: 12b7cbf716a772af91f4740064cf148f6aac7726d4d6ac3f5fdb4d01aad12f30c378bd4393834f55d0f63e9407755a3395a26ba6f1b82b412ae6d468c68da849

data/Gemfile

@@ -20,10 +20,10 @@ if File.exists?(file)
 else
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] !~ /^4.2/
+    gem 'sass-rails', "< 5.0"
+  else
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
-  else
-    gem 'sass-rails', "< 5.0"
   end
 end

data/README.md

@@ -96,28 +96,12 @@ rake jetty:start
 ### To use the CSS and JavaScript and other assets that ship with Sufia...
 
 #### Modify app/assets/stylesheets/application.css
-Add this line:
-```
- *= require sufia
-```
-**Remove** this line:
-```*= require_tree .```
-
-_Removing the require_tree from application.css will ensure you're not loading the blacklight.css.  This is because blacklight's css styling does not mix well with sufia's default styling._
-
-#### Modify app/assets/javascripts/application.js
-
-Add this line at the bottom of the file:
-```
-//= require sufia
-```
-
-**Remove** this line, if present (typically, when using Rails 4):
+**Remove** this line, if present:
 ```
 //= require turbolinks
 ```
 
-Turbolinks does not mix well with Blacklight.
+Turbolinks causes the TinyMCE editor to not load.
 
 ### Install Notes
 

data/SUFIA_VERSION

@@ -1 +1 @@
-6.0.0.rc3
+6.0.0.rc4

data/app/assets/javascripts/sufia.js

@@ -34,6 +34,7 @@
 //= require sufia/permissions
 //= require sufia/trophy
 //= require sufia/featured_works
+//= require sufia/featured_researcher
 //= require sufia/batch_select_all
 //= require sufia/edit_metadata
 //= require sufia/single_use_link

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

@@ -0,0 +1,14 @@
+
+// The selector for the User field (external_key field) on the
+// featured researcher form
+
+(function( $ ){
+  $.fn.userSelector = function( options ) {
+    $(".select2-user").userSearch();
+  };
+})( jQuery );
+
+Blacklight.onLoad(function() {
+  $('.select2-user').userSelector();
+});
+

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

@@ -8,9 +8,12 @@
 
     return this.each(function() {
       $(this).select2( {
-        placeholder: "Search for a user",
+        placeholder: $(this).attr('value') || "Search for a user",
         minimumInputLength: 2,
-        initSelection: function(element, callback) { },
+        initSelection : function (element, callback) {
+          var data = {id: element.val(), text: element.val()};
+          callback(data);
+        },
         ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
           url: "/users.json",
           dataType: 'json',

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

@@ -1,13 +1,73 @@
-.btn-raised {
-  box-shadow: 1px 2px 2px 0 rgba(0, 0, 0, 0.15);
+.action-button {
+  padding-top: 1em;
+  padding-bottom: 1em;
 }
 
-.btn-raised:active {
-  box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.1);
-  transition-delay: 0s;
+.multi_value .listing .input-group {
+  margin-bottom: .35em;
 }
 
-.action-button {
-  padding-top: 1em;
-  padding-bottom: 1em;
+.input-group-btn:last-child > .btn {
+  margin-left: 0;
+}
+
+ul.listing .add, ul.listing .remove {
+  width: 7em;
+  text-align: center;
+}
+
+.add, .btn-primary {
+  background-color: $add-background-color;
+  border-color: $add-border-color;
+  color: $add-text-color;
+}
+.add:hover, .add:focus,
+.btn-primary:hover, .btn-primary:focus {
+  background-color: $add-background-hover;
+  border-color: $add-border-color;
+  color: $add-text-hover;
+}
+
+#search-form-header {
+  .btn-primary:hover, .btn-primary:focus {
+    background-color: $gray-light !important;
+    color: $basic-black;
+  }
 }
+
+.remove, .btn-danger {
+  background-color: $remove-background-color;
+  border-color: $remove-border-color;
+  color: $remove-text-color;
+}
+.remove:hover, .remove:focus,
+.btn-danger:hover, .btn-danger:focus {
+  background-color: $remove-background-hover;
+  border-color: $remove-border-color;
+  color: $remove-text-hover;
+}
+
+.btn-warning {
+  background-color: $neutral-background-color;
+  border-color: $neutral-border-color;
+  color: $neutral-text-color;
+}
+.btn-warning:hover, .btn-warning:focus {
+  background-color: $neutral-background-hover;
+  border-color: $neutral-border-color;
+  color: $neutral-text-hover;
+}
+
+.info {
+  background-color: $view-select-background-color;
+  border-color: $view-select-border-color;
+  color: $view-select-text-color;
+}
+.info:hover, .info:focus {
+  background-color: $view-select-background-hover;
+  border-color: $view-select-border-color;
+  color: $view-select-text-hover;
+}
+
+
+

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

@@ -56,10 +56,16 @@
   padding-top: .5em;
   a:link, a:visited {
     color: $icon-link-color;
+    text-decoration: none;
+    transition-property: background-color, color;
+    transition-duration: .35s;
+    transition-timing-function: ease-out;
   }
-  a:hover {
+  a:hover, a:focus {
     color: $icon-link-hover-color;
-    text-decoration: none;
+    transition-property: background-color, color;
+    transition-duration: .35s;
+    transition-timing-function: ease-out;
   }
 }
 
@@ -74,6 +80,18 @@ div.heading-tile .glyphicon {
   border-radius: 50%;
   border: 2px solid $icon-border-color;
   overflow: hidden;
+  transition-property: background-color, color;
+  transition-duration: .35s;
+  transition-timing-function: ease-out;
+}
+
+div.heading-tile:hover .glyphicon {
+  background-color: $icon-background-color-hover;
+  border-color: $icon-border-color-hover;
+  color: $icon-font-color-hover;
+  transition-property: background-color, color;
+  transition-duration: .35s;
+  transition-timing-function: ease-out;
 }
 
 .proxy-search h3 {

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

@@ -14,3 +14,7 @@ ol#featured_works {
   }
 }
 
+.featured-researcher {
+  padding: 1em 0;
+  border-bottom: 1px dotted $gray-lighter;
+}

data/app/assets/stylesheets/sufia/_file-listing.scss

@@ -2,6 +2,10 @@ h4 .small {
   color: $navbar-default-toggle-icon-bar-bg;
 }
 
+.table-responsive {
+  overflow-x: visible;
+}
+
 .table thead th {
   text-align: center;
 }

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

@@ -1,17 +1,5 @@
 #masthead {
-  background: #0071BC; /* Old browsers */
-  background-image: -webkit-gradient(
-      linear,
-      left top,
-      left bottom,
-      color-stop(0, #0071BC),
-      color-stop(1, #003457)
-  );
-  background-image: -o-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -moz-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -webkit-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -ms-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: linear-gradient(to bottom, #0071BC 0%, #003457 100%);
+  background: $blue-dark;
   min-height: 4em;
 
   #logo span.glyphicon {
@@ -57,36 +45,44 @@
   }
 }
 
+#masthead_controls .navbar-default .navbar-nav > .active > a,
+#masthead_controls .navbar-default .navbar-nav > .active > a:hover,
+#masthead_controls .navbar-default .navbar-nav > .active > a:focus {
+  background-color: $blue-medium-bright;
+  color: $classic-white;
+}
+
 #masthead_controls {
-  background-color: #D2B48C;
-  border-top: 1px solid #0071BC;
-  border-bottom: 1px solid #B89972;
+  border-top: 1px solid $blue-medium;
+  border-bottom: 1px solid $blue-medium;
+  background-color: $blue-medium-bright;
+  #search-submit-header {
+    background-color: $gray-dark;
+    border-top: 1px solid $gray-medium;
+    border-bottom: 1px solid $gray-medium;
+  }
   .navbar {
-    background-color: #D2B48C;
+    background-color: $blue-medium-bright;
     margin-bottom: 0;
-    text-align: center;
-  }
-  .navbar li {
-    border-right: 1px solid #B89972;
-  }
-  .navbar a:link, .navbar a:visited {
-    color: #FFF;
-  }
-  .navbar a:hover {
-    background-color: #7D5D55;
+    li {
+      border-right: 2px solid $blue-medium;
+    }
+    li:first-child {
+      border-left: 2px solid $blue-medium;
+    }
+    a:link, a:visited {
+      background-color: $blue-medium-bright;
+      color: $classic-white;
+    }
+    a:hover {
+      background-color: $basic-black;
+    }
   }
   .navbar-default {
-    border: 0;
-  }
-  .navbar-default .navbar-nav>.active>a,
-  .navbar-default .navbar-nav>.active>a:hover,
-  .navbar-default .navbar-nav>.active>a:focus {
-    background-color: #F7EEDE;
-    color: #555;
+    border: none;
   }
 }
 
-
 .login_button {
   margin: 1.75em 3em 0 0;
 }

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

@@ -7,6 +7,8 @@ $basic-black: #000;
 $blue-dark: #036;
 $blue-medium: #1C5798;
 $blue-medium-bright: #2674CA;
+$teal: #2CAEB7;
+$teal-light: #67ADA9;
 $brown-dark: #7D5D55;
 $brown-medium-dark: #A78352;
 $brown-medium: #B89972;
@@ -19,21 +21,56 @@ $gray-medium: #CECDCD;
 $gray-light: #DDD;
 $gray-lighter: #E1E1E1;
 $gray-lightish: #bbb;
+$yellow-medium: #FFC74E;
 $highlight-yellow: #F0CA00;
-$teal: #2CAEB7;
 $vermilion: #F30;
+$red-orange: #D6562B;
+
 
+// Dashboard
 $badge-background-color: $highlight-yellow;
 $badge-optional-background-color: $gray-medium;
 $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;
+$icon-link-color: $gray-med-dark;
+$icon-link-hover-color: $basic-black;
+$icon-background-color-hover: $classic-white;
+$icon-border-color-hover: $basic-black;
+$icon-font-color-hover: $basic-black;
+
 $panel-background-color: $classic-white;
 $panel-dashboard-background-color: $teal;
 $panel-dashboard-font-color: $classic-white;
+
+// Buttons
+$add-background-color: $teal-light;
+$add-border-color: $teal-light;
+$add-text-color: $classic-white;
+$add-background-hover: $classic-white;
+$add-text-hover: $teal-light;
+
+$neutral-background-color: $yellow-medium;
+$neutral-border-color: $highlight-yellow;
+$neutral-text-color: $classic-white;
+$neutral-background-hover: $classic-white;
+$neutral-text-hover: $yellow-medium;
+
+$remove-background-color: $red-orange;
+$remove-border-color: $red-orange;
+$remove-text-color: $classic-white;
+$remove-background-hover: $classic-white;
+$remove-text-hover: $red-orange;
+
+$view-select-background-color: $blue-medium-bright;
+$view-select-border-color: $blue-medium-bright;
+$view-select-text-color: $classic-white;
+$view-select-background-hover: $classic-white;
+$view-select-text-hover: $blue-medium-bright;

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

@@ -55,23 +55,11 @@ button {
 }
 
 #footer {
+  background: $blue-dark;
   clear: both;
-  color: #FFF;
+  color: $classic-white;
   margin-top: 2em;
   padding: 1em;
-  background: #0071BC; /* Old browsers */
-  background-image: -webkit-gradient(
-      linear,
-      left top,
-      left bottom,
-      color-stop(0, #0071BC),
-      color-stop(1, #003457)
-  );
-  background-image: -o-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -moz-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -webkit-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: -ms-linear-gradient(bottom, #0071BC 0%, #003457 100%);
-  background-image: linear-gradient(to bottom, #0071BC 0%, #003457 100%);
   min-height: 4em;
 }
 

data/app/controllers/batch_controller.rb

@@ -1,46 +1,3 @@
 class BatchController < ApplicationController
-  include Hydra::Controller::ControllerBehavior
-  layout "sufia-one-column"
-
-  before_filter :has_access?
-
-  def edit
-    @batch = Batch.find_or_create(params[:id])
-    @form = edit_form
-  end
-
-  def update
-    authenticate_user!
-    @batch = Batch.find_or_create(params[:id])
-    @batch.status = ["processing"]
-    @batch.save
-    file_attributes = Sufia::Forms::BatchEditForm.model_attributes(params[:generic_file])
-    Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params[:id], params[:title], file_attributes, params[:visibility]))
-    flash[:notice] = 'Your files are being processed by ' + t('sufia.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-danger" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
-    if uploading_on_behalf_of? @batch
-      redirect_to sufia.dashboard_shares_path
-    else
-      redirect_to sufia.dashboard_files_path
-    end
-  end
-
-  protected
-
-  def edit_form
-    generic_file = GenericFile.new(creator: [current_user.name], title: @batch.generic_files.map(&:label))
-    Sufia::Forms::BatchEditForm.new(generic_file)
-  end
-
-  # override this method if you need to initialize more complex RDF assertions (b-nodes)
-  def initialize_fields(file)
-    file.initialize_fields
-  end
-
-  def uploading_on_behalf_of? batch
-    file = batch.generic_files.first
-    return false if file.nil? || file.on_behalf_of.blank?
-    current_user.user_key != file.on_behalf_of
-  end  
-
-  ActiveSupport::Deprecation.deprecate_methods(BatchController, :initialize_fields)
+  include Sufia::BatchControllerBehavior
 end