sufia 0.0.5 → 0.0.6

data/spec/models/generic_file_spec.rb

@@ -15,10 +15,25 @@
 require 'spec_helper'
 
 describe GenericFile do
-  before(:each) do
+  before do
     @file = GenericFile.new
     @file.apply_depositor_metadata('jcoyne')
   end
+
+  describe "terms_for_editing" do
+    it "should return a list" do
+      @file.terms_for_editing.should == [ :contributor, :creator, :title, :description, :publisher,
+       :date_created, :subject, :language, :rights, :identifier, :based_near, :tag, :related_url]
+    end
+  end
+  describe "terms_for_display" do
+    it "should return a list" do
+      @file.terms_for_display.should == [ :part_of, :contributor, :creator, :title, :description, 
+        :publisher, :date_created, :date_uploaded, :date_modified,:subject, :language, :rights, 
+        :resource_type, :identifier, :based_near, :tag, :related_url]
+    end
+  end
+
   describe "attributes" do
     it "should have rightsMetadata" do
       @file.rightsMetadata.should be_instance_of ParanoidRightsDatastream
@@ -182,9 +197,9 @@ describe GenericFile do
     @file.title = "The Work"
     @file.description = "The work by Allah"
     @file.publisher = "Vertigo Comics"
-    @file.date_created = "1200"
-    @file.date_uploaded = "2011"
-    @file.date_modified = "2012"
+    @file.date_created = "1200-01-01"
+    @file.date_uploaded = "2011-01-01"
+    @file.date_modified = "2012-01-01"
     @file.subject = "Theology"
     @file.language = "Arabic"
     @file.rights = "Wide open, buddy."
@@ -208,12 +223,13 @@ describe GenericFile do
     local["generic_file__publisher_t"].should == ["Vertigo Comics"]
     local["generic_file__subject_t"].should == ["Theology"]
     local["generic_file__language_t"].should == ["Arabic"]
-    local["generic_file__date_created_t"].should == ["1200"]
+    local["generic_file__date_created_t"].should == ["1200-01-01"]
     local["generic_file__resource_type_t"].should == ["Book"]
     local["file_format_t"].should == "jpeg (JPEG Image)"
     local["generic_file__identifier_t"].should == ["urn:isbn:1234567890"]
     local["generic_file__based_near_t"].should == ["Medina, Saudi Arabia"]
     local["mime_type_t"].should == ["image/jpeg"]    
+    local["noid_s"].should == "__DO_NOT_USE__"
   end
   it "should support multi-valued fields in solr" do
     @file.tag = ["tag1", "tag2"]

data/spec/models/trophy_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Trophy do
+   before(:all) do
+    @trophy = Trophy.create(user_id:99,generic_file_id:"99")
+  end
+  after(:all) do
+    @trophy.delete
+  end
+
+  it "should have a user" do
+     @trophy.should respond_to(:user_id)
+     @trophy.user_id.should == 99
+  end
+  it "should have a file" do
+     @trophy.should respond_to(:generic_file_id)
+     @trophy.generic_file_id.should == "99"
+  end
+
+  it "should not allow six trophies" do
+     (1..6).each {|n| Trophy.create(user_id:120,generic_file_id:n.to_s)}
+     Trophy.where(user_id:120).count.should == 5
+     Trophy.where(user_id:120).map(&:delete)
+  end
+end
+

data/spec/models/user_spec.rb

@@ -43,8 +43,8 @@ describe User do
     @user.should respond_to(:facebook_handle)
     @user.should respond_to(:googleplus_handle)
   end
-  it "should redefine to_param to make redis keys more recognizable" do
-    @user.to_param.should == @user.user_key
+  it "should redefine to_param to make redis keys more recognizable (and useable within Rails URLs)" do
+    @user.to_param.should == "jilluser@example-dot-com"
   end
   it "should have a cancan ability defined" do
     @user.should respond_to(:can?)

data/spec/routing/route_spec.rb

@@ -15,7 +15,12 @@
 require 'spec_helper'
 
 describe 'Routes' do
-  before(:each) { @routes = Sufia::Engine.routes }
+  before(:each) do
+    @routes = Sufia::Engine.routes 
+    # so we have to do this instead:
+    # engine routes broke in rspec rails 2.12.1, so we had to add this:
+    assertion_instance.instance_variable_set(:@routes, @routes)
+  end
   describe 'Catalog' do
   
     it 'should route the root url to the catalog controller' do
@@ -81,16 +86,6 @@ describe 'Routes' do
     end
   end
 
-  describe 'Sessions' do
-    it "should route to logout" do
-      { get: '/logout' }.should route_to(controller: 'sessions', action: 'destroy')
-    end
-
-    it "should route to login" do
-      { get: '/login' }.should route_to(controller: 'sessions', action: 'new')
-    end
-  end
-
   describe 'Dashboard' do
     it "should route to dashboard" do
       { get: '/dashboard' }.should route_to(controller: 'dashboard', action: 'index')
@@ -100,6 +95,8 @@ describe 'Routes' do
       { get: '/dashboard/facet/1' }.should route_to(controller: 'dashboard', action: 'facet', id: '1')
     end
 
+  
+
     it "should route to dashboard activity" do
       { get: '/dashboard/activity' }.should route_to(controller: 'dashboard', action: 'activity')
     end
@@ -118,6 +115,9 @@ describe 'Routes' do
   end
 
   describe 'Users' do
+    it 'should route to user trophies' do
+      { post: '/users/bob135/trophy' }.should route_to(controller: 'users', action: 'toggle_trophy', uid: 'bob135')
+    end
     it 'should route to user profile' do
       { get: '/users/bob135' }.should route_to(controller: 'users', action: 'show', uid: 'bob135')
     end

data/spec/support/Gemfile

@@ -1,14 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.10'
+gem 'rails', '3.2.11'
 
 gem 'sqlite3'
 
 gem 'devise'
 gem 'blacklight'
-#gem "hydra-head"
-gem 'hydra-head', github: 'projecthydra/hydra-head', ref: 'd60913b'  #pre5.2
-
+gem "hydra-head", github: 'projecthydra/hydra-head', ref: '5ee4e26' # 5.2.0+ (doesn't generate solr_mappings.yml)
 
 gem 'sufia', :path=>'../../'
 gem 'rspec-rails', :group=>:test

data/sufia.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'blacklight', '~> 4.0.0'
   gem.add_dependency 'blacklight_advanced_search'
   gem.add_dependency "hydra-head", "~> 5.2"
+  gem.add_dependency "active-fedora", "~> 5.5.0.rc1"
 
   gem.add_dependency 'noid', '0.5.5'
   gem.add_dependency 'hydra-batch-edit', '~> 0.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.5.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: noid
   requirement: !ruby/object:Gem::Requirement
@@ -490,6 +506,7 @@ files:
 - app/assets/javascripts/sufia.js
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/tabs.js
+- app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/terms_of_service.js
 - app/assets/stylesheets/blacklight_more_facets.css
 - app/assets/stylesheets/bootstrap.min.css
@@ -506,6 +523,7 @@ files:
 - app/assets/stylesheets/reset_body.css
 - app/assets/stylesheets/scholarsphere-bootstrap.css
 - app/assets/stylesheets/sufia.css.scss
+- app/assets/stylesheets/trophy.css
 - app/assets/stylesheets/video-js.css
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
@@ -517,7 +535,6 @@ files:
 - app/controllers/errors_controller.rb
 - app/controllers/generic_files_controller.rb
 - app/controllers/mailbox_controller.rb
-- app/controllers/sessions_controller.rb
 - app/controllers/single_use_link_controller.rb
 - app/controllers/static_controller.rb
 - app/controllers/users_controller.rb
@@ -526,6 +543,7 @@ files:
 - app/helpers/contact_form_helper.rb
 - app/helpers/generic_file_helper.rb
 - app/helpers/sufia_helper.rb
+- app/helpers/trophy_helper.rb
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
 - app/models/contact_form.rb
@@ -544,6 +562,7 @@ files:
 - app/models/local_authority_entry.rb
 - app/models/single_use_link.rb
 - app/models/subject_local_authority_entry.rb
+- app/models/trophy.rb
 - app/models/version_committer.rb
 - app/views/_add_assets_links.html.erb
 - app/views/_flash_msg.html.erb
@@ -559,10 +578,9 @@ files:
 - app/views/advanced/_facet_layout.html.erb
 - app/views/advanced/_facet_limit.html.erb
 - app/views/advanced/index.html.erb
-- app/views/batch/_metadata.html.erb
 - app/views/batch/edit.html.erb
 - app/views/batch_edits/_check_all.html.erb
-- app/views/batch_edits/_delete_selected
+- app/views/batch_edits/_delete_selected.html.erb
 - app/views/batch_edits/_metadata.html.erb
 - app/views/batch_edits/edit.html.erb
 - app/views/batch_edits/update_edit.js.erb
@@ -653,7 +671,7 @@ files:
 - app/views/generic_files/_breadcrumbs.html.erb
 - app/views/generic_files/_descriptions.html.erb
 - app/views/generic_files/_extra_fields_modal.html.erb
-- app/views/generic_files/_field_form
+- app/views/generic_files/_field_form.html.erb
 - app/views/generic_files/_groups_description.html.erb
 - app/views/generic_files/_media_display.html.erb
 - app/views/generic_files/_multiple_upload.html.erb
@@ -665,6 +683,11 @@ files:
 - app/views/generic_files/_versioning.html.erb
 - app/views/generic_files/citation.html.erb
 - app/views/generic_files/edit.html.erb
+- app/views/generic_files/edit_fields/_default.html.erb
+- app/views/generic_files/edit_fields/_description.html.erb
+- app/views/generic_files/edit_fields/_rights.html.erb
+- app/views/generic_files/edit_fields/_suffix.html.erb
+- app/views/generic_files/edit_fields/_type.html.erb
 - app/views/generic_files/new.html.erb
 - app/views/generic_files/show.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
@@ -692,6 +715,7 @@ files:
 - app/views/users/_notify_link.html.erb
 - app/views/users/_notify_number.html.erb
 - app/views/users/_search_form.html.erb
+- app/views/users/_trophy_edit.html.erb
 - app/views/users/_user_info.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
@@ -722,13 +746,10 @@ files:
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
 - lib/active_support/core_ext/marshal.rb
-- lib/devise/models/http_header_authenticatable.rb
-- lib/devise/strategies/http_header_authenticatable.rb
 - lib/generators/sufia/sufia_generator.rb
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/sufia/templates/config/clamav.rb
-- lib/generators/sufia/templates/config/devise.rb
 - lib/generators/sufia/templates/config/hydra_config.rb
 - lib/generators/sufia/templates/config/mailboxer.rb
 - lib/generators/sufia/templates/config/redis.yml
@@ -744,9 +765,9 @@ files:
 - lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/sufia/templates/migrations/create_local_authorities.rb
 - lib/generators/sufia/templates/migrations/create_single_use_links.rb
+- lib/generators/sufia/templates/migrations/create_trophies.rb
 - lib/generators/sufia/templates/migrations/create_version_committers.rb
 - lib/kaminari/helpers/tag.rb
-- lib/redirect_to_web_access_failure.rb
 - lib/sufia.rb
 - lib/sufia/active_fedora/redis.rb
 - lib/sufia/active_record/redis.rb
@@ -762,7 +783,6 @@ files:
 - lib/sufia/generic_file/export.rb
 - lib/sufia/generic_file/permissions.rb
 - lib/sufia/generic_file/thumbnail.rb
-- lib/sufia/http_header_auth.rb
 - lib/sufia/id_service.rb
 - lib/sufia/jobs/audit_job.rb
 - lib/sufia/jobs/batch_update_job.rb
@@ -796,7 +816,6 @@ files:
 - solr_conf/solr.xml
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
-- spec/config/host_to_vhost_spec.rb
 - spec/controllers/_sort_and_per_page.html.erb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
@@ -805,7 +824,6 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
-- spec/controllers/sessions_controller_spec.rb
 - spec/controllers/single_use_link_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
@@ -856,6 +874,7 @@ files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/helpers/generic_file_helper_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/role_mapper_spec.rb
 - spec/models/audit_job_spec.rb
@@ -869,6 +888,7 @@ files:
 - spec/models/local_authority_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/transcode_video_job_spec.rb
+- spec/models/trophy_spec.rb
 - spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
 - spec/rake/sufia_fixtures_spec.rb
@@ -963,7 +983,6 @@ test_files:
 - features/users.feature
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
-- spec/config/host_to_vhost_spec.rb
 - spec/controllers/_sort_and_per_page.html.erb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
@@ -972,7 +991,6 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
-- spec/controllers/sessions_controller_spec.rb
 - spec/controllers/single_use_link_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
@@ -1023,6 +1041,7 @@ test_files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/helpers/generic_file_helper_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/role_mapper_spec.rb
 - spec/models/audit_job_spec.rb
@@ -1036,6 +1055,7 @@ test_files:
 - spec/models/local_authority_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/transcode_video_job_spec.rb
+- spec/models/trophy_spec.rb
 - spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
 - spec/rake/sufia_fixtures_spec.rb

data/app/controllers/sessions_controller.rb

@@ -1,30 +0,0 @@
-# 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.
-
-
-#TODO I think this can just be in the PSU version of scholarsphere
-
-class SessionsController < ApplicationController
-  def destroy
-    # make any local additions here (e.g. expiring local sessions, etc.)
-    # adapted from here: http://cosign.git.sourceforge.net/git/gitweb.cgi?p=cosign/cosign;a=blob;f=scripts/logout/logout.php;h=3779248c754001bfa4ea8e1224028be2b978f3ec;hb=HEAD
-
-    cookies.delete(request.env['COSIGN_SERVICE']) if request.env['COSIGN_SERVICE']
-    redirect_to Sufia::Engine.config.logout_url
-  end
-
-  def new
-    redirect_to Sufia::Engine.config.login_url
-  end
-end

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

@@ -1,195 +0,0 @@
-<%#
-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.
-%>
-
-<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 %>  
-            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
-          </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">
-        <%= 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} %>
-          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
-      </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;
-          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
-      </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;
-          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
-      </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;
-        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
-        <%= 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 -->
-
-    <div class="hide" id="more_descriptions">
-      <div class="control-group">
-        <%= f.label :related_url, "Related URL", :class=>"control-label" %> 
-        <div class="controls" id="additional_related_url_clone">
-          <%= f.text_field :related_url, :name=>"generic_file[related_url][]", :value=>""  %> 
-          <button class="adder btn" name="additional_related_url" id="additional_related_url_submit">+<span class="accessible-hidden">add another Related URL</span></button>
-          &nbsp;
-          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_related_url_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :based_near, 'Location', :class=>"control-label" %> 
-        <div class="controls" id="additional_based_near_clone">
-        <%= f.text_field :based_near, :name=>"generic_file[based_near][]", :value=>""  %> 
-        <button class="adder btn" name="additional_based_near" id="additional_based_near_submit">+<span class="accessible-hidden">add another Location</span></button>
-        &nbsp;
-          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_based_near_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :contributor, :class=>"control-label" %> 
-        <div class="controls" id="additional_contributor_clone">
-          <%= f.text_field :contributor, :name=>"generic_file[contributor][]", :value=>gf.contributor[0]  %> 
-          <button class="adder btn" name="additional_contributor" id="additional_contributor_submit">+<span class="accessible-hidden">add another Contributor</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_contributor_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :date_created, "Date Created", :class=>"control-label" %> 
-        <div class="controls" id="additional_date_created_clone">
-          <%= f.text_field :date_created, :name=>"generic_file[date_created][]", :value=>""  %> 
-          <button class="adder btn" name="additional_date_created" id="additional_date_created_submit">+<span class="accessible-hidden">add another Date Created</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_date_created_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :description, "Abstract or Summary", :class=>"control-label" %> 
-        <div class="controls" id="additional_description_clone">
-          <%= f.text_area :description, :name=>"generic_file[description][]", :value=>""  %> 
-          <button class="adder btn" name="additional_description" id="additional_description_submit">+<span class="accessible-hidden">add another Abstract or Summary</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_description_elements"></div>
-      </div>
-  
-      <div class="control-group">
-        <%= f.label :identifier, :class=>"control-label" %> 
-        <div class="controls" id="additional_identifier_clone">
-          <%= f.text_field :identifier, :name=>"generic_file[identifier][]", :value=>""  %> 
-          <button class="adder btn" name="additional_identifier" id="additional_identifier_submit">+<span class="accessible-hidden">add another Identifier</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_identifier_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :language, :class=>"control-label" %> 
-        <div class="controls" id="additional_language_clone">
-          <%= f.text_field :language, :name=>"generic_file[language][]", :value=>""  %> 
-          <button class="adder btn" name="additional_language" id="additional_language_submit">+<span class="accessible-hidden">add another Language</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_language_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :publisher, :class=>"control-label" %> 
-        <div class="controls" id="additional_publisher_clone">
-          <%= f.text_field :publisher, :name=>"generic_file[publisher][]", :value=>""  %> 
-          <button class="adder btn" name="additional_publisher" id="additional_publisher_submit">+<span class="accessible-hidden">add another Publisher</span></button>
-            &nbsp;
-          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_publisher_elements"></div>
-      </div>
-
-      <div class="control-group">
-        <%= f.label :subject, :class=>"control-label" %> 
-        <div class="controls" id="additional_subject_clone"> 
-          <%= f.text_field :subject, :name=>"generic_file[subject][]", :value=>"" %>  
-          <button class="adder btn" name="additional_subject" id="additional_subject_submit">+<span class="accessible-hidden">add another Subject</span></button>
-          &nbsp;
-          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
-        </div>
-        <div id="additional_subject_elements"></div>
-      </div>
-    </div> <!-- /more_descriptions -->
-  </div><!-- /well -->
-</div> <!-- /row /span6 -->