sufia 3.7.2 → 4.0.0.beta1

data/app/views/users/_trophy_edit.html.erb

@@ -1,6 +1,6 @@
 <div class="control-label">
   <i class="icon-trophy trophy-on" ></i> Remove Highlight Designation
-  <a href="#" id="remove_trophy_help" rel="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="icon-question-sign icon-large"></i></a>
+  <a href="#" id="remove_trophy_help" rel="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
 </div>
 <div class="control-group">
   <dl>
@@ -9,7 +9,7 @@
         <div class="controls">
           <%= link_to t, sufia.generic_file_path(t) %>
           <label class="checkbox fleft">
-            <%= check_box_tag "remove_trophy_#{t.id}" %> Yes &nbsp;
+            <%= check_box_tag "remove_trophy_#{t.noid}" %> Yes &nbsp;
           </label>
         </div>
       </dd>

data/app/views/users/_user_info.html.erb

@@ -1,59 +1,59 @@
-<dl id="user_info">
-  <dt><i class="icon-facebook"></i> Facebook Handle</dt>
-  <dd><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
+<dl id="user_info" class="row">
+  <dt class="col-xs-5"><i class="glyphicon glyphicon-facebook"></i> Facebook Handle</dt>
+  <dd class="col-xs-7"><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
 
-  <dt><i class="icon-twitter"></i> Twitter Handle</dt>
-  <dd><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
+  <dt class="col-xs-5"><i class="glyphicon glyphicon-twitter"></i> Twitter Handle</dt>
+  <dd class="col-xs-7"><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
  
-  <dt><i class="icon-google-plus"></i> Google+ Handle</dt>
-  <dd><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
+  <dt class="col-xs-5"><i class="glyphicon glyphicon-google-plus"></i> Google+ Handle</dt>
+  <dd class="col-xs-7"><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
  
-  <dt><i class="icon-envelope-alt"></i> Email</dt>
-  <dd><%= mail_to user.email %></dd>
+  <dt class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>
+  <dd class="col-xs-7"><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>
-    <dt><i class="icon-bullhorn"></i> Chat ID</dt>
-    <dd><%= user.chat_id %></dd>
+    <dt class="col-xs-5"><i class="glyphicon glyphicon-bullhorn"></i> Chat ID</dt>
+    <dd class="col-xs-7"><%= user.chat_id %></dd>
   <% end %>
 
   <% if user.website %>
-    <dt><i class="icon-globe"></i> Website(s)</dt>
-    <dd><%= iconify_auto_link(user.website) %></dd>
+    <dt class="col-xs-5"><i class="glyphicon glyphicon-globe"></i> Website(s)</dt>
+    <dd class="col-xs-7"><%= iconify_auto_link(user.website) %></dd>
   <% end %>
 
   <% if user.title %>
-    <dt>Title</dt>
-    <dd><%= user.title.titleize %></dd>
+    <dt class="col-xs-5">Title</dt>
+    <dd class="col-xs-7"><%= user.title.titleize %></dd>
   <% end %>
 
   <% if user.admin_area %>
-    <dt>Administrative Area</dt>
-    <dd><%= user.admin_area.titleize %></dd>
+    <dt class="col-xs-5">Administrative Area</dt>
+    <dd class="col-xs-7"><%= user.admin_area.titleize %></dd>
   <% end %>
 
   <% if user.department %>
-    <dt>Department</dt>
-    <dd><%= user.department.titleize %></dd>
+    <dt class="col-xs-5">Department</dt>
+    <dd class="col-xs-7"><%= user.department.titleize %></dd>
   <% end %>
 
   <% if user.office %>
-    <dt>Office</dt>
-    <dd><%= user.office.titleize %></dd>
+    <dt class="col-xs-5">Office</dt>
+    <dd class="col-xs-7"><%= user.office.titleize %></dd>
   <% end %>
 
   <% if user.address %>
-    <dt><i class="icon-map-marker"></i> Address</dt>
-    <dd><%= user.address.titleize %></dd>
+    <dt class="col-xs-5"><i class="glyphicon glyphicon-map-marker"></i> Address</dt>
+    <dd class="col-xs-7"><%= user.address.titleize %></dd>
   <% end %>
 
   <% if user.affiliation %>
-    <dt>Affiliation</dt>
-    <dd><%= user.affiliation.titleize %></dd>
+    <dt class="col-xs-5">Affiliation</dt>
+    <dd class="col-xs-7"><%= user.affiliation.titleize %></dd>
   <% end %>
 
   <% if user.telephone %>
-    <dt><i class="icon-phone"></i> Telephone</dt>
-    <dd><%= link_to user.telephone, "wtai://wp/mc;#{user.telephone}" %><%# user.telephone %></dd>
+    <dt class="col-xs-5"><i class="glyphicon glyphicon-phone"></i> Telephone</dt>
+    <dd class="col-xs-7"><%= link_to user.telephone, "wtai://wp/mc;#{user.telephone}" %><%# user.telephone %></dd>
   <% end %>
 
 </dl>

data/app/views/users/_vitals.html.erb

@@ -1,4 +1,4 @@
-        <i class="icon-time"></i> Joined on <%= @user.created_at.to_date.strftime("%b %d, %Y") %> <br />
-        <i class="icon-folder-open"></i> Deposited Files
+        <i class="glyphicon glyphicon-time"></i> Joined on <%= @user.created_at.to_date.strftime("%b %d, %Y") %> <br />
+        <i class="glyphicon glyphicon-folder-open"></i> Deposited Files
         <%= link_to_field('depositor', @user.to_s, number_of_deposits(@user)) %> <br />
 

data/app/views/users/edit.html.erb

@@ -4,74 +4,74 @@ $("a[rel=popover]").popover({ html: true });
 <% end %>
 
 <h1>Edit Profile</h1>
-<div class="span45 well">
+<div class="col-xs-12 col-sm-5 well">
   <%= form_for @user, :url => sufia.profile_path(@user.to_param), :html => {:multipart => true, :class => 'form-horizontal' } do |f| %>
-    <div class="control-group">
-      <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, :class => "col-xs-4 control-label" %>
+      <div class="col-xs-8">
         <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
         <%= f.file_field :avatar %>
         <%= f.hidden_field :avatar_cache %>
-        <span class="label label-important">JPG, GIF, or PNG (less than 2MB)</span>
-      </div>
-    </div>
+        <span class="help-block">JPG, GIF, or PNG (less than 2MB)</span>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
-    <div class="control-group">
-      <%= f.label :delete_avatar, '<i class="icon-remove"></i> Delete picture'.html_safe, :class => 'control-label' %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :delete_avatar, '<i class="glyphicon glyphicon-remove"></i> Delete picture'.html_safe, :class => 'col-xs-4 control-label' %>
+      <div class="col-xs-8">
         <label class="checkbox">
           <%= f.check_box :remove_avatar %> Yes
-          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
         </label>
-      </div>
-    </div>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
-    <div class="control-group">
-      <%= f.label :update_directory, '<i class="icon-refresh"></i> Refresh directory info'.html_safe, :class => 'control-label' %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :update_directory, '<i class="glyphicon glyphicon-refresh"></i> Refresh directory info'.html_safe, :class => 'col-xs-4 control-label' %>
+      <div class="col-xs-8">
         <label class="checkbox">
           <%= check_box_tag 'update_directory' %> Yes
-          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="refresh_directory_help" rel="popover" data-content="The information displayed in your profile comes from <%=t('sufia.institution_name') %>'s central directory (LDAP) and is cached by <%=t('sufia.product_name') %>.  If you have updated that information and don't see those changes in your <%=t('sufia.product_name') %> profile, check the box and save your profile." data-original-title="Refresh Directory Info"><i class="glyphicon glyphicon-question-sign icon-large"></i></a>
         </label>
-      </div>
-    </div>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
-    <div class="control-group">
-      <%= f.label :twitter_handle, '<i class="icon-twitter"></i> Twitter Handle'.html_safe, :class => 'control-label' %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :twitter_handle, '<i class="glyphicon glyphicon-twitter"></i> Twitter Handle'.html_safe, :class => 'col-xs-4 control-label' %>
+      <div class="col-xs-8">
          <%= f.text_field :twitter_handle, :class =>"input-medium" %>
-      </div>
-    </div>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
-    <div class="control-group">
-      <%= f.label :facebook_handle, '<i class="icon-facebook"></i> Facebook Handle'.html_safe, :class => 'control-label' %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :facebook_handle, '<i class="glyphicon glyphicon-facebook"></i> Facebook Handle'.html_safe, :class => 'col-xs-4 control-label' %>
+      <div class="col-xs-8">
          <%= f.text_field :facebook_handle, :class =>"input-medium" %>
-      </div>
-    </div>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
-    <div class="control-group">
-      <%= f.label :googleplus_handle, '<i class="icon-google-plus"></i> Google+ Handle'.html_safe, :class => 'control-label' %>
-      <div class="controls">
+    <div class="form-group">
+      <%= f.label :googleplus_handle, '<i class="glyphicon glyphicon-google-plus"></i> Google+ Handle'.html_safe, :class => 'col-xs-4 control-label' %>
+      <div class="col-xs-8">
          <%= f.text_field :googleplus_handle, :class =>"input-medium" %>
-      </div>
-    </div>
+      </div><!-- .controls -->
+    </div><!-- .form-group -->
 
     <%= render :partial => 'trophy_edit', :locals => {:trophies => @trophies} %>
 
     <div class="form-actions">
-      <%= f.button '<i class="icon-save"></i> Save Profile'.html_safe, :type => 'submit', :class => "btn-primary btn-large" %>
+      <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, :type => 'submit', :class => "btn-primary btn-large" %>
     </div>
   <% end %>
-</div><!-- /span /well-->
+</div><!-- .col-xs-5 /well-->
 
-<div class="span53 offset1 well">
-  <h3><i class="icon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', :class => 'btn btn-mini btn-primary' %></h3>
+<div class="col-xs-12 col-sm-offset-1 col-sm-6  well">
+  <h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', :class => 'btn btn-mini btn-primary' %></h3>
   <%= render :partial => 'user_info', :locals => {:user => @user} %>
 
   <hr />
 
-  <h3><i class="icon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', :class => 'btn btn-mini btn-primary' %> </h3>
+  <h2><i class="glyphicon glyphicon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', :class => 'btn btn-mini btn-primary' %> </h3>
   <% current_user.groups.each do |g| %>
     <i class="icon-caret-right"></i> <%= g %><br />
   <% end %>

data/app/views/users/index.html.erb

@@ -7,9 +7,9 @@
         <thead> 
             <tr> 
                 <th>Avatar</th> 
-                <th class="sorts"><i id="name" class="<%=params[:sort].blank? ? 'icon-caret-up' : params[:sort]== "name desc" ? 'icon-caret-down' : params[:sort]== "name" ? 'icon-caret-up' : ''%>"/>User Name</th> 
-                <th class="sorts"><i id="login" class="<%=params[:sort]== "login desc" ? 'icon-caret-down' : params[:sort]== "login" ? 'icon-caret-up' : ''%>"/>User Id</th> 
-                <th class="sorts"><i id="department" class="<%=params[:sort]== "department desc" ? 'icon-caret-down' : params[:sort]== "department" ? 'icon-caret-up' : ''%>"/>Department</th>
+                <th class="sorts"><i id="name" class="<%=params[:sort].blank? ? 'caret up' : params[:sort]== "name desc" ? 'caret' : params[:sort]== "name" ? 'caret up' : ''%>"></i>User Name</th>
+                <th class="sorts"><i id="login" class="<%=params[:sort]== "login desc" ? 'caret' : params[:sort]== "login" ? 'caret up' : ''%>"></i>User Id</th>
+                <th class="sorts"><i id="department" class="<%=params[:sort]== "department desc" ? 'caret' : params[:sort]== "department" ? 'caret up' : ''%>"></i>Department</th>
                 <th>Files Deposited</th> 
             </tr> 
         </thead> 

data/app/views/users/show.html.erb

@@ -6,21 +6,19 @@ $('#myTab a').click(function (e) {
 })
 
 <% end %>
-  <div class="accessible-hidden" id="current_user"><%=@user.user_key%></div>
-  <div class="span110"> 
+  <div class="col-xs-12">
     <div class="pull-right">
       <%= render 'profile_actions' %>
     </div>
-    <span class="span20">
+    <span class="col-xs-3">
       <%= render 'left_sidebar' %>
-    </span> <!-- /close span20 -->
-
-<!-- right col -->
-    <span class="span78 offset2"> 
+    </span>
 
+    <!-- right col -->
+    <span class="col-xs-9">
       <%= render 'profile_tabs' %>
-    </span> <!-- /close span50 -->
-  </div><!-- /close span110 -->
+    </span>
+  </div>
 
 
 

data/config/locales/sufia.en.yml

@@ -1,17 +1,25 @@
 en:
   sufia:
-    account_name:       "Penn State Access Account Id"
-    deposit_agreement:  "ScholarSphere's Deposit Agreement"
+    account_name:       "My Institution Account Id"
+    deposit_agreement:  "Sufia's Deposit Agreement"
     upload_tooltip:     "Please accept Deposit Agreement before you can upload."
     share_button:       "Share Your Work"
     directory:
-      suffix:           "@psu.edu"
+      suffix:           "@example.org"
     search:
       form:
         q:
-          label:        "Search Scholarsphere"
+          label:        "Search Sufia"
           placeholder:  "Type keywords in here"
-
+    upload:
+      my_computer:
+        tab_label: "My Computer"
+      browse_everything:
+        tab_label: "Cloud Providers"
+        browse_files_button: "Browse cloud files"
+        files_selected: "files selected"
+      local_ingest:
+        tab_label: "Network/Server Location"
     field_label:
       based_near:       "Location"
       description:      "Abstract or Summary"
@@ -32,6 +40,6 @@ en:
       description: "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs."
       identifier: "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
       language: " The language of the file content."
-      publisher: "The person or group making the file available. Generally this is Penn State."
+      publisher: "The person or group making the file available. Generally this is the institution."
       rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
-
+    background_attribution: "Background image courtesy of Penn State University"

data/config/routes.rb

@@ -8,21 +8,22 @@ Sufia::Engine.routes.draw do
 
   # Route path-less requests to the index view of catalog
   root :to => "catalog#index"
-  
-  # "Recently added files" route for catalog index view
-  get "catalog/recent" => "catalog#recent", :as => :catalog_recent
 
   # "Notifications" route for catalog index view
   get "users/notifications_number" => "users#notifications_number", :as => :user_notify
 
   # Generic file routes
-  resources :generic_files, :path => :files, :except => :index do
+  resources :generic_files, path: :files, except: :index do
     member do
-      get 'citation', :as => :citation
+      resource :featured_work, only: [:create, :destroy]
+      get 'citation'
+      get 'stats'
       post 'audit'
     end
   end
 
+  resources :featured_work_lists, path: 'featured_works', only: :create
+
   # Downloads controller route
   resources :downloads, :only => "show"
 
@@ -50,7 +51,6 @@ Sufia::Engine.routes.draw do
       get 'facet/:id', :action => :facet, :as => :dashboard_facet
     end
   end
-    
 
   # advanced routes for advanced search
   get 'search' => 'advanced#index', :as => :advanced
@@ -81,8 +81,12 @@ Sufia::Engine.routes.draw do
     end
   end
 
+  resources :content_blocks, only: 'update'
+  post '/tinymce_assets' => 'tinymce_assets#create'
+
+  get 'about' => 'pages#show', id: 'about_page'
   # Static page routes (workaround)
-  get ':action' => 'static#:action', :constraints => { :action => /about|help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
+  get ':action' => 'static#:action', :constraints => { :action => /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
 
   #Single use link errors
   get 'single_use_link/not_found' => 'errors#single_use_error'
@@ -92,6 +96,5 @@ Sufia::Engine.routes.draw do
   unless Rails.env.development? || Rails.env.test?
     match '*error' => 'errors#routing', via: [:get, :post]
   end
-  
-end
 
+end

data/lib/generators/sufia/sufia_generator.rb

@@ -7,20 +7,27 @@ class SufiaGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument     :model_name, :type => :string , :default => "user"
+  argument :model_name, :type => :string , :default => "user"
   desc """
 This generator makes the following changes to your application:
  1. Runs sufia-models:install
- 2. Adds controller behavior to the application controller
- 3. Copies the catalog controller into the local app
+ 2. Adds Sufia's abilities into the Ability class
+ 3. Adds controller behavior to the application controller
+ 4. Copies the catalog controller into the local app
        """
 
   def run_required_generators
-    generate "blacklight --devise"
+    generate "blacklight:install --devise"
     generate "hydra:head -f"
     generate "sufia:models:install"
   end
 
+  def insert_abilities
+    insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
+      "\n  include Sufia::Ability\n"
+    end
+  end
+
   # Add behaviors to the application controller
   def inject_sufia_controller_behavior
     controller_name = "ApplicationController"
@@ -32,30 +39,26 @@ This generator makes the following changes to your application:
       end
       gsub_file file_path, "layout 'blacklight'", "layout :search_layout"
     else
-      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition."
+      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your Controllers, you must include the Sufia::Controller module in the Controller class definition."
     end
   end
 
-
   def catalog_controller
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
   end
 
+  def tinymce_config
+    copy_file "config/tinymce.yml", "config/tinymce.yml"
+  end
 
   # The engine routes have to come after the devise routes so that /users/sign_in will work
   def inject_routes
-    routing_code = "Hydra::BatchEdit.add_routes(self)"
-    sentinel = /HydraHead.add_routes\(self\)/
-    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
-
-    routing_code = "\n  # This must be the very last route in the file because it has a catch all route for 404 errors.
+    routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" +
+      "  # This must be the very last route in the file because it has a catch-all route for 404 errors.
   # This behavior seems to show up only in production mode.
   mount Sufia::Engine => '/'\n"
+
     sentinel = /devise_for :users/
     inject_into_file 'config/routes.rb', routing_code, { :after => sentinel, :verbose => false }
-
   end
-
 end
-
-

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -4,7 +4,7 @@ require 'blacklight/catalog'
 require 'blacklight_advanced_search'
 
 # bl_advanced_search 1.2.4 is doing unitialized constant on these because we're calling ParseBasicQ directly
-require 'parslet'  
+require 'parslet'
 require 'parsing_nesting/tree'
 
 class CatalogController < ApplicationController
@@ -12,43 +12,16 @@ class CatalogController < ApplicationController
   # Extend Blacklight::Catalog with Hydra behaviors (primarily editing).
   include Hydra::Controller::ControllerBehavior
   include BlacklightAdvancedSearch::ParseBasicQ
+  include Sufia::Catalog
 
   # These before_filters apply the hydra access controls
-  before_filter :enforce_show_permissions, :only=>:show
+  before_filter :enforce_show_permissions, only: :show
   # This applies appropriate access controls to all solr queries
   CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-  # This filters out objects that you want to exclude from search results, like FileAssets
-  CatalogController.solr_search_params_logic += [:exclude_unwanted_models]
 
   skip_before_filter :default_html_head
 
-  def index
-    super
-    recent
-    #also grab my recent docs too
-    recent_me    
-  end
-
-  def recent
-    if user_signed_in?
-      # grab other people's documents
-      (_, @recent_documents) = get_search_results(:q =>filter_not_mine,
-                                        :sort=>sort_field, :rows=>4)      
-    else 
-      # grab any documents we do not know who you are
-      (_, @recent_documents) = get_search_results(:q =>'', :sort=>sort_field, :rows=>4)
-    end
-  end
-
-  def recent_me
-    if user_signed_in?
-      (_, @recent_user_documents) = get_search_results(:q =>filter_mine,
-                                        :sort=>sort_field, :rows=>4)
-    end
-  end
-
   def self.uploaded_field
-#  system_create_dtsi
     solr_name('desc_metadata__date_uploaded', :stored_sortable, type: :date)
   end
 
@@ -56,22 +29,20 @@ class CatalogController < ApplicationController
     solr_name('desc_metadata__date_modified', :stored_sortable, type: :date)
   end
 
-
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       :qt => "search",
       :rows => 10
     }
-
-    # solr field configuration for search results/index views
-    config.index.show_link = solr_name("desc_metadata__title", :displayable)
-    config.index.record_display_type = "id"
+    
+    # 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)
 
     # solr field configuration for document/show views
-    config.show.html_title = solr_name("desc_metadata__title", :displayable)
-    config.show.heading = solr_name("desc_metadata__title", :displayable)
-    config.show.display_type = solr_name("has_model", :symbol)
+    config.index.title_field = solr_name("desc_metadata__title", :displayable)
+    config.index.display_type_field = solr_name("has_model", :symbol)
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
@@ -145,15 +116,13 @@ class CatalogController < ApplicationController
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', :label => 'All Fields', :include_in_advanced_search => false) do |field|
+      all_names = config.show_fields.values.map{|val| val.field}.join(" ")
       title_name = solr_name("desc_metadata__title", :stored_searchable, type: :string)
-      label_name = solr_name("desc_metadata__title", :stored_searchable, type: :string)
-      contributor_name = solr_name("desc_metadata__contributor", :stored_searchable, type: :string)
       field.solr_parameters = {
-        :qf => "#{title_name} noid_tsi #{label_name} file_format_tesim #{contributor_name}",
+        :qf => "#{all_names} noid_tsi file_format_tesim",
         :pf => "#{title_name}"
       }
     end
-    
 
     # Now we see how to over-ride Solr request handler defaults, in this
     # case for a BL "search field", which is really a dismax aggregate
@@ -175,8 +144,6 @@ class CatalogController < ApplicationController
       }
     end
 
-
-
     config.add_search_field('creator') do |field|
       field.solr_parameters = { :"spellcheck.dictionary" => "creator" }
       solr_name = solr_name("desc_metadata__creator", :stored_searchable, type: :string)
@@ -327,7 +294,6 @@ class CatalogController < ApplicationController
       }
     end
 
-
     # "sort results by" select (pulldown)
     # label in pulldown is followed by the name of the SOLR field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc
@@ -344,32 +310,4 @@ class CatalogController < ApplicationController
     config.spell_max = 5
   end
 
-  protected
-
-  # Limits search results just to GenericFiles
-  # @param solr_parameters the current solr parameters
-  # @param user_parameters the current user-subitted parameters
-  def exclude_unwanted_models(solr_parameters, user_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:GenericFile\""
-  end
-
-  def depositor 
-    #Hydra.config[:permissions][:owner] maybe it should match this config variable, but it doesn't.
-    Solrizer.solr_name('depositor', :stored_searchable, type: :string)
-  end
-
-  def filter_not_mine 
-    "{!lucene q.op=AND df=#{depositor}}-#{current_user.user_key}"
-  end
-
-  def filter_mine 
-    "{!lucene q.op=AND df=#{depositor}}#{current_user.user_key}"
-  end
-
-  def sort_field
-    "#{Solrizer.solr_name('system_create', :sortable)} desc"
-  end
-
-
 end