sufia 3.7.2 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c4c30d06096c8bf96dd31815ac959204aa7ba0
-  data.tar.gz: a5f92e07ff3b432ab8b0fcd9c257b86e7c9b76c0
+  metadata.gz: 0c16d96868814166f2c0475ce38bd6da8e5f3193
+  data.tar.gz: b77646cded22e7a995937bb92df35d437f24e59d
 SHA512:
-  metadata.gz: d09bc93fc96305ffb8f2406611419e9979ba1bc28e7096ca9d04370132d91396b820d44b03d23f09d30153b2b3c5d5792b4cc150e5ea45bd0724e8d96a3fdae5
-  data.tar.gz: 6150293ef7e9b349b62deab24475e3b370af265e2116c065c904943880506d3000a13d0878e746fd47b5fe693c78cd88d96f7d64e1df19da812f87e3a4dcb9b5
+  metadata.gz: 34c6f2849a8b5589d25862010da85d8bb22f0c63252694b6f4810f52c89f911970e46958b8056edea4bc9aac0d1f9a21348c7dc4e93c262f04ab627441c46163
+  data.tar.gz: e98491c8e9502bd04ff101db715fb4c9e3ef37a05dde8330699e119341b4083258736a6240d088cc89e4aaab7f7fa8531b735ed0fcbc27f4f6008552cde0b329

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.1.0"
+  - "2.1.1"
   - "2.0.0"
 env:
   global:

data/Gemfile

@@ -6,11 +6,14 @@ 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'
+gem 'sass', '~> 3.2.15'
+gem 'sprockets', '~> 2.11.0'
 
 group :development, :test do
   gem 'sqlite3'
   gem 'rspec-rails'
   gem 'launchy' unless ENV['TRAVIS']
+  gem 'byebug' unless ENV['TRAVIS']
   gem 'capybara'
   gem "jettywrapper"
   gem "factory_girl_rails"

data/README.md

@@ -1,14 +1,14 @@
 # Sufia [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia) [![Build Status](https://travis-ci.org/projecthydra/sufia.png?branch=master)](https://travis-ci.org/projecthydra/sufia) [![Dependency Status](https://gemnasium.com/projecthydra/sufia.png)](https://gemnasium.com/projecthydra/sufia)
 
 ## What is Sufia?
-Sufia is a component that adds self-deposit institutional repository features to a Rails app. 
+Sufia is a component that adds self-deposit institutional repository features to a Rails app.
 Sufia is created with Ruby on Rails and builds on the Hydra Framework.
 
 Sufia has the following features:
 
 * Multiple file, or folder, upload
 * Flexible user- and group-based access controls
-* Transcoding of audio and video files 
+* Transcoding of audio and video files
 * Generation and validation of identifiers
 * Fixity checking
 * Version control
@@ -24,6 +24,7 @@ Sufia has the following features:
 * Activity streams
 * Background jobs
 * Single-use links
+* Usage statistics
 
 ## Sufia needs the following software to work:
 1. Solr
@@ -42,11 +43,10 @@ Sufia has the following features:
 ```
 gem 'sufia'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
-gem 'font-awesome-sass-rails'
 ```
 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. 
+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.
 
 ### Run the sufia generator
 ```
@@ -66,18 +66,17 @@ rake jetty:config
 rake jetty:start
 ```
 
-### If you want to use the assets that ship with Sufia...
+### 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._ 
-
+**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:
@@ -92,6 +91,69 @@ Add this line:
 
 Turbolinks does not mix well with Blacklight.
 
+### Usage statistics
+
+Sufia provides support for capturing usage information via Google Analytics and for displaying usage stats in the UI.
+
+#### Capturing usage
+
+To enable the Google Analytics javascript snippet, make sure that `config.google_analytics_id` is set in your app within the `config/initializers/sufia.rb` file. A Google Analytics ID typically looks like _UA-99999999-1_.
+
+#### Displaying usage
+
+To display usage statistics in the UI, first head to the Google Developers Console and create a new project:
+
+https://console.developers.google.com/project
+
+Let's assume for now Google assigns it a project ID of _foo-bar-123_. It may take a few seconds for this to complete (watch the Activities bar near the bottom of the browser).  Once it's complete, enable the Google+ and Google Analytics APIs here (note: this is an example URL -- you'll have to change the project ID to match yours):
+
+https://console.developers.google.com/project/apps~foo-bar-123/apiui/api
+
+Finally, head to this URL (note: this is an example URL -- you'll have to change the project ID to match yours):
+
+https://console.developers.google.com/project/apps~foo-bar-537/apiui/credential
+
+And create a new OAuth client ID.  When prompted for the type, use the "Service Account" type.  This will give you the OAuth client ID, a client email address, a private key file, a private key secret/password, which you will need in the next step.
+
+Then run this generator:
+
+```
+rails g sufia:models:usagestats
+```
+
+The generator will create a configuration file at _config/analytics.yml_.  Edit that file to reflect the information that the Google Developer Console gave you earlier, namely you'll need to provide it:
+
+* The path to the private key
+* The password/secret for the privatekey
+* The OAuth client email
+* An application name (you can make this up)
+* An application version (you can make this up)
+
+Finally, you will need to set `config.usage_statistics = true` in _config/initializers/sufia.rb_.
+
+### To use browse-everything
+
+Sufia provides built-in support for the [browse-everything](https://github.com/projecthydra/browse-everything) gem, which provides a consolidated file picker experience for selecting files from [DropBox](http://www.dropbox.com),
+[Skydrive](https://skydrive.live.com/), [Google Drive](http://drive.google.com),
+[Box](http://www.box.com), and a server-side directory share.
+
+To activate browse-everything in your sufia app, run the browse-everything config generator
+
+```
+rails g browse_everything:config
+```
+
+This will generate a file at _config/browse_everything_providers.yml_. Open that file and enter the API keys for the providers that you want to support in your app.  For more info on configuring browse-everything, go to the [project page](https://github.com/projecthydra/browse-everything) on github.
+
+After running the browse-everything config generator and setting the API keys for the desired providers, an extra tab will appear in your app's Upload page allowing users to pick files from those providers and submit them into your app's repository.
+
+*Note*: If you want to use the built-in browse-everything support, _you need to include the browse-everything css and javascript files_. If you already included the sufia css and javascript (see [above](#if-you-want-to-use-the-css-and-javascript-and-other-assets-that-ship-with-sufia)), then you don't need to do anything.  Otherwise, follow the instructions in the [browse-everything README page](https://github.com/projecthydra/browse-everything)
+
+*If your config/initializers/sufia.rb was generated with sufia 3.7.2 or older*, then you need to add this line to an initializer (probably _config/initializers/sufia.rb _):
+```ruby
+config.browse_everything = BrowseEverything.config
+```
+
 ### Install Fits.sh
 1. Go to http://code.google.com/p/fits/downloads/list and download a copy of fits & unpack it somewhere on your machine.  You can also install fits on OSX with homebrew `brew install fits` (you may also have to create a symlink from `fits.sh -> fits` in the next step).
 1. Give your system access to fits
@@ -124,6 +186,21 @@ Use homebrew:
 ```
 brew install ffmpeg --with-fdk-aac --with-libvpx --with-libvorbis
 ```
+### Tag Cloud
+Sufia provides a tag cloud on the home page.  To change which field is displayed in that cloud, change the value of `config.tag_cloud_field_name` in the `blacklight_config` section of your CatalogController.  For example:
+```ruby
+configure_blacklight do |config|
+  ...
+  
+  # Specify which field to use in the tag cloud on the homepage.  
+  # To disable the tag cloud, comment out this line.
+  config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
+end
+```
+
+If your CatalogController was generated by a version of sufia older than 3.7.3 you need to add that line to the blacklight configuration in order to make the tag cloud appear.
+
+The contents of the cloud are retrieved as JSON from Blacklight's CatalogController#facet method.  If you need to change how that content is returned (ie. if you need to limit the number of results), override the `render_facet_list_as_json` method in your CatalogController.
 
 #### On Ubuntu Linux
 See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
@@ -131,7 +208,7 @@ See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
 ## Developers:
 This information is for people who want to modify the engine itself, not an application that uses the engine:
 
-# run the tests
+### run the tests
 rake clean spec
 ```
 

data/SUFIA_VERSION

@@ -1 +1 @@
-3.7.2
+4.0.0.beta1

data/app/assets/javascripts/contact_form.js

@@ -1,18 +1,2 @@
-/*
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.

data/app/assets/javascripts/jquery.blacklightTagCloud.js

@@ -0,0 +1,44 @@
+//= require jquery.tagcloud
+//= require jquery.tinysort.min
+
+(function( $ ){
+
+  // Loads facet values for the facet specified in data-facet attribute
+  // Displays the results as a tag cloud 
+  // Passes all options through to the tagcloud jquery plugin.  See https://github.com/addywaddy/jquery.tagcloud.js for options.
+  $.fn.blacklightTagCloud = function( options ) {  
+    // Create some defaults, extending them with any options that were provided
+    var settings = $.extend( { }, options);
+
+    var $container = this;
+
+    return this.each(function() {  
+      var facet_name = $(this).data("facet");
+      var $tagCloud = $(this)
+      $.ajax({url:"/catalog/facet/"+facet_name+".json"}).done(function(data) {
+        data.response.facets.items.map(function(item) {
+          $tagCloud.append('<li rel="'+item.hits+'" title="'+item.value+'"><a href="/?f['+facet_name+'][]='+item.value+'">'+item.value+'</a><span class="badge facet-count">'+item.hits+'</span></li>');
+        });
+        $tagCloud.tagcloud(options);
+        $tagCloud.children().tsort({attr:'title', order:'asc'});
+      });
+      $tagCloud.siblings('.tag-toggle-list').each(function() { 
+        var $toggle = $(this)
+        $toggle.click(function() { 
+          $tagCloud.toggleClass("list"); 
+          $toggle.text( $toggle.text()=="Cloud"?"List":"Cloud");
+        });
+      });
+      $tagCloud.siblings('.tag-sort').children().each(function() {
+        var $btn = $(this)
+        if ($btn.hasClass('tag-sort-az')) { var opts = {attr:'title', order:'asc'} }
+        else if ($btn.hasClass('tag-sort-za')) { var opts = {attr:'title', order:'desc'} }
+        else if ($btn.hasClass('tag-sort-numerical')) { var opts = {attr:'rel', order:'desc'} }
+        if (opts) {
+          $btn.click(function() { $tagCloud.children().tsort(opts); });
+        }; 
+      });
+    });
+
+  };
+})( jQuery );

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

@@ -0,0 +1,116 @@
+/*!
+ * flyingzumwalt: jquery.tagcloud.js v. 0.1.0
+ *    (contains modifications for use in projecthydra/sufia)
+ *
+ * Forked from:
+ *
+ * jquery.tagcloud.js
+ * A Simple Tag Cloud Plugin for JQuery
+ *
+ * https://github.com/addywaddy/jquery.tagcloud.js
+ * created by Adam Groves
+ */
+(function($) {
+
+  /*global jQuery*/
+  "use strict";
+
+  var compareWeights = function(a, b)
+  {
+    return a - b;
+  };
+
+  // Converts hex to an RGB array
+  var toRGB = function(code) {
+    if (code.length === 4) {
+      code = code.replace(/(\w)(\w)(\w)/gi, "\$1\$1\$2\$2\$3\$3");
+    }
+    var hex = /(\w{2})(\w{2})(\w{2})/.exec(code);
+    return [parseInt(hex[1], 16), parseInt(hex[2], 16), parseInt(hex[3], 16)];
+  };
+
+  // Converts an RGB array to hex
+  var toHex = function(ary) {
+    return "#" + jQuery.map(ary, function(i) {
+      var hex =  i.toString(16);
+      hex = (hex.length === 1) ? "0" + hex : hex;
+      return hex;
+    }).join("");
+  };
+
+  var colorIncrement = function(color, range) {
+    return jQuery.map(toRGB(color.end), function(n, i) {
+      return (n - toRGB(color.start)[i])/range;
+    });
+  };
+
+  var tagColor = function(color, increment, weighting) {
+    var rgb = jQuery.map(toRGB(color.start), function(n, i) {
+      var ref = Math.round(n + (increment[i] * weighting));
+      if (ref > 255) {
+        ref = 255;
+      } else {
+        if (ref < 0) {
+          ref = 0;
+        }
+      }
+      return ref;
+    });
+    return toHex(rgb);
+  };
+  
+  // Scales the value according to the preferred granularity based on the max value for the scale
+  // Assumes an inverted scale, where 1 corresponds to the highest values.
+  // This is useful for generating css styles corresponding to scaled values 
+  //    (ie. weight-1 for largest values, weight-15 for smallest values)
+  // Examples: 
+  //    scaleValue(322,322,15)  => 1
+  //    scaleValue(250,322,15)  => 4
+  //    scaleValue(75,322,15)   => 12
+  //    scaleValue(5,322,15)    => 15
+  //    scaleValue(2,322,15)    => 15
+  var scaleValue = function(value, max, granularity) {
+    var scaleFactor = ((granularity-1)/max)
+    return granularity - Math.round(value*scaleFactor) 
+  }
+
+  $.fn.tagcloud = function(options) {
+
+    var opts = $.extend({}, $.fn.tagcloud.defaults, options);
+    var tagWeights = this.children().map(function(idx, item){
+      return $(item).attr("rel")
+    });
+    tagWeights = jQuery.makeArray(tagWeights).sort(compareWeights);
+    var lowest = tagWeights[0];
+    var highest = tagWeights.pop();
+    var range = highest - lowest;
+    if(range === 0) {range = 1;}
+    // Sizes
+    var fontIncr, colorIncr;
+    if (opts.size) {
+      fontIncr = (opts.size.end - opts.size.start)/range;
+    }
+    // Colors
+    if (opts.color) {
+      colorIncr = colorIncrement (opts.color, range);
+    }
+    return this.children().each(function() {
+      var weighting = $(this).attr("rel") - lowest;
+      if (opts.size) {
+        $(this).css({"font-size": opts.size.start + (weighting * fontIncr) + opts.size.unit});
+      }
+      if (opts.color) {
+        $(this).css({"color": tagColor(opts.color, colorIncr, weighting)});
+      }
+      if (opts.cssHooks) {
+        $(this).addClass("weight-"+scaleValue($(this).attr("rel"), highest, opts.cssHooks.granularity))
+      }
+    });
+  };
+
+  $.fn.tagcloud.defaults = {
+    // size: {start: 0.9, end: 2.5, unit: "em"},
+    cssHooks: {granularity: 15}
+  };
+
+})(jQuery);

data/app/assets/javascripts/jquery.tinysort.min.js

@@ -0,0 +1,7 @@
+/*! TinySort 1.5.6
+* Copyright (c) 2008-2013 Ron Valstar http://tinysort.sjeiti.com/
+* License:
+*     MIT: http://www.opensource.org/licenses/mit-license.php
+*     GPL: http://www.gnu.org/licenses/gpl.html
+*/
+!function(a,b){"use strict";function c(a){return a&&a.toLowerCase?a.toLowerCase():a}function d(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]==b)return!e;return e}var e=!1,f=null,g=parseFloat,h=Math.min,i=/(-?\d+\.?\d*)$/g,j=/(\d+\.?\d*)$/g,k=[],l=[],m=function(a){return"string"==typeof a},n=function(a,b){for(var c,d=a.length,e=d;e--;)c=d-e-1,b(a[c],c)},o=Array.prototype.indexOf||function(a){var b=this.length,c=Number(arguments[1])||0;for(c=0>c?Math.ceil(c):Math.floor(c),0>c&&(c+=b);b>c;c++)if(c in this&&this[c]===a)return c;return-1};a.tinysort={id:"TinySort",version:"1.5.6",copyright:"Copyright (c) 2008-2013 Ron Valstar",uri:"http://tinysort.sjeiti.com/",licensed:{MIT:"http://www.opensource.org/licenses/mit-license.php",GPL:"http://www.gnu.org/licenses/gpl.html"},plugin:function(){var a=function(a,b){k.push(a),l.push(b)};return a.indexOf=o,a}(),defaults:{order:"asc",attr:f,data:f,useVal:e,place:"start",returns:e,cases:e,forceStrings:e,ignoreDashes:e,sortFunction:f}},a.fn.extend({tinysort:function(){var p,q,r,s,t=this,u=[],v=[],w=[],x=[],y=0,z=[],A=[],B=function(a){n(k,function(b){b.call(b,a)})},C=function(a,b){return"string"==typeof b&&(a.cases||(b=c(b)),b=b.replace(/^\s*(.*?)\s*$/i,"$1")),b},D=function(a,b){var c=0;for(0!==y&&(y=0);0===c&&s>y;){var d=x[y],f=d.oSettings,h=f.ignoreDashes?j:i;if(B(f),f.sortFunction)c=f.sortFunction(a,b);else if("rand"==f.order)c=Math.random()<.5?1:-1;else{var k=e,o=C(f,a.s[y]),p=C(f,b.s[y]);if(!f.forceStrings){var q=m(o)?o&&o.match(h):e,r=m(p)?p&&p.match(h):e;if(q&&r){var t=o.substr(0,o.length-q[0].length),u=p.substr(0,p.length-r[0].length);t==u&&(k=!e,o=g(q[0]),p=g(r[0]))}}c=d.iAsc*(p>o?-1:o>p?1:0)}n(l,function(a){c=a.call(a,k,o,p,c)}),0===c&&y++}return c};for(p=0,r=arguments.length;r>p;p++){var E=arguments[p];m(E)?z.push(E)-1>A.length&&(A.length=z.length-1):A.push(E)>z.length&&(z.length=A.length)}for(z.length>A.length&&(A.length=z.length),s=z.length,0===s&&(s=z.length=1,A.push({})),p=0,r=s;r>p;p++){var F=z[p],G=a.extend({},a.tinysort.defaults,A[p]),H=!(!F||""===F),I=H&&":"===F[0];x.push({sFind:F,oSettings:G,bFind:H,bAttr:!(G.attr===f||""===G.attr),bData:G.data!==f,bFilter:I,$Filter:I?t.filter(F):t,fnSort:G.sortFunction,iAsc:"asc"==G.order?1:-1})}return t.each(function(c,d){var e,f=a(d),g=f.parent().get(0),h=[];for(q=0;s>q;q++){var i=x[q],j=i.bFind?i.bFilter?i.$Filter.filter(d):f.find(i.sFind):f;h.push(i.bData?j.data(i.oSettings.data):i.bAttr?j.attr(i.oSettings.attr):i.oSettings.useVal?j.val():j.text()),e===b&&(e=j)}var k=o.call(w,g);0>k&&(k=w.push(g)-1,v[k]={s:[],n:[]}),e.length>0?v[k].s.push({s:h,e:f,n:c}):v[k].n.push({e:f,n:c})}),n(v,function(a){a.s.sort(D)}),n(v,function(a){var b=a.s,c=a.n,f=b.length,g=c.length,i=f+g,j=[],k=i,l=[0,0];switch(G.place){case"first":n(b,function(a){k=h(k,a.n)});break;case"org":n(b,function(a){j.push(a.n)});break;case"end":k=g;break;default:k=0}for(p=0;i>p;p++){var m=d(j,p)?!e:p>=k&&k+f>p,o=m?0:1,q=(m?b:c)[l[o]].e;q.parent().append(q),(m||!G.returns)&&u.push(q.get(0)),l[o]++}}),t.length=0,Array.prototype.push.apply(t,u),t}}),a.fn.TinySort=a.fn.Tinysort=a.fn.tsort=a.fn.tinysort}(jQuery);

data/app/assets/javascripts/sufia.js

@@ -1,19 +1,3 @@
-/*
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 //= require jquery-ui-1.9.2/jquery.ui.core
 //= require jquery-ui-1.9.2/jquery.ui.widget
 //= require jquery-ui-1.9.2/jquery.ui.menu
@@ -22,13 +6,13 @@ limitations under the License.
 //= require jquery-ui-1.9.2/jquery.ui.effect
 //= require jquery-ui-1.9.2/jquery.ui.effect-highlight
 
-//= require bootstrap-dropdown
-//= require bootstrap-button
-//= require bootstrap-modal
-//= require bootstrap-collapse
-//= require bootstrap-tooltip
-//= require bootstrap-popover
-//= require bootstrap-tab
+//= require bootstrap/dropdown
+//= require bootstrap/button
+//= require bootstrap/modal
+//= require bootstrap/collapse
+//= require bootstrap/tooltip
+//= require bootstrap/popover
+//= require bootstrap/tab
 
 //= require video
 //= require audio.min
@@ -36,18 +20,28 @@ limitations under the License.
 //= require swfobject
 //= require ZeroClipboard.min
 
+//= require flot/excanvas
+//= require flot/jquery.flot
+//= require flot/jquery.flot.time
+//= require flot/jquery.flot.selection
+
 //= require batch_edit
 //= require terms_of_service
 //= require sufia/fileupload
 //= require sufia/permissions
 //= require sufia/trophy
+//= require sufia/featured_works
 //= require sufia/batch_select_all
 //= require sufia/multiForm
 //= require sufia/edit_metadata
 //= require sufia/single_use_link
 //= require sufia/audio
+//= require sufia/editor
 //= require hydra/batch_select
 //= require hydra_collections
+//= require browse_everything
+//= require jquery.blacklightTagCloud
+//= require nestable
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require sufia/batch_edit
@@ -69,8 +63,7 @@ function notify_update_link() {
    $('#notify_update_link').click();
 }
 
-// short hand for $(document).ready();
-$(function() {
+Blacklight.onLoad(function() {
 
   // set up global batch edit options to override the ones in the gem
   window.batch_edits_options = { checked_label: "",unchecked_label: "",progress_label: "",status_label: "",css_class: "batch_toggle"};
@@ -99,18 +92,14 @@ $(function() {
 
   // show/hide more information on the dashboard when clicking
   // plus/minus
-  $('.icon-plus').on('click', function() {
+  $('.glyphicon-plus').on('click', function() {
+    var button = $(this);
     //this.id format: "expand_NNNNNNNNNN"
-    var a = this.id.split("expand_");
-    if (a.length > 1) {
-      var docId = a[1];
-      $("#detail_"+docId).toggle();
-      if( $("#detail_"+docId).is(":hidden") ) {
-        $("#expand_"+docId).attr("class", "icon-plus icon-large");
-      }
-      else {
-        $("#expand_"+docId).attr("class", "icon-minus icon-large");
-      }
+    var array = this.id.split("expand_");
+    if (array.length > 1) {
+      var docId = array[1];
+      $("#detail_" + docId + " .expanded-details").slideToggle();
+      button.toggleClass('glyphicon-plus glyphicon-minus');
     }
     return false;
   });
@@ -123,6 +112,14 @@ $(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: '#cde', end: '#f52'}
+  });
 
 
   /*
@@ -140,28 +137,28 @@ $(function() {
   $(".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 = itag.attr('class') == "caret" ? itag.attr('id')+' desc' :  itag.attr('id') +' asc';
     $('#sort').val(sort).selected = true;
-    $(".icon-refresh").parent().click();
+    $("#dashboard_sort_submit").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');
+    sort = itag.attr('class') == "caret up" ? itag.attr('id')+' desc':  itag.attr('id');
     $('input[name="sort"]').attr('value', sort);
-    $(".icon-search").parent().click();
+    $("#user_submit").click();
   });
-}); //closing function at the top of the page
-
 
+}); //closing function at the top of the page
 
 /*
  * begin functions
  */
 
 function toggle_icon(itag){
-       itag.toggleClass("icon-caret-down");
-       itag.toggleClass("icon-caret-up");
+       itag.toggleClass("caret");
+       itag.toggleClass("caret up");
 }
 
 function preg_quote( str ) {