hydra-head 3.0.0pre2 → 3.0.0pre3

data/README.textile

@@ -99,7 +99,7 @@ h3. Run the generators and migrations:
 
 Run the blacklight generator
 
-<pre>rails g blacklight -devise</pre>
+<pre>rails g blacklight --devise</pre>
 
 Run the hydra-head generator
 

data/README_RAILS3_CHANGES.textile

@@ -1,4 +1,8 @@
 
+h2. Views
+
+Security has been tightened in Rails3, forcing you to include _authenticity_token__ with all requests.  If you have forms or javascript that submits requests without this token, Rails will destroy the user session, effectively logging the user out (see http://weblog.rubyonrails.org/2011/2/8/csrf-protection-bypass-in-ruby-on-rails).  The easiest way to make sure this token is properly included in your forms is to generate the forms using the +form_tag+ or +form_for+ view helpers from Rails.
+
 h2. Fixtures
 
 Fixtures are loaded from a directory _within the test app_, which is updated when you run rake hyhead:setup_test_app so in order to update a fixture, you must change it in test_support/fixtures and then either re-run rake hyhead:setup_test_app or copy the fixture into tmp/test_app/test_support/fixtures

data/app/views/catalog/_edit_partials/_default_details.html.erb

@@ -1,7 +1,7 @@
 
 
 <%# this should imitate the stuff in catalog/_show_partials/_default_details -%>
-<form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets") %>" method="post" accept-charset="utf-8">
+<%= form_tag url_for(:action=>"update", :controller=>"assets"), :id=>"document_metadata"  "accept-charset"=>"utf-8" do %>
 
   <div id="multipleEdit">
     <div id="loading" style="display:none;"><img src="/plugin_assets/hydra-head/images/ajax-loader.gif" width="32" height="32" alt="Saving"/> Saving...</div>
@@ -11,5 +11,5 @@
       </dl>
     </div>
   </div>
-</form>
+<% end %>
 <%# -- end of code replicating catalog/_show_partials/_default_details -%>

data/app/views/contributors/_new.html.erb

@@ -1,4 +1,4 @@
-<form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:asset_id]) %>" method="post">
+<%= form_tag url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:asset_id]), :id=>"new_contributor"  "accept-charset"=>"utf-8" do %>
   <input class="content_type" type="hidden" name="content_type" value="generic_content" />
   <label for="contributor_type">Contributor Type</label>
   <select id="contributor_type" name="contributor_type">
@@ -7,4 +7,4 @@
     <option value="conference">Add a Conference</option>
   </select>
   <input type="submit" value="Add Contributor" />
-</form>
+<% end %>

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

@@ -3,11 +3,12 @@
   <%- ct = params[:contributor_type] %>
   <%# Calculating the new index so all field values (ie first name & last name) will be added to one contributor with that index %>
   <%- new_contributor_index = @document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(ct.to_sym).length %>
-  <form id="add_contributor" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset", :id=>params[:asset_id]) %>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
+  
+  <%= form_tag url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset", :id=>params[:asset_id]), :id=>"add_contributor", "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8" do %>
       <input name="_method" type="hidden" value="put" />  
       <%= render :partial=>"contributors/edit_#{ct}.html", :locals=>{"edit_#{ct}".to_sym =>{}, "edit_#{ct}_counter".to_sym =>new_contributor_index}  %>
       <%= submit_tag "Add #{ct.capitalize}", {:id => "addContributor"} %> 
-  </form>
+  <% end %>
 <%- else %>
   <%= render :partial=>"contributors/new.html"  %>
 <%- end %>

data/app/views/fluid_infusion/_uploader.html.erb

@@ -3,19 +3,18 @@
 <%- container_content_type_param = defined?(container_content_type) ? "?container_content_type=#{container_content_type}" : "" %>
 <div id="uploader-contents">
     
-    <!-- This form will be progressively enhanced by the Fluid Uploader component. -->    
-    <form method="post" enctype="multipart/form-data" class="fl-uploader fl-progEnhance-basic" action="<%=h upload_url %>">
+    <!-- This form will be progressively enhanced by the Fluid Uploader component. -->   
+    <%= form_tag upload_url, :enctype=>"multipart/form-data", :class=>"fl-uploader fl-progEnhance-basic" do %>     
         <input type="hidden" name="container_id" value="<%=h container_id %>"/>
         <%= hidden_field_tag("container_content_type", container_content_type) if defined?(container_content_type) %>
         <p>Browse to upload a file.</p>
         <!-- <input name="Filedata-orig" type="file" /> -->
         <%= file_field_tag "Filedata", field_tag_options %>
         <div><input type="submit" value="Upload File"/></div>
-    </form>
+    <% end %>
     
     <!-- This is the markup for the Fluid Uploader component itself. -->
-    <form class="flc-uploader fl-uploader fl-progEnhance-enhanced" action="<%=h upload_url %>" method="get" enctype="multipart/form-data">
-              
+    <%= form_tag upload_url, :enctype=>"multipart/form-data", :class=>"flc-uploader fl-uploader fl-progEnhance-enhanced", :method=>:get do %>                   
         <!-- The file queue -->
         <div class="fl-uploader-queue-wrapper">
             
@@ -75,7 +74,7 @@
         <div class="fl-uploader-btns">
             <button type="button" class="flc-uploader-button-pause fl-uploader-pause fl-uploader-hidden">Stop Upload</button><button type="button" class="flc-uploader-button-upload fl-uploader-upload fl-uploader-button-default fl-uploader-dim ui-button ui-widget ui-state-default" disabled="disabled">Upload</button>
         </div>
-    </form>
+    <% end %>
 	
 </div>
 <div style="clear:both;"></div>

data/app/views/generic_content_objects/_edit_description.html.erb

@@ -1,4 +1,4 @@
-<form id="descriptive_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
+<%= form_tag url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset"), :id=>"descriptive_metadata", "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8" do %>
   <input type="hidden" name="_method" value="put"/>
   <fieldset id="title_fields">
     <legend>Title</legend>
@@ -47,4 +47,4 @@
     </dl>
   </fieldset>
   <%= submit_tag 'Save Description', {:id => "submitDescription"} %>
-</form>
+<% end %>

data/app/views/generic_content_objects/_show_description.html.erb

@@ -1,5 +1,5 @@
-<form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
 
+<%= form_tag url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset"), :id=>"descriptive_metadata", "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8" do %>
 		<%= render :partial => "#{content_type}s/show_content" %>
 
 	  <fieldset id="title_fields">

data/app/views/generic_contents/_edit.html.erb

@@ -36,20 +36,6 @@
 
   </div>
   
-    <%#
-    // This hidden form really belongs elsewhere, but putting it inside of an 
-    // accordion section un-hides it, so I stuck it here for now. -MZ
-    %>
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post" style="display:none;">
-      <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
-      <label for="contributor_type">Contributor Type</label>
-      <select id="contributor_type" name="contributor_type">
-        <option value="person">Person</option>
-        <option value="organization">Organization</option>
-        <option value="conference">Conference</option>
-      </select>
-      <input type="submit" value="Add Contributor" />
-    </form>
   </div>
 </div>
 <% sidebar_items << capture do %>

data/app/views/generic_images/_edit.html.erb

@@ -34,21 +34,8 @@
     </div>
 
   </div>
-  
-    <%#
-    // This hidden form really belongs elsewhere, but putting it inside of an 
-    // accordion section un-hides it, so I stuck it here for now. -MZ
-    %>
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post" style="display:none;">
-      <input class="content_type" type="hidden" name="content_type" value="generic_content" />
-      <label for="contributor_type">Contributor Type</label>
-      <select id="contributor_type" name="contributor_type">
-        <option value="person">Person</option>
-        <option value="organization">Organization</option>
-        <option value="conference">Conference</option>
-      </select>
-      <input type="submit" value="Add Contributor" />
-    </form>
+
+    
   </div>
 </div>
 <% sidebar_items << capture do %>

data/app/views/mods_assets/_edit.html.erb

@@ -21,21 +21,6 @@
 
   </div>
 
-    <%#
-    // This hidden form really belongs elsewhere, but putting it inside of an 
-    // accordion section un-hides it, so I stuck it here for now. -MZ
-    %>
-    <form id="new_contributor" action="<%=url_for(:action=>"create", :controller=>"contributors", :asset_id=>params[:id]) %>" method="post" style="display:none;">
-      <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
-      <label for="contributor_type">Contributor Type</label>
-      <select id="contributor_type" name="contributor_type">
-        <option value="person">Person</option>
-        <option value="organization">Organization</option>
-        <option value="conference">Conference</option>
-      </select>
-      <input type="submit" value="Add Contributor" />
-    </form>
-
       
   </div>
 </div>

data/app/views/mods_assets/_edit_description.html.erb

@@ -7,7 +7,7 @@
 <%- license_values = @ds_rights_metadata.term_values(:copyright, :license) %>
 <%- journal_title_values = @ds_desc_metadata.term_values(:journal,:title_info,:main_title) %>
 
-<form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
+<%= form_tag url_for( :action=>"update", :controller=>"assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
     <input name="_method" type="hidden" value="put" />
 
     <input class="content_type" type="hidden" name="content_type" value="mods_asset" />
@@ -74,7 +74,7 @@
 
 		<input name="_method" type="hidden" value="put" />
 		<%= submit_tag 'Save Description', {:id => "saveDescription"} %>   
-</form>
+<% end %>
 
 <%= render :partial => "shared/delete_asset_confirmation", :locals => {:pid => params[:id], :title => (get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first.empty? ? "this article" : "'" << get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first << "'")  } %>
 	<div id="deleteAsset">

data/app/views/mods_assets/_progress_box.html.erb

@@ -39,8 +39,8 @@
     <hr size="1" />
     <!-- <p class="progressItem progressItemChecked bold">Released</p> -->
     <!-- <div class="progressInfoBox"><%#= formatTimestamp(@ds_properties.submit_date_values.first) %></div> -->
-      <form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
-        <input name="_method" type="hidden" value="put" />
+      <%= form_tag url_for( :action=>"update", :controller=>"assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
+            <input name="_method" type="hidden" value="put" />
       	<div>  
             <p class="progressItem progressItemChecked bold">
         			<%= fedora_field_label("properties", [:release_to], "Released to") %>
@@ -49,7 +49,7 @@
         			<%= tag(:input, :type=>"hidden", :name=>"asset[properties][released][0]", :value=>"true")%>
             </p>
       	</div>
-      </form>
+      <% end %>
     <hr size="1" />
     <div id="deleteAsset">
   		<%= delete_asset_link(params[:id], "article") %>
@@ -58,7 +58,7 @@
 <% else %>
   <li class="progressBoxSubmit noIndent" id="submitToRegistrarDiv">
     <hr size="1" />
-      <form id="document_metadata" action="<%= url_for(:action=>"update", :controller=>"assets", :content_type=>"mods_asset")%>" method="post" data-resourceType="mods_asset" accept-charset="utf-8">
+      <%= form_tag url_for( :action=>"update", :controller=>"assets", :content_type=>"mods_asset"), "data-resourceType"=>"mods_asset", "accept-charset"=>"utf-8"  do %>
         <input name="_method" type="hidden" value="put" />
       	<div>  
         			<%= fedora_field_label("properties", [:release_to], "Release to") %>
@@ -71,7 +71,7 @@
             	<%= button_to 'Release for UVa Library Circulation', {},{:id => "submitForRelease", :disabled => "disabled"} %>		
           <% end %>
       	</div>
-      </form>
+      <% end %>
 	  <hr size="1" />
     <div id="deleteAsset">
   		<%= delete_asset_link(params[:id], "article") %>

data/app/views/permissions/_index.html.erb

@@ -1,7 +1,7 @@
 <% unless defined?(asset_id) %>
   <% asset_id = params[:asset_id] %>
 <% end %>
-<form id="permissions_metadata" action="<%= url_for(:asset_id=>@document_fedora.pid,:action=>"update", :controller=>"permissions") %>" method="post" accept-charset="utf-8">
+<%= form_tag url_for(:asset_id=>@document_fedora.pid,:action=>"update", :controller=>"permissions"), :id=>"permissions_metadata", :method=>"post", "accept-charset"=>"utf-8" do %>
   <input type="hidden" name="_method" value="put"/>
   <fieldset class="slider">
     <legend>Group Permissions</legend>
@@ -51,5 +51,5 @@
       </dl>
   </fieldset>
   <%= submit_tag 'Save Permissions', {:id => "submitPermissions"} %>
-</form>
+<% end %>
 <%= render :partial=>"permissions/new.html", :locals=>{:asset_id=>asset_id} %>

data/app/views/permissions/_new.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 <div id="add_permissions" class="slider">
   <h2>Add Individual Permissions</h2>
-  <form id="new_permissions" action="<%= url_for(:action=>"create", :controller=>"permissions", :asset_id=>asset_id) %>" method="post">
+  <%= form_tag url_for(:action=>"create", :controller=>"permissions", :asset_id=>asset_id), :id=>"new_permissions", :method=>"post" do %>
     <input id="permission_actor_type" type="hidden" name="permission[actor_type]" value="person" />
     <label for="permission_actor_id">User ID</label>
     <input id="permission_actor_id" name="permission[actor_id]" />
@@ -14,5 +14,5 @@
       <option value="edit">Edit &amp; Upload</option>
     </select>
     <input type="submit" value="Add Permissions" />
-  </form>
+  <% end %>
 </div>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0pre2"
+  VERSION = "3.0.0pre3"
 end
 

data/lib/hydra/catalog.rb

@@ -24,9 +24,8 @@ module Hydra::Catalog
     
     # Controller filters
     # Also see the generator (or generated CatalogController) to see more before_filters in action
-    klass.before_filter :require_solr, :require_fedora, :only=>[:show, :edit, :index, :delete]
+    klass.before_filter :require_solr, :require_fedora
     klass.before_filter :load_fedora_document, :only=>[:show,:edit]
-    klass.before_filter :lookup_facets, :only=>:edit
     
     # View Helpers
     klass.helper :hydra
@@ -56,9 +55,5 @@ module Hydra::Catalog
     end
     @file_assets = @document_fedora.file_objects(:response_format=>:solr)
   end
-  
-  def lookup_facets
-    params = {:qt=>"search",:defType=>"dismax",:q=>"*:*",:rows=>"0",:facet=>"true", :facets=>{:fields=>Blacklight.config[:facet][:field_names]}}
-    @facet_lookup = Blacklight.solr.find params
-  end
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832013
+  hash: 1923832015
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - pre
-  - 2
-  version: 3.0.0pre2
+  - 3
+  version: 3.0.0pre3
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -741,7 +741,6 @@ files:
 - app/models/superuser.rb
 - app/models/video_asset.rb
 - app/views/_add_assets_links.html.erb
-- app/views/_brown_sidebar.html
 - app/views/_user_util_links.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_constraints_element.html.erb
@@ -788,13 +787,6 @@ files:
 - app/views/generic_content_objects/_edit_description.html.erb
 - app/views/generic_content_objects/_new.html.erb
 - app/views/generic_content_objects/_show_description.html.erb
-- app/views/generic_content_objects/contributors/_edit_conference.html.erb
-- app/views/generic_content_objects/contributors/_edit_organization.html.erb
-- app/views/generic_content_objects/contributors/_edit_person.html.erb
-- app/views/generic_content_objects/contributors/_new.html.erb
-- app/views/generic_content_objects/contributors/_show_conference.html.erb
-- app/views/generic_content_objects/contributors/_show_organization.html.erb
-- app/views/generic_content_objects/contributors/_show_person.html.erb
 - app/views/generic_contents/_edit.html.erb
 - app/views/generic_contents/_index.html.erb
 - app/views/generic_contents/_show.html.erb

data/app/views/_brown_sidebar.html

@@ -1,15 +0,0 @@
-<div id="brown_box">
-<form action="/catalog" method="get" id="side_search">
-	<label for="q">Search Libra</label>
-  	<input class="q" id="q" name="q" type="text" />
-  	<input type="submit" value="Submit" />
-</form>
-
-<ul>
-	<li><a href="/">Return to Libra</a></li>
-	<li><a href="/open_access_self_deposit_policies.html">Libra Policies</a></li>
-	<li><a href="/open_access_self_deposit_policies.html">Help & FAQs</a></li>
-	<li><a href="http://search.lib.virginia.edu">VIRGO Library Catalog</a></li>			
-	<li><a href="http://www.lib.virginia.edu">UVa Library Home</a></li>				
-</ul>
-</div>

data/app/views/generic_content_objects/contributors/_edit_conference.html.erb

@@ -1,29 +0,0 @@
-<% conference = edit_conference %>
-<% conference_counter = edit_conference_counter %>
-<% conference_name = get_values_from_datastream(@document_fedora,'descMetadata', [{:conference=>conference_counter}, :namePart]).first %>
-<% base_id = "conference_#{conference_counter}" %>
-<% if @document_fedora.class.respond_to?(:conference_relator_terms) %>
-  <% choices = @document_fedora.class.conference_relator_terms %>
-<% else %>
-  <% choices = Hydra::ModsArticle.conference_relator_terms %>
-<% end %>
-<li>
-  <dl class="conference contributor" id="<%= base_id %>">
-    <dt>
-      <%= fedora_field_label("descMetadata", [{:conference=>conference_counter}, :role, :text], "Conference's Role:") %>
-      <%= fedora_select(@document_fedora,"descMetadata", [{:conference=>conference_counter}, :role, :text], :choices=>choices.values.sort) %>
-    </dt>
-    <dd class="organization">
-      <ul>
-        <li>
-          <%= fedora_field_label("descMetadata", [{:conference=>conference_counter}, :namePart], "Conference:") %>
-          <%= fedora_text_field(@document_fedora,"descMetadata", [{:conference=>conference_counter}, :namePart], :multiple=>false) %>
-        </li>
-      </ul>
-      <% if params[:action] == "edit" && !conference_name.empty? %>
-        <%= field_selectors_for("descMetadata", [{:person=>conference_counter}]) %>
-        <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "conference", conference_counter) %>" title="Delete '<%= conference_name %>"> Delete</a>
-      <% end %>
-    </dd>
-  </dl>
-</li>

data/app/views/generic_content_objects/contributors/_edit_organization.html.erb

@@ -1,29 +0,0 @@
-<% organization = edit_organization %>
-<% organization_counter = edit_organization_counter %>
-<% organization_name = get_values_from_datastream(@document_fedora,'descMetadata', [{:organization=>organization_counter}, :namePart]).first %>
-<% base_id = "organization_#{organization_counter}" %>
-<% if @document_fedora.class.respond_to?(:organization_relator_terms) %>
-  <% choices = @document_fedora.class.organization_relator_terms %>
-<% else %>
-  <% choices = Hydra::ModsArticle.organization_relator_terms %>
-<% end %>
-<li>
-  <dl class="organization contributor" id="<%= base_id %>">
-    <dt>
-      <%= fedora_field_label("descMetadata", [{:organization => organization_counter}, :role, :text], "Organization's Role:") %>
-      <%= fedora_select(@document_fedora,"descMetadata", [{:organization => organization_counter}, :role, :text], :choices=>choices.values.sort) %>
-    </dt>
-    <dd class="organization">
-      <ul>
-        <li>
-          <%= fedora_field_label("descMetadata", [{:organization => organization_counter}, :namePart], "Organization:") %>
-          <%= fedora_text_field(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart], :multiple=>false) %>
-        </li>
-      </ul>
-      <% if (params[:action] == "edit" && !organization_name.empty?) %>
-        <%= field_selectors_for("descMetadata", [{:person=>organization_counter}]) %>
-        <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "organization", organization_counter) %>" title="Delete '<%= organization_name %>"> Delete</a>
-      <% end %>
-    </dd>
-  </dl>
-</li>

data/app/views/generic_content_objects/contributors/_edit_person.html.erb

@@ -1,37 +0,0 @@
-<% person = edit_person %>
-<% person_counter = edit_person_counter %>
-<% person_name = "#{get_values_from_datastream(@document_fedora,'descMetadata', [{:person=>person_counter}, :first_name])} #{get_values_from_datastream(@document_fedora,'descMetadata', [{:person=>person_counter}, :last_name])}" %>
-<% base_id = "person_#{person_counter}" %>
-<% if @document_fedora.class.respond_to?(:person_relator_terms) %>
-  <% choices = @document_fedora.class.person_relator_terms %>
-<% else %>
-  <% choices = Hydra::ModsArticle.person_relator_terms %>
-<% end %>
-<li>
-  <dl class="person contributor" id="<%= base_id %>">
-    <dt>
-      <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :role, :text], "Person's Role:") %>
-      <%= fedora_select(@document_fedora,"descMetadata", [{:person=>person_counter}, :role, :text], :choices=>choices.values.sort) %>
-    </dt>
-    <dd class="multi_inline person">
-      <ul>
-        <li class="name_first">
-          <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :first_name], "First Name") %>
-          <%= fedora_text_field(@document_fedora,"descMetadata", [{:person=>person_counter}, :first_name], :multiple=>false) %>
-        </li>
-        <li class="name_last">
-          <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :last_name], "Last Name") %>
-          <%= fedora_text_field(@document_fedora,"descMetadata", [{:person=>person_counter}, :last_name], :multiple=>false) %>
-        </li>
-        <li class="affiliation">
-          <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :institution], "Institution") %>
-          <%= fedora_text_field(@document_fedora,"descMetadata", [{:person=>person_counter}, :institution], :multiple=>false) %>
-        </li>
-      </ul>
-      <% if ( (params[:action] == "edit" || params[:action] == "create") && !person_name.strip.empty? ) %>
-        <%= field_selectors_for("descMetadata", [{:person=>person_counter}]) %>
-        <a class="destructive destroy_contributor" href="<%= asset_contributor_path(@document_fedora.pid, "person", person_counter) %>" title="Delete '<%= person_name %>'"> Delete</a>
-      <% end %>
-    </dd>
-  </dl>
-</li>

data/app/views/generic_content_objects/contributors/_new.html.erb

@@ -1,10 +0,0 @@
-<form id="new_contributor" :action=>"http://localhost:3000/assets/#{params[:asset_id]}! /contributors", :method=>"post">
-  <input class="content_type" :type=>"hidden", :name=>"content_type", :value=>params[:content_type] />
-  <label :for=>"contributor_type">Contributor Type</label>
-  <select id="contributor_type" :name=>"contributor_type">
-    <option :value=>"person">Person</option>
-    <option :value=>"organization">Organization</option>
-    <option :value=>"conference">Conference</option>
-  </select>
-  <input :type=>"submit", :value=>"Add Contributor" />
-</form>

data/app/views/generic_content_objects/contributors/_show_conference.html.erb

@@ -1,22 +0,0 @@
-<% conference = show_conference %>
-<% conference_counter = show_conference_counter %>
-<% conference_name = get_values_from_datastream(@document_fedora,'descMetadata', [{:conference=>conference_counter}, :namePart]).first %>
-<% base_id = "conference_#{conference_counter}" %>
-<% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:conference=>conference_counter}, :namePart]).first.empty? %>
-  <li>
-    <dl class="conference contributor" id="<%= base_id %>">
-      <dt>
-        <%= fedora_field_label("descMetadata", [{:conference=>conference_counter}, :role, :text], "Conference's Role:") %>
-        <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:conference=>conference_counter}, :role, :text]) %>
-      </dt>
-      <dd class="organization">
-        <ul>
-          <li>
-            <%= fedora_field_label("descMetadata", [{:conference=>conference_counter}, :namePart], "Conference:") %>
-            <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:conference=>conference_counter}, :namePart]) %>
-          </li>
-        </ul>
-      </dd>
-    </dl>
-  </li>
-<% end %>

data/app/views/generic_content_objects/contributors/_show_organization.html.erb

@@ -1,22 +0,0 @@
-<% organization = show_organization %>
-<% organization_counter = show_organization_counter %>
-<% organization_name = get_values_from_datastream(@document_fedora,'descMetadata', [{:organization=>organization_counter}, :namePart]).first %>
-<% base_id = "organization_#{organization_counter}" %>
-<% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart]).first.empty? %>
-  <li>
-    <dl class="organization contributor" id="<%= base_id %>">
-      <dt>
-        <%= fedora_field_label("descMetadata", [{:organization => organization_counter}, :role, :text], "Organization's Role:") %>
-        <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :role, :text]) %>
-      </dt>
-      <dd class="organization">
-        <ul>
-          <li>
-            <%= fedora_field_label("descMetadata", [{:organization => organization_counter}, :namePart], "Organization:") %>
-            <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart]) %>
-          </li>
-        </ul>
-      </dd>
-    </dl>
-  </li>
-<% end %>

data/app/views/generic_content_objects/contributors/_show_person.html.erb

@@ -1,38 +0,0 @@
-<% person = show_person %>
-<% person_counter = show_person_counter %>
-<% person_name = "#{get_values_from_datastream(@document_fedora,'descMetadata', [{:person=>person_counter}, :first_name])} #{get_values_from_datastream(@document_fedora,'descMetadata', [{:person=>person_counter}, :last_name])}" %>
-<% base_id = "person_#{person_counter}" %>
-<% unless ( get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :last_name]).first.empty? || get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :first_name]).first.empty? ) %>
-  <li>
-    <dl class="person contributor" id="<%= base_id %>">
-      <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :role]).first.empty? %>
-        <dt>
-          <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :role, :text], "Person's Role:") %>
-          <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :role, :text]) %>
-        </dt>
-      <% end %>
-      <dd class="multi_inline person">
-        <ul>
-          <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :first_name]).first.empty? %>
-            <li class="name_first">
-              <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :first_name], "First Name") %>
-              <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :first_name]) %>
-            </li>
-          <% end %>
-          <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :last_name]).first.empty? %>
-            <li class="name_last">
-              <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :last_name], "Last Name") %>
-              <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :last_name]) %>
-            </li>
-          <% end %>
-          <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :institution]).first.empty? %>
-            <li class="affiliation">
-              <%= fedora_field_label("descMetadata", [{:person=>person_counter}, :institution], "Institution") %>
-              <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:person=>person_counter}, :institution]) %>
-            </li>
-          <% end %>
-        </ul>
-      </dd>
-    </dl>
-  </li>
-<% end %>