sufia 4.0.0.beta3 → 4.0.0.beta4

data/app/views/generic_files/_show_descriptions.html.erb

@@ -1,12 +1,13 @@
-<%# convert class variable to a local variable if the local hasn't been set %>
 <% generic_file = @generic_file unless generic_file  %>
 
-    <h2 class="non lower">Descriptions</h2>
-    <table class="table table-striped"><!-- class="verticalheadings"> -->
-      <tbody>
-        <% (generic_file.terms_for_display - [:resource_type]).each do |term| %>
-          <%= render_show_field_partial(term, generic_file: generic_file) %>
-        <% end %>
-      </tbody>
-    </table> <!-- /verticalheadings -->
-
+<h2 class="non lower">Descriptions</h2>
+<table class="table table-striped"><!-- class="verticalheadings"> -->
+  <tbody>
+  <% (generic_file.terms_for_display).each do |term| %>
+      <tr>
+        <th><%= get_label(term) %></th>
+        <td> <%= render_show_field_partial(term, generic_file: generic_file) %></td>
+      </tr>
+  <% end %>
+  </tbody>
+</table> <!-- /verticalheadings -->

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

@@ -16,7 +16,7 @@
     <%= render partial: 'generic_files/media_display' %>
     <%= render partial: 'show_actions' %>
   </div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12 col-sm-8">
+  <div itemscope itemtype="<%= @generic_file.itemtype %>" class="col-xs-12 col-sm-8">
     <h1><%= @generic_file %></h1>
     <%= render partial: 'show_descriptions' %>
     <%= render partial: 'show_details' %>

data/app/views/generic_files/show_fields/_based_near.html.erb

@@ -0,0 +1,7 @@
+<% @generic_file.based_near.each do |bn| %>
+  <span itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
+    <span itemprop="name"><%= link_to_facet(bn, Solrizer.solr_name("desc_metadata__based_near", :facetable)) %></span>
+  </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_contributor.html.erb

@@ -0,0 +1,7 @@
+<% @generic_file.contributor.each do |contributor| %>
+  <span itemprop="contributor" itemscope itemtype="http://schema.org/Thing">
+    <span itemprop="name"><%= link_to_field('contributor', contributor) %></span>
+  </span>
+  <br />
+<% end %>
+

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

@@ -0,0 +1,7 @@
+<% @generic_file.creator.each do |creator| %>
+        <span itemprop="creator" itemscope itemtype="http://schema.org/Thing">
+    <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("desc_metadata__creator", :facetable)) %></span>
+        </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_date_created.html.erb

@@ -0,0 +1,7 @@
+<% @generic_file.date_created.each do |dc| %>
+  <span itemprop="dateCreated">
+  <%= dc %>
+  </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_default.html.erb

@@ -1,12 +1,6 @@
-<% vals =  Array(generic_file[key]) %>
-<tr>
-  <th><%= get_label(key) %></th>
-  <td>
-    <% vals.each do |v| %>
-      <span itemprop="name">
-        <%= v %>
-      </span>
-      <br />
-    <% end %>
-  </td>
-</tr>
+<% Array(generic_file[key]).each do |v| %>
+  <span itemprop="#{key}" itemscope itemtype="http://schema.org/Thing">
+    <%= v %>
+  </span>
+  <br />
+<% end %>

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

@@ -0,0 +1,7 @@
+<% @generic_file.description.each do |desc| %>
+  <span itemprop="description">
+  <%= iconify_auto_link(desc) %>
+  </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_identifier.html.erb

@@ -0,0 +1,4 @@
+<% @generic_file.identifier.each do |id| %>
+  <%= id %><br />
+<% end %>
+

data/app/views/generic_files/show_fields/_language.html.erb

@@ -0,0 +1,4 @@
+<% @generic_file.language.each do |lang| %>
+  <span itemprop="inLanguage"><%= link_to_facet(lang, Solrizer.solr_name("desc_metadata__language", :facetable)) %></span><br />
+<% end %>
+

data/app/views/generic_files/show_fields/_publisher.html.erb

@@ -0,0 +1,7 @@
+<% @generic_file.publisher.each do |pub| %>
+  <span itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
+    <span itemprop="name"><%= link_to_facet(pub, Solrizer.solr_name("desc_metadata__publisher", :facetable)) %></span>
+        </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_related_url.html.erb

@@ -0,0 +1,6 @@
+<% @generic_file.related_url.each do |url| %>
+  <div style="word-break:break-all;">
+    <%= iconify_auto_link(url) %>
+  </div>
+<% end %>
+

data/app/views/generic_files/show_fields/_resource_type.html.erb

@@ -0,0 +1,4 @@
+<% @generic_file.resource_type.each do |rtype| %>
+  <%= link_to_facet(rtype, Solrizer.solr_name("desc_metadata__resource_type", :facetable)) %><br />
+<% end %>
+

data/app/views/generic_files/show_fields/_rights.html.erb

@@ -0,0 +1,4 @@
+<% @generic_file.rights.each do |r| %>
+  <%=link_to_field('rights',r, Sufia.config.cc_licenses_reverse[r])%> <%= iconify_auto_link(r,false) %><br />
+<% end %>
+

data/app/views/generic_files/show_fields/_subject.html.erb

@@ -0,0 +1,7 @@
+<% @generic_file.subject.each do |sub| %>
+  <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
+    <span itemprop="name"><%= link_to_facet(sub, Solrizer.solr_name("desc_metadata__subject", :facetable)) %></span>
+  </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/show_fields/_tag.html.erb

@@ -0,0 +1,4 @@
+<% @generic_file.tag.each do |t| %>
+  <span itemprop="keywords"><%= link_to_facet(t, Solrizer.solr_name("desc_metadata__tag", :facetable)) %></span><br />
+<% end %>
+

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

@@ -0,0 +1,7 @@
+<% @generic_file.title.each do |title| %>
+  <span itemprop="name">
+  <%= title %>
+  </span>
+  <br />
+<% end %>
+

data/app/views/generic_files/upload/_form_fields.html.erb

@@ -6,7 +6,7 @@
       <%= render partial: 'generic_files/upload/tos_checkbox' %>
         <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="row fileupload-buttonbar">
-            <div class="span70">
+            <div class="col-md-7">
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span class="btn btn-success fileinput-button">
                     <i class="icon-plus icon-white"></i>
@@ -32,10 +32,10 @@
                     <span>Cancel upload</span>
                 </button>
             </div>
-            <div class="span50">
+            <div class="col-md-5 fileupload-progress">
                 <!-- The global progress bar -->
-                <div class="progress progress-success progress-striped active fade">
-                    <div class="bar" style="width:0%;"></div>
+                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">
+                    <div class="progress-bar progress-bar-success" style="width:0%;"></div>
                 </div>
             </div>
         </div>
@@ -44,4 +44,3 @@
         <br />
         <!-- The table listing the files available for upload/download -->
         <table id="file-table" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
-

data/app/views/generic_files/upload/_script_templates.html.erb

@@ -15,7 +15,7 @@
             <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
         {% } else if (o.files.valid && !i) { %}
             <td>
-                <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
+                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
             </td>
             <td class="start">{% if (!o.options.autoUpload) { %}
               <button class="btn btn-primary hide">
@@ -58,4 +58,3 @@
     </tr>
 {% } %}
 </script>
-

data/app/views/layouts/sufia-dashboard.html.erb

@@ -1,43 +1,29 @@
 <!DOCTYPE html>
 <html>
-  <head>
-
-    <%= render partial: "layouts/head_tag_content"%>
-  </head>
-
+<head><%= render partial: "layouts/head_tag_content" %></head>
 <body> 
-<div  id="wrapper"> 
+<div id="wrapper"> 
   <div class="container-fluid">
     <div id="page-positioner">
-      <%= render partial: '/masthead' %>
-      <%= render partial: '/controls' %>
-      <%= render partial: '/flash_msg' %>
+
+      <%= render partial: "/masthead" %>
+      <%= render partial: "/controls" %>
+      <%= render partial: "/flash_msg" %>
+      
       <div id="content-wrapper">
         <div class="container-fluid">
-        <div id="content-header" class="row">
-          <div class="col-xs-12 col-sm-3">
-            <%= link_to '<i class="glyphicon glyphicon-upload"></i> Upload File(s)'.html_safe, sufia.new_generic_file_path, {class: "btn btn-primary"}  %><br />
-          </div>
-          <div class="col-xs-12 col-sm-9">
-            <div class="row">
-              <%= render partial: 'heading' %>
-              <%= render partial: 'search_form' %>
-            </div>
-          </div>
+          <div id="content-header" class="row"><%= yield :heading %></div>
         </div>
-        </div><!-- /.container-fluid -->
         <div class="container-fluid">
-        <div id="content" class="row">
-          <div class="col-xs-12 col-sm-3">
-            <%= yield :sidebar %>
-          </div>
-          <div class="col-xs-12 col-sm-9">
-            <%= yield %>
+          <div id="content" class="row">
+            <div class="col-xs-12 col-sm-3"><%= yield :sidebar %></div>
+            <div class="col-xs-12 col-sm-9"><%= yield %></div>
           </div>
-        </div><!-- /#content -->
-        </div><!-- /.container-fluid -->
-      </div><!-- /#content-wrapper -->
-      <%= render partial: '/footer' %>
+        </div>
+      </div>
+      
+      <%= render partial: "/footer" %>
+    
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->

data/app/views/mailbox/_notifications.html.erb

@@ -0,0 +1,21 @@
+<table class="table table-striped"> 
+  <thead> 
+    <tr>
+      <th>Date</th>
+      <th>Subject</th>
+      <th>Message</th> 
+    </tr>
+  </thead> 
+  <tbody> 
+    <% messages.each do |msg| %> 
+      <%= content_tag :tr, class: cycle("","zebra") do %>
+        <td><%= (time_ago_in_words(msg.last_message.created_at) + " ago") %></td>
+        <td><%= msg.last_message.subject.html_safe %></td> 
+        <td><%= msg.last_message.body.html_safe %></td> 
+        <td>
+          <%= link_to raw('<i class="icon-trash icon-large"></i>'), sufia.notification_path(msg.id), class: "itemicon itemtrash", title: "Delete File", method: :delete %>
+        </td>
+      <% end %>
+    <% end %> 
+  </tbody> 
+</table>

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

@@ -3,26 +3,5 @@
     sufia.delete_all_notifications_path, method: :delete, class: 'btn',
     title: 'Delete all user notifications' %>
 <div id="Data">
-    <table class="table table-striped"> 
-        <thead> 
-            <tr>
-                <th>Date</th>
-                <th>Subject</th>
-                <th>Message</th> 
-            </tr> 
-        </thead> 
-        <tbody> 
-            <% @messages.each do |msg| %> 
-                <tr class="<%= cycle("","zebra") %>">
-                   <td><%= time_ago_in_words(msg.last_message.created_at) %> ago </td>
-                   <td><%= msg.last_message.subject.html_safe  %></td> 
-                   <td><%= msg.last_message.body.html_safe  %></td> 
-                   <td><%= link_to raw('<i class="icon-trash icon-large"></i>'),
-                     sufia.notification_path(msg.id), class: 'itemicon itemtrash',
-                     title: 'Delete File', method: :delete %>
-                   </td>
-                </tr> 
-            <% end %> 
-        </tbody> 
-    </table> 
-</div> 
+  <%= render partial: "mailbox/notifications", locals: { messages: @messages } %>   
+</div>

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

@@ -0,0 +1,4 @@
+<% # container for all documents in index view -%>
+<div id="documents" class="clear">
+  <%= render partial: 'my/_index_partials/default_group', locals: {docs: @response.docs.map { |x| SolrDocument.new(x) }, facet_value: nil} %>
+</div>

data/app/views/{dashboard → my}/_index_partials/_default_group.html.erb

@@ -16,9 +16,9 @@
   <% docs.each_with_index do |document,counter| %>
     <% case document.hydra_model %>
     <% when "GenericFile" %>
-      <%= render partial: 'dashboard/_index_partials/list_files', locals: {document: document, counter: counter} %>
+      <%= render partial: 'my/_index_partials/list_files', locals: {document: document, counter: counter} %>
     <% when "Collection" %>
-      <%= render partial: 'dashboard/_index_partials/list_collections', locals: {document: document, counter: counter} %>
+      <%= render partial: 'my/_index_partials/list_collections', locals: {document: document, counter: counter} %>
     <% else %>
       <tr><td colspan='6'><%= document.hydra_model %> : <%= document.id %></td></tr>
     <% end %>

data/app/views/my/_scripts.js.erb

@@ -0,0 +1,11 @@
+initialize_audio();
+
+// hide or show the batch update buttons on page startup
+window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
+window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
+window.result_set_size = <%= @result_set_size %>;
+window.document_list_count = <%= @document_list.count %>;
+toggleButtons(<%= !@empty_batch %>);
+
+// initialize hydra batch edit and set up select all button toggle after checkboxes have been created
+$('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});

data/app/views/{dashboard/lists → my}/index.html.erb

@@ -3,20 +3,8 @@
     <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(format: 'atom')), title: "Atom for results") %>
 <% end %>
 
-<% content_for :local_js do %>
-
-    initialize_audio();
-
-    // hide or show the batch update buttons on page startup
-    window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
-    window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
-    window.result_set_size = <%= @result_set_size %>;
-    window.document_list_count = <%= @document_list.count %>;
-    toggleButtons(<%= !@empty_batch %>);
-
-    // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
-    $('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
-
+<%= javascript_tag do %>
+  <%= render partial: 'scripts', formats: [:js] %>
 <% end %>
 
 <% @page_title = application_name + " Dashboard" %>
@@ -44,16 +32,12 @@
 <%= render partial: 'did_you_mean' %>
 <%= render partial: 'facet_selected' %>
 
-<%= render 'constraints', localized_params: params %>
-
 <%= render 'sort_and_per_page' %>
 
-<%= render partial: 'dashboard/document_list' %>
+<%= render partial: 'document_list' %>
+
 <% content_for :sidebar do %>
     <%= render partial: 'facets' %>
 <% end %>
 
 <%= render 'results_pagination' %>
-<% if @events.present? %>
-    <%= render partial: 'users/activity_log', locals: {events: @events} %>
-<% end %>

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

@@ -53,7 +53,7 @@
 
   <% if user.telephone %>
     <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>
+    <dd class="col-xs-7"><%= link_to_telephone(user) %></dd>
   <% end %>
 
 </dl>

data/config/initializers/sufia_events.rb

@@ -1,3 +1,20 @@
-Sufia.config.after_create_content = lambda {|generic_file, user|
+Sufia.config.after_create_content = lambda { |generic_file, user|
   Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, user.user_key))
-}
+}
+
+Sufia.config.after_revert_content = lambda { |generic_file, user, revision|
+  Sufia.queue.push(ContentRestoredVersionEventJob.new(generic_file.pid, user.user_key, revision))
+}
+
+Sufia.config.after_update_content = lambda { |generic_file, user|
+  Sufia.queue.push(ContentNewVersionEventJob.new(generic_file.pid, user.user_key))
+}
+
+Sufia.config.after_update_metadata = lambda { |generic_file, user|
+  Sufia.queue.push(ContentUpdateEventJob.new(generic_file.pid, user.user_key))
+}
+
+Sufia.config.after_destroy = lambda { |pid, user|
+  Sufia.queue.push(ContentDeleteEventJob.new(pid, user.user_key))
+}
+