sufia 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f58a172c978631ed2850516f2ab9502cd114d61a
-  data.tar.gz: 1fd149a51495e374d2b9dab1baca7b121521fe2a
+  metadata.gz: dc608966c9285b346242ba6be80305cc3ee82cad
+  data.tar.gz: 7be4d8597798945013fdf1c4b6b82dbf267ab041
 SHA512:
-  metadata.gz: 57bc995e34962a7babd5c8c19e22ee51e96fdadefbbfc6c553b2d266183178df62b831f7c5fedee29309de2d4c5bbbeccbb06cd7678940f4f6a72e7b5eaee8c4
-  data.tar.gz: 34eb247bfe4bc0baf28dc6fcaecda85eac8b4025883b02ec85dc043be93b4cdc7e72403d20ed79d654dca114a2ef3be05061cf496071582a9529559d31fce626
+  metadata.gz: 7aa180c10138cd6460044b1271de080662daab0bc355c10e4e64177fc16ec6c3683191733ae2244836feb31ed1b4821cbfa12dfe2183a22fb7a7c55b260618bb
+  data.tar.gz: 7bc1d454033cc0b2cd9eee243e30d91ddc890bd6745136b966b4025c272d85d34a2a8d88b32b47ff83c8fceb2264462ac5d24e65ad1c95a0699b1739c69d918b

data/.travis.yml

@@ -3,4 +3,15 @@ rvm:
   - "1.9.3"
   - "2.0.0"
 notifications:
-  irc: "irc.freenode.org#scholarsphere"
+  email:
+    recipients:
+      - "ul-dlt-applications@lists.psu.edu"
+      - "michael@psu.edu"
+    on_success: "change"
+    on_failure: "always"
+  irc:
+    channels:
+      - "irc.freenode.org#scholarsphere"
+      - "irc.freenode.org#projecthydra"
+    template:
+      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"

data/History.md

@@ -1,5 +1,15 @@
 # History of Sufia releases
 
+## 1.1.0
+* Allows a user to deposit on behalf of another user
+* Tweaks dashboard UI to be less busy: actions now in dropdown button
+* Allows HTML tags in metadata helps to render
+* Fixes notifications icon
+* Raises routing errors in dev and test so they can be resolved
+* Refactors users controller for easy re-use
+* Adds JSON support to users controller
+* Removes dependency on sitemap gem
+
 ## 1.0.0
 * Initial API-stable release
 

data/README.md

@@ -1,9 +1,4 @@
-# Sufia
-
-## Code Status
-
-[![Build Status](https://travis-ci.org/curationexperts/sufia.png?branch=master)](https://travis-ci.org/curationexperts/sufia)
-[![Dependencies Status](https://gemnasium.com/curationexperts/sufia.png)](https://gemnasium.com/curationexperts/sufia)
+# Sufia [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia) [![Build Status](https://travis-ci.org/projecthydra/sufia.png?branch=master)](https://travis-ci.org/projecthydra/sufia) [![Dependency Status](https://gemnasium.com/projecthydra/sufia.png)](https://gemnasium.com/projecthydra/sufia)
 
 ## What is Sufia?
 Sufia is a component that adds self-deposit institutional repository features to a Rails app. 

data/app/assets/javascripts/sufia.js

@@ -28,18 +28,18 @@ limitations under the License.
 //= require bootstrap-collapse
 //= require bootstrap-tooltip
 //= require bootstrap-popover
+//= require bootstrap-tab
 
 //= require video
 //= require audio.min
 //= require jquery.validate
 //= require swfobject
-//= require jquery.zclip.min
+//= require ZeroClipboard.min
 
 //= require batch_edit
 //= require terms_of_service
 //= require fileupload
 //= require sufia/permissions
-//= require sufia/tabs
 //= require sufia/trophy
 //= require sufia/batch_select_all
 //= require sufia/multiForm
@@ -65,7 +65,7 @@ function notify_update_link() {
 // short hand for $(document).ready();
 $(function() {
 
-  // set up global batch edit options to override the ones in the gem 
+  // set up global batch edit options to override the ones in the gem
   window.batch_edits_options = { checked_label: "",unchecked_label: "",progress_label: "",status_label: "",css_class: "batch_toggle"};
 
   setInterval(notify_update_link, 30*1000);
@@ -194,4 +194,3 @@ function initialize_audio() {
     });
   };
 }
-

data/app/assets/javascripts/sufia/batch_select_all.js

@@ -5,10 +5,10 @@
     var n = $(".batch_toggle:checked").length;
     if ((n>0) || (forceOn)) {
         $('.batch-select-all').show();
-        $('.button_to').show();
+        $('#batch-edit').show();
     } else if ( otherPage){
         $('.batch-select-all').hide();
-        $('.button_to').hide();
+        $('#batch-edit').hide();
     }
     $("body").css("cursor", "auto");
   }

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -0,0 +1,133 @@
+module Sufia::UsersControllerBehavior
+  extend ActiveSupport::Concern
+
+  included do
+    prepend_before_filter :find_user, :except => [:index, :search, :notifications_number]
+    before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
+    before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
+
+    before_filter :user_not_current_user, only: [:follow, :unfollow]
+  end
+
+  def index
+    sort_val = get_sort
+    query = params[:uq].blank? ? nil : "%"+params[:uq].downcase+"%"
+    base = User.where(*base_query)
+    unless query.blank?
+      base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", query, query)
+    end
+    @users = base.order(sort_val).page(params[:page]).per(10)
+
+    respond_to do |format|
+      format.html
+      format.json { render json: @users.to_json }
+    end
+    
+  end
+
+  # Display user profile
+  def show
+    if @user.respond_to? :profile_events
+      @events = @user.profile_events(100) 
+    else 
+      @events = []
+    end
+    @trophies = @user.trophy_ids
+    @followers = @user.followers
+    @following = @user.all_following
+  end
+
+  # Display form for users to edit their profile information
+  def edit
+    @user = current_user
+    @trophies = @user.trophy_ids
+  end
+
+  # Process changes from profile form
+  def update
+    @user.update_attributes(params[:user])
+    @user.populate_attributes if params[:update_directory]
+    @user.avatar = nil if params[:delete_avatar]
+    unless @user.save
+      redirect_to sufia.edit_profile_path(URI.escape(@user.to_s,'@.')), alert: @user.errors.full_messages
+      return
+    end
+    delete_trophy = params.keys.reject{|k,v|k.slice(0,'remove_trophy'.length)!='remove_trophy'}
+    delete_trophy = delete_trophy.map{|v| v.slice('remove_trophy_'.length..-1)}
+    delete_trophy.each do | smash_trophy |
+      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
+    end
+    Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
+  end
+
+  def toggle_trophy    
+     id = params[:file_id]
+     id = "#{Sufia::Engine.config.id_namespace}:#{id}" unless id.include?(":")
+     unless current_user.can? :edit, id
+       redirect_to root_path, alert: "You do not have permissions to the file"
+       return false
+     end
+     # TODO  make sure current user has access to file
+     t = Trophy.where(:generic_file_id => params[:file_id], :user_id => current_user.id).first
+     if t.blank? 
+       t = Trophy.create(:generic_file_id => params[:file_id], :user_id => current_user.id)
+       return false unless t.persisted?
+     else
+       t.delete  
+       #TODO do this better says Mike
+       return false if t.persisted?  
+     end
+     render :json => t
+  end 
+
+
+  # Follow a user
+  def follow
+    unless current_user.following?(@user)
+      current_user.follow(@user)
+      Sufia.queue.push(UserFollowEventJob.new(current_user.user_key, @user.user_key))
+    end
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are following #{@user.to_s}"
+  end
+
+  # Unfollow a user
+  def unfollow
+    if current_user.following?(@user)
+      current_user.stop_following(@user)
+      Sufia.queue.push(UserUnfollowEventJob.new(current_user.user_key, @user.user_key))
+    end
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are no longer following #{@user.to_s}"
+  end
+
+  protected
+
+  # You can override base_query to return a list of arguments 
+  def base_query
+    [nil]
+  end
+
+  def find_user
+    @user = User.from_url_component(params[:uid])
+    redirect_to root_path, alert: "User '#{params[:uid]}' does not exist" if @user.nil?
+  end
+
+  def user_is_current_user
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "Permission denied: cannot access this page." unless @user == current_user
+  end
+
+  def user_not_current_user
+    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "You cannot follow or unfollow yourself" if @user == current_user
+  end
+
+  def get_sort
+    sort = params[:sort].blank? ? "name" : params[:sort]
+    sort_val = case sort
+           when "name"  then "display_name"
+           when "name desc"   then "display_name DESC"
+           else sort
+           end
+    return sort_val
+  end
+end
+

data/app/controllers/users_controller.rb

@@ -13,119 +13,5 @@
 # limitations under the License.
 
 class UsersController < ApplicationController
-  prepend_before_filter :find_user, :except => [:index, :search, :notifications_number]
-  before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
-  before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
-
-  before_filter :user_not_current_user, only: [:follow, :unfollow]
-
-  def index
-    sort_val = get_sort
-    query = params[:uq].blank? ? nil : "%"+params[:uq].downcase+"%"
-    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
-  def show
-    if @user.respond_to? :profile_events
-      @events = @user.profile_events(100) 
-    else 
-      @events = []
-    end
-    @trophies = @user.trophy_ids
-    @followers = @user.followers
-    @following = @user.all_following
-  end
-
-  # Display form for users to edit their profile information
-  def edit
-    @user = current_user
-    @trophies = @user.trophy_ids
-  end
-
-  # Process changes from profile form
-  def update
-    @user.update_attributes(params[:user])
-  
-    @user.populate_attributes if params[:update_directory]
-    @user.avatar = nil if params[:delete_avatar]
-    unless @user.save
-      redirect_to sufia.edit_profile_path(URI.escape(@user.to_s,'@.')), alert: @user.errors.full_messages
-      return
-    end
-    Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
-    delete_trophy = params.keys.reject{|k,v|k.slice(0,'remove_trophy'.length)!='remove_trophy'}
-    delete_trophy = delete_trophy.map{|v| v.slice('remove_trophy_'.length..-1)}
-    delete_trophy.each do | smash_trophy |
-      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
-      #Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
-    end
-  end
-  def toggle_trophy    
-     id = params[:file_id]
-     id = "#{Sufia::Engine.config.id_namespace}:#{id}" unless id.include?(":")
-     unless current_user.can? :edit, id
-       redirect_to root_path, alert: "You do not have permissions to the file"
-       return false
-     end
-     # TO DO  make sure current user has access to file
-     t = Trophy.where(:generic_file_id => params[:file_id], :user_id => current_user.id).first
-     if t.blank? 
-       t = Trophy.create(:generic_file_id => params[:file_id], :user_id => current_user.id)
-       return false unless t.persisted?
-     else
-       t.delete  
-       #TODO do this better says Mike
-       return false if t.persisted?  
-     end
-     render :json => t
-  end 
-
-
-  # Follow a user
-  def follow
-    unless current_user.following?(@user)
-      current_user.follow(@user)
-      Sufia.queue.push(UserFollowEventJob.new(current_user.user_key, @user.user_key))
-    end
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are following #{@user.to_s}"
-  end
-
-  # Unfollow a user
-  def unfollow
-    if current_user.following?(@user)
-      current_user.stop_following(@user)
-      Sufia.queue.push(UserUnfollowEventJob.new(current_user.user_key, @user.user_key))
-    end
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "You are no longer following #{@user.to_s}"
-  end
-
-  private
-  def find_user
-    @user = User.from_url_component(params[:uid])
-    redirect_to root_path, alert: "User '#{params[:uid]}' does not exist" if @user.nil?
-  end
-
-  def user_is_current_user
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "Permission denied: cannot access this page." unless @user == current_user
-  end
-
-  def user_not_current_user
-    redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), alert: "You cannot follow or unfollow yourself" if @user == current_user
-  end
-
-  def get_sort
-    sort = params[:sort].blank? ? "name" : params[:sort]
-    sort_val = case sort
-           when "name"  then "display_name"
-           when "name desc"   then "display_name DESC"
-           else sort
-           end
-    return sort_val
-  end
+  include Sufia::UsersControllerBehavior
 end

data/app/helpers/trophy_helper.rb

@@ -16,12 +16,11 @@
 module TrophyHelper
  def display_trophy_link(user, noid)
    trophyclass = "trophy-off"
-   trophytitle= "Highlight work "
+   trophytitle= "Highlight File on Profile"
    if user.trophies.map(&:generic_file_id).include? noid
      trophyclass = "trophy-on"
-     trophytitle= "Unhighlight work"
    end
 
-   return link_to raw("<i class='#{trophyclass} icon-trophy icon-large'></i>"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
+   return link_to raw("<i class='#{trophyclass} icon-trophy'></i> #{trophytitle}"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
  end
 end

data/app/models/datastreams/properties_datastream.rb

@@ -15,11 +15,13 @@
 # properties datastream: catch-all for info that didn't have another home.  Particularly depositor.
 class PropertiesDatastream < ActiveFedora::OmDatastream
   set_terminology do |t|
-    t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil) 
+    t.root(:path=>"fields" ) 
     # This is where we put the user id of the object depositor -- impacts permissions/access controls
-    t.depositor :xmlns => '', :namespace_prefix => nil, :index_as=>[:stored_searchable]
+    t.depositor :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
+    t.relative_path
+
+    t.proxy_depositor path: 'proxyDepositor', :index_as=>:symbol
   end
 
   def self.xml_template

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

@@ -23,7 +23,7 @@ limitations under the License.
 $('#permissions_display').show();
 
 // initialize popover helpers
-$("a[rel=popover]").popover();
+$("a[rel=popover]").popover({ html: true });
 
 confirmation_needed = true;
 window.onbeforeunload = confirmExit;
@@ -45,8 +45,12 @@ function confirmExit(){
 </div>
 <%= form_for([@batch, @generic_file], :url => sufia.batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
 
-<%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f} %>
+  <%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f} %>
 
-<%= render :partial => 'generic_files/permission', :formats => [:html], :locals => { :gf => @generic_file, :batch => @batch } %>
+  <%= 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="icon-save"></i> Save'.html_safe, :type => 'submit', :class => 'btn-primary btn-large', :onclick => "confirmation_needed = false;", :id => "upload_submit", :name => "update_permission" %>
+  </div>
 
 <% end %>

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

@@ -12,7 +12,7 @@
   }  
 
 // initialize popover helpers
-$("a[rel=popover]").popover();
+$("a[rel=popover]").popover({ html: true });
   <% @terms.each do |term| %>
     <% vals =  @show_file.send(term) %>
     <% next if vals.blank? %>    
@@ -20,9 +20,6 @@ $("a[rel=popover]").popover();
 
   <% end %>
 
-//  $(".ajax-form").bind('ajax:success', function(){
-//     var form_id = "#"+this.id;
-//     var key = this.id.replace("form_","");
   function after_ajax(form_id){
       var key = form_id.replace("form_","");
       var save_button = "#"+key+"_save";
@@ -33,9 +30,6 @@ $("a[rel=popover]").popover();
       $('#'+form_id).children([".control-group"]).removeClass('hidden')
   }
 
-//  $(".ajax-form").bind('ajax:before', function(){
-//       var form_id = "#"+this.id;
-//       var key = this.id.replace("form_","");
   function before_ajax(form_id){
         var key = form_id.replace("form_","");
         var save_button = "#"+key+"_save";
@@ -45,32 +39,6 @@ $("a[rel=popover]").popover();
         $('#'+form_id).children([".control-group"]).addClass('hidden')        
     }
 
-  // hide permissions to begin with
-  $('#permissions_display').hide();
-  $('#permissions_submit').hide();
-
-
-  // called from edit object view 
-  $('#batch_descriptions_link').on('click', function() {
-    $('#batch_descriptions_link').attr('class', 'active');
-    $('#batch_permissions_link').attr('class', '');
-
-    $('#descriptions_display').show();
-    $('#permissions_display').hide();
-    $('#permissions_submit').hide();
-      descriptions_tab();
-    });
-
-  // called from edit object view
-  $('#batch_permissions_link').on('click', function() {
-    $('#batch_permissions_link').attr('class', 'active');
-    $('#batch_descriptions_link').attr('class', '');
-
-    $('#descriptions_display').hide();
-    $('#permissions_display').show();
-    $('#permissions_submit').hide();
-  });
-
 
     $("tr.expandable").click(function(){
        $(this).next("ul").slideToggle();
@@ -216,52 +184,54 @@ $("a[rel=popover]").popover();
   <h3> Descriptions:</h3>
 
     <ul class="nav nav-tabs">
-      <li id="batch_descriptions_link"><a href="#"><i class="icon-tags"></i> Descriptions</a></li>
-      <li id="batch_permissions_link"><a href="#"><i class="icon-key"></i> Permissions</a></li>
+      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="icon-tags"></i> Descriptions</a></li>
+      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="icon-key"></i> Permissions</a></li>
     </ul>
-  <div class="well 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 icon-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' , :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>
+    <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 icon-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' , :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><!-- /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('generic_file[terms_of_service]', '1') %>
+           <%= hidden_field_tag('update_type', 'update') %>
+           <%= hidden_field_tag('key', 'permissions') %>
+           <%= render :partial => "generic_files/permission_form", :locals => { :gf => @show_file } %>
+         <div class="row">
+            <%= f.submit "Save changes", :class=>'btn btn-primary', :id=>'permissions_save' %>
+            <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
+            <div id="status_permissions" class="status fleft"></div>
+         </div>
        <% end %>
-        </tbody></table> <!-- class="verticalheadings"> -->
-    </div><!-- /well -->
-    <div id="permissions_display">
-      <%= form_for @generic_file, :url=>batch_edits_path, :method=>:put, :remote => true, :html => { :id=>"form_permissions", :class=>"ajax-form"} do |f| %>
-         <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
-         <%= hidden_field_tag('update_type', 'update') %>
-         <%= hidden_field_tag('key', 'permissions') %>
-         <%= render :partial => "generic_files/permission", :locals => { :gf => @show_file, :f=> f } %>
-       <div class="row">
-          <%= f.submit "Save changes", :class=>'btn btn-primary', :id=>'permissions_save' %>
-          <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
-          <div id="status_permissions" class="status fleft"></div>
-       </div>
-     <% end %>
-   </div>
+     </div>
+   </div> <!-- .tab-content -->
 
 <!-- Ajax call to clear the batch before page uload. -->
 <%= button_to "Clear Batch", { :controller => :batch_edits, :action=>:clear  }, :form_class=>'hidden' , :remote => true, :id=>'clear_batch' %>