enju_biblio 0.1.0.pre55 → 0.1.0.pre56

data/app/views/manifestations/index.opds.builder

@@ -1,14 +1,14 @@
-atom_feed(:url => manifestations_url(:format => :atom),
+atom_feed(url: manifestations_url(format: :atom),
   "xmlns:opds" => "http://opds-spec.org/2010/catalog",
   "xmlns:jepa" => "http://www.jepa.or.jp/xmlns/atomPhonetics/1.1"
 ) do |feed|
-  feed.title t('manifestation.query_search_result', :query => @query, :library_group_name => @library_group.display_name.localize)
+  feed.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
   feed.updated(@manifestations.first ? @manifestations.first.created_at : Time.zone.now)
-  feed.link :rel => 'start', :href => manifestations_url(:format => :opds), :type => "application/atom+xml;profile=opds-catalog;kind=navigation"
+  feed.link rel: 'start', href: manifestations_url(format: :opds), type: "application/atom+xml;profile=opds-catalog;kind=navigation"
 
   @manifestations.each do |manifestation|
     feed.entry(manifestation) do |entry|
-      entry.link :rel => "http://opds-spec.org/acquisition/borrow", :href => manifestation_url(manifestation), :type => 'text/html'
+      entry.link rel: "http://opds-spec.org/acquisition/borrow", href: manifestation_url(manifestation), type: 'text/html'
       entry.title(manifestation.original_title)
 
       manifestation.creators.readable_by(current_user).each do |agent|

data/app/views/manifestations/index.rdf.builder

@@ -8,9 +8,9 @@ xml.rdf(:RDF,
         'xmlns:foaf' => "http://xmlns.com/foaf/0.1/",
         'xmlns:prism' => "http://prismstandard.org/namespaces/basic/2.0/",
         'xmlns:rdfs' =>"http://www.w3.org/2000/01/rdf-schema#"){
-  xml.channel("rdf:about" => manifestations_url(:params => params.merge(:format => 'rdf', :only_path => true))){
-    xml.title t('manifestation.query_search_result', :query => @query, :library_group_name => @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
+  xml.channel("rdf:about" => manifestations_url(:params => params.merge(format: 'rdf', only_path: true))){
+    xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
@@ -25,6 +25,6 @@ xml.rdf(:RDF,
     end
   }
   @manifestations.each do |manifestation|
-    xml << render('manifestations/show', :manifestation => manifestation)
+    xml << render('manifestations/show', manifestation: manifestation)
   end
 }

data/app/views/manifestations/index.rss.builder

@@ -4,19 +4,19 @@ xml.rss('version' => "2.0",
         'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('manifestation.query_search_result', :query => @query, :library_group_name => @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
+    xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
-    xml.tag! "atom:link", :rel => 'alternate', :href => manifestations_url
-    xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => page_opensearch_url
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'alternate', href: manifestations_url
+    xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @manifestations.total_count
       xml.tag! "opensearch:startIndex", @manifestations.offset_value + 1
       xml.tag! "opensearch:itemsPerPage", @manifestations.limit_value
-      xml.tag! "opensearch:Query", :role => 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
+      xml.tag! "opensearch:Query", role: 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
     end
     if @manifestations
       @manifestations.each do |manifestation|

data/app/views/manifestations/index.sru.builder

@@ -69,7 +69,7 @@ def get_record(manifestation)
     'xmlns:srw_dc' => "info:srw/schema/1/dc-v1.1",
     'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
     'xsi:schemaLocation' => "info:srw/schema/1/dc-v1.1 http://www.loc.gov/standards/sru/dc-schema.xsd" do
-    cache(:manifestation => manifestation.id, :fragment => 'index_sru', :role => current_user_role_name, :locale => @locale) do
+    cache([manifestation, fragment: 'index_sru', role: current_user_role_name, locale: @locale]) do
       xml.tag! 'dc:title', manifestation.original_title
       manifestation.creators.readable_by(current_user).each do |agent|
         xml.tag! 'dc:creator', agent.full_name

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.manifestation')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.manifestation')) -%></h1>
 <div id="content_list">
   <%= render 'manifestations/form' %>
 </div>

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

@@ -1,30 +1,30 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content" itemscope="itemscope" itemtype="http://schema.org/Book">
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.manifestation')) -%></h1>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.manifestation')) -%></h1>
   <div id="content_list">
     <p id="notice"><%= notice %></p>
-    <%= render 'paginate_id_link', :manifestation => @manifestation, :manifestation_ids => @manifestation_ids %>
+    <%= render 'paginate_id_link', manifestation: @manifestation, manifestation_ids: @manifestation_ids %>
 
-    <%= render 'manifestations/title', :manifestation => @manifestation -%>
+    <%= render 'manifestations/title', manifestation: @manifestation -%>
     <%- if @version -%>
       <p>(<%= l(@manifestation.versions.find(@version).created_at) -%>)</p>
     <%- end -%>
     <% if current_user.try(:has_role?, 'Librarian') %>
-      <%= render 'manifestations/show_detail_librarian', :manifestation => @manifestation %>
+      <%= render 'manifestations/show_detail_librarian', manifestation: @manifestation %>
     <% else %>
-      <%= render 'manifestations/show_detail_user', :manifestation => @manifestation %>
+      <%= render 'manifestations/show_detail_user', manifestation: @manifestation %>
     <% end %>
   </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%= render 'manifestations/book_jacket', :manifestation => @manifestation -%>
+  <%= render 'manifestations/book_jacket', manifestation: @manifestation -%>
   <ul>
     <%- if @manifestation.picture_files.exists? -%>
-      <li><%= t('page.total') %>: <%= @manifestation.picture_files.count %> <%= t('page.number_of_pictures', :count => @manifestation.picture_files.count) %></li>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.picture_file')), manifestation_picture_files_path(@manifestation) -%></li>
+      <li><%= t('page.total') %>: <%= @manifestation.picture_files.count %> <%= t('page.number_of_pictures', count: @manifestation.picture_files.count) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.picture_file')), picture_files_path(manifestation_id: @manifestation.id) -%></li>
     <% end %>
     <%- if can? :create, PictureFile -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.picture_file')), new_manifestation_picture_file_path(@manifestation) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: @manifestation.id) -%></li>
     <%- end -%>
   </ul>
   <script type="text/javascript">
@@ -35,7 +35,7 @@
   <%- if user_signed_in? -%>
     <div id="call_number_content">
       <%- @manifestation.items.for_checkout.on_shelf.each do |item| -%>
-        <%- if item.hold?(current_user.library) -%>
+        <%- if item.hold?(current_user.profile.library) -%>
           <%= call_number_label(item) -%>
         <%- end -%>
       <%- end -%>
@@ -46,7 +46,7 @@
       <ul>
         <%- if user_signed_in? -%>
           <%- if current_user.email.present? -%>
-            <li><%= link_to t('manifestation.send_email'), manifestation_path(:mode => 'send_email'), :data => {:confirm => t('page.are_you_sure')} -%></li>
+            <li><%= link_to t('manifestation.send_email'), manifestation_path(mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
           <%- end -%>
         <% end %>
 
@@ -56,16 +56,16 @@
               <% if @manifestation.is_reservable_by?(current_user) %>
                 <li><%= link_to_reservation(@manifestation, @reserve) %>
                 <br />
-                (<%= t('page.number_of_reservations', :count => @reserved_count) -%>)</li>
+                (<%= t('page.number_of_reservations', count: @reserved_count) -%>)</li>
               <%- else -%>
                 <% if defined?(EnjuPurchaseRequest) %>
-                  <li><%= link_to t('activerecord.models.purchase_request'), new_purchase_request_path(:purchase_request => {:url => manifestation_url(@manifestation)}) %></li>
+                  <li><%= link_to t('activerecord.models.purchase_request'), new_purchase_request_path(purchase_request: {url: manifestation_url(@manifestation)}) %></li>
                 <% end %>
               <%- end -%>
             <% else %>
               <% unless @manifestation.items.for_checkout.empty? %>
                 <li><%= link_to_reservation(@manifestation, @reserve) %><br />
-                (<%= t('page.number_of_reservations', :count => @reserved_count) -%>)</li>
+                (<%= t('page.number_of_reservations', count: @reserved_count) -%>)</li>
               <% end %>
             <% end %>
           <% end %>

data/app/views/manifestations/show.mobile.erb

@@ -1,9 +1,9 @@
 <div data-role="header">
   <a href="javascript:history.back()" data-icon="back" data-iconpos="notext" class="ui-btn-left"><%= t('page.back') %></a>
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.manifestation')) -%></h1>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.manifestation')) -%></h1>
 </div>
 <div data-role="content">
-<%= render 'title', :manifestation => @manifestation %>
+<%= render 'title', manifestation: @manifestation %>
 <table class="table table-striped">
 <tr>
 <th>ISBN</th>
@@ -15,6 +15,6 @@
 </tr>
 </table>
 <%- if @manifestation.items.for_checkout.on_shelf.exists? -%>
-  <%= render 'manifestations/show_holding', :manifestation => @manifestation -%>
+  <%= render 'manifestations/show_holding', manifestation: @manifestation -%>
 <%- end -%>
 </div>

data/app/views/manifestations/show.mods.builder

@@ -2,5 +2,5 @@ xml.instruct! :xml, :version=>"1.0"
 xml.mods('version' => "3.3",
         'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
         'xmlns' => "http://www.loc.gov/mods/v3"){
-  xml << render('manifestations/show', :manifestation => @manifestation)
+  xml << render('manifestations/show', manifestation: @manifestation)
 }

data/app/views/manifestations/show.rdf.builder

@@ -8,5 +8,5 @@ xml.rdf(:RDF,
         'xmlns:foaf' => "http://xmlns.com/foaf/0.1/",
         'xmlns:prism' => "http://prismstandard.org/namespaces/basic/2.0/",
         'xmlns:rdfs' =>"http://www.w3.org/2000/01/rdf-schema#") do
-  xml << render('manifestations/show', :manifestation => @manifestation)
+  xml << render('manifestations/show', manifestation: @manifestation)
 end

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.medium_of_performance')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.medium_of_performance')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,13 +1,16 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.medium_of_performance')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.medium_of_performance')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.medium_of_performance.name') -%></th>
-    <th><%= t('activerecord.attributes.medium_of_performance.display_name') -%></th>
-    <th><%= t('activerecord.attributes.medium_of_performance.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.medium_of_performance.display_name') -%>
+      /
+      <%= t('activerecord.attributes.medium_of_performance.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,27 +21,31 @@
         <%= move_position(medium_of_performance) -%>
       <%- end -%>
     </td>
-    <td><%= link_to medium_of_performance.name, medium_of_performance -%></td>
-    <td><%= link_to medium_of_performance.display_name.localize, medium_of_performance -%></td>
-    <td><%= medium_of_performance.note -%></td>
+    <td><%= medium_of_performance.name -%></td>
+    <td>
+      <%= link_to medium_of_performance.display_name.localize, medium_of_performance -%>
+      <br />
+      <%= medium_of_performance.note %>
+    </td>
     <td>
       <%- if can? :update, medium_of_performance -%>
         <%= link_to t('page.edit'), edit_medium_of_performance_path(medium_of_performance) -%>
       <% end %>
       <%- if can? :delete, medium_of_performance -%>
-        <%= link_to t('page.destroy'), medium_of_performance, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), medium_of_performance_path(medium_of_performance), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
 <%- end -%>
 </table>
 
-<%= paginate(@medium_of_performances) -%>
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.medium_of_performance')), new_medium_of_performance_path -%></li>
+    <%- if can? :create, ContentType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.medium_of_performance')), new_medium_of_performance_path -%></li>
+    <%- end -%>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.medium_of_performance')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.medium_of_performance')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.medium_of_performance')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.medium_of_performance')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/views/notifier/manifestation_info.en.text.erb

@@ -1,4 +1,4 @@
-<%= @user.full_name -%> :
+<%= @user.username -%> :
 
 Title: <%= @manifestation.original_title %>
 Creator(s): <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
@@ -14,5 +14,5 @@ Holding:
 <%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>
 
 -- 
-<%= LibraryGroup.system_name(@user.locale) %>
+<%= LibraryGroup.system_name(@user.profile.locale) %>
 <%= LibraryGroup.site_config.url %>

data/app/views/notifier/manifestation_info.ja.text.erb

@@ -1,4 +1,4 @@
-<%= @user.full_name -%> さん
+<%= @user.username -%> さん
 
 資料名: <%= @manifestation.original_title %>
 著者: <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
@@ -14,5 +14,5 @@ URL: <%= @manifestation.access_address %>
 <%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>
 
 -- 
-<%= LibraryGroup.system_name(@user.locale) %>
+<%= LibraryGroup.system_name(@user.profile.locale) %>
 <%= LibraryGroup.site_config.url %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.own')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.own')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.own')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.own')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -21,12 +21,12 @@
       <%- end -%>
     </td>
     <td>
-      <%= render 'manifestations/show_index', :manifestation => own.item.manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: own.item.manifestation -%>
     </td>
     <td>
       <%- if can? :delete, own -%>
         <%= link_to t('page.show'), own -%>
-        <%= link_to t('page.destroy'), own, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), own, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -40,7 +40,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Own -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.own')), new_own_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.own')), new_own_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.own')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.own')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.own')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.own')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -19,7 +19,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.agent')), item_agents_path(@own.item) -%></li>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.item')), agent_items_path(@own.agent) -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.agent')), agents_path(item_id: @own.item_id) -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.item')), items_path(agent_id: @own.agent_id) -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.picture_file')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -20,14 +20,14 @@
       </td>
       <td><%= picture_file.picture_file_size -%></td>
       <td><%= picture_file.picture_content_type -%></td>
-      <td><%= link_to h(picture_file.picture_file_name), picture_file_path(picture_file, :format => :download, :size => 'original') -%></td>
+      <td><%= link_to h(picture_file.picture_file_name), picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
         <%- if can? :delete, picture_file -%>
-          <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -41,12 +41,12 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, PictureFile -%>
     <ul>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), manifestations_path -%></li>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.shelf')), shelves_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.manifestation')), manifestations_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.shelf')), shelves_path -%></li>
       <% if defined?(EnjuEvent) %>
-        <li><%= link_to t('page.listing', :model => t('activerecord.models.event')), events_path -%></li>
+        <li><%= link_to t('page.listing', model: t('activerecord.models.event')), events_path -%></li>
       <% end %>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.agent')), agents_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agents_path -%></li>
     </ul>
   <%- end -%>
 </div>

data/app/views/picture_files/_index_agent.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.picture_file')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <h2 class="resource_title">
@@ -27,14 +27,14 @@
       </td>
       <td><%= picture_file.picture_file_size -%></td>
       <td><%= picture_file.picture_content_type -%></td>
-      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, :format => :download, :size => 'original') -%></td>
+      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
         <%- if can? :delete, picture_file -%>
-          <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), picture_file_path(picture_file, agent_id: agent.id), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -48,7 +48,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, PictureFile -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.picture_file')), new_agent_picture_file_path(agent) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(agent_id: agent.id) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
     </ul>
   <%- end -%>

data/app/views/picture_files/_index_event.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.picture_file')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <h2 class="resource_title"><%= link_to event.display_name.localize, event -%></h2>
@@ -25,14 +25,14 @@
       </td>
       <td><%= picture_file.picture_file_size -%></td>
       <td><%= picture_file.picture_content_type -%></td>
-      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, :format => :download, :size => 'original') -%></td>
+      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
         <%- if can? :delete, picture_file -%>
-          <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -46,7 +46,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, PictureFile -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.picture_file')), new_event_picture_file_path(event) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_event_picture_file_path(event) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
     </ul>
   <%- end -%>

data/app/views/picture_files/_index_manifestation.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.picture_file')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <h2 class="resource_title">
@@ -27,14 +27,14 @@
       </td>
       <td><%= picture_file.picture_file_size -%></td>
       <td><%= picture_file.picture_content_type -%></td>
-      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, :format => :download, :size => 'original') -%></td>
+      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
         <%- if can? :delete, picture_file -%>
-          <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -48,7 +48,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, PictureFile -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.picture_file')), new_manifestation_picture_file_path(manifestation) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(manifestation_id: manifestation) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
     </ul>
   <%- end -%>

data/app/views/picture_files/_index_shelf.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.picture_file')) -%></h1>
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <h2 class="resource_title"><%= link_to shelf.display_name.localize, shelf -%></h2>
@@ -25,14 +25,14 @@
       </td>
       <td><%= picture_file.picture_file_size -%></td>
       <td><%= picture_file.picture_content_type -%></td>
-      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, :format => :download, :size => 'original') -%></td>
+      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
         <%- if can? :update, picture_file -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
         <%- if can? :delete, picture_file -%>
-          <%= link_to t('page.destroy'), picture_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -46,7 +46,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, PictureFile -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.picture_file')), new_shelf_picture_file_path(shelf) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_shelf_picture_file_path(shelf) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
     </ul>
   <%- end -%>

data/app/views/picture_files/_link.html.erb

@@ -1,3 +1,3 @@
-<a href="<%= picture_file_path(picture_file, :format => :download, :size => 'original') -%>">
+<a href="<%= picture_file_path(picture_file, format: :download, size: 'original') -%>">
   <%= show_image(picture_file) %>
 </a>

data/app/views/picture_files/_link.mobile.erb

@@ -1,3 +1,3 @@
-<a href="<%= picture_file_path(picture_file, :format => :download, :size => 'original') -%>">
+<a href="<%= picture_file_path(picture_file, format: :download, size: 'original') -%>">
   <%= show_image(picture_file) %>
 </a>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.picture_file')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@picture_file) do |f| -%>

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

@@ -1,7 +1,7 @@
 <%- case @attachable.class.to_s when 'Shelf' -%>
   <%= render 'index_shelf', :shelf => @attachable -%>
 <%- when 'Manifestation' -%>
-  <%= render 'index_manifestation', :manifestation => @attachable -%>
+  <%= render 'index_manifestation', manifestation: @attachable -%>
 <%- when 'Agent' -%>
   <%= render 'index_agent', :agent => @attachable -%>
 <%- when 'Event' -%>

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

@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.picture_file')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.picture_file')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@picture_file, :url => picture_files_path, :html => { :multipart => true, :method => :post }) do |f| -%>
+<%= form_for(@picture_file, url: picture_files_path, html: { multipart: true, method: :post }) do |f| -%>
   <% if @picture_file.errors.any? %>
     <div id="error_explanation">
       <ul>