sufia 4.0.0.rc1 → 4.0.0.rc2

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

@@ -1,20 +1,20 @@
   <% if !user.facebook_handle.blank?() %>
-    <dt><i class="icon-facebook"></i> Facebook Handle</dt>
+    <dt><i class="fa fa-facebook"></i> Facebook Handle</dt>
     <dd><%= link_to "http://facebook.com/#{user.facebook_handle}", "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
   <% end %>
 
   <% if !user.twitter_handle.blank?() %>
-    <dt><i class="icon-twitter"></i> Twitter Handle</dt>
+    <dt><i class="fa fa-twitter"></i> Twitter Handle</dt>
     <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
   <% end %>
 
   <!-- 
 
-  <dt><i class="icon-google-plus"></i> Google+ Handle</dt>
+  <dt><i class="fa fa-google-plus"></i> Google+ Handle</dt>
   <dd><%# link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
   --> 
 
   <% if !user.linkedin_handle.blank?() %>
-    <dt><i class="icon-linkedin"></i> Linked In</dt>
+    <dt><i class="fa fa-linkedin"></i> Linked In</dt>
     <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
   <% end %>

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

@@ -2,16 +2,14 @@
   <i class="glyphicon glyphicon-star 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="glyphicon glyphicon-question-sign"></i></a>
 </div>
-<div class="control-group">
+<div class="form-group">
   <dl>
     <% trophies.each do |t| %>
       <dd>
-        <div class="controls">
-          <%= link_to t, sufia.generic_file_path(t) %>
-          <label class="checkbox fleft">
-            <%= check_box_tag "remove_trophy_#{t.noid}" %> Yes &nbsp;
-          </label>
-        </div>
+        <%= link_to t, sufia.generic_file_path(t) %>
+        <label class="checkbox fleft">
+          <%= check_box_tag "remove_trophy_#{t.noid}" %> Yes &nbsp;
+        </label>
       </dd>
       <br/>
     <% end %>

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

@@ -1,11 +1,11 @@
 <dl id="user_info" class="row">
-  <dt class="col-xs-5"><i class="icon-facebook"></i> Facebook Handle</dt>
+  <dt class="col-xs-5"><i class="fa fa-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 class="col-xs-5"><i class="icon-twitter"></i> Twitter Handle</dt>
+  <dt class="col-xs-5"><i class="fa fa-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 class="col-xs-5"><i class="icon-google-plus"></i> Google+ Handle</dt>
+  <dt class="col-xs-5"><i class="fa fa-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 class="col-xs-5"><i class="glyphicon glyphicon-envelope-alt"></i> Email</dt>

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

@@ -0,0 +1,4 @@
+<% # Overwrite this view in your application to insert app specific links to %>
+<% # render on the user utility button using the sample HTML shown below %>
+<% # %>
+<% # <li><%= link_to 'text', 'path', id: 'extra_nav_link' </li> %>

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

@@ -8,66 +8,61 @@
         <%= f.file_field :avatar %>
         <%= f.hidden_field :avatar_cache %>
         <span class="help-block">JPG, GIF, or PNG (less than 2MB)</span>
-      </div><!-- .controls -->
+      </div>
     </div><!-- .form-group -->
 
-    <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
+    <div class="col-xs-offset-4 col-xs-8">
+      <div class="checkbox">
+        <%= f.label :remove_avatar do %>
+          <%= f.check_box :remove_avatar %>
+          Delete picture
           <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"></i></a>
-        </label>
-      </div><!-- .controls -->
-    </div><!-- .form-group -->
-
-    <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
+        <% end %>
+      </div>
+      <div class="checkbox">
+        <%= f.label :update_directory do %>
+          <%= f.check_box :update_directory %>
+          Refresh directory info
           <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"></i></a>
-        </label>
-      </div><!-- .controls -->
-    </div><!-- .form-group -->
+        <% end %>
+      </div>
+    </div>
 
     <div class="form-group">
-      <%= f.label :twitter_handle, '<i class="icon-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :twitter_handle, '<i class="fa fa-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><!-- .controls -->
+         <%= f.text_field :twitter_handle, class: "form-control" %>
+      </div>
     </div><!-- .form-group -->
 
     <div class="form-group">
-      <%= f.label :facebook_handle, '<i class="icon-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :facebook_handle, '<i class="fa fa-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><!-- .controls -->
+         <%= f.text_field :facebook_handle, class: "form-control" %>
+      </div>
     </div><!-- .form-group -->
 
     <div class="form-group">
-      <%= f.label :googleplus_handle, '<i class="icon-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
+      <%= f.label :googleplus_handle, '<i class="fa fa-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><!-- .controls -->
+         <%= f.text_field :googleplus_handle, class: "form-control" %>
+      </div>
     </div><!-- .form-group -->
 
     <%= render partial: 'trophy_edit', locals: {trophies: @trophies} %>
 
-    <div class="form-actions">
-      <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn-primary btn-large" %>
-    </div>
+    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
   <% end %>
 </div><!-- .col-xs-5 /well-->
 
-<div class="col-xs-12 col-sm-offset-1 col-sm-6  well">
+<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 />
 
-  <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>
+  <h2><i class="glyphicon glyphicon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', class: 'btn btn-xs btn-primary' %> </h3>
   <% current_user.groups.each do |g| %>
-    <i class="icon-caret-right"></i> <%= g %><br />
+    <i class="glyphicon glyphicon-asterisk"></i> <%= g %><br />
   <% end %>
 </div>

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

@@ -16,7 +16,7 @@
         <tbody> 
             <% @users.each do |user| %> 
                 <tr class="<%= cycle("","zebra") %>"> 
-                   <td><a href="<%= sufia.profile_path(user) %>" class="btn btn-small " ><%= image_tag user.avatar.url(:thumb), width: 30 %></a></td> 
+                   <td><a href="<%= sufia.profile_path(user) %>" class="btn btn-sm " ><%= image_tag user.avatar.url(:thumb), width: 30 %></a></td> 
                    <td ><a href="<%= sufia.profile_path(user) %>"  ><%= user.name %><a></td> 
                    <td><a href="<%= sufia.profile_path(user) %>"  ><%= user.user_key %><a></td>
                    <td><%= user.department %> </td> 

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

@@ -1,8 +1,4 @@
 <%= javascript_tag do %>
-  $('#myTab a').click(function (e) {
-    e.preventDefault();
-    $(this).tab('show');
-  })
 <% end %>
 
 <div class="col-xs-12">

data/config/jetty.yml

@@ -1,5 +1,5 @@
 default:
-  startup_wait: 45
+  startup_wait: 90
   jetty_port: 8983
   java_opts:
     - "-Xmx256m" 

data/config/locales/sufia.en.yml

@@ -29,6 +29,9 @@ en:
           my_shares:
             label_short:  "My Shares"
             label_long:   "My Shares"
+      button:
+        html: '<span class="glyphicon glyphicon-search"></span> Go'
+        text: "Search"
     upload:
       my_computer:
         tab_label: "My Computer"
@@ -38,28 +41,59 @@ en:
         files_selected: "files selected"
       local_ingest:
         tab_label: "Network/Server Location"
+      processing: "File is being processed; you may edit when processing has completed"
     field_label:
       based_near:       "Location"
       description:      "Abstract or Summary"
       tag:              "Keyword"
       date_created:     "Date Created"
       related_url:      "Related URL"
+      total_items:      "Total Items"
+      size:             "Size"
     homepage:
       featured_works:       'Featured Works'
     dashboard:
-      title:                "My Dashboard"
-      greeting:             "Hello, "
-      upload:               "Upload"
-      create_collection:    "Create Collection"
-      view_files:           "View Files"
-      user_activity:        "User Activity"
-      user_notiticiations:  "User Notifications"
+      title:                    "My Dashboard"
+      greeting:                 "Hello, "
+      upload:                   "Upload"
+      create_collection:        "Create Collection"
+      view_collections:         "View Collections"
+      view_files:               "View Files"
+      user_activity:            "User Activity"
+      no_activity:              "User has no recent activity"
+      user_notiticiations:      "User Notifications"
+      no_notifications:         "User has no notifications"
+      additional_notifications: "See all notifications"
       stats:
-        heading:    "Your Statistics"
-        deposits:   "Files you've deposited into Sufia"
-        following:  "People you follow"
-        followers:  "People who are following you"
-
+        heading:            "Your Statistics"
+        files:              "Files you've deposited"
+        collections:        "Collections you've created"
+        following:          "People you follow"
+        followers:          "People who are following you"
+      my:
+        files:        "My Files"
+        collections:  "My Collections"
+        highlights:   "My Highlights"
+        shares:       "Files Shared with Me"
+    file:
+      collections_list:
+        heading:   "This file is in the following collections:"
+        empty:     "This file is not currently in any collections."
+    messages:
+      success:
+        single: "has been saved."
+        multiple:
+          link: "These files"
+          tag: "have been saved."
+        title:  "Files uploaded successfully" 
+        subject: "Batch upload complete"
+      failure:
+        single: "could not be updated. You do not have sufficient privileges to edit it."
+        multiple:
+          link: "These files" 
+          tag: "could not be updated. You do not have sufficient privileges to edit them."
+        title:  "Files failed" 
+        subject: "Batch upload permission denied"
     metadata_help:
       resource_type: "Pre-defined categories to describe the type of file content being uploaded, such as \"article\" or \"dataset.\"  More than one type may be selected."
       title: "A name for the file to aid in identifying it. Defaults to the file name, though a more descriptive title is encouraged. <em>This is a required field</em>."
@@ -78,5 +112,12 @@ en:
     background_attribution: "Background image courtesy of Penn State University"
     bread_crumb:
       file_list: "Your File Listing"
+      collections_list: "Your Collections"
       previous:  "Back to Previous"
       search_results: "Back to search results"
+    visibility:
+      open: "Open Access"
+      private: "Private"
+    user_profile:
+      no_followers: "No one is following you."
+      no_following: "You are not following anyone."

data/lib/generators/sufia/install_generator.rb

@@ -0,0 +1,89 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Sufia
+  class Install < Rails::Generators::Base
+    include Rails::Generators::Migration
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    argument :model_name, type: :string , default: "user"
+    desc """
+  This generator makes the following changes to your application:
+   1. Runs sufia-models:install
+   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
+   5. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
+         """
+
+    def run_required_generators
+      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"
+      file_path = "app/controllers/application_controller.rb"
+      if File.exists?(file_path)
+        insert_into_file file_path, after: 'include Blacklight::Controller' do
+          "  \n# Adds Sufia behaviors into the application controller \n" +
+          "  include Sufia::Controller\n"
+        end
+        gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
+      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."
+      end
+    end
+
+    def catalog_controller
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    end
+
+    def copy_helper
+      copy_file 'sufia_helper.rb', 'app/helpers/sufia_helper.rb'
+    end
+
+    def remove_blacklight_scss
+      remove_file 'app/assets/stylesheets/blacklight.css.scss'
+    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
+      gsub_file 'config/routes.rb', 'root :to => "catalog#index"', ''
+
+      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  root to: 'homepage#index'\n"
+
+      sentinel = /devise_for :users/
+      inject_into_file 'config/routes.rb', routing_code, { after: sentinel, verbose: false }
+    end
+
+    # Add behaviors to the SolrDocument model
+    def inject_sufia_solr_document_behavior
+      file_path = "app/models/solr_document.rb"
+      if File.exists?(file_path)
+        inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
+          "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
+            "  include Sufia::SolrDocumentBehavior\n"
+        end
+      else
+        puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
+      end
+    end
+  end
+end

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

@@ -120,7 +120,7 @@ class CatalogController < ApplicationController
       all_names = config.show_fields.values.map{|val| val.field}.join(" ")
       title_name = solr_name("desc_metadata__title", :stored_searchable)
       field.solr_parameters = {
-        qf: "#{all_names} noid_tsi file_format_tesim",
+        qf: "#{all_names} noid_tsi file_format_tesim all_text_timv",
         pf: "#{title_name}"
       }
     end

data/lib/generators/sufia/upgrade400_generator.rb

@@ -58,6 +58,10 @@ This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes
     remove_file 'app/assets/stylesheets/blacklight.css.scss'
   end
 
+  def install_blacklight_gallery
+    generate "blacklight_gallery:install"
+  end
+
   def tinymce_config
     copy_file "config/tinymce.yml", "config/tinymce.yml"
   end

data/lib/sufia.rb

@@ -9,7 +9,7 @@ require 'browse-everything'
 require 'sufia/models'
 
 require 'rails_autolink'
-require 'font-awesome-sass-rails'
+require 'font-awesome-rails'
 require 'tinymce-rails'
 require 'tinymce-rails-imageupload'
 
@@ -29,13 +29,4 @@ module Sufia
     config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
     config.assets.precompile << %r(vjs\.(?:eot|ttf|woff)$)
   end
-
-  autoload :Controller
-  autoload :Ability
-  autoload :HttpHeaderAuth
-  autoload :FilesControllerBehavior
-  autoload :BatchEditsControllerBehavior
-  autoload :DownloadsControllerBehavior
-  autoload :HomepageController
-  autoload :MyControllerBehavior
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 end

data/solr_conf/conf/solrconfig.xml

@@ -3,9 +3,9 @@
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
      as well as the default solrconfig file included with Solr -->
-  
+
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
@@ -13,7 +13,9 @@
   <!-- solr lib dirs -->
   <lib dir="../lib/contrib/analysis-extras/lib" />
   <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
-  
+  <!-- for full-text indexing -->
+  <lib dir="../lib/contrib/extraction/lib" regex=".*\.jar" />
+
   <dataDir>${solr.data.dir:}</dataDir>
 
   <requestHandler name="search" class="solr.SearchHandler" default="true">
@@ -30,7 +32,7 @@
        <float name="tie">0.01</float>
        <!-- this qf and pf are used by default, if not otherwise specified by
             client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
             below, which the default blacklight_config will specify for
             those searches. You may also be interested in:
             http://wiki.apache.org/solr/LocalParams
@@ -57,9 +59,9 @@
        </str>
        <str name="subject_pf">
        </str>
-       
+
        <str name="fl">
-         *, 
+         *,
          score
        </str>
 
@@ -68,7 +70,7 @@
        <str name="facet.limit">10</str>
        <str name="facet.field">active_fedora_model_ssi</str>
        <str name="facet.field">object_type_si</str>
-       
+
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
        <str name="spellcheck.onlyMorePopular">true</str>
@@ -104,7 +106,20 @@
       </str>
     </lst>
   </requestHandler>
-  
+
+<requestHandler name="/update/extract" startup="lazy" class="org.apache.solr.handler.extraction.ExtractingRequestHandler" >
+    <lst name="defaults">
+      <!-- All the main content goes into "text"... if you need to return the extracted text or do highlighting, use a stored field. -->
+      <str name="fmap.content">text</str>
+      <str name="lowernames">true</str>
+      <str name="uprefix">ignored_</str>
+      <!-- capture link hrefs but ignore div attributes -->
+      <str name="captureAttr">true</str>
+      <str name="fmap.a">links</str>
+      <str name="fmap.div">ignored_</str>
+    </lst>
+ </requestHandler>
+
   <requestHandler name="standard" class="solr.SearchHandler">
      <lst name="defaults">
        <str name="echoParams">explicit</str>
@@ -122,7 +137,6 @@
     </lst>
   </requestHandler>
 
-
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
     <str name="queryAnalyzerFieldType">textSpell</str>
     <!-- Multiple "Spell Checkers" can be declared and used by this component
@@ -135,17 +149,17 @@
       <str name="buildOnOptimize">true</str>
     </lst>
   </searchComponent>
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
-  
+
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
+
   <requestDispatcher handleSelect="true" >
     <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
-  
+
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
   <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-  
+
   <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
     <lst name="invariants">
       <str name="q">solrpingquery</str>
@@ -154,10 +168,10 @@
       <str name="echoParams">all</str>
     </lst>
   </requestHandler>
-  
-  <!-- config for the admin interface --> 
+
+  <!-- config for the admin interface -->
   <admin>
     <defaultQuery>search</defaultQuery>
   </admin>
-  
+
 </config>