sufia 0.0.3 → 0.0.4

data/app/assets/stylesheets/{sufia.css → sufia.css.scss}

@@ -1,10 +1,13 @@
 /* ...
  *= require_self
  *= require bootstrap.min
- *= require font-awesome
  *= require scholarsphere-bootstrap
  *= require blacklight_more_facets
  *= require batch_edit
  *= require generic_files
  *= require video-js
+ *= require jquery-ui
 */
+
+@import 'font-awesome';
+

data/app/controllers/directory_controller.rb

@@ -13,27 +13,33 @@
 # limitations under the License.
 
 class DirectoryController < ApplicationController
-  include Hydra::Controller::ControllerBehavior
 
-  # returns true if the user exists and false otherwise
+  # Stub method.  Override this in your application if you want directory lookups
   def user
-    render :json => User.directory_attributes(params[:uid])
+    #render :json => User.directory_attributes(params[:uid])
+    render :json => "" 
   end
 
+  # Stub method.  Override this in your application if you want directory lookups
   def user_attribute
-    if params[:attribute] == "groups"
-      res = User.groups(params[:uid])
-    else
-      res = User.directory_attributes(params[:uid], params[:attribute])
-    end
-    render :json => res
+    # if params[:attribute] == "groups"
+    #   res = User.groups(params[:uid])
+    # else
+    #   res = User.directory_attributes(params[:uid], params[:attribute])
+    # end
+    # render :json => res
+    render :json => "" 
   end
 
+  # Stub method.  Override this in your application if you want directory lookups
   def user_groups
-    render :json => User.groups(params[:uid])
+    # render :json => User.groups(params[:uid])
+    render :json => [] 
   end
 
+  # Stub method.  Override this in your application if you want directory lookups
   def group
-    Group.exists?(params[:cn])
+    #render :json => Group.exists?(params[:cn])
+    render :json => false 
   end
 end

data/app/controllers/users_controller.rb

@@ -21,9 +21,11 @@ class UsersController < ApplicationController
   def index
     sort_val = get_sort
     query = params[:uq].blank? ? nil : "%"+params[:uq].downcase+"%"
-    @users = User.where("(login like lower(?) OR display_name like lower(?)) and ldap_available = true ",query,query).paginate(:page => params[:page], 
-                           :per_page => 10, :order => sort_val) unless query.blank?   
-    @users = User.where("ldap_available = true").paginate(:page => params[:page], :per_page => 10, :order => sort_val) if query.blank?
+    if query.blank?
+      @users = User.order(sort_val).page(params[:page]).per(10) if query.blank? 
+    else
+      @users = User.where("(login like lower(?) OR display_name like lower(?))",query,query).order(sort_val).page(params[:page]).per(10)
+    end
   end
 
   # Display user profile

data/app/models/datastreams/file_content_datastream.rb

@@ -12,58 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'open3'
 class FileContentDatastream < ActiveFedora::Datastream
-  include Open3
-
-  def to_tempfile &block
-    return if content.nil?
-    f = Tempfile.new("#{pid}-#{dsVersionID}")
-    f.binmode
-    if content.respond_to? :read
-      f.write(content.read)
-    else
-      f.write(content)
-    end
-    f.close
-    content.rewind if content.respond_to? :rewind
-    yield(f)
-    f.unlink
-
-  end
-
-  def extract_metadata
-    out = nil
-    to_tempfile do |f|
-      command = "#{fits_path} -i #{f.path}"
-      stdin, stdout, stderr = popen3(command)
-      stdin.close
-      out = stdout.read
-      stdout.close
-      err = stderr.read
-      stderr.close
-      raise "Unable to execute command \"#{command}\"\n#{err}" unless err.empty? or err.include? "Error parsing Exiftool XML Output"
-    end
-    out
-  end
-
-  # TODO: All the version functionality here + what's in the GF model should probably move into a mixin
-  def get_version(version_id)
-    self.versions.select { |v| v.versionID == version_id}.first
-  end
-
-  def latest_version
-    self.versions.first
-  end
-
-  def version_committer(version)
-    vc = VersionCommitter.where(:obj_id => version.pid,
-                                :datastream_id => version.dsid,
-                                :version_id => version.versionID)
-    return vc.empty? ? nil : vc.first.committer_login
-  end
-
-  def fits_path
-    Sufia::Engine.config.fits_path
-  end
+  include Sufia::FileContent::ExtractMetadata
+  include Sufia::FileContent::Versions
 end

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

@@ -38,7 +38,6 @@ limitations under the License.
   </div>
 </div>
 
-<%= hidden_field_tag('generic_file[terms_of_service]', '1') %>  
 <%= hidden_field_tag(:extra_description_count, "1") %>
 <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>

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

@@ -22,7 +22,6 @@
   </div>
 </div>
 
-<%= hidden_field_tag('generic_file[terms_of_service]', '1') %>  
 <%= hidden_field_tag(:extra_description_count, "1") %>
 <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>

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

@@ -276,7 +276,6 @@ h2 small {
     
                   <div id="collapse_<%=key%>" class="accordion-body collapse scrolly">
                     <%= form_for @generic_file, :url=>batch_edits_path, :method=>:put, :remote => true, :html => { :id=>"form_"+key, :class=>"ajax-form"} do |f| %>
-                        <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
                         <%= hidden_field_tag('update_type', 'update') %>
                         <%= hidden_field_tag('key', key) %>
                         <%= render :partial => "generic_files/field_form", :locals => { :generic_file => @show_file, :f =>f, :render_req => false, :key => key } %>

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

@@ -1,44 +1,25 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-  <% if @pagination.has_previous? || @pagination.has_next? %>
-    <div class="prev_next_links">
-      <% if @pagination.has_previous? -%>        
-        <%= link_to('« Previous', sufia.catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page)  %>
-      <% else -%>
-        <span class="disabled ui-state-active prev_page">« Previous</span> 
-      <% end -%>
-      
-      <% if @pagination.has_next? -%>
-        <%= link_to('Next »', sufia.catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
-      <% else -%>
-        <span class="disabled ui-state-active next_page">Next »</span> 
-      <% end -%>
-               
+<!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_facet_pagination.html.erb
+ It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
+-->
+    <div class="prev_next_links btn-group pull-left">
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+       <span class="disabled btn"><%= raw(t('views.pagination.previous')) %></span>
+     <% end %>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+       
+       <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
+      <% end %>
+     
     </div>
-  <% end %>
-
-  <div class="sort_options">
+ 
+  <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>
-      <span class="disabled az">A-Z Sort</span><%= link_to_unless(@pagination.sort == 'count', "Numerical Sort", 
-        sufia.url_for(@pagination.params_for_resort_url('count', params)), :class => "sort_change numeric") %>
+      <span class="active az btn"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'), 
+        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('count', params).symbolize_keys.merge(:only_path=>true)), 
+        :class => "sort_change numeric btn") %>
     <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to("A-Z Sort", sufia.url_for(@pagination.params_for_resort_url('index', params)), 
-          :class => "sort_change az") %><span class="disabled numeric">Numerical Sort</span>
+      <%=  link_to(t('blacklight.search.facets.sort.index'),
+        Sufia::Engine.routes.url_for(@pagination.params_for_resort_url('index', params).symbolize_keys.merge(:only_path=>true)), 
+        :class => "sort_change az btn") %><span class="active numeric btn"><%= t('blacklight.search.facets.sort.count') %></span>
     <% end -%>    
   </div>
-
-

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

@@ -18,7 +18,7 @@ limitations under the License.
 <%- width = 36 if width.blank? -%>
 <% if (document['mime_type_t']) %>
   <% if !(document['mime_type_t'] & ['image/jpeg', 'image/png', 'image/bmp', 'image/gif', 'image/jpg']).empty? %>
-    <%= link_to image_tag(download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width, :height=>height}), sufia.generic_file_path(document[:noid_s].first) %>
+    <%= link_to image_tag(sufia.download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width, :height=>height}), sufia.generic_file_path(document[:noid_s].first) %>
   <% elsif !(document['mime_type_t'] & ['application/pdf']).empty? %>
     <%= link_to image_tag(sufia.download_path(document["id"], {:datastream_id => 'thumbnail'}), {:width=>width,:height=>height}),sufia.generic_file_path(document[:noid_s].first) %>
   <% elsif !(document['mime_type_t'] & ['video/mp4']).empty? %>

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

@@ -1,42 +1,37 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
+<!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/facet.html.erb
+ It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
+-->
+ <% sidebar_items << capture do %>
+  <p><%= link_back_to_catalog %></p>
+<% end %>
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
+<div class="facet_pagination top">
+  <%= render :partial=>'facet_pagination' %>
+</div>
 
-<div class="facet_extended_list">
-  <% sidebar_items << capture do %>
-  <p><%= link_back_to_catalog %></p>
-  <% end %>
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3><%= facet_field_labels[params[:id]] %></h3>
+</div>
+<div class="modal-body">
+  <div class="facet_extended_list">
 
-  <div class="facet_pagination top">
-    <%= render :partial=>'facet_pagination' %>
+    <ul class="facet_extended_list">
+      <% @pagination.items.each do |item| %>
+        <li>
+          <% if facet_in_params?( params[:id], item.value ) %>              
+            <%= render_selected_facet_value(params[:id], item) %>              
+          <% else %>              
+            <%= render_facet_value(params[:id], item) %>              
+          <% end -%>
+        </li>
+      <% end %>
+    </ul>
   </div>
+</div>
   
-  <h3><%= facet_field_labels[params[:id]] %></h3>
-  
-  <ul class="facet_extended_list">
-    <% @pagination.items.each do |item| %>
-      <li>
-        <% if facet_in_params?( params[:id], item.value ) %>              
-          <%= render_selected_facet_value(params[:id], item) %>              
-        <% else %>              
-          <%= render_facet_value(params[:id], item) %>              
-        <% end -%>
-      </li>
-    <% end %>
-  </ul>
-  
+<div class="modal-footer">
+
   <div class="facet_pagination bottom">
     <%= render :partial=>'facet_pagination' %>
   </div>

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

@@ -15,7 +15,6 @@ limitations under the License.
 %>
 
 <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
-<%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
 <%= hidden_field_tag('redirect_tab', 'descriptions') %>
 <div id="descriptions_display">
   <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>

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

@@ -0,0 +1,5 @@
+    <p>
+    The list of groups in the drop-down marked &quot;Select a group&quot; is a list of User Managed Groups that you are a member of, and are managed by <%=t('sufia.institution_name') %>'s ITS department.  You may select a specific group and assign an access
+    level for a file within <%=t('sufia.product_name') %>, similarly to adding user access levels.  However, management of these groups and their membership is handled centrally at <a href="http://umg.its.psu.edu" target="_blank">umg.its.psu.edu</a>.  
+    </p>
+

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

@@ -0,0 +1,135 @@
+<div class="alert">
+  <strong>Note:</strong> You must agree to <a href='/agreement/' target="_blank"><%= t('sufia.deposit_agreement') %></a> before starting your upload.
+</div>
+
+<div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
+  <%=sufia.batch_edit_path(@batch_noid)%>
+</div>
+
+<div id="upload_tooltip"><%= t('sufia.upload_tooltip') %></div>
+
+<div class="alert alert-info hide" id="success">
+  You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
+  <p>
+  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
+  </p>
+</div>
+
+<div class="alert hide" id="fail">
+  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', sufia.new_generic_file_path %>
+</div>
+
+<div class="alert hide" id="partial_fail">
+  One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
+  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
+</div>
+
+<div class="alert hide" id="errmsg"> </div>
+
+    <!-- The file upload form used as target for the file upload widget -->
+    <%= form_for(@generic_file, :url => sufia.generic_files_path, :html => {:multipart => true, :class => 'form-horizontal well', :id => 'fileupload'}) do |f| %>
+      <%= hidden_field_tag(:total_upload_size, 0) %>
+      <%= hidden_field_tag(:relative_path) %>
+      <%= hidden_field_tag(:batch_id, @batch_noid) %>
+      <label class="checkbox">
+      <%= check_box_tag 'terms_of_service' %> I have read and do agree
+      to <%= link_to t('sufia.deposit_agreement'),
+        '/agreement/', :target => "_blank" %>.
+    </label>
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+        <div class="row fileupload-buttonbar">
+            <div class="span70">
+                <!-- 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>
+                    <span>Select files...</span>
+                    <input type="file" name="files[]" multiple />
+                </span>
+                <% ua = request.env['HTTP_USER_AGENT'] %>
+                <% if !!(ua =~ /Chrome/) %>
+                <span class="btn btn-success fileinput-button">
+                    <i class="icon-plus icon-white"></i>
+                    <span>Select folder...</span>
+                    <input type="file" name="files[]" directory webkitdirectory mozdirectory />
+                </span>
+                <% end %>
+                <span id="main_upload_start_span">
+                <button type="submit" class="btn btn-primary start" id='main_upload_start'>
+                    <i class="icon-upload icon-white"></i>
+                    <span>Start upload</span>
+                </button>
+                </span>
+                <button type="reset" class="btn btn-warning cancel">
+                    <i class="icon-ban-circle icon-white"></i>
+                    <span>Cancel upload</span>
+                </button>
+            </div>
+            <div class="span50">
+                <!-- The global progress bar -->
+                <div class="progress progress-success progress-striped active fade">
+                    <div class="bar" style="width:0%;"></div>
+                </div>
+            </div>
+        </div>
+        <!-- The loading indicator is shown during image processing -->
+        <div class="fileupload-loading"></div>
+        <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>
+  <% end %>
+
+<!-- The template to display files available for upload -->
+<script id="template-upload" type="text/x-jquery-tmpl">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+
+    <tr class="template-upload fade">
+        <td class="preview"><span class="fade"></span></td>
+        <td class="name"><span>{%=file.name%}</span></td>
+        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+        {% if (file.error) { %}
+            <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>
+            </td>
+            <td class="start">{% if (!o.options.autoUpload) { %}
+              <button class="btn btn-primary hide">
+                    <i class="icon-upload icon-white"></i>
+                    <span>{%=locale.fileupload.start%}</span>
+              </button>
+            {% } %}</td>
+        {% } else { %}
+            <td colspan="2"></td>
+        {% } %}
+        <td class="cancel">{% if (!i) { %}
+            <button class="btn btn-warning">
+                <i class="icon-ban-circle icon-white"></i>
+                <span>{%=locale.fileupload.cancel%}</span>
+            </button>
+        {% } %}</td>
+    </tr>
+{% } %}
+</script>
+<!-- The template to display files available for download -->
+<script id="template-download" type="text/x-jquery-tmpl">
+{% for (var i=0, file; file=o.files[i]; i++) { %}
+    <tr class="template-download fade">
+        {% if (file.error) { %}
+            <td><span></span></td>
+            <td class="name"><span>{%=file.name%}</span></td>
+            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
+        {% } else { %}
+            <td class="preview">
+              {% if (file.thumbnail_url) { %} <span class="label label-success">Success</span> {% } %}
+            </td>
+            <td class="name">
+                {%=file.name%}
+                <!--a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}" target="_blank">{%=file.name%}</a-->
+            </td>
+            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+            <td colspan="2"></td>
+        {% } %}
+    </tr>
+{% } %}
+</script>