sufia 0.1.0 → 1.0.0

data/app/models/datastreams/properties_datastream.rb

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 # properties datastream: catch-all for info that didn't have another home.  Particularly depositor.
-class PropertiesDatastream < ActiveFedora::NokogiriDatastream
+class PropertiesDatastream < ActiveFedora::OmDatastream
   set_terminology do |t|
     t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil) 
     # This is where we put the user id of the object depositor -- impacts permissions/access controls
-    t.depositor :xmlns => '', :namespace_prefix => nil, :index_as=>[:searchable]
+    t.depositor :xmlns => '', :namespace_prefix => nil, :index_as=>[:stored_searchable]
     # This is where we put the relative path of the file if submitted as a folder
     t.relative_path :xmlns => '', :namespace_prefix => nil
   end

data/app/views/_user_util_links.html.erb

@@ -13,14 +13,14 @@ 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 current_user %>
+<% if user_signed_in? %>
    <%= render :partial => 'users/notify_link' %>
   <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
   <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
   <ul class="dropdown-menu">
       <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link'  %></li>
       <li><%= link_to raw('<i class="icon-upload-alt"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link'  %></li>
-      <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user.user_key), :id => 'upload_nav_link'  %></li>
+      <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), :id => 'upload_nav_link'  %></li>
       <li class="divider"></li>
       <li><%= link_to raw('<i class="icon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
   </ul>

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

@@ -0,0 +1,82 @@
+<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.
+  </p>
+  <div class="row">
+    <div class="span60">
+      <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
+        <div class="control-group">
+          <%= f.label :title, "<span class='error'>*</span> Title #{index+1}".html_safe, :class=>"control-label" %> 
+          <div class="controls" id="additional_title_clone">
+            <%= f.text_field :title, :name=>"title[#{gen_f.id}][]", :value=>gen_f.label, :required=> true %>  
+            <%= help_icon(:title) %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="span40">
+      <!-- put metadata about file being edited here -->
+    </div>
+  </div>
+</div>
+
+<%= 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>
+  <div class="well">
+    <div class="control-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>
+    </div>
+
+    <div class="control-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="accessible-hidden">add another Tag</span></button>
+          &nbsp;
+          <%= help_icon(:tag) %>
+      </div>
+      <div id="additional_tag_elements"></div>
+    </div>
+
+    <div class="control-group">
+      <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, :class=>"control-label" %>
+      <div class="controls" 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="accessible-hidden">add another Creator</span></button>
+          &nbsp;
+          <%= help_icon(:creator) %>
+      </div>
+      <div id="additional_creator_elements"></div>
+    </div>
+
+    <div class="control-group">
+      <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, :class=>"control-label" %>
+      <div class="controls" 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="accessible-hidden">add another Rights</span></button>
+        &nbsp;
+        <%= help_icon(:rights) %>
+        <%= render :partial => "generic_files/rights_modal" %>
+        
+      </div>
+      <div id="additional_rights_elements"></div>
+    </div>
+
+    <div class="row" id="add_descriptions">
+      <a href="#" id="add_descriptions" >Add More Description Types</a>
+    </div>
+      <!-- hidden on initial load -->
+
+    <%= render partial: 'more_metadata', locals: {f:f} %>
+
+  </div><!-- /well -->
+</div> <!-- /row /span6 -->

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

@@ -0,0 +1,6 @@
+    <div class="hide" 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 %>
+    </div> <!-- /more_descriptions -->
+

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

@@ -14,13 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% content_for :local_css do %>
-  label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
-<% end %> 
-
-
-  
-
 <% content_for :local_js do %>
    if (navigator.userAgent.match("MSIE")){
       $("#new_generic_file").validate();
@@ -52,7 +45,7 @@ function confirmExit(){
 </div>
 <%= form_for([@batch, @generic_file], :url => sufia.batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
 
-<%= render :partial => 'batch_edits/metadata', :formats => [:html], :locals => {:f => f, :gf => @generic_file} %>
+<%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f} %>
 
 <%= render :partial => 'generic_files/permission', :formats => [:html], :locals => { :gf => @generic_file, :batch => @batch } %>
 

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

@@ -1,160 +1,3 @@
-<script type = "text/javascript"> 
-
-  function toggleState (obj, state) {
-    if (state == 'on'){
-      obj.attr("data-state", 'on');
-      obj.find('a i').addClass('icon-ok');
-    }else {
-      obj.attr("data-state", 'off');
-      obj.find('a i').removeClass('icon-ok');
-    }
-
-  }
-
-  function check_all_page(e) {
-     var checked = $("#check_all")[0]['checked'];
-
-     // only check the current page
-     var timeout = 0;
-     var timeoutInc = 60;
-     
-     $("input[type='checkbox'].batch_toggle").each(function(index, value) {
-        // check each individual box
-        var ck = value['checked'];
-        // not the same state click the box
-        if ((checked && !ck) || (!checked && ck)){
-           window.parent.setTimeout(function(){value.click();},timeout);
-        }
-        timeout+=timeoutInc; 
-     });
-     window.parent.setTimeout(toggleButtons,timeout+500);     
-     $("#check_all").attr('checked', checked);
-  }
-
-  function clear_batch () {
-    var url = '<%=clear_batch_edits_path %>';
-    var clearState = $.ajax({
-      headers: {           
-           Accept : "application/javascript",          
-       },      
-      type: 'PUT',
-      url: url,
-      async: false,
-    });
-
-  }
-  
-  function set_all_checkboxes(checked){
-    $("input[type='checkbox'].batch_toggle").each(function(){
-      $(this).attr('checked', checked);   
-      
-      // make sure the form is set correctly
-      form = $($(this).parent()[0]);      
-      if (checked) {
-        form.find("input[name=_method]").val("delete");
-
-      } else {
-        form.find("input[name=_method]").val("put");
-      }
-    });
-    
-  }
- 
-
-$(document).ready(function() { 
-
-  $("[data-behavior='batch-edit-select-page']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
-    e.preventDefault();
-    $("#check_all").attr('checked', true);
-    toggleState($(this),'on');    
-    toggleState($("[data-behavior='batch-edit-select-all']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-none']"),'off');    
-    clear_batch();
-    
-    // uncheck everything on the current page
-    set_all_checkboxes(false);
-    
-    // check everything on the current page
-    check_all_page();
-    
-  });
-
-  $("[data-behavior='batch-edit-select-all']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
-    e.preventDefault();
-    $("#check_all").attr('checked', true);
-    toggleState($(this), 'on');    
-    toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-none']"),'off');    
-    var url =  '<%=all_batch_edits_path %>';
-    var clearState = $.ajax({
-      headers: {           
-           Accept : "application/javascript",          
-       },      
-      type: 'PUT',
-      url: url,
-      async: false,
-    });
-    
-    // show that update on the local screen
-    set_all_checkboxes(true)
-    $("body").css("cursor", "auto");
-    toggleButtons(true);
-  });
-
-  $("[data-behavior='batch-edit-select-none']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
-    e.preventDefault();
-    $("#check_all").attr('checked', false);
-    toggleState($(this), 'on');    
-    toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-all']"),'off');  
-    clear_batch();  
-
-    // show that update on the local screen
-    set_all_checkboxes(false)
-    $("body").css("cursor", "auto");
-    toggleButtons(false, true);
-  });
-
-  
-  
-  // check all buttons
-  $("#check_all").bind('click', check_all_page);
-  
-
-  $(".batch_toggle").bind('click', function(e) {
-
-      // if we are unchecking a box remove the group selections
-      if ($(e.currentTarget).attr('checked') != "checked") {
-        toggleState($("[data-behavior='batch-edit-select-all']"),'off');    
-        toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-        toggleState($("[data-behavior='batch-edit-select-none']"),'off');
-        $("#check_all").attr('checked', false);
-      }
-      // checking a single box see if we need to turn on one of the groups    
-      else {
-        var n = $(".batch_toggle:checked").length;
-        if (n == <%= @document_list.count %>) {
-            $("#check_all").attr('checked', true);
-            if (!<%=@batch_part_on_other_page%>) {
-              toggleState($("[data-behavior='batch-edit-select-page']"),'on');    
-            } else if ((n + <%=@batch_size_on_other_page%>) == <%=@result_set_size%>){
-              toggleState($("[data-behavior='batch-edit-select-all']"),'on');    
-            }
-        } else {            
-            if ((n + <%=@batch_size_on_other_page%>) == 0){
-              toggleState($("[data-behavior='batch-edit-select-none']"),'on');                 
-            }
-        }
-      }
-    });
-  
- 
-}); 
- 
-</script>
   <% 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) %>

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

@@ -204,35 +204,6 @@ $("a[rel=popover]").popover();
 
 <% end %>
 
-<% content_for :local_css do %>
-    #upload_tooltip { background: #ff0; padding: 5px; border: 1px solid #ddd; position: absolute; }
-
-.fileHeight {
-  max-height: 50px
-}
-
-.scrollx {
-  overflow-x: auto;
-}
-
-.scrolly {
-  overflow-y: auto;
-}
-
-h2 small {
-   color: red;   
-}
-
-
-.status {
-   color: green; 
-   padding:5px 5px 5px;  
-}
-
-.loading { 
- background: white url('/assets/loading.gif') center bottom no-repeat; 
-}
-<% end %>
 
 <%= render :partial => 'generic_files/breadcrumbs', :locals => {:include_file=>false} %>
 <h2 class="non lower">Batch Edit Descriptions &nbsp;&nbsp;&nbsp;<small>Click on labels below to edit file descriptions.</small> </h2>

data/app/views/catalog/_index_partials/_list_files.html.erb

@@ -1,36 +1,34 @@
-<% if document.has_key?(:noid_s) %>
 <li>
   <h2>
-    <%= link_to render_document_show_field_value(:document=>document, :field=>document.title_or_label), sufia.generic_file_path(document[:noid_s].first) %>
-    <small>[<%= link_to 'Download', sufia.download_path(document[:noid_s].first), :target => '_new' %>]</small>
+    <%= link_to document.title_or_label, sufia.generic_file_path(document.noid) %>
+    <small>[<%= link_to 'Download', sufia.download_path(document.noid), :target => '_new' %>]</small>
   </h2>
   <table class="table">
     <tr>
       <td rowspan="6" class="span20"> <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>document, :height=>200, :width=>150} %>
       </td>
       <th><h4>Title:</h4></th>
-      <td><%= render_document_show_field_value(:document=>document, :field=>"desc_metadata__title_display") %></td>
+      <td><%= document.title %></td>
     </tr>
     <tr>
       <th><h4>Depositor:<h4></div>
-      <td><%= link_to_profile get_depositor_from_document(document) %></td>
+      <td><%= link_to_profile document.depositor("no depositor value") %></td>
     </tr>
     <tr>
       <th><h4>Creator:</h4></th>
-      <td><%= render_document_show_field_value(:document=>document, :field=>"desc_metadata__creator_display") %></td>
+      <td><%= document.creator %></td>
     </tr>
     <tr>
       <th><h4>Description:</h4></th>
-      <td><%= iconify_auto_link(render_document_show_field_value(:document=>document, :field=>"desc_metadata__description_display")) %></th>
+      <td><%= iconify_auto_link(document.description) %></th>
     </tr>
     <tr>
       <th><h4>Keywords:</h4></th>
-      <td><%= render_document_show_field_value(:document=>document, :field=>"desc_metadata__tag_display") %></td>
+      <td><%= document.tags.join(', ') %></td>
     </tr>
     <tr>
       <th><h4>Date Uploaded:</h4></th>
-      <td><%= render_document_show_field_value(:document=>document, :field=>"desc_metadata__date_uploaded_display") %></td>
+      <td><%= document.date_uploaded %></td>
     </tr>
   </table>
 </li>
-<% end %>

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

@@ -1,34 +1,25 @@
-<%- keywords = link_to_facet_list(recent_document[:desc_metadata__tag_t], 'desc_metadata__tag_facet', 'no keywords specified') -%>
-<%- filename = render_document_show_field_value(:document=>recent_document, :field=>"label_t") -%>
-<%- title = render_document_show_field_value(:document=>recent_document, :field=>"desc_metadata__title_t") -%>
-<%- title = filename if title.empty? -%>
-<%- short_title = truncate(title, :length => 28, :separator => ' ') -%>
-<%- depositor = get_depositor_from_document(recent_document) -%>
     <tr>
       <% if display_thumbs %>
-        <td class="span10"><%= link_to_profile depositor %> <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>recent_document, :height=>60, :width=>45} %> </td>
+        <td class="span10"><%= link_to_profile recent_document.depositor("no depositor value") %> <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>recent_document, :height=>60, :width=>45} %> </td>
       <% end %>
       <td>
         <h3>
-          <%= link_to short_title, sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => title  %>
+          <%= link_to truncate(recent_document.title_or_label, :length => 28, :separator => ' '), sufia.generic_file_path(recent_document.noid), :title => recent_document.title_or_label  %>
 
           <% if display_access %>
-              <% if !recent_document[:read_access_group_t].blank? and recent_document[:read_access_group_t].include?('registered') %>
+              <% if recent_document.registered? %>
                  <span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span>
-              <% elsif recent_document[:read_access_group_t].nil? or (recent_document[:read_access_group_t] & ['public']).empty? %>
-                <span class="label label-important">Private</span>
-              <% else %>
+              <% elsif recent_document.public? %>
                 <span class="label label-success">Open Access</span>
+              <% else %>
+                <span class="label label-important">Private</span>
               <% end %>
           <% end %>
         </h3>
         <p> 
-          <% if filename.length > 25 %>
-            <%= link_to "#{filename[0..24]}...", sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
-          <% else %>
-            <%= link_to filename, sufia.generic_file_path(recent_document.fetch(:noid_s, :id)), :title => filename %><br />
-          <% end %>
-            <%= keywords.html_safe %>
+          <%= link_to truncate(recent_document.label, :length=>25),
+              sufia.generic_file_path(recent_document.noid), :title => recent_document.label %><br />
+          <%= link_to_facet_list(recent_document.tags, 'desc_metadata__tag', 'no keywords specified').html_safe %>
         </p>
       </td>
     </tr>

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

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

data/app/views/contact_form/new.html.erb

@@ -19,7 +19,7 @@ limitations under the License.
   <%= render partial: 'directions' %>
 </div>
 
-<% if current_user %>
+<% if user_signed_in? %>
   <% nm = current_user.name %>
   <% em = current_user.email_address %>
 <% else %>