enju_biblio 0.1.3 → 0.2.0.beta.1

data/app/views/form_of_works/index.html.erb

@@ -18,7 +18,7 @@
 <%- @form_of_works.each do |form_of_work| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, form_of_work -%>
+      <%- if policy(form_of_work).update? -%>
         <%= move_position(form_of_work) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= form_of_work.note %>
     </td>
     <td>
-      <%- if can? :update, form_of_work -%>
+      <%- if policy(form_of_work).update? -%>
         <%= link_to t('page.edit'), edit_form_of_work_path(form_of_work) -%>
       <% end %>
-      <%- if can? :delete, form_of_work -%>
+      <%- if policy(form_of_work).destroy? -%>
         <%= link_to t('page.destroy'), form_of_work_path(form_of_work), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, FormOfWork -%>
+    <%- if policy(FormOfWork).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.form_of_work')), new_form_of_work_path -%></li>
     <%- end -%>
   </ul>

data/app/views/form_of_works/show.html.erb

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @form_of_work -%>
+    <%- if policy(@form_of_work).update? -%>
       <li><%= link_to t('page.edit'), edit_form_of_work_path(@form_of_work) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/frequencies/index.html.erb

@@ -18,7 +18,7 @@
 <%- @frequencies.each do |frequency| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, frequency -%>
+      <%- if policy(frequency).update? -%>
         <%= move_position(frequency) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= frequency.note %>
     </td>
     <td>
-      <%- if can? :update, frequency -%>
+      <%- if policy(frequency).update? -%>
         <%= link_to t('page.edit'), edit_frequency_path(frequency) -%>
       <% end %>
-      <%- if can? :delete, frequency -%>
+      <%- if policy(frequency).destroy? -%>
         <%= link_to t('page.destroy'), frequency_path(frequency), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Frequency -%>
+    <%- if policy(Frequency).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.frequency')), new_frequency_path -%></li>
     <%- end -%>
   </ul>

data/app/views/frequencies/show.html.erb

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @frequency -%>
+    <%- if policy(@frequency).update? -%>
       <li><%= link_to t('page.edit'), edit_frequency_path(@frequency) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/identifier_types/index.html.erb

@@ -18,7 +18,7 @@
 <%- @identifier_types.each do |identifier_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, identifier_type -%>
+      <%- if policy(identifier_type).update? -%>
         <%= move_position(identifier_type) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= identifier_type.note %>
     </td>
     <td>
-      <%- if can? :update, identifier_type -%>
+      <%- if policy(identifier_type).update? -%>
         <%= link_to t('page.edit'), edit_identifier_type_path(identifier_type) -%>
       <% end %>
-      <%- if can? :delete, identifier_type -%>
+      <%- if policy(identifier_type).destroy? -%>
         <%= link_to t('page.destroy'), identifier_type_path(identifier_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, IdentifierType -%>
+    <%- if policy(IdentifierType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.identifier_type')), new_identifier_type_path -%></li>
     <%- end -%>
   </ul>

data/app/views/identifier_types/show.html.erb

@@ -23,7 +23,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @identifier_type -%>
+    <%- if policy(@identifier_type).update? -%>
       <li><%= link_to t('page.edit'), edit_identifier_type_path(@identifier_type) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/import_requests/index.html.erb

@@ -27,7 +27,7 @@
     <td><%= localized_state(import_request.current_state) -%></td>
     <td><%= link_to import_request.manifestation.original_title, import_request.manifestation if import_request.manifestation -%></td>
     <td>
-      <%- if can? :delete, import_request -%>
+      <%- if policy(import_request).destroy? -%>
         <%= link_to t('page.destroy'), import_request, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>

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

@@ -9,9 +9,9 @@
   <%= render 'manifestations/book_jacket', manifestation: @item.manifestation -%>
   <ul>
     <li><%= link_to t('page.show'), @item -%></li>
-    <% if can? :delete, @item %>
+    <% if policy(@item).destroy? %>
       <li><%= link_to t('page.destroy'), @item, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
-    <li><%= link_to t('page.back'), items_path(manifestation_id: @item.manifestation.id) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/items/{index.mobile.erb → index.html+phone.erb}

@@ -41,7 +41,7 @@
       <td><%= link_to item.shelf.library.display_name.localize, item.shelf.library -%></td>
       <td><%= link_to item.shelf_display_name.localize, item.shelf -%></td>
       <td><%= item.circulation_status.display_name.localize -%></td>
-      <%- if can? :delete, item -%>
+      <%- if policy(item).destroy? -%>
         <td><%= link_to t('page.edit'), edit_item_path(item) -%></td>
       <%- end -%>
   </tr>

data/app/views/items/index.html.erb

@@ -72,7 +72,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'manifestations/book_jacket', manifestation: @manifestation if @manifestation -%>
   <ul>
-    <%- if can?(:create, Item) and @manifestation -%>
+    <%- if policy(Item).create? and @manifestation -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>
@@ -83,7 +83,7 @@
         <li><%= circulation_status_facet(facet) %></li>
       <%- end -%>
       <%- if params[:circulation_status] -%>
-        <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
+        <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
       <%- end -%>
     </ul>
   <% end %>

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

@@ -11,10 +11,6 @@
   <%- end -%>
 
   <ul>
-    <%- if @manifestation -%>
-      <li><%= link_to t('page.back'), items_path(manifestation_id: @manifestation.id) -%></li>
-    <%- else -%>
-      <li><%= link_to t('page.back'), items_path -%></li>
-    <%- end -%>
+    <li><%= link_to t('page.back'), :back %></li>
   </ul>
 </div>

data/app/views/items/show.html.erb

@@ -136,14 +136,14 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'manifestations/book_jacket', manifestation: @item.manifestation -%>
   <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
-    <% if can? :update, @item %>
+    <li><%= link_to t('page.back'), :back -%></li>
+    <% if policy(@item).update? %>
       <li><%= link_to t('page.edit'), edit_item_path(@item) -%></li>
     <% end %>
     <% if defined?(EnjuInterLibraryLoan) %>
       <li><%= link_to t('page.listing', model: t('activerecord.models.inter_library_loan')), item_inter_library_loans_path(@item) -%></li>
     <% end %>
-    <% if can? :delete, @item %>
+    <% if policy(@item).destroy? %>
       <li><%= link_to t('page.destroy'), @item, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
     <% if defined?(EnjuInterLibraryLoan) %>
@@ -152,12 +152,16 @@
       <%- end -%>
     <% end %>
     <% if defined?(EnjuCirculation) %>
-      <li><%= link_to t('page.listing', model: t('activerecord.models.lending_policy')), lending_policies_path(item_id: @item.id) -%></li>
-      <li><%= link_to t('page.checkout_history'), checkouts_path(item_id: @item.id) -%></li>
+      <% if policy(LendingPolicy).index? %>
+        <li><%= link_to t('page.listing', model: t('activerecord.models.lending_policy')), lending_policies_path(item_id: @item.id) -%></li>
+      <% end %>
+      <% if policy(Checkout).index? %>
+        <li><%= link_to t('page.checkout_history'), checkouts_path(item_id: @item.id) -%></li>
+      <% end %>
     <% end %>
   </ul>
 </div>
 
-<% if can? :update, @item %>
+<% if policy(@item).update? %>
   <%= render 'tooltip', item: @item %>
 <% end %>

data/app/views/languages/index.html.erb

@@ -18,7 +18,7 @@
 <%- @languages.each do |language| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, language -%>
+      <%- if policy(language).update? -%>
         <%= move_position(language) -%>
       <%- end -%>
     </td>
@@ -29,7 +29,7 @@
     <td><%= language.iso_639_2 -%></td>
     <td><%= language.iso_639_3 -%></td>
     <td>
-      <%- if can? :update, language -%>
+      <%- if policy(language).update? -%>
         <%= link_to t('page.edit'), edit_language_path(language) -%>
       <%- end -%>
     </td>
@@ -42,7 +42,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, Language -%>
+  <%- if policy(Language).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.language')), new_language_path -%></li>
     </ul>

data/app/views/languages/show.html.erb

@@ -43,7 +43,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @language -%>
+    <%- if policy(@language).update? -%>
       <li><%= link_to t('page.edit'), edit_language_path(@language) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/layouts/{agents.mobile.erb → agents.html+phone.erb}

@@ -10,7 +10,7 @@
 
 <%= yield %>
 
-<%= render 'page/footer.mobile' %>
+<%= render 'page/footer' %>
 
 </div>
 

data/app/views/layouts/agents.html.erb

@@ -5,8 +5,8 @@
   <title><%= title(controller.controller_name) %></title>
   <%= render 'page/include' %>
   <%- if controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.merge(format: 'rss', page: nil, commit: nil, only_path: true)), title: (t('agent.library_group_agent', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.merge(format: 'atom', page: nil, commit: nil, only_path: true)), title: (t('agent.library_group_agent', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: 'rss', page: nil, commit: nil, only_path: true)), title: (t('agent.library_group_agent', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: 'atom', page: nil, commit: nil, only_path: true)), title: (t('agent.library_group_agent', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
 </head>
 <body>

data/app/views/layouts/{manifestations.mobile.erb → manifestations.html+phone.erb}

@@ -10,7 +10,7 @@
 
 <%= yield %>
 
-<%= render 'page/footer.mobile' %>
+<%= render 'page/footer' %>
 
 </div>
 

data/app/views/layouts/manifestations.html.erb

@@ -5,8 +5,8 @@
   <title><%= resource_title(@manifestation, controller.action_name) %></title>
   <%= render 'page/include' %>
   <%- if controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.merge(format: :rss, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: :rss, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
   <% if %w(show edit).include?(controller.action_name) %>
     <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>

data/app/views/licenses/index.html.erb

@@ -18,7 +18,7 @@
 <%- @licenses.each do |license| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, license -%>
+      <%- if policy(license).update? -%>
         <%= move_position(license) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= license.note %>
     </td>
     <td>
-      <%- if can? :update, license -%>
+      <%- if policy(license).update? -%>
         <%= link_to t('page.edit'), edit_license_path(license) -%>
       <% end %>
-      <%- if can? :delete, license -%>
+      <%- if policy(license).destroy? -%>
         <%= link_to t('page.destroy'), license_path(license), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, License -%>
+    <%- if policy(License).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.license')), new_license_path -%></li>
     <%- end -%>
   </ul>

data/app/views/manifestation_relationship_types/index.html.erb

@@ -18,7 +18,7 @@
 <%- @manifestation_relationship_types.each do |manifestation_relationship_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, manifestation_relationship_type -%>
+      <%- if policy(manifestation_relationship_type).update? -%>
         <%= move_position(manifestation_relationship_type) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= manifestation_relationship_type.note %>
     </td>
     <td>
-      <%- if can? :update, manifestation_relationship_type -%>
+      <%- if policy(manifestation_relationship_type).update? -%>
         <%= link_to t('page.edit'), edit_manifestation_relationship_type_path(manifestation_relationship_type) -%>
       <% end %>
-      <%- if can? :delete, manifestation_relationship_type -%>
+      <%- if policy(manifestation_relationship_type).destroy? -%>
         <%= link_to t('page.destroy'), manifestation_relationship_type_path(manifestation_relationship_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -45,7 +45,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, ManifestationRelationshipType -%>
+    <%- if policy(ManifestationRelationshipType).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.manifestation_relationship_type')), new_manifestation_relationship_type_path -%></li>
     <%- end -%>
   </ul>

data/app/views/manifestations/_attachment_file.html.erb

@@ -1,4 +1,4 @@
-<%- if can? :show, manifestation -%>
+<%- if policy(manifestation).show? -%>
   <tr>
     <td><%= t('manifestation.attachment_file') -%>:</td>
     <td><%= link_to manifestation.attachment_file_name, manifestation_path(format: :download) -%></td>

data/app/views/manifestations/_carrier_type_facet.html.erb

@@ -4,6 +4,6 @@
     <li><%= carrier_type_facet(facet) %></li>
   <%- end -%>
   <%- if params[:carrier_type] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(carrier_type: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(carrier_type: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/manifestations/_classification_facet.html.erb

@@ -4,12 +4,12 @@
     <% @classification_facet.each do |category| %>
       <li>
         <% if category.value == params[:classification].to_s.downcase %><strong><% end %>
-        <%= link_to "#{t('classification.category', number: category.value)} #{category_name(category.value)} (#{category.count})", url_for(params.merge(classification: category.value, page: nil, view: nil, only_path: true)) %>
+        <%= link_to "#{t('classification.category', number: category.value)} #{category_name(category.value)} (#{category.count})", url_for(params.permit.merge(classification: category.value, page: nil, view: nil, only_path: true)) %>
         <% if category.value == params[:classification].to_s.downcase %></strong><% end %>
       </li>
     <% end %>
     <%- if params[:classification] -%>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- else -%>

data/app/views/manifestations/_contributor_fields.html.erb

@@ -0,0 +1,4 @@
+<div class="nested-fields">
+  <%= f.text_field :full_name, class: 'resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/manifestations/_creator_fields.html.erb

@@ -0,0 +1,5 @@
+<div class="nested-fields">
+  <%= f.hidden_field :agent_id %>
+  <%= f.text_field :full_name, class: 'creator_full_name resource_name' %>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/manifestations/_edit_detail.html.erb

@@ -7,7 +7,7 @@
     (<%= link_to t('manifestation.new_item'), new_item_path(manifestation_id: @manifestation.id) %>)
   </li>
   <li><%= link_to t('manifestation.add_derivation'), manifestations_path(parent_id: @manifestation.id, mode: 'add') -%></li>
-  <% if can? :delete, @manifestation %>
+  <% if policy(@manifestation).destroy? %>
     <li><%= link_to t('page.destroy'), @manifestation, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
   <% end %>
 </ul>

data/app/views/manifestations/_export_list.html.erb

@@ -1,6 +1,6 @@
 <h4><%= t('page.other_format') %></h4>
 <ul>
-  <li><%= link_to 'RDF/XML', url_for(params.merge(format: :rdf, only_path: true)) %>
-  <li><%= link_to 'MODS', url_for(params.merge(format: :mods, only_path: true)) %></li>
-  <li><%= link_to 'TSV', url_for(params.merge(format: :txt, only_path: true)) %></li>
+  <li><%= link_to 'RDF/XML', url_for(params.permit.merge(format: :rdf, only_path: true)) %>
+  <li><%= link_to 'MODS', url_for(params.permit.merge(format: :mods, only_path: true)) %></li>
+  <li><%= link_to 'TSV', url_for(params.permit.merge(format: :txt, only_path: true)) %></li>
 </ul>

data/app/views/manifestations/_form.html.erb

@@ -1,5 +1,5 @@
 <%= render 'page/required_field' %>
-<%= simple_nested_form_for(@manifestation, html: { multipart: true }) do |f| -%>
+<%= simple_form_for(@manifestation, html: { multipart: true }) do |f| -%>
   <%= f.error_messages -%>
 
   <% if @manifestation.original_manifestations.exists? or @parent %>
@@ -62,51 +62,46 @@
   <div class="field">
     <%= f.label :series_statement_string -%><br />
     <%= f.fields_for :series_statements do |series_form| %>
-      <%= series_form.label :original_title %>
-      <%= series_form.text_field :original_title, class: 'resource_title' %>
-      <%= series_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %><br />
-      <%= series_form.label :title_transcription %>
-      <%= series_form.text_field :title_transcription, class: 'resource_title' %><br />
-      <%= series_form.label :volume_number_string %>
-      <%= series_form.text_field :volume_number_string %><br />
-      <%= series_form.label :creator_string %>
-      <%= series_form.text_field :creator_string %><br />
-      <%= series_form.label :series_master %>
-      <%= series_form.check_box :series_master %>
+      <%= render 'series_statement_fields', f: series_form %>
     <% end %>
-    <p><%= f.link_to_add t('page.add_series_statement'), :series_statements %></p>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add_series_statement'), f, :series_statements %></p>
+    </div>
   </div>
 
-  <div class="field">
+  <div class="field" id="creator_form">
     <%= f.label :creator_string -%><br />
     <%= f.fields_for :creators do |creator_form| %>
-      <%= creator_form.text_field :full_name %>
-      <%= creator_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %>
+      <%= render 'creator_fields', f: creator_form %>
     <% end %>
-    <p><%= f.link_to_add t('page.add'), :creators %></p>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :creators %></p>
+    </div>
   </div>
 
-  <div class="field">
+  <div class="field" id="contributor_form">
     <%= f.label :contributor_string -%><br />
     <%= f.fields_for :contributors do |contributor_form| %>
-      <%= contributor_form.text_field :full_name %>
-      <%= contributor_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %>
+      <%= render 'contributor_fields', f: contributor_form %>
     <% end %>
-    <p><%= f.link_to_add t('page.add'), :contributors %></p>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :contributors %></p>
+    </div>
   </div>
 
-  <div class="field">
+  <div class="field" id="publisher_form">
     <%= f.label :publisher_string -%><br />
     <%= f.fields_for :publishers do |publisher_form| %>
-      <%= publisher_form.text_field :full_name %>
-      <%= publisher_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure') %>
+      <%= render 'publisher_fields', f: publisher_form %>
     <% end %>
-    <p><%= f.link_to_add t('page.add'), :publishers %></p>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :publishers %></p>
+    </div>
   </div>
 
   <div class="field">
     <%= f.label :publication_place -%>
-      <%= f.text_field :publication_place %>
+      <%= f.text_field :publication_place, class: 'resource_title' %>
   </div>
 
   <div class="field">
@@ -139,11 +134,11 @@
   <div class="field">
     <%= f.label :identifier -%><br />
     <%= f.fields_for :identifiers do |identifier_form| %>
-      <%= identifier_form.select(:identifier_type_id, @identifier_types.collect{|i| [i.display_name.localize, i.id]}) %>
-      <%= identifier_form.text_field :body, class: 'resource_identifier_body', style: 'ime-mode: disabled' -%>
-      <%= identifier_form.link_to_remove t('page.remove'), confirm: t('page.are_you_sure')  %>
+      <%= render 'identifier_fields', f: identifier_form %>
     <% end %>
-    <p><%= f.link_to_add t('page.add'), :identifiers %></p>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :identifiers %></p>
+    </div>
   </div>
 
   <div class="field">

data/app/views/manifestations/_holding.html.erb

@@ -1,15 +1,13 @@
-<% if manifestation.items.available_for(current_user).count >= 1 %>
-  <div id="holding_link_<%= manifestation.id %>">
-    (<%= link_to t('page.holding'), manifestation_path(manifestation), remote: true %>)
-  </div>
-<% end %>
 <% if defined?(EnjuBookmark) %>
   <%- if manifestation.tags.first -%>
     (<%= link_to "#", { onclick: "$('#tag_#{manifestation.id}').toggle(); return false;" } do t('activerecord.models.tag') end %>)
   <%- end -%>
   <%= render 'manifestations/show_tag', manifestation: manifestation -%>
 <% end %>
-<div id="holding_<%= manifestation.id -%>"></div>
-<%- if can? :create, Item -%>
-  <p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
+
+<% if manifestation.items.available_for(current_user).count >= 1 %>
+  <div id="holding_link_<%= manifestation.id %>">
+    (<%= link_to t('page.holding'), manifestation_path(manifestation), remote: true %>)
+  </div>
+  <div id="holding_<%= manifestation.id -%>"></div>
 <%- end -%>

data/app/views/manifestations/_identifier_fields.html.erb

@@ -0,0 +1,5 @@
+<div class="nested-fields">
+  <%= f.select(:identifier_type_id, @identifier_types.collect{|i| [i.display_name.localize, i.id]}) %>
+  <%= f.text_field :body, class: 'resource_identifier_body', style: 'ime-mode: disabled' -%>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/manifestations/_index_form_contributor.html.erb

@@ -1,10 +1,10 @@
 <div class="search_form">
-<%= form_for :manifestations, url: contributor_manifestations_path(@index_agent[:contributor]), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(contributor_id: @index_agent[:contributor].id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :create, Realize %>
+    <% if policy(Realize).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_index_form_creator.html.erb

@@ -1,10 +1,10 @@
 <div class="search_form">
-<%= form_for :manifestations, url: creator_manifestations_path(@index_agent[:creator]), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(creator_id: @index_agent[:creator].id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :create, Create %>
+    <% if policy(Create).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_index_form_item.html.erb

@@ -1,9 +1,9 @@
 <div class="search_form">
-<%= form_for :manifestations, url: item_manifestations_path(@item), html: {method: 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path(item_id: @item.id), html: {method: 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
-    <% if can? :create, Create %>
+    <% if policy(Create).create? %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>