sufia 4.0.0.beta4 → 4.0.0.rc1

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

@@ -102,5 +102,28 @@ button {
   }
 }
 
+.large-icon {
+  font-size: 1.5em;
+}
 
+.btn.collection-remove {
+  background:none;
+  border:none;
+  /*     padding:0!important;
+    padding: 6px 12px;*/
 
+  cursor:pointer;
+  clear: both;
+  color: #333333;
+  display: block;
+  width: 100%;
+  font-weight: normal;
+  line-height: 18px;
+  padding: 3px 15px;
+  white-space: nowrap;
+  border-radius:0px
+}
+.btn.collection-remove:hover{
+  text-decoration:underline;
+  background-color:#0088CC;
+}

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

@@ -9,7 +9,7 @@
  *= require home-page
  *= require tagcloud
  *= require featured
- *= require dashboard
+ *= require file-listing
  *= require usage-stats
  *= require nestable
 */
@@ -31,3 +31,7 @@
   clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
   clip: rect(1px, 1px, 1px, 1px);
 }
+
+#content {
+  padding-top: 10px;
+}

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

@@ -2,17 +2,17 @@ module Sufia
   module Catalog
     extend ActiveSupport::Concern
     included do
-      self.solr_search_params_logic += [:only_generic_files]
+      self.solr_search_params_logic += [:only_generic_files_and_collections]
     end
 
     protected
 
-      # Limits search results just to GenericFiles
+      # Limits search results just to GenericFiles and collections
       # @param solr_parameters the current solr parameters
       # @param user_parameters the current user-subitted parameters
-      def only_generic_files(solr_parameters, user_parameters)
+      def only_generic_files_and_collections(solr_parameters, user_parameters)
         solr_parameters[:fq] ||= []
-        solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:GenericFile\""
+        solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"info:fedora/afmodel:GenericFile\" \"info:fedora/afmodel:Collection\")"
       end
 
   end

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

@@ -41,10 +41,6 @@ module Sufia::Controller
     end
   end
 
-  def search_layout
-    "sufia-two-column"
-  end
-
   protected
 
   ### Hook which is overridden in Sufia::Ldap::Controller

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

@@ -58,12 +58,8 @@ module Sufia
       end
     end
 
-    def search_action_url opts={}
-      sufia.url_for(opts)
-    end
-
     protected
-    
+
     # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
     def discovery_permissions
       ["edit"]

data/app/controllers/my/collections_controller.rb

@@ -16,5 +16,12 @@ module My
       super
       @selected_tab = :collections
     end
+  
+    protected
+    
+    def search_action_url *args
+      sufia.dashboard_collections_url *args
+    end
+
   end
 end

data/app/controllers/my/files_controller.rb

@@ -10,5 +10,12 @@ module My
       super
       @selected_tab = :files
     end
+
+    protected
+    
+    def search_action_url *args
+      sufia.dashboard_files_url *args
+    end
+  
   end
 end

data/app/controllers/my/highlights_controller.rb

@@ -17,5 +17,12 @@ module My
       super
       @selected_tab = :highlighted
     end
+  
+    protected
+    
+    def search_action_url *args
+      sufia.dashboard_highlights_url *args
+    end
+
   end
 end

data/app/controllers/my/shares_controller.rb

@@ -16,5 +16,12 @@ module My
       super
       @selected_tab = :shared
     end
+  
+    protected
+    
+    def search_action_url *args
+      sufia.dashboard_shares_url *args
+    end
+
   end
 end

data/app/helpers/sufia/records_helper_behavior.rb

@@ -12,7 +12,7 @@ module Sufia
       link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover', 
         'data-content' => metadata_help(key),
         'data-original-title' => get_label(key) do
-          content_tag 'i', '', class: "glyphicon glyphicon-question-sign icon-large"
+          content_tag 'i', '', class: "glyphicon glyphicon-question-sign large-icon"
       end
     end
 

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -5,7 +5,7 @@ module Sufia
     # example:
     #   config.index.thumbnail_method = :sufia_thumbnail_tag
     def sufia_thumbnail_tag(document, options)
-      path = if document.image? || document.pdf? || document.video?
+      path = if document.image? || document.pdf? || document.video? || document.office_document?
         sufia.download_path document.noid, datastream_id: 'thumbnail'
       elsif document.audio?
         "audio.png"
@@ -69,7 +69,7 @@ module Sufia
 
     def iconify_auto_link(text, showLink = true)
       auto_link(text) do |value|
-        "<i class='icon-external-link'></i>&nbsp;#{value if showLink}<br />"
+        "<i class='glyphicon glyphicon-new-window'></i>&nbsp;#{value if showLink}<br />"
       end
     end
 

data/app/models/concerns/sufia/solr_document_behavior.rb

@@ -124,5 +124,15 @@ module Sufia
       # audio/mpeg is the mime type that fits 0.6.0 returns for an mp3 file.
       ['audio/mp3', 'audio/mpeg', 'audio/x-wave', 'audio/x-wav', 'audio/ogg'].include? self.mime_type
     end
+
+    def office_document?
+        ['text/rtf',
+         'application/msword',
+         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+         'application/vnd.ms-excel',
+         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+         'application/vnd.ms-powerpoint',
+         'application/vnd.openxmlformats-officedocument.presentationml.presentation'].include? self.mime_type
+    end
   end
 end

data/app/views/_user_util_links.html.erb

@@ -9,7 +9,7 @@
         <li><%= link_to raw('<span class="glyphicon glyphicon-upload"></span> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
         <li><%= link_to raw('<span class="glyphicon glyphicon-cog"></span> edit profile'), sufia.edit_profile_path(current_user), id: 'upload_nav_link' %></li>
         <li class="divider"></li>
-        <li><%= link_to raw('<span class="glyphicon glyphicon-signout"></span> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
+        <li><%= link_to raw('<span class="glyphicon glyphicon-log-out"></span> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
       </ul>
     </div><!-- /.btn-group -->
 <% else %>

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

@@ -1,25 +1,22 @@
 <% @page_title = "More Search Options - #{application_name}" %>
-<% content_for :local_js do %>
-  $(document).ready(function(){$("form.advanced input:first").focus();});
-<% end %>
 <div class="span55">
   <h1>More Search Options</h1>
   <%= render 'advanced_search_form' %>
 </div> <!-- /.span65 -->
 
 <div class="span50">
- <h2><i class="icon-pushpin"></i> Search tips</h2>
+ <h2><i class=glyphicon glyphicon-pushpin"></i> Search tips</h2>
   <div class="well">
 <ul id="advanced_search_tips">
-    <li><i class="icon-caret-right"></i> Select "match all" to require all fields.</li>
-    <li><i class="icon-caret-right"></i> Select "match any" to find at least one field.</li>
-    <li><i class="icon-caret-right"></i> Combine keywords and attributes to find specific items.</li>
-    <li><i class="icon-caret-right"></i> Use quotation marks to search as a phrase.  </li>
-    <li><i class="icon-caret-right"></i> Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
-    <li><i class="icon-caret-right"></i> Use "-" before a word or phrase to exclude. </li>
-    <li><i class="icon-caret-right"></i> Use "OR", "AND", and "NOT" to create complex Boolean logic. You can use parentheses in your complex expressions.</li>
-    <li><i class="icon-caret-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
-    <li><i class="icon-caret-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Select "match all" to require all fields.</li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Select "match any" to find at least one field.</li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Combine keywords and attributes to find specific items.</li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Use quotation marks to search as a phrase.  </li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Use "-" before a word or phrase to exclude. </li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Use "OR", "AND", and "NOT" to create complex Boolean logic. You can use parentheses in your complex expressions.</li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
+    <li><i class="glyphicon glyphicon-chevron-right"></i> Truncation and wildcards are not supported - word-stemming is done automatically. </li>
 </ul>
   </div>
 </div>

data/app/views/batch/_edit.js.erb

@@ -0,0 +1,15 @@
+if (navigator.userAgent.match("MSIE"))
+  $("#new_generic_file").validate();
+
+$('#permissions_display').show();
+
+confirmation_needed = true;
+window.onbeforeunload = confirmExit;
+
+function confirmExit(){
+  if(confirmation_needed){
+    // if you return a string it will be displayed in between "don't navigate away"
+    // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
+    return "Your metadata has not been saved.";
+  }
+}

data/app/views/batch/_metadata.html.erb

@@ -1,7 +1,7 @@
 <h2>Individual Titles <small>(applied to individual files uploaded)</small><small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
 <div id="" class="well">
   <p>
-  <i class="icon-info-sign"></i> Filename will be the default title.  Please provide a more meaningful title, and filenames will still be preserved by the system.
+  <i class="glyphicon glyphicon-info-sign"></i> Filename will be the default title.  Please provide a more meaningful title, and filenames will still be preserved by the system.
   </p>
   <div class="row">
     <div class="span60">

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

@@ -1,30 +1,14 @@
-<% content_for :local_js do %>
-   if (navigator.userAgent.match("MSIE")){
-      $("#new_generic_file").validate();
-   }
-
-$('#permissions_display').show();
-
-// initialize popover helpers
-$("a[rel=popover]").popover({ html: true });
-
-confirmation_needed = true;
-window.onbeforeunload = confirmExit;
-function confirmExit(){
-      if(confirmation_needed){
-      // if you return a string it will be displayed in between "don't navigate away"
-      // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
-         return "Your metadata has not been saved.";
-      }
- }
+<%= javascript_tag do %>
+  <%= render partial: "edit", formats: [:js] %>
 <% end %>
 
 <h1>Apply Metadata</h1>
-<br />
-<div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other
-  information you provide will be applied <em>to the entire batch of files</em> you have just deposited into <%= t('sufia.product_name') %>.
-  You may edit individual files from <%= link_to "<i class='icon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %> once
-  this step is finished.
+<div class="alert">
+  The information you provide for Title will be applied to the corresponding file only; however all other
+  information you provide will be applied <em>to the entire batch of files</em> you have just 
+  deposited into <%= t('sufia.product_name') %>. You may edit individual files from 
+  <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('sufia.bread_crumb.file_list')}".html_safe, sufia.dashboard_files_path %>
+  once this step is finished.
 </div>
 <%= form_for([@batch, @generic_file], url: sufia.batch_generic_files_path, html: { multipart: true, class: 'form-horizontal' }) do |f| %>
 
@@ -33,7 +17,8 @@ function confirmExit(){
   <%= render partial: 'generic_files/permission_form', formats: [:html], locals: { gf: @generic_file, batch: @batch } %>
 
   <div class="row form-actions" id="permissions_submit">
-          <%= button_tag '<i class="icon-save"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
+    <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large',
+        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
   </div>
 
 <% end %>

data/app/views/batch_edits/_batch_edits_actions.html.erb

@@ -1 +1 @@
-<li data-behavior="batch-edit-select-abc" data-state="on"><a href="#"><i class="icon-ok"></i> Select ABC</a></li>
+<li data-behavior="batch-edit-select-abc" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select ABC</a></li>

data/app/views/batch_edits/_check_all.html.erb

@@ -1,7 +1,7 @@
   <% if !@disable_select_all %> 
     <div class="dropdown" >
       <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
-      <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="icon-cog" title="click for selection options"></span></a>
+      <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-cog" title="click for selection options"></span></a>
       <ul class="dropdown-menu">
         <%= render partial: "#{controller_name}/batch_edits_actions" %>
       </ul>

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

@@ -9,8 +9,8 @@
   <h3> Descriptions:</h3>
 
     <ul class="nav nav-tabs">
-      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="icon-tags"></i> Descriptions</a></li>
-      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="icon-key"></i> Permissions</a></li>
+      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="glyphicon glyphicon-tags"></i> Descriptions</a></li>
+      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="glyphicon glyphicon-lock"></i> Permissions</a></li>
     </ul>
     <div class="tab-content">
       <div class="well tab-pane active" id="descriptions_display">
@@ -21,7 +21,7 @@
               <tr id='row_<%= term.to_s %>' class="expandable">
                 <th width="20%">
                    <a class="accordion-toggle grey" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%=term.to_s%>">
-                      <%= get_label(term) %>&nbsp;<i class="toggle icon-chevron-right grey"></i>
+                      <%= get_label(term) %>&nbsp;<i class="toggle glyphicon glyphicon-chevron-right grey"></i>
                    </a>
                 </th>
                 <td  width="50%" class="scrolly">

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

@@ -1,2 +1,7 @@
 <%# container for all documents in index view -%>
-    <%= render partial: 'catalog/_index_partials/default_group', locals: { docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_name: nil, facet_value: nil } %>
+<div id="search-results">
+  <ol class="catalog" start="<%= document_counter_with_offset(0) %>">
+    <%= render documents, as: :document %>
+  </ol>
+</div>
+

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

@@ -1,21 +1,34 @@
-<% content_for :sidebar do %>
-  <%= render partial: 'facets' %>
-<% end %>
-
-<% @page_title = application_name + " Search Results" %>
-
-<h3>Search Results</h3>
-<% if query_has_constraints? %>
-  <div class="alert alert-info">
-    <div class="pull-right">
-        <%=link_to t('blacklight.search.start_over'), start_over_path, class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" %>
-    </div>
-    <i class="icon-search icon-large"></i> You searched for: <strong><%= render_constraints(params) %></strong></div>
-  </div>
-<% end %>
-<%= render 'did_you_mean' %>
-<%= render 'facet_selected' %>
-<%= render 'sort_and_per_page' %>
-<%= render 'results_pagination' %>
-<%= render_document_index %>
-<%= render 'results_pagination' %>
+<div id="sidebar" class="col-md-3">
+  <%= render 'search_sidebar' %>
+</div>
+
+<div id="content" class="col-md-9">
+
+
+  <h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
+
+  <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
+
+
+  <% content_for(:head) do -%>
+      <%= render_opensearch_response_metadata %>
+      <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') ) %>
+      <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') ) %>
+  <% end -%>
+
+
+  <%= render 'search_header' %>
+
+  <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
+
+  <%- if @response.empty? %>
+      <%= render "zero_results" %>
+  <%- elsif render_grouped_response? %>
+      <%= render_grouped_document_index %>
+  <%- else %>
+      <%= render_document_index %>
+  <%- end %>
+
+  <%= render 'results_pagination' %>
+
+</div>

data/app/views/collections/_action_menu.html.erb

@@ -1,18 +1,18 @@
 <div class="btn-group">
-  <button class="btn btn-small" href="#"><i class="icon-wrench"></i> Select an action</button>
-  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></button>
+  <button class="btn btn-small" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
+  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
   <ul class="dropdown-menu">
    <li>
      <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>
    </li>
    <li>
-     <%= link_to raw('<i class="icon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
+     <%= link_to raw('<i class="glyphicon glyphicon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
    </li>
    <li>
-     <%= link_to raw('<i class="icon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid), class: 'itemicon itemedit', title: 'Edit File'  %>
+     <%= link_to raw('<i class="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid), class: 'itemicon itemedit', title: 'Edit File'  %>
    </li>
    <li>
-     <%= link_to raw('<i class="icon-download-alt"></i> Download File'), sufia.download_path(noid), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
+     <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i> Download File'), sufia.download_path(noid), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
    </li>
    <li>
      <%= display_trophy_link(@user, noid) do |text| %>

data/app/views/collections/_batch_edits_actions.html.erb

@@ -1,3 +1,3 @@
-<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select None</a></li>
 <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
 <li><%= button_for_remove_selected_from_collection @collection %></li>