sufia 4.0.0.rc1 → 4.0.0.rc2

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -3,7 +3,7 @@ module Sufia
 
     def render_recent_activity
       if @activity.empty?
-        "User has no recent activity"
+        t('sufia.dashboard.no_activity')
       else
         render partial: 'users/activity_log', locals: {events: @activity}
       end
@@ -11,9 +11,9 @@ module Sufia
 
     def render_recent_notifications
       if @notifications.empty?
-        "User has no notifications"
+        t('sufia.dashboard.no_notifications')
       else
-        render partial: "mailbox/notifications", locals: { messages: @notifications }
+        render partial: "mailbox/notifications", locals: { messages: notifications_for_dashboard }
       end
     end
 
@@ -21,5 +21,27 @@ module Sufia
       params[:controller].match(/^dashboard|my/)
     end
 
+    def on_my_files?
+      params[:controller].match(/^my\/files/)
+    end
+
+    def number_of_files user=current_user
+      ::GenericFile.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
+    end
+
+    def number_of_collections user=current_user
+      ::Collection.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
+    end
+
+    def notifications_for_dashboard
+      @notifications.limit(Sufia.config.max_notifications_for_dashboard)
+    end
+
+    def link_to_additional_notifications
+      if @notifications.count > Sufia.config.max_notifications_for_dashboard
+        link_to t('sufia.dashboard.additional_notifications'), sufia.notifications_path
+      end
+    end
+
   end
 end

data/app/helpers/sufia/records_helper_behavior.rb

@@ -8,11 +8,19 @@ module Sufia
      more_or_less_button(key, 'remover', '-')
     end
 
-    def help_icon(key)
-      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 large-icon"
+    def help_icon(key, content = nil, title = nil)
+      content = content || metadata_help(key)
+      title = title || get_label(key)
+      link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover',
+              'data-content' => content,
+              'data-original-title' => title do
+        content_tag 'i', '', class: "glyphicon glyphicon-question-sign large-icon"
+      end
+    end
+
+    def help_icon_modal(modal_id)
+      link_to '#' + modal_id, id: "generic_file_#{modal_id}_help_modal", rel: 'button', data: { toggle: 'modal' } do
+        content_tag 'i', '', class: 'glyphicon glyphicon-question-sign large-icon'
       end
     end
 

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -99,18 +99,6 @@ module Sufia
       link_to @user.telephone, "wtai://wp/mc;#{@user.telephone}" if @user.telephone
     end
 
-    # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
-    # We should be able to do away with this method in Blacklight 5
-    # @example
-    #   link_back_to_catalog(label: 'Back to Search')
-    def link_back_to_catalog(opts = { label: nil })
-      scope = opts.delete(:route_set) || self
-      query_params = current_search_session.try(:query_params) || {}
-      link_url = scope.url_for(query_params)
-      opts[:label] ||= t('blacklight.back_to_search')
-      link_to opts[:label], link_url
-    end
-
     # Only display the current search parameters if the user is not in the dashboard.
     # If they are in the dashboard, then the search defaults to the user's files and not
     # all of Sufia.
@@ -132,6 +120,21 @@ module Sufia
       end
     end
 
+    def render_visibility_link document
+      link_to render_visibility_label(document), sufia.edit_generic_file_path(document.noid, {anchor: "permissions_display"}),
+        id: "permission_"+document.noid, class: "visibility-link"
+    end
+
+    def render_visibility_label document
+      if document.registered?
+        content_tag :span, t('sufia.institution_name'), class: "label label-info", title: t('sufia.institution_name')
+      elsif document.public?
+        content_tag :span, t('sufia.visibility.open'), class: "label label-success", title: t('sufia.visibility.open')
+      else
+        content_tag :span, t('sufia.visibility.private'), class: "label label-danger", title: t('sufia.visibility.private')
+      end
+    end
+
     private
 
     def search_action_for_dashboard

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

@@ -1,6 +1,10 @@
 # -*- encoding : utf-8 -*-
 module Sufia
   module SolrDocumentBehavior
+    extend ActiveSupport::Concern
+    include Sufia::GenericFile::MimeTypes
+    include Sufia::Permissions::Readable
+    
     # Add a schema.org itemtype
     def itemtype
       Sufia.config.resource_types_to_schema[resource_type.first] || 'http://schema.org/CreativeWork'
@@ -46,7 +50,7 @@ module Sufia
       begin
         Date.parse(field).to_formatted_s(:standard)
       rescue
-        logger.info "Unable to parse date: #{field.first.inspect} for #{self['id']}"
+        ActiveFedora::Base.logger.info "Unable to parse date: #{field.first.inspect} for #{self['id']}"
       end
     end
 
@@ -99,40 +103,5 @@ module Sufia
       Array(self[::Ability.edit_user_field])
     end
 
-    def public?
-      read_groups.include?('public')
-    end
-
-    def registered?
-      read_groups.include?('registered')
-    end
-
-    def pdf?
-      ['application/pdf'].include? self.mime_type
-    end
-
-    def image?
-      ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif'].include? self.mime_type
-    end
-
-    def video?
-      ['video/mpeg', 'video/mp4', 'video/webm', 'video/x-msvideo', 'video/avi', 'video/quicktime', 'application/mxf'].include? self.mime_type
-    end
-
-    def audio?
-      # audio/x-wave is the mime type that fits 0.6.0 returns for a wav file.
-      # 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/_masthead.html.erb

@@ -3,7 +3,7 @@
     <div class="col-xs-6 col-sm-7">
       <%= render partial: '/logo' %>
     </div><!-- /.col-xs-5 -->
-    <div class="col-xs-6 col-sm-5">
+    <div class="col-xs-6 col-sm-5 text-right">
         <%= render partial: '/user_util_links' %>
     </div><!-- /.col-xs-7 -->
   </div><!-- /.row -->

data/app/views/_user_util_links.html.erb

@@ -1,13 +1,15 @@
 <% if user_signed_in? %>
     <div class="btn-group" id="user_utility_links">
       <%= render partial: 'users/notify_link' %>
-      <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-default " id="profile_link" title="click for User Profile"><span class="glyphicon glyphicon-user">&nbsp;</span><%= current_user.name %>
-      </a>
+      <%= link_to sufia.dashboard_index_path, class: "btn btn-default", id: "dashboard_link", title: "click for Dashboard" do %>
+        <span class="glyphicon glyphicon-dashboard"></span>
+        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+      <% end %>
       <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret" title="click for additional menu options"></span></a>
       <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to raw('<span class="glyphicon glyphicon-dashboard"></span> my dashboard'), sufia.dashboard_index_path, id: 'dashboard_nav_link' %></li>
         <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><%= link_to raw('<span class="glyphicon glyphicon-user"></span> my profile'), sufia.profile_path(current_user), id: 'profile_nav_link' %></li>
+        <%= render partial: 'users/user_util_links_extra' %>
         <li class="divider"></li>
         <li><%= link_to raw('<span class="glyphicon glyphicon-log-out"></span> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
       </ul>

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

@@ -1,8 +1,8 @@
 <%- search_fields_for_advanced_search.each do |key, field_def| -%>
-  <div class="control-group">
-      <%= label_tag key, "#{field_def.label }:", class: 'control-label' %>
-    <div class="controls">
-      <%= text_field_tag key, label_tag_default_for(key), class: 'input-large' %>
+  <div class="form-group">
+    <%= label_tag key, "#{field_def.label }:", class: 'control-label col-sm-4' %>
+    <div class="col-sm-8">
+      <%= text_field_tag key, label_tag_default_for(key), class: 'form-control' %>
     </div>
   </div>
 <%- end -%>

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

@@ -2,20 +2,13 @@
 
   <%= render_hash_as_hidden_fields(params_for_search(advanced_search_context)) %>
 
-  <div>
-
-    <div>
-        <div class="control-group">
-          <label class="control-label">Find items that match</label>
-          <div class="controls">
-            <%= select_tag(:op, options_for_select({ all: 'AND', any: 'OR'}.sort, 'all'), class: "span10") %> of the fields below:
-          </div>
-        </div>
+  <div class="form-group">
+    <label class="control-label" for='op'>Find items that match</label>
+    <%= select_tag(:op, options_for_select({ all: 'AND', any: 'OR'}.sort, 'all'), class: "") %> of the fields below:
+  </div>
 
-        <div id="advanced_search">
-          <%= render 'advanced/advanced_search_fields' %>
-        </div>
-    </div>
+  <div id="advanced_search">
+    <%= render 'advanced/advanced_search_fields' %>
   </div>
 
   <% unless (search_context_str = render_search_to_s( advanced_search_context)).blank? %>
@@ -25,13 +18,17 @@
     </div>
   <% end %>
 
+  <div class="form-group">
+    <%= label_tag :sort, "Sort results by: ", class: 'control-label col-sm-4' %>
+    <div class="col-sm-8">
+      <%= select_tag :sort, options_for_select(sort_fields, h(params[:sort])), class: 'form-control' %>
+    </div>
+  </div>
 
-  <div class="form-actions">
-    <%= label_tag(:sort, "Sort results by") %>
-    <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
+  <div>
     <%= hidden_field_tag(:search_field, blacklight_config.advanced_search[:url_key]) %>
     <br />
     <%= submit_tag 'Search', class: 'btn btn-primary', id: 'advanced_search' %>
-	  <%= link_to "Start over", {controller: "advanced", action: "index"}, class:"btn" %>
+	  <%= link_to "Start over", {controller: "advanced", action: "index"}, class:"btn btn-default" %>
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% @page_title = "More Search Options - #{application_name}" %>
-<div class="span55">
+<div class="col-md-6">
   <h1>More Search Options</h1>
   <%= render 'advanced_search_form' %>
-</div> <!-- /.span65 -->
+</div>
 
-<div class="span50">
+<div class="col-md-6">
  <h2><i class=glyphicon glyphicon-pushpin"></i> Search tips</h2>
   <div class="well">
 <ul id="advanced_search_tips">

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

@@ -4,11 +4,11 @@
   <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">
+    <div class="col-sm-8">
       <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
-        <div class="control-group">
+        <div class="form-group">
           <%= f.label :title, "<span class='error'>*</span> Title #{index + 1}".html_safe, class: "control-label" %>
-          <div class="controls" id="additional_title_clone">
+          <div id="additional_title_clone">
             <%= f.text_field :title, name: "title[#{gen_f.id}][]", value: gen_f.label, required: true %>
             <%= help_icon(:title) %>
           </div>
@@ -16,7 +16,7 @@
       <% end %>
     </div>
 
-    <div class="span40">
+    <div class="col-sm-4">
       <!-- put metadata about file being edited here -->
     </div>
   </div>
@@ -26,30 +26,28 @@
 <div  id="descriptions_display">
   <h2 class="non lower">Bulk Descriptions <small>(applied to all files just uploaded)</small>  <small class="pull-right"><span class="error">*</span> indicates required fields</small></h2>
   <div class="well">
-    <div class="control-group" id="resources">
+    <div class="form-group" id="resources">
       <%# See if this works: render_edit_field_partial(:type, f:f) %>
       <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
-      <div class="controls">
-          <p class="help-block">You may select multiple types to apply to all files<p>
-          <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7 } %>
-          <%= help_icon(:resource_type) %>
-      </div>
+      <p class="help-block">You may select multiple types to apply to all files<p>
+      <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, { multiple: true, size: 7 } %>
+      <%= help_icon(:resource_type) %>
     </div>
 
-    <div class="control-group">
+    <div class="form-group">
       <%= f.label :tag, "<span class='error'>*</span> Keyword".html_safe, class: "control-label" %>
-      <div class="controls" id="additional_tag_clone">
-          <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
-          <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="sr-only">add another Tag</span></button>
-          &nbsp;
-          <%= help_icon(:tag) %>
+      <div id="additional_tag_clone">
+        <%= f.text_field :tag, name: "generic_file[tag][]", value: "", required: true  %>
+        <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="sr-only">add another Tag</span></button>
+        &nbsp;
+        <%= help_icon(:tag) %>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
 
-    <div class="control-group">
+    <div class="form-group">
       <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, class: "control-label" %>
-      <div class="controls" id="additional_creator_clone">
+      <div id="additional_creator_clone">
         <%= f.text_field :creator, name: "generic_file[creator][]", value: "", required: true %>
           <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="sr-only">add another Creator</span></button>
           &nbsp;
@@ -58,16 +56,16 @@
       <div id="additional_creator_elements"></div>
     </div>
 
-    <div class="control-group">
+    <div class="form-group">
       <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, class: "control-label" %>
-      <div class="controls" id="additional_rights_clone">
+      <div id="additional_rights_clone">
         <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), required: true %>
-          <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="sr-only">add another Rights</span></button>
+        <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="sr-only">add another Rights</span></button>
         &nbsp;
-        <%= help_icon(:rights) %>
+        <%= help_icon_modal('rightsModal') %>
         <%= render partial: "generic_files/rights_modal" %>
-
       </div>
+
       <div id="additional_rights_elements"></div>
     </div>
 
@@ -79,4 +77,4 @@
     <%= render partial: 'more_metadata', locals: {f:f} %>
 
   </div><!-- /well -->
-</div> <!-- /row /span6 -->
+</div> <!-- /row -->

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

@@ -1,4 +1,4 @@
-    <div class="hide" id="more_descriptions">
+    <div id="more_descriptions">
       <% (@generic_file.terms_for_editing - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
         <%= render partial: "generic_files/field_form", locals: { generic_file: @generic_file, f: f, render_req: false, key: term } %>
       <% end %>

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

@@ -16,8 +16,8 @@
 
   <%= 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="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large',
+  <div class="row" id="permissions_submit">
+    <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn btn-primary btn-lg',
         onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
   </div>
 

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

@@ -1,9 +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="glyphicon glyphicon-cog" title="click for selection options"></span></a>
-      <ul class="dropdown-menu">
-        <%= render partial: "#{controller_name}/batch_edits_actions" %>
-      </ul>
-    </div>
-  <% end %>
+<div class="dropdown" >
+  <%= check_box_tag 'check_all', 'yes', @all_checked, class: 'pull-left', disabled: ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
+  <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>
+</div>

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

@@ -1,4 +1,5 @@
 <%= form_tag(batch_edits_path, method: :delete, class: "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>
     <%= hidden_field_tag('update_type', 'delete_all') %>
+    <%= hidden_field_tag('return_controller', params[:controller]) %>
   <%= submit_tag("Delete Selected", class: 'batch-all-button btn btn-primary submits-batches', data: { confirm: "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation" }) %>
 <% end %>

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

@@ -14,35 +14,34 @@
     </ul>
     <div class="tab-content">
       <div class="well tab-pane active" id="descriptions_display">
-        <table class="table table-striped"><!-- class="verticalheadings"> -->
-        <tbody>
         <% @terms.each do |term| %>
           <% vals = @show_file.send(term) %>
-              <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 glyphicon glyphicon-chevron-right grey"></i>
-                   </a>
-                </th>
-                <td  width="50%" class="scrolly">
-
-                    <div id="collapse_<%= term.to_s %>" class="accordion-body collapse scrolly">
-                      <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
-                          <%= hidden_field_tag('update_type', 'update') %>
-                          <%= hidden_field_tag('key', term.to_s) %>
-                          <%= render partial: "generic_files/field_form", locals: { generic_file: @show_file, f: f, render_req: false, key: term } %>
-                        <div class="row">
-                           <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , id: "#{term.to_s}_save" %>
-                           <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
-                           <div id="status_<%= term.to_s %>" class="status fleft"></div>
-                        </div>
-                      <% end %>
-                    </div>
-                </td>
-              </tr>
-         <% end %>
-          </tbody></table> <!-- class="verticalheadings"> -->
+          <div class="row">
+            <!-- look into dashboard_actions.js -->
+            <div class="col-sm-2 col-sm-offset-1">
+              <a class="accordion-toggle grey glyphicon-chevron-right-helper" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#" id="expand_link_<%=term.to_s%>">
+                <%= get_label(term) %>
+              </a>
+              <a href="#collapse_<%=term.to_s%>" class="small" id="chevron_link_<%=term.to_s%>"><span id="expand_<%=term.to_s%>" class="glyphicon glyphicon-chevron-right"></span></a>
+            </div>
+            <div id="detail_<%= term.to_s %>" class="col-sm-6">
+              <div class="accordion-body collapse expanded-details scrolly">
+                <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
+                  <%= hidden_field_tag('update_type', 'update') %>
+                  <%= hidden_field_tag('key', term.to_s) %>
+                  <%= render partial: "generic_files/field_form", locals: { generic_file: @show_file, f: f, render_req: false, key: term } %>
+                  <div>
+                    <%= f.submit "Save changes", class: 'btn btn-primary field-save updates-batches' , id: "#{term.to_s}_save" %>
+                    <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
+                    <div id="status_<%= term.to_s %>" class="status fleft"></div>
+                  </div>
+                <% end %>
+              </div>
+            </div>
+          </div>
+        <% end %>
       </div><!-- /well -->
+
       <div id="permissions_display" class="tab-pane">
         <%= form_for @generic_file, url: batch_edits_path, method: :put, remote: true, html: { id: "form_permissions", class: "ajax-form"} do |f| %>
            <%= hidden_field_tag('update_type', 'update') %>