sufia 4.0.0.rc1 → 4.0.0.rc2

data/app/assets/stylesheets/file-listing.css.scss

@@ -1,5 +1,10 @@
-$gray-lightish: #bbb;
-$gray-lighter: #eee;
+h4 .small {
+  color: $navbar-default-toggle-icon-bar-bg;
+}
+
+.table thead th {
+  text-align: center;
+}
 
 .table {
   > tbody {
@@ -17,6 +22,7 @@ $gray-lighter: #eee;
           }
           dd {
             margin-left: -15px;
+            min-height: 1.5em;
           }
         }
       }
@@ -35,7 +41,8 @@ $gray-lighter: #eee;
 }
 
 .file_listing_thumbnail {
-  width: 20%;
+  @extend .media-object;
+  width: 64px;
 }
 
 .nav > li > a.accordion-toggle {
@@ -59,10 +66,6 @@ $gray-lighter: #eee;
     }
   }
 
-  .facet_select {
-
-  }
-
   .facet-count {
     padding-left: 0.2em;
     padding-right: 0.2em;
@@ -73,15 +76,11 @@ $gray-lighter: #eee;
 
 }
 
-.batch-info {
-  margin-bottom: 0.8em;
-}
-
 .sorts-dash, .sorts, .expandable_new {
   cursor: pointer;
 }
 .sort-toggle {
-  padding: .5em 0;
+  padding: 10px 0 10px 0;
 }
 .caret.up {
   border-top: 0;
@@ -120,7 +119,20 @@ $gray-lighter: #eee;
 
 .heading-row {
   border-bottom: 1px solid $gray-lightish;
-  //margin-left: 10px;
+}
+
+input.batch_document_selector {
+  margin: 10px 10px 2px 10px;
+  padding: 0px;
+}
+
+input#check_all {
+  padding: 0;
+  margin: 3px 3px 3px 10px;
+}
+
+.constraints-container {
+  margin-bottom: 10px;
 }
 
 #collection-list-container {
@@ -136,3 +148,15 @@ $gray-lighter: #eee;
   }
 }
 
+#documents {
+  .media-body {
+    padding-top: 12px;
+  }
+  td {
+    vertical-align: middle;
+  }
+}
+
+#my_nav {
+  margin-bottom: 20px;
+}

data/app/assets/stylesheets/generic_files.css.erb

@@ -43,3 +43,8 @@ h2 small {
 .loading {
    background: white url(<%= image_path('loading.gif') %>) center bottom no-repeat;
 }
+
+h1.visibility span.label {
+  font-size: 30%;
+  vertical-align: middle;
+}

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

@@ -1,6 +1,3 @@
-$gray-lightish: #bbb;
-$gray-lighter: #eee;
-
 #masthead {
   background: #0071BC; /* Old browsers */
   background-image: -webkit-gradient(
@@ -98,5 +95,5 @@ $gray-lighter: #eee;
   margin-top: 7px;
 }
 #search-submit-header {
-  margin-left: -15px;
+  border: none;
 }

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

@@ -0,0 +1,6 @@
+// Settings
+//
+// Variables, colors, etc. that are used in Sufia.
+// Some are unique or override other variables from Bootstrap.
+$gray-lightish: #bbb;
+$gray-lighter: #eee;

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

@@ -1,6 +1,3 @@
-$gray-lightish: #bbb;
-$gray-lighter: #eee;
-
 body {
   margin: 0;
   padding: 0;
@@ -50,6 +47,10 @@ button {
   padding: 1em 0;
 }
 
+.alert {
+  margin: 20px;
+}
+
 #footer {
   clear: both;
   color: #FFF;

data/app/assets/stylesheets/sufia-audio-overrides.css

@@ -4,6 +4,6 @@
     box-shadow: none;
 }
 
-.span40 .audiojs audio {
+.audiojs audio {
     left: 10px;
-}
+}

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

@@ -4,21 +4,26 @@
  *= require video-js
  *= require jquery-ui
  *= require sufia-audio-overrides
- *= require styles
- *= require header
  *= require home-page
  *= require tagcloud
  *= require featured
- *= require file-listing
  *= require usage-stats
  *= require nestable
+ *= require catalog
 */
 
 @import 'bootstrap';
-
 @import 'blacklight/blacklight';
 @import "browse_everything";
 
+// Use import here instead of require so we can use the Sass variables defined in Bootstrap and Blacklight
+// TODO: Probably should use import throughout and move all of Sufia's stylesheets into a single named directory.
+@import 'settings';
+@import 'header';
+@import 'styles';
+@import 'file-listing';
+@import 'collections';
+
 #browse-everything {
   top:10%;
   background-color: initial;
@@ -34,4 +39,21 @@
 
 #content {
   padding-top: 10px;
-}
+}
+
+/* This class is to workaround an issue in which Bootstrap requires a div to display a tooltip
+ * on a disabled button. Using a span instead of a div would be ideal but unfortunately it does
+ * not render the tooltip correctly in all browsers (e.g. in Chrome the tooltip is detected in
+ * the wrong position). This class forces the div to render inline, just like a span.
+ *
+ * More info:
+ *    http://getbootstrap.com/css/#responsive-utilities-classes
+ *    http://stackoverflow.com/a/19938049/446681
+ */
+.visible-all-inline-block {
+  display: inline-block;
+}
+
+.button_to-inline {
+  display: inline-block;
+}

data/app/assets/stylesheets/tagcloud.css

@@ -1,6 +1,6 @@
 .tagcloud {
     padding-left: 0px;
-    text-align: justify;
+    text-align: center;
 }
 .tagcloud li{
     display: inline;
@@ -14,6 +14,10 @@
 .tagcloud.list li {
     display: block;
 }
+.tagcloud li a {
+    color: inherit;
+}
+
 .tagcloud li .badge {
     display:none;
 }

data/app/controllers/batch_controller.rb

@@ -8,7 +8,7 @@ class BatchController < ApplicationController
   def edit
     @batch =  Batch.find_or_create(params[:id])
     @generic_file = GenericFile.new
-    @generic_file.creator = current_user.name
+    @generic_file.creator = [current_user.name]
     @generic_file.title = @batch.generic_files.map(&:label)
     @generic_file.initialize_fields
   end
@@ -16,10 +16,10 @@ class BatchController < ApplicationController
   def update
     authenticate_user!
     @batch = Batch.find_or_create(params[:id])
-    @batch.status="processing"
+    @batch.status = ["processing"]
     @batch.save
     Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params))
-    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-important" 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.'
+    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.'
     redirect_to sufia.dashboard_files_path
   end
 

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

@@ -40,9 +40,13 @@ module Sufia
     end
 
     def after_update
-      redirect_to sufia.dashboard_files_path unless request.xhr?
+      redirect_to_return_controller unless request.xhr?
     end
 
+    def after_destroy_collection
+      redirect_to_return_controller unless request.xhr?
+    end 
+
     def update_document(obj)
       super
       obj.date_modified = Time.now.ctime
@@ -86,5 +90,14 @@ module Sufia
          file[key] = attributes[key].empty? ? [''] : attributes[key]
        end
     end
+
+    def redirect_to_return_controller
+      if params[:return_controller]
+        redirect_to sufia.url_for(controller: params[:return_controller], only_path: true)
+      else
+        redirect_to sufia.dashboard_index_path
+      end
+    end
+
   end
 end

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

@@ -14,6 +14,5 @@ module Sufia
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"info:fedora/afmodel:GenericFile\" \"info:fedora/afmodel:Collection\")"
       end
-
   end
 end

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

@@ -41,6 +41,11 @@ module Sufia::Controller
     end
   end
 
+  # Override Devise method to redirect to dashboard after signing in
+  def after_sign_in_path_for(resource)
+    sufia.dashboard_index_path
+  end
+
   protected
 
   ### Hook which is overridden in Sufia::Ldap::Controller

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

@@ -32,20 +32,13 @@ module Sufia
     # in your dashboard view.  You'll need to alter dashboard/index.html.erb accordingly.
     def gather_dashboard_information
       @user = current_user
-      @activity = get_user_activity
+      @activity = current_user.get_all_user_activity(params[:since].blank? ? DateTime.now.to_i - 8640 : params[:since].to_i)
       @notifications = current_user.mailbox.inbox
     end
 
-    # Returns the most recent activity in the last 24 hours, or since a given timestamp
-    # specified by params[:since]
-    def get_user_activity
-      since = params[:since] ? params[:since].to_i : (DateTime.now.to_i - 86400)
-      current_user.events.reverse.collect { |event| event if event[:timestamp].to_i > since }.compact
-    end
-
     # Formats the user's activities into human-readable strings used for rendering JSON
     def human_readable_user_activity
-      get_user_activity.map do |event|
+      current_user.get_all_user_activity.map do |event|
         [event[:action], "#{time_ago_in_words(Time.at(event[:timestamp].to_i))} ago", event[:timestamp].to_i]
       end
     end

data/app/controllers/concerns/sufia/files_controller/browse_everything.rb

@@ -15,15 +15,15 @@ module Sufia::FilesController
       def create_from_browse_everything(params)
         params[:selected_files].each_pair do |index, file_info| 
           next if file_info.blank? || file_info["url"].blank?
-          create_file_from_url(file_info["url"])
+          create_file_from_url(file_info["url"], file_info["file_name"])
         end
         redirect_to self.class.upload_complete_path( params[:batch_id])
       end
       
       # Generic utility for creating GenericFile from a URL
       # Used in to import files using URLs from a file picker like browse_everything 
-      def create_file_from_url(url, batch_id=nil)
-        generic_file = ::GenericFile.new(import_url: url, label: File.basename(url)).tap do |gf|
+      def create_file_from_url(url, file_name, batch_id=nil)
+        generic_file = ::GenericFile.new(import_url: url, label: file_name).tap do |gf|
           actor = Sufia::GenericFile::Actor.new(gf, current_user)
           actor.create_metadata(params[:batch_id])
           gf.save!

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

@@ -112,7 +112,7 @@ module Sufia
 
     # routed to /files/:id (PUT)
     def update
-      success = if params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.versionID
+      success = if wants_to_revert?
         update_version
       elsif params.has_key? :filedata
         update_file
@@ -134,6 +134,10 @@ module Sufia
 
     protected
 
+    def wants_to_revert?
+      params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.versionID
+    end
+
     def actor
       @actor ||= Sufia::GenericFile::Actor.new(@generic_file, current_user)
     end

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

@@ -27,7 +27,7 @@ module Sufia::HomepageController
   end
 
   def sort_field
-    "#{Solrizer.solr_name('system_create', :sortable)} desc"
+    "#{Solrizer.solr_name('system_create', :stored_sortable, type: :date)} desc"
   end
 
   # Limits search results just to GenericFiles

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

@@ -49,13 +49,14 @@ module Sufia::UsersControllerBehavior
   def update
     if params[:user]
       @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
+      @user.populate_attributes if ActiveRecord::ConnectionAdapters::Column.value_to_boolean(params[:user][:update_directory])
     end
-    @user.populate_attributes if params[:update_directory]
-    @user.remove_avatar = true if params[:delete_avatar]
+
     unless @user.save
       redirect_to sufia.edit_profile_path(@user.to_param), alert: @user.errors.full_messages
       return
     end
+    # TODO this should be moved to TrophiesController
     params.keys.select {|k, v| k.starts_with? 'remove_trophy_' }.each do |smash_trophy|
       smash_trophy = smash_trophy.sub /^remove_trophy_/, ''
       current_user.trophies.where(generic_file_id: smash_trophy).destroy_all

data/app/helpers/batch_edits_helper.rb

@@ -4,4 +4,10 @@ module BatchEditsHelper
   def batch_delete
     render partial: '/batch_edits/delete_selected'
   end
+
+  def render_check_all
+    unless @disable_select_all || params[:controller].match("my/collections")
+      render partial: 'batch_edits/check_all'
+    end
+  end
 end

data/app/helpers/generic_file_helper.rb

@@ -32,6 +32,12 @@ module GenericFileHelper
     link_to (text || "Download"), sufia.download_path(@generic_file.noid), { id: "file_download", target: "_new", data: { label: @generic_file.id } }
   end
 
+  def render_collection_list gf
+    unless gf.collections.empty?
+      ("Is part of: " + gf.collections.map { |c| link_to(c.title, collections.collection_path(c.id)) }.join(", ")).html_safe
+    end
+  end
+
   private
 
   def render_edit_field_partial_with_action(action, key, locals)
@@ -74,4 +80,13 @@ module GenericFileHelper
       image_tag sufia.download_path(@generic_file, datastream_id: 'thumbnail'), { class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}" }
     end
   end
+
+  def render_visibility_badge
+    if can? :edit, @generic_file
+      render_visibility_link @generic_file
+    else
+      render_visibility_label @generic_file
+    end
+  end
+
 end

data/app/helpers/sufia/blacklight_override.rb

@@ -4,8 +4,24 @@ module Sufia
       false
     end
 
-   def url_for_document doc, options = {}
-     [sufia, doc]
-   end
+    def url_for_document doc, options = {}
+      if doc['has_model_ssim'].first == ::Collection.to_class_uri
+        [collections, doc]
+      else
+        [sufia, doc]
+      end
+    end
+  
+    def render_constraints_query(localized_params = params)
+      # So simple don't need a view template, we can just do it here.
+      scope = localized_params.delete(:route_set) || self
+      return "".html_safe if localized_params[:q].blank?
+
+      render_constraint_element(constraint_query_label(localized_params),
+            localized_params[:q],
+            :classes => ["query"],
+            :remove => scope.url_for(localized_params.merge(:q=>nil, :action=>'index')))
+    end
+
   end
 end