sufia 4.0.0.beta3 → 4.0.0.beta4

data/app/controllers/{dashboard → my}/collections_controller.rb

@@ -1,5 +1,6 @@
-module Dashboard
-  class CollectionsController < ListsController
+module My
+  class CollectionsController < MyController
+
     self.solr_search_params_logic += [
       :show_only_collections
     ]

data/app/controllers/{dashboard → my}/files_controller.rb

@@ -1,5 +1,6 @@
-module Dashboard
-  class FilesController < ListsController
+module My
+  class FilesController < MyController
+
     self.solr_search_params_logic += [
       :show_only_files_deposited_by_current_user,
       :show_only_generic_files

data/app/controllers/{dashboard → my}/highlights_controller.rb

@@ -1,5 +1,6 @@
-module Dashboard
-  class HighlightsController < ListsController
+module My
+  class HighlightsController < MyController
+
     self.solr_search_params_logic += [
       :show_only_highlighted_files
     ]

data/app/controllers/{dashboard → my}/shares_controller.rb

@@ -1,5 +1,6 @@
-module Dashboard
-  class SharesController < ListsController
+module My
+  class SharesController < MyController
+
     self.solr_search_params_logic += [
       :show_only_shared_files,
     ]

data/app/controllers/my_controller.rb

@@ -0,0 +1,3 @@
+class MyController < ApplicationController
+  include Sufia::MyControllerBehavior
+end

data/app/controllers/single_use_links_controller.rb

@@ -1,8 +1,6 @@
 require 'sufia/single_use_error'
 
 class SingleUseLinksController < ApplicationController
-  include Sufia::Noid
-
   prepend_before_filter :normalize_identifier
   before_filter :load_asset
   before_filter :authenticate_user!

data/app/helpers/dashboard_helper.rb

@@ -0,0 +1,3 @@
+module DashboardHelper
+  include Sufia::DashboardHelperBehavior
+end

data/app/helpers/generic_file_helper.rb

@@ -8,6 +8,10 @@ module GenericFileHelper
     [:title, :creator, :tag, :rights].include?(key)
   end
 
+  def render_show_field_partial(key, locals)
+    render_show_field_partial_with_action('generic_files', key, locals)
+  end
+
   def render_edit_field_partial(key, locals)
     render_edit_field_partial_with_action('generic_files', key, locals)
   end
@@ -16,10 +20,6 @@ module GenericFileHelper
     render_edit_field_partial_with_action('batch_edit', key, locals)
   end
 
-  def render_show_field_partial(key, locals)
-    render_show_field_partial_with_action('generic_files', key, locals)
-  end
-
   def render_download_icon title = nil
     if title.nil?
       link_to download_image_tag, sufia.download_path(@generic_file.id), { target: "_blank", title: "Download the document", id: "file_download", data: { label: @generic_file.id } }

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -0,0 +1,25 @@
+module Sufia
+  module DashboardHelperBehavior
+
+    def render_recent_activity
+      if @activity.empty?
+        "User has no recent activity"
+      else
+        render partial: 'users/activity_log', locals: {events: @activity}
+      end
+    end
+
+    def render_recent_notifications
+      if @notifications.empty?
+        "User has no notifications"
+      else
+        render partial: "mailbox/notifications", locals: { messages: @notifications }
+      end
+    end
+
+    def on_the_dashboard?
+      params[:controller].match(/^dashboard|my/)
+    end
+
+  end
+end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -94,6 +94,11 @@ module Sufia
       end
     end
 
+    def link_to_telephone(user = nil)
+      @user ||= user
+      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
@@ -105,5 +110,44 @@ module Sufia
       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.
+    def current_search_parameters
+      if on_the_dashboard?
+        return nil
+      else
+        return params[:q]
+      end
+    end
+
+    # Depending on which page we're landed on, we'll need to set the appropriate action url for
+    # our search form.
+    def search_form_action
+      if on_the_dashboard?
+        search_action_for_dashboard
+      else  
+        catalog_index_path
+      end
+    end
+
+    private
+
+    def search_action_for_dashboard
+      case params[:controller]
+      when "my/files"
+        sufia.dashboard_files_path
+      when "my/collections"
+        sufia.dashboard_collections_path
+      when "my/shares"
+        sufia.dashboard_shares_path
+      when "my/highlights"
+        sufia.dashboard_highlights_path
+      else
+        sufia.dashboard_files_path
+      end    
+    end
+
   end
 end

data/app/jobs/content_delete_event_job.rb

@@ -1,8 +1,8 @@
 class ContentDeleteEventJob < EventJob
 
-
   def run
-    action = "User #{link_to_profile depositor_id} has deleted file '#{generic_file_id}'"
+    noid = Sufia::Noid.noidify(generic_file_id)
+    action = "User #{link_to_profile depositor_id} has deleted file '#{noid}'"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

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

@@ -1,6 +1,11 @@
 # -*- encoding : utf-8 -*-
 module Sufia
   module SolrDocumentBehavior
+    # Add a schema.org itemtype
+    def itemtype
+      Sufia.config.resource_types_to_schema[resource_type.first] || 'http://schema.org/CreativeWork'
+    end
+
     def title_or_label
       title || label
     end

data/app/views/_user_util_links.html.erb

@@ -1,15 +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"><i class="glyphicon glyphicon-user">&nbsp;</i><%= current_user.name %>
+      <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>
       <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('<i class="glyphicon glyphicon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, id: 'dashboard_nav_link' %></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-upload"></i> upload'), sufia.new_generic_file_path, id: 'upload_nav_link' %></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), id: 'upload_nav_link' %></li>
+        <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 class="divider"></li>
-        <li><%= link_to raw('<i class="glyphicon glyphicon-signout"></i> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
+        <li><%= link_to raw('<span class="glyphicon glyphicon-signout"></span> log out'), destroy_user_session_path, id: 'logout_nav_link' %></li>
       </ul>
     </div><!-- /.btn-group -->
 <% else %>

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

@@ -1,6 +1,6 @@
 <% if @response.total_pages > 1 %>
     <div class="pager">
-      <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: sufia %>
+      <%= paginate @response, outer_window: 2, theme: 'blacklight' %>
       <div class="clearfix"></div>
     </div><!-- /pager -->
 <% end %>

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

@@ -1,31 +1,59 @@
-<%# only display the q parameter if the controller is not the dashboard.  If they are in the dashboard controller, then the search is of the dashboard. %>
-    <%= form_tag catalog_index_path, method: :get, id: "search-form-header", class: "col-xs-12", role: "search" do %>
-      <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8, :owner)) %>
-      <%= hidden_field_tag 'owner', params[:owner] %>
+<%= form_tag search_form_action, method: :get, id: "search-form-header", role: "search" do %>
+  <%= render_hash_as_hidden_fields(params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <div class="container-fluid">
+    <div class="row">
 
-      <div class="row">
-        <div class="col-lg-10">
-          <div class="input-group">
-            <% q = params[:controller].match(/^dashboard/) ? nil : params[:q] %>
-            <%= text_field_tag :q, q, class: "q form-control", id: "search-field-header", placeholder: t('sufia.search.form.q.placeholder') %>
-            <%# if this label goes before the search field, it'll mess up the rounded corners %>
-            <label class="sr-only" for="search-field-header"><%= t('sufia.search.form.q.label') %></label>
+      <div class="col-xs-10">
+        <div class="input-group">
+          <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", 
+              placeholder: t("sufia.search.form.q.placeholder") %>
 
-            <div class="input-group-btn">
-              <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span data-search-element="label"><%= t('sufia.search.form.option.all.label_long') %></span> <span class="caret"></span></button>
-              <ul class="dropdown-menu pull-right">
-                <li><a href="#" data-search-option="all" data-search-label="<%= t('sufia.search.form.option.all.label_short') %>"><%= t('sufia.search.form.option.all.label_long') %></a></li>
-                <li><a href="#" data-search-option="mine" data-search-label="<%= t('sufia.search.form.option.mine.label_short') %>"><%= t('sufia.search.form.option.mine.label_long') %></a></li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <div class="col-lg-2">
-          <button type="submit" class="btn btn-primary" id="search-submit-header">
-            <i class="glyphicon glyphicon-search"></i> Go
-          </button>
-        </div>
-      </div>
-    <% end %>
+          <%# if this label goes before the search field, it"ll mess up the rounded corners %>
+          <label class="sr-only" for="search-field-header"><%= t("sufia.search.form.q.label") %></label>
 
-  
+          <div class="input-group-btn">
+            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+              <span data-search-element="label"><%= t("sufia.search.form.option.all.label_long") %></span>
+              <span class="caret"></span>
+            </button>
+
+            <ul class="dropdown-menu pull-right">
+              <li>
+                <%= link_to t("sufia.search.form.option.all.label_long"), "#",
+                    data: { "search-option" => catalog_index_path, "search-label" => t("sufia.search.form.option.all.label_short") } %>
+              </li>
+
+              <% if current_user %>
+                <li>
+                  <%= link_to t("sufia.search.form.option.my_files.label_long"), "#",
+                      data: { "search-option" => sufia.dashboard_files_path, "search-label" => t("sufia.search.form.option.my_files.label_short") } %>
+                </li>
+                <li>
+                  <%= link_to t("sufia.search.form.option.my_collections.label_long"), "#",
+                      data: { "search-option" => sufia.dashboard_collections_path, "search-label" => t("sufia.search.form.option.my_collections.label_short") } %>
+                </li>
+                <li>
+                  <%= link_to t("sufia.search.form.option.my_highlights.label_long"), "#",
+                      data: { "search-option" => sufia.dashboard_highlights_path, "search-label" => t("sufia.search.form.option.my_highlights.label_short") } %>
+                </li>
+                <li>
+                  <%= link_to t("sufia.search.form.option.my_shares.label_long"), "#",
+                      data: { "search-option" => sufia.dashboard_shares_path, "search-label" => t("sufia.search.form.option.my_shares.label_short") } %>
+                </li>
+              <% end %>
+
+            </ul>
+          </div><!-- /.input-group-btn -->
+        
+        </div><!-- /.input-group -->
+      </div><!-- /text field dropdown -->
+      
+      <div class="col-xs-2">
+        <button type="submit" class="btn btn-primary" id="search-submit-header">
+          <span class="glyphicon glyphicon-search"></span> Go
+        </button>
+      </div><!-- /.go -->
+    
+    </div><!-- /.row -->
+  </div><!-- /.container-fluid -->
+<% end %>

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

@@ -3,4 +3,4 @@
 <% @all_checked = false %>
 <% @max_batch_size = 100 %>
 <% @user = current_user %>
-<%= render partial:'dashboard/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
+<%= render partial: "my/_index_partials/default_group", locals: { docs: documents } %>

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

@@ -4,7 +4,7 @@
 <% @max_batch_size = 100 %>
 <% @user = current_user %>
 <% if params[:action] == "edit" %>
-  <%= render partial:'dashboard/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
+  <%= render partial:'my/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
 <% else %>
   <%= render partial:'catalog/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
 <% end %>

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

@@ -1,6 +1,7 @@
 <% @page_title = "Edit Collection #{display_title(@collection)} - #{application_name}" %>
 <%= render partial: 'generic_files/breadcrumbs', locals: {
-  include_file: false, generic_file: GenericFile.new(title: @collection.title) } %>
+      include_file: false, generic_file: GenericFile.new(title: @collection.title) 
+    } %>
 
 <h1>Edit Collection: <%= display_title(@collection) %></h1>
 
@@ -15,16 +16,12 @@
     </div><!-- /columns second -->
   </div> <!-- /columns two-b -->
 <% end %>
-  
 
-  <h2>Manage Items in this Collection</h2>
-  <%= render partial: 'search_collection_dashboard_form'%>
-  <%= render partial: 'dashboard/did_you_mean' %>
-  <%= render partial: 'dashboard/facet_selected' %>
-
-	<%= render 'dashboard/constraints', localized_params: params %>
-
-  <%= render 'collections/sort_and_per_page' %>
-  <%= render partial:'document_list', locals: { documents: @member_docs, document_list_format: "dashboard" } %>
+<h2>Manage Items in this Collection</h2>
+<%= render partial: 'search_collection_dashboard_form'%>
+<%= render partial: 'my/did_you_mean' %>
+<%= render partial: 'my/facet_selected' %>
+<%= render 'collections/sort_and_per_page' %>
+<%= render partial:'document_list', locals: { documents: @member_docs, document_list_format: "dashboard" } %>
 
 <%= render partial:'paginate' %>

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

@@ -8,13 +8,13 @@
 <h3><%=@collection.description%> </h3>
 
 <% unless has_collection_search_parameters? %>
-  <div class="row">
+  <div itemscope itemtype="http://schema.org/CollectionPage" class="row">
     <div class="col-xs-12 col-sm-4">
       <%= render partial: 'collections/media_display', locals: { generic_file: @collection } %>
     </div>
     <div class="col-xs-12 col-sm-8"><!-- class="column second"> -->
       <%= render partial: 'collections/show_actions' %>
-      <%= render partial: 'generic_files/show_descriptions', locals: { generic_file: @collection } %>
+      <%= render partial: 'collections/show_descriptions', locals: { generic_file: @collection } %>
     </div><!-- /columns second -->
   </div> <!-- /columns two-b -->
 <% end %>

data/app/views/collections/show_fields/_creator.html.erb

@@ -0,0 +1,11 @@
+        <tr>
+          <th>Creator</th>
+          <td>
+            <% @collection.creator.each do |creator| %>
+            <span itemprop="creator" itemscope itemtype="http://schema.org/Thing">
+              <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("properties__creator", :facetable)) %></span>
+            </span>
+            <br />
+            <% end %>
+          </td>
+        </tr>

data/app/views/collections/show_fields/_description.html.erb

@@ -0,0 +1,8 @@
+        <tr>
+          <th>Abstract or Summary</th>
+          <td>
+            <span itemprop="description">
+              <%= iconify_auto_link(@collection.description) %>
+            </span>
+          </td>
+        </tr>

data/app/views/collections/show_fields/_title.html.erb

@@ -0,0 +1,8 @@
+        <tr>
+          <th>Title</th>
+          <td>
+            <span itemprop="name">
+              <%= @collection.title %>
+            </span>
+          </td>
+        </tr>

data/app/views/dashboard/_index_partials/_stats.html.erb

@@ -0,0 +1,16 @@
+<h3><%= t("sufia.dashboard.stats.heading") %></h3>
+
+<table class="table table-condensed">
+  <tr>
+    <td><span class="label label-default"><%= number_of_deposits(@user) %></span></td>
+    <td><%= t("sufia.dashboard.stats.deposits") %></td>
+  </tr>
+  <tr>
+    <td><span class="label label-default"><%= @user.all_following.count %></span></td>
+    <td><%= t("sufia.dashboard.stats.following") %></td>
+  </tr>
+  <tr>
+    <td><span class="label label-default"><%= @user.followers.count %></span></td>
+    <td><%= t("sufia.dashboard.stats.followers") %></td>
+  </tr>
+</table>

data/app/views/dashboard/_index_partials/_user_info.html.erb

@@ -0,0 +1,18 @@
+<div class="row">
+  <div class="col-xs-12">
+    <h3><%= @user.name %></h3>
+    <h5><%= @user.title %></h5>
+    <h5><%= @user.department %></h5>
+    <h6><%= link_to_telephone %></h6>
+    <h6><%= @user.email %></h6>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-xs-6">
+    <%= link_to t("sufia.view_profile"), sufia.profile_path(@user), class: "btn btn-info" %>
+  </div>
+  <div class="col-xs-6">
+    <%= link_to t("sufia.edit_profile"), sufia.edit_profile_path(@user), class: "btn btn-info" %>
+  </div>
+</div>

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

@@ -1,21 +1,53 @@
-<% content_for :head do %>
-    <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(format: 'rss')), title: "RSS for results") %>
-    <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
+<%= content_for :heading do %>
+
+  <div class="col-xs-12 heading-row">
+    <div class="col-xs-3 heading-tile">
+      <h1><%= t("sufia.dashboard.title") %></h1> 
+    </div>
+    <div class="col-xs-9 heading-tile">
+      <h1><%= t("sufia.dashboard.greeting") + current_user.name %></h1>
+    </div>
+  </div>
+
+  <div class="col-xs-12 heading-row">
+    <div class="col-xs-4 heading-tile">
+      <span class="glyphicon glyphicon-open"></span>
+      <%= link_to t("sufia.dashboard.upload"), sufia.new_generic_file_path %>
+    </div>
+    <div class="col-xs-4 heading-tile">
+    <span class="glyphicon glyphicon-folder-open"></span>
+      <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path %>
+    </div>
+    <div class="col-xs-4 heading-tile">
+    <span class="glyphicon glyphicon-eye-open"></span>
+      <%= link_to t("sufia.dashboard.view_files"), sufia.dashboard_files_path  %>
+    </div>
+  </div>
+
+<% end %>
+
+<%= content_for :sidebar do %>
+  
+  <div class="row">
+    <div class="portal"><%= render partial: "dashboard/_index_partials/user_info" %></div>
+  </div>
+
+  <div class="row">
+    <div class="portal"><%= render partial: "dashboard/_index_partials/stats" %></div>
+  </div>
+
 <% end %>
 
-<ul class="nav nav-tabs">
-  <li class="<%= "active" if @selected_tab == :files %>">
-    <%= link_to "Files", sufia.dashboard_files_path %>
-  </li>
-  <li class="<%= "active" if @selected_tab == :collections %>">
-    <%= link_to "Collections", sufia.dashboard_collections_path %>
-  </li>
-  <li class="<%= "active" if @selected_tab == :highlighted %>">
-    <%= link_to "Highlighted", sufia.dashboard_highlights_path %>
-  </li>
-  <li class="<%= "active" if @selected_tab == :shared %>">
-    <%= link_to "Shared with Me", sufia.dashboard_shares_path %>
-  </li>
-</ul>
-
-Totally awesome new dashboard goes here!<br/>
+<div class="row">
+  <div class="portal">
+    <h3><%= t("sufia.dashboard.user_activity") %></h3>
+    <%= render_recent_activity %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="portal">
+    <h3><%= t("sufia.dashboard.user_notifications") %></h3>
+    <%= render_recent_notifications %>
+  </div>
+</div>