blacklight 4.9.0 → 5.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea490616aa86b3b39a0189cbc5a5367c443085d
-  data.tar.gz: 9997faba251e860106a7d5cd144298f6126d7653
+  metadata.gz: 5631f0f750bdf8d5e7976d0b0a771537d1aa06d6
+  data.tar.gz: bbacc4edb12e35515e736b2c9affcae1f77be44a
 SHA512:
-  metadata.gz: cbf5727a785c3e85e3fc29b9dae71f8ee244ccda246cca9d1ae25999fafc2de3ff94fc1e396cff6ce4181a46c53e5cc3940fa94c29b4b02521cae98da897e9b5
-  data.tar.gz: 83c06a38785804fb67995acbd2771a2bde1cfac55201b28f25d0ee86ca386b6e5ef1cc432c235c619e270a88d5ef73ac16c458b11b8296468e571f502065879f
+  metadata.gz: be0707d62ef0c9a16c9a16d5de6bc621f4e1ea4bfb1528a7a8731c71ccf94f76ec7728d4d7b67b38ee5c91ddf4d082019922dce72f72db4286d440f5ad6a2307
+  data.tar.gz: 9b3b49fa307537ba8e5efee64a683292641a6d9477795e54b038a7d493bb74e205d239f3bfd1f5bbef3a27861737ece82d102c582857577d91c77f2d8024714b

data/.gitignore

@@ -20,4 +20,3 @@ spec/internal
 pkg/*
 *.sw[pon]
 gemfiles/*.gemfile.lock
-/.internal_test_app

data/.travis.yml

@@ -1,19 +1,29 @@
-sudo: false
-language: ruby
+notifications:
+  email: false
+
 rvm:
-  - 2.3.7
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+
+before_install:
+  - gem install bundler 
 
 matrix:
-  include:
-    - rvm: 2.3.7
-      env: "RAILS_VERSION=4.0.13"
-    - rvm: 2.3.7
-      env: "RAILS_VERSION=4.1.16"
-    - rvm: 2.3.7
-      env: "RAILS_VERSION=4.2.10"
+  allow_failures:
+    - rvm: 2.1.0
+
+gemfile:
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile
 
 notifications:
   irc: "irc.freenode.org#blacklight"
-  email: false
+  email:
+      - blacklight-commits@googlegroups.com
 
-env: JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
+env:
+  global:
+    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -3,52 +3,15 @@ source 'https://rubygems.org'
 # Please see blacklight.gemspec for dependency information.
 gemspec
 
-gem 'simplecov', :platform => :mri
-gem 'simplecov-rcov', :platform => :mri
-gem 'json', '~> 1.8'
-
 group :test do
   gem 'devise'
   gem 'devise-guests'
-  gem 'bootstrap-sass'
+  gem "bootstrap-sass"
   gem 'turbolinks'
-  gem 'poltergeist'
-end
-
-# BEGIN ENGINE_CART BLOCK
-# engine_cart: 1.0.1
-# engine_cart stanza: 0.10.0
-# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
-if File.exist?(file)
-  begin
-    eval_gemfile file
-  rescue Bundler::GemfileError => e
-    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
-    Bundler.ui.warn e.message
-  end
-else
-  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-  if ENV['RAILS_VERSION']
-    if ENV['RAILS_VERSION'] == 'edge'
-      gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
-    else
-      gem 'rails', ENV['RAILS_VERSION']
-    end
-  end
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
+  gem 'sass-rails'
+  gem 'blacklight_marc', :github => 'projectblacklight/blacklight_marc'
 end
-# END ENGINE_CART BLOCK
 
 if File.exists?('spec/test_app_templates/Gemfile.extra')
   eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
 end
-gem 'transpec'

data/LICENSE

@@ -1,6 +1,5 @@
 ##########################################################################
-# Copyright 2008-2014 Rector and Visitors of the University of Virginia, The Board of Trustees of the Leland Stanford Junior University, Johns Hopkins Universities, and Data Curation Experts
-# Additional copyright may be held by others, as reflected in the commit log
+# Copyright 2008 Rector and Visitors of the University of Virginia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/README.md

@@ -22,10 +22,9 @@ the University of Virginia Library and is made public under an Apache 2.0 licens
 
 * ruby v1.9.3 or higher 
 * git
-* java 1.5 or higher
 * access to a command prompt on the machine to install
 
-In addition, you must have the Bundler and Rails 3.0 gems installed. Other gem dependencies are defined in the blacklight.gemspec file and will be automatically loaded by Bundler.
+In addition, you must have the Bundler and Rails 4.0 gems installed. Other gem dependencies are defined in the blacklight.gemspec file and will be automatically loaded by Bundler.
 
 ## Configuring Apache Solr 
 You'll also want some information about how Blacklight expects [Apache Solr](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)

data/Rakefile

@@ -7,12 +7,8 @@ rescue LoadError
 end
 
 Bundler::GemHelper.install_tasks
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
 
-# load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
 load "tasks/blacklight.rake"
 
 task :default => [:ci]
 task :clean => ['blacklight:clean']
-

data/VERSION

@@ -1 +1 @@
-4.9.0
+5.0.0.pre1

data/app/assets/javascripts/blacklight/ajax_modal.js

@@ -0,0 +1,190 @@
+//= require blacklight/core
+
+/* 
+  The ajax_modal plugin can display some interactions inside a Bootstrap
+  modal window, including some multi-page interactions. 
+
+  It supports unobtrusive Javascript, where a link or form that would have caused
+  a new page load is changed to display it's results inside a modal dialog,
+  by this plugin.  The plugin assumes there is a Bootstrap modal div
+  on the page with id #ajax-modal to use as the modal -- the standard Blacklight
+  layout provides this. 
+
+  To make a link or form have their results display inside a modal, add
+  `data-ajax-modal="trigger"` to the link or form. (Note, form itself not submit input)
+  With Rails link_to helper, you'd do that like:
+
+      link_to something, link, :data => {:ajax_modal => "trigger"}
+
+  The results of the link href or form submit will be displayed inside
+  a modal -- they should include the proper HTML markup for a bootstrap modal's
+  contents. Also, you ordinarily won't want the Rails template with wrapping
+  navigational elements to be used.  The Rails controller could suppress
+  the layout when a JS AJAX request is detected, OR the response
+  can include a `<div data-ajax-modal="container">` -- only the contents
+  of the container will be placed inside the modal, the rest of the
+  page will be ignored. 
+
+  If you'd like to have a link or button that closes the modal,
+  you can just add a `data-dismiss="modal"` to the link,
+  standard Bootstrap convention. But you can also have
+  an href on this link for non-JS contexts, we'll make sure
+  inside the modal it closes the modal and the link is NOT followed. 
+
+  Link or forms inside the modal will ordinarily cause page loads
+  when they are triggered. However, if you'd like their results
+  to stay within the modal, just add `data-ajax-modal="preserve"`
+  to the link or form. 
+
+  Here's an example of what might be returned, demonstrating most of the devices available:
+
+    <div data-ajax-modal="container">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3 class="modal-title">Request Placed</h3>
+      </div>
+  
+      <div class="modal-body">
+        <p>Some message</p>
+        <%= link_to "This result will still be within modal", some_link, :data => {:ajax_modal => "preserve"} %>
+      </div>
+
+
+      <div class="modal-footer">
+        <%= link_to "Close the modal", request_done_path, :class => "submit button dialog-close", :data => {:dismiss => "modal"} %>
+      </div>
+    </div>
+
+
+  One additional feature. If the content returned from the AJAX modal load
+  has an element with `data-ajax-modal=close`, that will trigger the modal
+  to be closed. And if this element includes a node with class "flash_messages",
+  the flash-messages node will be added to the main page inside #main-flahses. 
+
+  == Events
+
+  We'll send out an event 'loaded.blacklight.ajax-modal' with the #ajax-modal
+  dialog as the target, right after content is loaded into the modal but before
+  it is shown (if not already a shown modal).  In an event handler, you can 
+  inspect loaded content by looking inside $(this).  If you call event.preventDefault(),
+  we won't 'show' the dialog (although it may already have been shown, you may want to
+  $(this).modal("hide") if you want to ensure hidden/closed. 
+
+  The data-ajax-modal=close behavior is implemented with this event, see for example. 
+*/
+
+// We keep all our data in Blacklight.ajaxModal object. 
+// Create lazily if someone else created first. 
+if (Blacklight.ajaxModal === undefined) {
+  Blacklight.ajaxModal = {};
+}
+
+
+// a Bootstrap modal div that should be already on the page hidden
+Blacklight.ajaxModal.modalSelector = "#ajax-modal";
+
+Blacklight.ajaxModal.triggerLinkSelector  = "a[data-ajax-modal~=trigger], a.lightboxLink,a.more_facets_link,.ajax_modal_launch";
+Blacklight.ajaxModal.triggerFormSelector  = "form[data-ajax-modal~=trigger], form.ajax_form";
+
+// preserve selectors will be scopied inside the modal only
+Blacklight.ajaxModal.preserveLinkSelector = 'a[data-ajax-modal~=preserve]';
+Blacklight.ajaxModal.preserveFormSelector = 'form[data-ajax-modal~=preserve], form.ajax_form';
+
+Blacklight.ajaxModal.containerSelector    = "[data-ajax-modal~=container]";
+
+Blacklight.ajaxModal.modalCloseSelector   = "[data-ajax-modal~=close], span.ajax-close-modal";
+
+Blacklight.ajaxModal.receiveAjax = function (data) {
+      var contents = data.responseText;
+
+      // does it have a data- selector for container?
+      // important we don't execute script tags, we shouldn't. 
+      // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/master/src/ajax/load.js?source=c#L62
+      var container =  $("<div>").
+        append( jQuery.parseHTML(contents) ).find( Blacklight.ajaxModal.containerSelector ).first();
+      if (container.size() !== 0) {
+        contents = container.html();
+      }
+
+      $(Blacklight.ajaxModal.modalSelector).find('.modal-content').html(contents);
+
+      // send custom event with the modal dialog div as the target
+      var e    = $.Event('loaded.blacklight.ajax-modal')
+      $(Blacklight.ajaxModal.modalSelector).trigger(e);
+      // if they did preventDefault, don't show the dialog
+      if (e.isDefaultPrevented()) return;
+
+      $(Blacklight.ajaxModal.modalSelector).modal('show');      
+};
+
+
+Blacklight.ajaxModal.modalAjaxLinkClick = function(e) {
+  e.preventDefault();
+
+  var jqxhr = $.ajax({
+    url: $(this).attr('href'),
+    dataType: 'script'
+  });
+
+  jqxhr.always( Blacklight.ajaxModal.receiveAjax );
+};
+
+Blacklight.ajaxModal.modalAjaxFormSubmit = function(e) {
+  e.preventDefault();
+
+  var jqxhr = $.ajax({
+    url: $(this).attr('action'),
+    data: $(this).serialize(),
+    type: $(this).attr('method'), //POST',
+    dataType: 'script'
+ });
+
+ jqxhr.always(Blacklight.ajaxModal.receiveAjax);
+}
+
+
+
+Blacklight.ajaxModal.setup_modal = function() {
+	// Event indicating blacklight is setting up a modal link,
+  // you can catch it and call e.preventDefault() to abort
+  // setup. 
+	var e = $.Event('setup.blacklight.ajax-modal');
+	$("body").trigger(e);
+	if (e.isDefaultPrevented()) return;
+
+  $("body").on("click", Blacklight.ajaxModal.triggerLinkSelector, Blacklight.ajaxModal.modalAjaxLinkClick);
+  $("body").on("submit", Blacklight.ajaxModal.triggerFormSelector, Blacklight.ajaxModal.modalAjaxFormSubmit);
+
+  // preserve selectors apply just within the existing modal
+  $("body").on("click", Blacklight.ajaxModal.modalSelector + " " + Blacklight.ajaxModal.preserveLinkSelector, Blacklight.ajaxModal.modalAjaxLinkClick);
+  $("body").on("submit", Blacklight.ajaxModal.modalSelector + " " + Blacklight.ajaxModal.preserveFormSelector, Blacklight.ajaxModal.modalAjaxFormSubmit);
+
+  // Catch our own custom loaded event to implement data-ajax-modal=closed
+  $("body").on("loaded.blacklight.ajax-modal", Blacklight.ajaxModal.check_close_ajax_modal);
+
+  // we support doing data-dismiss=modal on a <a> with a href for non-ajax
+  // use, we need to suppress following the a's href that's there for
+  // non-JS contexts. 
+  $("body ").on("click", Blacklight.ajaxModal.modalSelector + " a[data-dismiss~=modal]", function (e) {
+    e.preventDefault();
+  });
+};
+
+// A function used as an event handler on loaded.blacklight.ajax-modal
+// to catch contained data-ajax-modal=closed directions
+Blacklight.ajaxModal.check_close_ajax_modal = function(event) {  
+  if ($(event.target).find(Blacklight.ajaxModal.modalCloseSelector).length) {
+    modal_flashes = $(this).find('.flash_messages');
+
+    $(event.target).modal("hide");
+    event.preventDefault();
+
+    main_flashes = $('#main-flashes');
+    main_flashes.append(modal_flashes);
+    modal_flashes.fadeIn(500);  
+  }
+}
+
+Blacklight.onLoad(function() {  
+  Blacklight.ajaxModal.setup_modal();
+});

data/app/assets/javascripts/blacklight/blacklight.js

@@ -7,19 +7,15 @@
 //= require blacklight/core
 //= require blacklight/autofocus
 //= require blacklight/bookmark_toggle
-//= require blacklight/facet_expand_contract
-//= require blacklight/lightbox_dialog
+//= require blacklight/ajax_modal
 //= require blacklight/search_context
-//= require blacklight/select_submit
-//= require blacklight/zebra_stripe
-//= require blacklight/css_dropdowns
 //
 //Bootstrap JS for providing collapsable tablet/mobile menu/alert boxes
-//= require bootstrap-transition
-//= require bootstrap-collapse
-//= require bootstrap-alert
-//= require improved-modal/bootstrap-modalmanager.js
-//= require improved-modal/bootstrap-modal.js
+//= require bootstrap/transition
+//= require bootstrap/collapse
+//= require bootstrap/dropdown
+//= require bootstrap/alert
+//= require bootstrap/modal
 
 /* Blacklight has a Javascript setup meant to support local disabling, 
   modification, and use of Blacklight behaviors. 
@@ -39,13 +35,7 @@
   comes along. 
   
   Examples, in your application's own JS:
-  
-    Change what items zebra_striping gets applied to:
-    
-        Blacklight.do_zebra_stripe.selector = ".my_class .even";
-        //Or even add on to existing:
-        Blacklight.do_zebra_stripe.selector = Blacklight.do_zebra_stripe.selector + " .my_class .even";
-      
+        
     Turn off adding of behavior to facet 'more' links, using a no-op function:
     
         Blacklight.do_more_facets_behavior = function() {};

data/app/assets/javascripts/blacklight/checkbox_submit.js

@@ -40,7 +40,7 @@
         //for both bookmarks/$doc_id.  But let's take out the irrelevant parts
         //of the form to avoid any future confusion. 
         form.find("input[type=submit]").remove();
-        form.addClass('form-inline');
+        form.addClass('form-horizontal');
         
         //View needs to set data-doc-id so we know a unique value
         //for making DOM id

data/app/assets/stylesheets/blacklight/{_blacklight_base.scss → _blacklight_base.css.scss}

@@ -6,34 +6,13 @@
    which over-rides things in this file. Or of course you can choose
    not to use the Blacklight CSS file at all in your local app. */
 
-
-
-$btnInfoBackground: #9ad0fe;
-
 @import 'blacklight/blacklight_defaults';
 
-/* Import this to maintain the old YUI font styles */
 @import "blacklight/layout";
 @import "blacklight/header";
-@import "blacklight/footer";
 @import "blacklight/catalog";
 @import "blacklight/group";
 @import "blacklight/bookmark";
 @import "blacklight/facets";
 @import "blacklight/search_history";
-@import "blacklight/print";
-@import "blacklight/responsive";
-
-@import "blacklight/dropdown";
 @import "blacklight/modal";
-
-@import "improved-modal/bootstrap-modal";
-
-.hide-text {
-  width: 1px;
-  position: absolute;
-  display: inline-block;
-  text-indent: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-}

data/app/assets/stylesheets/blacklight/_bookmark.css.scss

@@ -0,0 +1,4 @@
+/* refworks uses a form; we need to give it some additional padding to make it look like a link */
+#refworks-form .btn {
+  padding: $nav-link-padding;
+}

data/app/assets/stylesheets/blacklight/_catalog.css.scss

@@ -0,0 +1,192 @@
+.ajax_form
+{
+  margin-bottom: 0;
+}
+
+#librarian_view
+{
+	left:-17%;
+	text-align:left;
+	top:10%;
+	width:700px;
+}
+
+#marc_view
+{
+	text-align:left;
+
+  .field
+  {
+    border-bottom: $marc_item_separator;
+    clear:both;
+  }
+
+  .ind1, .ind2
+  {
+    display:inline;
+    padding:0 5px;
+  }
+
+  .subfields
+  {
+    padding-left:5em;
+  }
+
+  .tag_ind
+  {
+    float:left;
+  }
+}
+
+.catalog_startOverLink {
+  @extend .pull-right;
+}
+
+.constraints-container {
+  @extend .well;
+  line-height: 2.5;
+  padding: 16px 19px;
+}
+
+span.constraints-label {
+  @extend .h5;
+}
+
+.appliedFilter
+{
+  .constraint-value {
+    cursor: default;
+    
+    &:hover, &:active {
+      background-color: $btn-default-bg;
+      border-color: $btn-default-border;
+    }
+  }
+
+  .filterName:after
+  {
+    @extend .text-muted;
+    content: "\276F";
+    padding-left: $caret-width-base;
+  }
+
+  .remove:hover, .remove:active {
+    @extend .btn-danger;
+
+  }
+}
+
+#documents {
+  .document {
+    margin-top: $padding-base-vertical;
+    padding-top: $padding-base-vertical;
+    border-bottom:1px dotted $table-border-color;
+  }
+
+  .documentFunctions {
+    @extend .pull-right;
+
+    .bookmark_toggle
+    {
+      display:inline;
+    }
+  }
+} 
+
+// Tools link on documetn show page
+.show-tools {
+  .bookmark_toggle {
+    padding: $nav-link-padding;
+  }
+}
+
+
+#sidebar form {
+  margin: 0;
+}
+
+.page_links
+{
+  display: inline-block;
+  border: 1px solid transparent;
+  padding: $padding-base-vertical $padding-base-horizontal;
+  padding-left: 0;
+}
+
+.pagination {
+  text-align: center ;
+}
+
+
+.solrQuery
+{
+	background-color: $search_ui_bg_color;
+	border:1px dotted $search_ui_border_color;
+	font-size:90%;
+	margin:2em;
+	padding:.5em;
+}
+
+.dl-horizontal
+{
+  dd {
+    margin-bottom: $padding-base-vertical;
+  }
+}
+
+.dl-invert {
+  dt {
+    font-weight: normal;
+    color: $field_name_color;
+  }
+}
+
+label.toggle_bookmark
+{
+	font-weight: inherit;
+	min-width: 8.5em;
+}
+
+#sidebar-mlt li {
+  padding-bottom: $padding-base-vertical;
+}
+
+#sortAndPerPage, #previousNextDocument {
+  border-bottom: 1px solid $pagination-border;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+}
+
+#previousNextDocument {
+  @extend .clearfix;
+  padding-top: 1px;
+  padding-bottom: $padding-base-vertical;
+}
+
+#sortAndPerPage .dropdown-toggle {
+  cursor: pointer;
+}
+
+.no-js #sortAndPerPage {
+  & {
+    @extend .clearfix;
+  }
+  .dropdown-menu {
+    background: none;
+    box-shadow: none;
+    border: none;
+    position: relative;
+    display: block;
+    float: none;
+  }
+
+}
+
+.index_title {
+  float: left;
+}
+
+.document-thumbnail {
+  float: right;
+  padding-left: 20px;
+}