blacklight 4.0.0 → 4.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: fd53955e7766d24bb6321e2f1c8276115ef7489f
+  data.tar.gz: 648c5e33395aa063a7b827e6c1418c12ab84aeae
+!binary "U0hBNTEy":
+  metadata.gz: e73973c3a91c7dfbd0dabea81280af47be472a0c12a89dc37b3060db482d7325c3d564cd510ea006282dc1303838131e1c2bf1106f0a4b52fa983a0c1a660e27
+  data.tar.gz: 63b8d103ae752c8cb697eb7c831501bb1b535fccdb2df53bb49c77546dd6e2f756bd904fb54eedfa65fef735ba9e9a9ec205a887ada8090149f8826f022d3fef

data/VERSION

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

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

@@ -4,9 +4,6 @@ Blacklight.setup_modal = function(link_selector, form_selector, launch_modal) {
       link = $(this)
       
       e.preventDefault();
-      if (launch_modal) {
-        GlobalModalManager.loading();
-      }
 
       var jqxhr = $.ajax({
         url: link.attr('href'),

data/app/assets/javascripts/improved-modal/bootstrap-modal.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-modal.js 
+ * bootstrap-modal.js v2.0
  * ===========================================================
  * Copyright 2012 Jordan Schroter
  *
@@ -32,7 +32,7 @@
 
 		constructor: Modal, 
 		
-		init: function(element, options){
+		init: function (element, options) {
 			this.options = options;
 		
 			this.$element = $(element)
@@ -40,8 +40,13 @@
 				
 			this.options.remote && this.$element.find('.modal-body').load(this.options.remote);
 			
-			var manager = typeof this.options.manager === 'function' ? this.options.manager.call(this) : this.options.manager;
-			manager && manager.appendModal && manager.appendModal(this);
+			var manager = typeof this.options.manager === 'function' ? 
+				this.options.manager.call(this) : this.options.manager;
+
+			manager = manager.appendModal ? 
+				manager : $(manager).modalmanager().data('modalmanager');
+
+			manager.appendModal(this);
 		}, 
 		
 		toggle: function () {
@@ -52,6 +57,8 @@
 			var that = this, 
 				e = $.Event('show');
 			
+			if (this.isShown) return;
+
 			this.$element.triggerHandler(e);
 
 			if (e.isDefaultPrevented()) return;
@@ -60,7 +67,7 @@
 				this.$element.css('width', this.options.width);
 				
 				var that = this;
-				this.$element.css('margin-left', function(){
+				this.$element.css('margin-left', function () {
 					if (/%/ig.test(that.options.width)){
 						return -(parseInt(that.options.width) / 2) + '%';
 					} else {
@@ -68,9 +75,9 @@
 					}
 				});
 			}
-
 		
 			var prop = this.options.height ? 'height' : 'max-height';
+
 			var value = this.options.height || this.options.maxHeight;
 			
 			if (value){
@@ -80,6 +87,8 @@
 			}
 
 			this.escape();
+
+			this.tab();
 			
 			this.options.loading && this.loading();
 		}, 
@@ -87,8 +96,6 @@
 		hide: function (e) {
 			e && e.preventDefault();
 
-			var that = this;
-
 			e = $.Event('hide');
 
 			this.$element.triggerHandler(e);
@@ -98,6 +105,8 @@
 			this.isShown = false;
 
 			this.escape();
+
+			this.tab();
 			
 			this.isLoading && this.loading();
 
@@ -105,6 +114,8 @@
 
 			this.$element
 				.removeClass('in')
+				.removeClass('animated')
+				.removeClass(this.options.attentionAnimation)
 				.removeClass('modal-overflow')
 				.attr('aria-hidden', true);
 
@@ -112,14 +123,47 @@
 				this.hideWithTransition() :
 				this.hideModal();
 		}, 
+
+		tab: function () {
+			var that = this;
+
+			if (this.isShown && this.options.consumeTab) {			
+				this.$element.on('keydown.tabindex.modal', '[data-tabindex]', function (e) {		    	
+			    	if (e.keyCode && e.keyCode == 9){	       
+				        var $next = $(this), 
+				        	$rollover = $(this);
+				        
+				       	that.$element.find('[data-tabindex]:enabled:not([readonly])').each(function (e) {
+			         		if (!e.shiftKey){
+			           	 		$next = $next.data('tabindex') < $(this).data('tabindex') ?
+				              		$next = $(this) :
+				              		$rollover = $(this);
+				          	} else {
+				            	$next = $next.data('tabindex') > $(this).data('tabindex') ?
+				              		$next = $(this) :
+				             		$rollover = $(this);
+				          	}
+				        });
+
+				        $next[0] !== $(this)[0] ?
+			          		$next.focus() : $rollover.focus();
+
+				        e.preventDefault();
+
+			      	}
+			    });
+			} else if (!this.isShown) {
+				this.$element.off('keydown.tabindex.modal');
+			}
+		}, 
 		
 		escape: function () {
 			var that = this;
 			if (this.isShown && this.options.keyboard) {
 				if (!this.$element.attr('tabindex')) this.$element.attr('tabindex', -1);
 				
-				this.$element.on('keyup.dismiss.modal', function ( e ) {
-					e.which == 27 && that.hide()
+				this.$element.on('keyup.dismiss.modal', function (e) {
+					e.which == 27 && that.hide();
 				});
 			} else if (!this.isShown) {
 				this.$element.off('keyup.dismiss.modal')
@@ -155,15 +199,15 @@
 			}
 
 		}, 
-		
-		removeLoading: function(){
+
+		removeLoading: function () {
 			this.$loading.remove();
 			this.$loading = null;
 			this.isLoading = false;
 		},
 		
-		loading: function(callback){
-			callback = callback || function(){};
+		loading: function (callback) {
+			callback = callback || function () {};
 		
 			var animate = this.$element.hasClass('fade') ? 'fade' : '';
 			
@@ -189,7 +233,7 @@
 
 				var that = this;
 				$.support.transition && this.$element.hasClass('fade')?
-					this.$loading.one($.support.transition.end, function(){ that.removeLoading() }) :
+					this.$loading.one($.support.transition.end, function () { that.removeLoading() }) :
 					that.removeLoading();
 
 			} else if (callback) {
@@ -197,9 +241,37 @@
 			}
 		},
 		
-		toggleLoading: function(callback){ this.loading(callback); }, 
+		focus: function () {
+			var $focusElem = this.$element.find(this.options.focusOn);
+
+			$focusElem = $focusElem.length ? $focusElem : this.$element;
+
+			$focusElem.focus();
+		},
+
+		attention: function (){
+			// NOTE: transitionEnd with keyframes causes odd behaviour
+
+			if (this.options.attentionAnimation){
+				this.$element
+					.removeClass('animated')
+					.removeClass(this.options.attentionAnimation);
+
+				var that = this;
+
+				setTimeout(function () {
+					that.$element
+						.addClass('animated')
+						.addClass(that.options.attentionAnimation);
+				}, 0);
+			}
+
+
+			this.focus();
+		},
 		
-		destroy: function(){
+
+		destroy: function () {
 			var e = $.Event('destroy');
 			this.$element.triggerHandler(e);
 			if (e.isDefaultPrevented()) return;
@@ -207,19 +279,17 @@
 			this.teardown();
 		},
 		
-		teardown: function(){
-			var $parent = this.$parent;
-			
-			if (!$parent.length){
+		teardown: function () {	
+			if (!this.$parent.length){
 				this.$element.remove();
 				this.$element = null;
 				return;
 			}
-			
-			if ($parent !== this.$element.parent()){
+
+			if (this.$parent !== this.$element.parent()){
 				this.$element.appendTo(this.$parent);
 			}
-			
+
 			this.$element.off('.modal');
 			this.$element.removeData('modal');
 			this.$element
@@ -253,7 +323,10 @@
 		height: null,
 		maxHeight: null,
 		modalOverflow: false,
-		manager: function(){ return GlobalModalManager },
+		consumeTab: true,
+		focusOn: null,
+		attentionAnimation: 'shake',
+		manager: 'body',
 		spinner: '<div class="loading-spinner" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
 	}
 

data/app/assets/javascripts/improved-modal/bootstrap-modalmanager.js

@@ -1,5 +1,5 @@
  /* ===========================================================
- * bootstrap-modalmanager.js 
+ * bootstrap-modalmanager.js v2.0
  * ===========================================================
  * Copyright 2012 Jordan Schroter.
  *
@@ -16,31 +16,10 @@
  * limitations under the License.
  * ========================================================== */
 
-!function($){
+!function ($) {
 
 	"use strict"; // jshint ;_;
 
-	var baseModalzIndex, baseModalAbszIndex, baseBackdropzIndex, baseBackdropAbszIndex,	zIndexFactor;
-
-	$(function(){
-		var $baseModal = $('<div class="modal hide" />').appendTo('body'),
-			$baseBackdrop = $('<div class="modal-backdrop hide" />').appendTo('body'),
-			$baseModalAbs = $('<div class="modal modal-absolute hide" />').appendTo('body'),
-			$baseBackdropAbs = $('<div class="modal-backdrop modal-absolute hide" />').appendTo('body');
-
-		baseModalzIndex = +$baseModal.css('z-index'),
-		baseModalAbszIndex = +$baseModalAbs.css('z-index'),
-		baseBackdropzIndex = +$baseBackdrop.css('z-index'),
-		baseBackdropAbszIndex = +$baseBackdropAbs.css('z-index'),
-		zIndexFactor = baseModalzIndex - baseBackdropzIndex;
-
-		$baseModal.remove();
-		$baseBackdrop.remove();
-		$baseModalAbs.remove();
-		$baseBackdropAbs.remove();
-		$baseBackdrop = $baseModal = $baseModalAbs = $baseBackdrop = null;
-	});
-
 	/* MODAL MANAGER CLASS DEFINITION
 	* ====================== */
 
@@ -48,61 +27,44 @@
 		this.init(element, options);
 	}
 
-	window.ModalManager = ModalManager;
-
 	ModalManager.prototype = {
 
 		constructor: ModalManager,
 
-		init: function(element, options){
+		init: function (element, options) {
 			this.$element = $(element);
 			this.options = $.extend({}, $.fn.modalmanager.defaults, this.$element.data(), typeof options == 'object' && options);
 			this.stack = [];
-			this.isBody = this.$element[0] === $('body')[0];
-			
-			this.$container = this.$element.find('.modal-container');
-			this.$parent = this.$container.length ? this.$container : this.$element;
-	
-			this.$element.toggleClass('has-modal-container', !!this.$container.length);
+			this.backdropCount = 0;
 		},
 
-		createModal: function(element, options){
+		createModal: function (element, options) {
 			$(element).modal($.extend({ manager: this }, options));
 		},
 
-		appendModal: function(modal){
+		appendModal: function (modal) {
 			this.stack.push(modal);
 
 			var that = this;
 
-			modal.$element.on('show.modalmanager', targetIsModal(function(e){
+			modal.$element.on('show.modalmanager', targetIsSelf(function (e) {
 				modal.isShown = true;
 
+				var transition = $.support.transition && modal.$element.hasClass('fade');
+				
 				that.$element
 					.toggleClass('modal-open', that.hasOpenModal())		
 					.toggleClass('page-overflow', $(window).height() < that.$element.height());
+			
+				modal.$parent = modal.$element.parent();
 				
+				modal.$container = that.createContainer(modal);
 
-				var $scrollElement = (that.$container.length ? that.$container : 
-					(that.isBody ? $(window) : that.$element));
-				
-				var modalOverflow = $(window).height() < modal.$element.height() || modal.options.modalOverflow;
+				modal.$element.appendTo(modal.$container);
 
-				modal.$element
-					.toggleClass('modal-overflow', modalOverflow)
-					.css('margin-top', $scrollElement.scrollTop() - (modalOverflow ? 0 : modal.$element.height()/2))
-					.css('z-index', (!that.isBody ? baseModalAbszIndex : baseModalzIndex) 
-						+ (zIndexFactor * that.getIndexOfModal(modal)));
+				var modalOverflow = $(window).height() < modal.$element.height() || modal.options.modalOverflow;
 					
 				that.backdrop(modal, function () {
-					var transition = $.support.transition && modal.$element.hasClass('fade')
-
-					
-					modal.$parent =  modal.$element.parent();
-					if (!modal.$parent.length || modal.$parent[0] !== that.$parent[0]) {
-						modal.$element.detach().appendTo(that.$parent);
-					}
-
 
 					modal.$element.show();
 
@@ -113,11 +75,12 @@
 					}
 
 					modal.$element
+						.toggleClass('modal-overflow', modalOverflow)
+						.css('margin-top', modalOverflow ? 0 : 0 - modal.$element.height()/2)
 						.addClass('in')
-						.attr('aria-hidden', false)
-						.toggleClass('modal-absolute', !that.isBody);
+						.attr('aria-hidden', false);
 					
-					var complete = function(){
+					var complete = function () {
 						that.setFocus();
 						modal.$element.triggerHandler('shown');
 					}
@@ -128,12 +91,13 @@
 				});
 			}));
 
-			modal.$element.on('hidden.modalmanager', targetIsModal(function(e){
+			modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) {
+
 				that.backdrop(modal);
 
 				if (modal.$backdrop){
 					$.support.transition && modal.$element.hasClass('fade')?
-						modal.$backdrop.one($.support.transition.end, function(){ that.destroyModal(modal) }) :
+						modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) :
 						that.destroyModal(modal);
 				} else {
 					that.destroyModal(modal);
@@ -141,25 +105,33 @@
 
 			}));
 
-			modal.$element.on('destroy.modalmanager', targetIsModal(function(e){
+			modal.$element.on('destroy.modalmanager', targetIsSelf(function (e) {
 				that.removeModal(modal);
 			}));
 		},
 
-		destroyModal: function(modal){
+		destroyModal: function (modal) {
+
 			modal.destroy();
+
 			var hasOpenModal = this.hasOpenModal();
+
 			this.$element.toggleClass('modal-open', hasOpenModal);
+			
 			if (!hasOpenModal){
 				this.$element.removeClass('page-overflow');
 			}
+
+			this.removeContainer(modal);
+
 			this.setFocus();
 		},
 
-		hasOpenModal: function(){
+		hasOpenModal: function () {
 			for (var i = 0; i < this.stack.length; i++){
 				if (this.stack[i].isShown) return true;
 			}
+
 			return false;
 		},
 
@@ -170,20 +142,23 @@
 				if (this.stack[i].isShown) topModal = this.stack[i];
 			}
 
-			topModal && topModal.$element.focus();
+			if (!topModal) return;
+
+			topModal.focus();
+
 		},
 
-		removeModal: function(modal){
+		removeModal: function (modal) {
 			modal.$element.off('.modalmanager');
 			if (modal.$backdrop) this.removeBackdrop.call(modal);
 			this.stack.splice(this.getIndexOfModal(modal), 1);
 		},
 
-		getModalAt: function(index){
+		getModalAt: function (index) {
 			return this.stack[index];
 		},
 
-		getIndexOfModal: function(modal){
+		getIndexOfModal: function (modal) {
 			for (var i = 0; i < this.stack.length; i++){
 				if (modal === this.stack[i]) return i;
 			}
@@ -194,13 +169,13 @@
 			modal.$backdrop = null;
 		}, 
 
-		createBackdrop: function(animate){
+		createBackdrop: function (animate) {
 			var $backdrop;
 
 			if (!this.isLoading) {
-				$backdrop =  $('<div class="modal-backdrop ' + animate + '" />')
-					.appendTo(this.$parent)
-					.toggleClass('modal-absolute', !this.isBody);
+				$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+					.appendTo(this.$element);
+
 			} else {
 				$backdrop = this.$loading;
 				$backdrop.off('.modalmanager');
@@ -212,9 +187,37 @@
 			return $backdrop
 		},
 
+		removeContainer: function (modal) {
+			modal.$container.remove();
+			modal.$container = null;
+		}, 
+
+		createContainer: function (modal) {
+			var $container;
+
+			$container = $('<div class="modal-scrollable">')
+				.css('z-index', getzIndex( 'modal', 
+					modal ? this.getIndexOfModal(modal) : this.stack.length ))
+				.appendTo(this.$element);
+
+			if (modal && modal.options.backdrop != 'static') {
+				$container.on('click.modal', targetIsSelf(function (e) {
+					modal.hide();
+				}));
+			} else if (modal) {
+				$container.on('click.modal', targetIsSelf(function (e) {
+					modal.attention();
+				}));
+			}
+
+			return $container;
+
+		},
+
 		backdrop: function (modal, callback) {
 			var animate = modal.$element.hasClass('fade') ? 'fade' : '',
-				showBackdrop = $.extend({}, this.options, modal.options).backdrop;
+				showBackdrop = modal.options.backdrop && 
+					this.backdropCount < this.options.backdropLimit;
 
 			if (modal.isShown && showBackdrop) {
 				var doAnimate = $.support.transition && animate && !this.isLoading;
@@ -222,29 +225,27 @@
 
 				modal.$backdrop = this.createBackdrop(animate);
 
-				modal.$backdrop.css('z-index', 
-						(!this.isBody ? baseBackdropAbszIndex : baseBackdropzIndex) 
-						+ (zIndexFactor * this.getIndexOfModal(modal)));
-
-
-				if (modal.options.backdrop != 'static') {
-					modal.$backdrop.on('click.modal', $.proxy(modal.hide, modal));
-				}
+				modal.$backdrop.css('z-index', getzIndex( 'backdrop', this.getIndexOfModal(modal) ))
 
 				if (doAnimate) modal.$backdrop[0].offsetWidth // force reflow
 
 				modal.$backdrop.addClass('in')
 
+				this.backdropCount += 1;
+
 				doAnimate ?
-				modal.$backdrop.one($.support.transition.end, callback) :
-				callback();
+					modal.$backdrop.one($.support.transition.end, callback) :
+					callback();
 
 			} else if (!modal.isShown && modal.$backdrop) {
 				modal.$backdrop.removeClass('in');
 
+				this.backdropCount -= 1;
+
 				var that = this;
+
 				$.support.transition && modal.$element.hasClass('fade')?
-					modal.$backdrop.one($.support.transition.end, function(){ that.removeBackdrop(modal) }) :
+					modal.$backdrop.one($.support.transition.end, function () { that.removeBackdrop(modal) }) :
 					that.removeBackdrop(modal);
 
 			} else if (callback) {
@@ -252,16 +253,18 @@
 			}
 		},
 
-		removeLoading: function(){
+		removeLoading: function () {
 			this.$loading && this.$loading.remove();
 			this.$loading = null;
 			this.isLoading = false;
 		},
 
-		loading: function(callback){
-			callback = callback || function(){ };
+		loading: function (callback) {
+			callback = callback || function () { };
 			
-			this.$element.toggleClass('modal-open', !this.isLoading || this.hasOpenModal());
+			this.$element
+				.toggleClass('modal-open', !this.isLoading || this.hasOpenModal())
+				.toggleClass('page-overflow', $(window).height() < this.$element.height());
 			
 			if (!this.isLoading) {
 
@@ -270,22 +273,18 @@
 				this.$loading[0].offsetWidth // force reflow	
 
 				this.$loading
-					.css('z-index', 
-						(!this.isBody ? baseBackdropAbszIndex : baseBackdropzIndex) 
-						+ (zIndexFactor * this.stack.length))
-					.on('click.modalmanager', $.proxy(this.loading, this))
+					.css('z-index', getzIndex('backdrop', this.stack.length))
 					.addClass('in');
 
-				var $scrollElement = (this.$container.length ? this.$container : 
-						(this.isBody ? $(window) : this.$element));
-
-				this.$spinner = $('<div class="modal-spinner fade">')
-					.append(this.options.spinner)
-					.css('z-index', this.$loading.css('z-index'))
-					.css('margin-top', $scrollElement.scrollTop())
-					.appendTo(this.$parent)
+				var $spinner = $(this.options.spinner)
+					.css('z-index', getzIndex('modal', this.stack.length))
+					.appendTo(this.$element)
 					.addClass('in');
 
+				this.$spinner = $(this.createContainer())
+					.append($spinner)
+					.on('click.modalmanager', $.proxy(this.loading, this));
+
 				this.isLoading = true;
 
 				$.support.transition ?
@@ -299,28 +298,51 @@
 
 				var that = this;
 				$.support.transition ?
-					this.$loading.one($.support.transition.end, function(){ that.removeLoading() }) :
+					this.$loading.one($.support.transition.end, function () { that.removeLoading() }) :
 					that.removeLoading();
 
 			} else if (callback) {
 				callback(this.isLoading);
 			}
-		},
-
-		toggleLoading: function(callback){ this.loading(callback); }
+		}
 	}
 
 	/* PRIVATE METHODS
 	* ======================= */
 
+	// computes and caches the zindexes
+	var getzIndex = (function () {
+		var zIndexFactor, 
+			baseIndex = {};
+
+		return function (type, pos) {
+
+			if (typeof zIndexFactor === 'undefined'){
+				var $baseModal = $('<div class="modal hide" />').appendTo('body'),
+					$baseBackdrop = $('<div class="modal-backdrop hide" />').appendTo('body');
+
+				baseIndex['modal'] = +$baseModal.css('z-index'),
+				baseIndex['backdrop'] = +$baseBackdrop.css('z-index'),
+				zIndexFactor = baseIndex['modal'] - baseIndex['backdrop'];
+				
+				$baseModal.remove();
+				$baseBackdrop.remove();
+				$baseBackdrop = $baseModal = null;
+			}
+
+			return baseIndex[type] + (zIndexFactor * pos);
+
+		}
+	}())
+
 	// make sure the event target is the modal itself in order to prevent 
 	// other components such as tabsfrom triggering the modal manager. 
 	// if Boostsrap namespaced events, this would not be needed.
-	function targetIsModal(callback){
-		return function(e){
+	function targetIsSelf(callback){
+		return function (e) {
 			if (this === e.target){
-				callback.apply(this, arguments);
-			}
+				return callback.apply(this, arguments);
+			} 
 		}
 	}
 
@@ -330,24 +352,19 @@
 
 	$.fn.modalmanager = function (option) {
 		return this.each(function () {
-			var $this = $(this)
-			, data = $this.data('modalmanager');
+			var $this = $(this), 
+				data = $this.data('modalmanager');
 
-			if (!data) $this.data('modalmanager', (data = new ModalManager(this, options)))
-			if (typeof option == 'string') data[option]()
+			if (!data) $this.data('modalmanager', (data = new ModalManager(this, option)))
+			if (typeof option === 'string') data[option]()
 		})
 	}
 
 	$.fn.modalmanager.defaults = {
-		backdrop: true,
-		spinner: '<div class="loading-spinner" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
+		backdropLimit: 999,
+		spinner: '<div class="loading-spinner fade" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
 	}
 
 	$.fn.modalmanager.Constructor = ModalManager
 
-	// Create a default global modal manager 
-	$(function(){
-		window.GlobalModalManager = new ModalManager('body');
-	})
-
 }(jQuery);

data/app/assets/stylesheets/improved-modal/bootstrap-modal.css

@@ -7,7 +7,7 @@
  *
  */
 
-.modal-open.has-modal-container {
+.modal-open {
 	position: relative; /* safari */
 	overflow: hidden;
 }
@@ -17,7 +17,7 @@
 .modal-open.page-overflow .page-container,
 .modal-open.page-overflow .page-container .navbar-fixed-top,
 .modal-open.page-overflow .page-container .navbar-fixed-bottom,
-.modal-open.page-overflow .modal-container  {
+.modal-open.page-overflow .modal-scrollable {
 	overflow-y: scroll;
 }
 
@@ -28,19 +28,14 @@
 	}
 }
 
-.modal-container {
-	display: none;
+
+.modal-scrollable {
 	position: fixed;
 	top: 0;
 	bottom: 0;
 	left: 0;
 	right: 0;
 	overflow: auto;
-	z-index: 9999;
-}
-
-.modal-open > .modal-container {
-	display: block;
 }
 
 .modal {
@@ -83,12 +78,6 @@
 	border-radius: 6px;
 }
 
-.modal-spinner {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-}
-
 .modal-backdrop.modal-absolute{
 	position: absolute;
 	z-index: 940;
@@ -110,7 +99,6 @@
 
 .modal-overflow.modal {
 	top: 1%;
-	/*bottom: 1%;*/
 }
 
 .modal-overflow.modal.fade {
@@ -119,7 +107,6 @@
 
 .modal-overflow.modal.fade.in {
 	top: 1%;
-	/*bottom: 1%;*/
 }
 
 .modal-overflow .modal-body {
@@ -127,25 +114,6 @@
 	-webkit-overflow-scrolling: touch;
 }
 
-/*.modal-overflow .modal-body {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	margin-top: 48px; // header height
-	margin-bottom: 60px; // footer height
-	overflow: auto;
-}
-
-
-.modal-overflow .modal-footer {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	left: 0;
-}*/
-
 /* Responsive */
 
 @media (min-width: 1200px) {
@@ -197,3 +165,51 @@
 	left: 50%;
 	margin: -12px 0 0 -12px;
 }
+
+/*
+Animate.css - http://daneden.me/animate
+Licensed under the ☺ license (http://licence.visualidiot.com/)
+
+Copyright (c) 2012 Dan Eden*/
+
+.animated {
+	-webkit-animation-duration: 1s;
+	   -moz-animation-duration: 1s;
+	     -o-animation-duration: 1s;
+	        animation-duration: 1s;
+	-webkit-animation-fill-mode: both;
+	   -moz-animation-fill-mode: both;
+	     -o-animation-fill-mode: both;
+	        animation-fill-mode: both;
+}
+
+@-webkit-keyframes shake {
+	0%, 100% {-webkit-transform: translateX(0);}
+	10%, 30%, 50%, 70%, 90% {-webkit-transform: translateX(-10px);}
+	20%, 40%, 60%, 80% {-webkit-transform: translateX(10px);}
+}
+
+@-moz-keyframes shake {
+	0%, 100% {-moz-transform: translateX(0);}
+	10%, 30%, 50%, 70%, 90% {-moz-transform: translateX(-10px);}
+	20%, 40%, 60%, 80% {-moz-transform: translateX(10px);}
+}
+
+@-o-keyframes shake {
+	0%, 100% {-o-transform: translateX(0);}
+	10%, 30%, 50%, 70%, 90% {-o-transform: translateX(-10px);}
+	20%, 40%, 60%, 80% {-o-transform: translateX(10px);}
+}
+
+@keyframes shake {
+	0%, 100% {transform: translateX(0);}
+	10%, 30%, 50%, 70%, 90% {transform: translateX(-10px);}
+	20%, 40%, 60%, 80% {transform: translateX(10px);}
+}
+
+.shake {
+	-webkit-animation-name: shake;
+	-moz-animation-name: shake;
+	-o-animation-name: shake;
+	animation-name: shake;
+}

data/app/views/_flash_msg.html.erb

@@ -3,7 +3,7 @@
     <%- alert_class = type == :notice ? 'info' : type %>
     <% if flash[type] %>
       <div class="alert alert-<%=alert_class%>"><%= flash[type] %>
-         <a class="close" data-dismiss="alert" href="#">x</a>
+         <a class="close" data-dismiss="alert" href="#">&times;</a>
       </div>
     <% end %>
   <% end %>

data/app/views/catalog/_constraints_element.html.erb

@@ -26,8 +26,7 @@
         %>                
         <%= link_to(accessible_remove_label.html_safe,
 					options[:remove],
-					:class=>'btnRemove imgReplace',
-          :alt=>'remove'
+					:class=>'btnRemove imgReplace'
 				) %>
       <%- end -%>
 </span>

data/app/views/catalog/_did_you_mean.html.erb

@@ -1,5 +1,5 @@
 <% if @response.total <= spell_check_max and @response.spelling.words.size > 0 %>
   <div id="spell">
-    <h4 class="suggest"><i><%= t('blacklight.did_you_mean', :options =>  @response.spelling.words.map { |word| link_to_query(word) }.join(" #{t('blacklight.or')} ")).html_safe %></i></h4>
+    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options =>  @response.spelling.words.map { |word| link_to_query(word) }.join(" #{t('blacklight.or')} ")).html_safe %></em></h4>
   </div>
 <% end %>

data/app/views/catalog/_results_pagination.html.erb

@@ -1,6 +1,6 @@
 <% if paginate_params(@response).num_pages > 1 %>
  <div class="row record-padding">
-  <div class="span8 offset1"> 
+  <div class="span9"> 
     <div class="pagination">
       <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight' %>
     </div>

data/app/views/catalog/_show_tools.html.erb

@@ -15,7 +15,7 @@
       </li>
       <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
         <li class="cite">
-         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
+         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :class => 'lightboxLink'} %>
         </li>
       <% end %>
       <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
@@ -30,18 +30,18 @@
     <% end %>
     <% if @document.respond_to?( :to_email_text ) %>
       <li class="email">
-      <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
+      <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :class => 'lightboxLink'} %>
       </li>
     <%- end -%>
     <%- if @document.respond_to?( :to_sms_text ) -%>
       <li class="sms">
-      <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :name => 'sms', :class => 'lightboxLink'} %>
+      <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :class => 'lightboxLink'} %>
       </li>
     <%- end -%>
     
     <% if @document.respond_to?(:to_marc) %>
       <li class="librarian_view">
-        <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
+        <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :class => 'lightboxLink'} %>
       </li>
     <% end %>
-  </ul>
+  </ul>

data/app/views/layouts/blacklight.html.erb

@@ -2,14 +2,16 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html" charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <!-- Mobile viewport optimization h5bp.com/ad -->
     <meta name="HandheldFriendly" content="True">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
-    <meta http-equiv="cleartype" content="on">
+    <!--[if IEMobile]>
+      <meta http-equiv="cleartype" content="on">
+    <![endif]-->
 
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= opensearch_catalog_path(:format => 'xml', :only_path => false) %>" title="<%= application_name%>" type="application/opensearchdescription+xml" rel="search"/>
@@ -40,7 +42,7 @@
             </div>
             <!-- /Top bar -->
                   <div class="row">
-                      <div class="span10">
+                      <div class="span12">
                         <div id="main-flashes">
                           <%= render :partial=>'/flash_msg' %>
                         </div>

data/blacklight.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "sass-rails"
-  s.add_dependency "bootstrap-sass", "~> 2.1.0"
+  s.add_dependency "bootstrap-sass", "~> 2.2.0"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
 end

data/config/locales/blacklight.en.yml

@@ -182,13 +182,13 @@ en:
         title: 'Results navigation'
       pagination_info:
         no_items_found: 'No %{entry_name} found'
-        single_item_found: '<b>1</b> to <b>1</b> of <b>1</b>'
+        single_item_found: '<strong>1</strong> to <strong>1</strong> of <strong>1</strong>'
         pages:
-          one: '<b>%{start_num}</b> - <b>%{end_num}</b> of <b>%{total_num}</b>'
-          other: '<b>%{start_num}</b> - <b>%{end_num}</b> of <b>%{total_num}</b>'
+          one: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num}</strong>'
+          other: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num}</strong>'
       entry_pagination_info:
-        one: '<b>1 of 1</b>'
-        other: '<b>%{current}</b> of <b>%{total}</b>'
+        one: '<strong>1 of 1</strong>'
+        other: '<strong>%{current}</strong> of <strong>%{total}</strong>'
       documents:
         counter: '%{counter}. '
       facets:

data/lib/blacklight/catalog.rb

@@ -95,12 +95,16 @@ module Blacklight::Catalog
     # citation action
     def citation
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
+      respond_to do |format|
+        format.html
+        format.js { render :layout => false }
+      end
     end
     # grabs a bunch of documents to export to endnote
     def endnote
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
       respond_to do |format|
-        format.endnote :layout => false
+        format.endnote { render :layout => false }
       end
     end
     

data/test_support/bin/setup-test-app.sh

@@ -83,7 +83,7 @@ end
 platforms :ruby do
  gem 'sqlite3'
  gem 'execjs'
- gem 'therubyracer'
+ gem 'therubyracer', '~> 0.10.2'
 end
 
 gem 'blacklight', :path => '../../'

data/test_support/bin/test.sh

@@ -83,7 +83,7 @@ end
 platforms :ruby do
  gem 'sqlite3'
  gem 'execjs'
- gem 'therubyracer'
+ gem 'therubyracer', '~> 0.10.2'
 end
 
 gem 'blacklight', :path => '../../'

data/test_support/spec/helpers/catalog_helper_spec.rb

@@ -43,7 +43,7 @@ describe CatalogHelper do
       @response = mock_response :total => 1
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<b>1</b> to <b>1</b> of <b>1</b>"
+      html.should == "<strong>1</strong> to <strong>1</strong> of <strong>1</strong>"
       html.html_safe?.should == true
     end
 
@@ -51,7 +51,7 @@ describe CatalogHelper do
       @response = mock_response :total => 7
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<b>1</b> - <b>7</b> of <b>7</b>"
+      html.should == "<strong>1</strong> - <strong>7</strong> of <strong>7</strong>"
       html.html_safe?.should == true
     end
 
@@ -59,7 +59,7 @@ describe CatalogHelper do
       @response = mock_response :total => 15, :per_page => 10
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<b>1</b> - <b>10</b> of <b>15</b>"
+      html.should == "<strong>1</strong> - <strong>10</strong> of <strong>15</strong>"
       html.html_safe?.should == true
     end
 
@@ -67,7 +67,7 @@ describe CatalogHelper do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 2
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<b>11</b> - <b>20</b> of <b>47</b>"
+      html.should == "<strong>11</strong> - <strong>20</strong> of <strong>47</strong>"
       html.html_safe?.should == true
     end
 
@@ -75,7 +75,7 @@ describe CatalogHelper do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 5
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<b>41</b> - <b>47</b> of <b>47</b>"
+      html.should == "<strong>41</strong> - <strong>47</strong> of <strong>47</strong>"
       html.html_safe?.should == true
     end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,12 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +28,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +35,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +42,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +49,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,7 +59,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -116,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -124,23 +111,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -148,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -454,33 +437,27 @@ files:
 - test_support/spec/views/catalog/index.atom.builder_spec.rb
 homepage: http://projectblacklight.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2075279285300653487
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2075279285300653487
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0.preview2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files: []
+has_rdoc: