enju_flower 0.1.0.pre16 → 0.1.0.pre17

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

@@ -1,7 +1,7 @@
   <div id="tabs">
-    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
+    <%= render 'manifestations/tab_menu', manifestation: manifestation %>
     <div id="detail">
-    <% cache(:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale) do %>
+    <% cache([manifestation, fragment: 'show_detail_librarian_html', role: current_user_role_name, locale: @locale]) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>
         <% if manifestation.title_alternative? %>
@@ -14,14 +14,14 @@
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <%= render 'show_series_detail', :manifestation => manifestation %>
+              <%= render 'show_series_detail', manifestation: manifestation %>
               <%- unless manifestation.identifier_contents(:issn).empty? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
         <% end %>
-        <%= render 'edition_and_number', :manifestation => manifestation %>
+        <%= render 'edition_and_number', manifestation: manifestation %>
         <tr>
           <td style="width: 200px"><%= t('page.form') -%>:</td>
           <td style="width: 500px">
@@ -33,6 +33,10 @@
           <td><%= t('activerecord.models.language') -%>:</td>
           <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
         </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.publication_place') -%>:</td>
+          <td><%= manifestation.publication_place %></td>
+        </tr>
         <tr>
           <td><%= t('manifestation.physical_description') -%>:</td>
           <td>
@@ -51,14 +55,14 @@
           <td><%= manifestation.price -%></td>
         </tr>
         <% if defined?(EnjuSubject) %>
-          <%= render 'manifestations/subject_detail', :manifestation => manifestation %>
-          <%= render 'manifestations/classification_detail', :manifestation => manifestation %>
+          <%= render 'manifestations/subject_detail', manifestation: manifestation %>
+          <%= render 'manifestations/classification_detail', manifestation: manifestation %>
         <% end %>
         <% if defined?(EnjuBookmark) %>
           <tr>
             <td><%= t('activerecord.models.tag') -%>:</td>
             <td>
-              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
+              <%= render 'manifestations/tag_list', manifestation: manifestation -%>
             </td>
           </tr>
         <% end %>
@@ -73,7 +77,7 @@
           </tr>
         <%- end -%>
         <%- unless manifestation.attachment_file_name.blank? -%>
-          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
+          <%= render 'manifestations/attachment_file', manifestation: manifestation -%>
         <%- end -%>
         <tr>
           <td><%= t('page.created_at') -%>:</td>
@@ -97,7 +101,7 @@
         </tr>
       </table>
     <% end %>
-      <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
+      <%= render 'manifestations/show_holding', manifestation: manifestation -%>
     </div>
-    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
+    <%= render 'manifestations/tab_list', manifestation: manifestation %>
   </div>

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

@@ -1,7 +1,7 @@
   <div id="tabs">
-    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
+    <%= render 'manifestations/tab_menu', manifestation: manifestation %>
     <div id="detail">
-    <% cache(:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale) do %>
+    <% cache([manifestation, fragment: 'show_detail_user_html', role: current_user_role_name, locale: @locale]) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>
         <% if manifestation.title_alternative? %>
@@ -14,14 +14,14 @@
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
-              <%= render 'show_series_detail', :manifestation => manifestation %>
+              <%= render 'show_series_detail', manifestation: manifestation %>
               <%- unless manifestation.identifier_contents(:issn).empty? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
         <% end %>
-        <%= render 'edition_and_number', :manifestation => manifestation %>
+        <%= render 'edition_and_number', manifestation: manifestation %>
         <tr>
           <td style="width: 200px"><%= t('page.form') -%>:</td>
           <td style="width: 500px">
@@ -33,6 +33,10 @@
           <td><%= t('activerecord.models.language') -%>:</td>
           <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
         </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.publication_place') -%>:</td>
+          <td><%= manifestation.publication_place %></td>
+        </tr>
         <tr>
           <td><%= t('manifestation.physical_description') -%>:</td>
           <td>
@@ -53,14 +57,14 @@
           </tr>
         <% end %>
         <% if defined?(EnjuSubject) %>
-          <%= render 'manifestations/subject_detail', :manifestation => manifestation %>
-          <%= render 'manifestations/classification_detail', :manifestation => manifestation %>
+          <%= render 'manifestations/subject_detail', manifestation: manifestation %>
+          <%= render 'manifestations/classification_detail', manifestation: manifestation %>
         <% end %>
         <% if defined?(EnjuBookmark) %>
           <tr>
             <td><%= t('activerecord.models.tag') -%>:</td>
             <td>
-              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
+              <%= render 'manifestations/tag_list', manifestation: manifestation -%>
             </td>
           </tr>
         <% end %>
@@ -75,7 +79,7 @@
           </tr>
         <%- end -%>
         <%- unless manifestation.attachment_file_name.blank? -%>
-          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
+          <%= render 'manifestations/attachment_file', manifestation: manifestation -%>
         <%- end -%>
         <tr>
           <td><%= t('page.created_at') -%>:</td>
@@ -104,8 +108,8 @@
       </table>
     <% end %>
       <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
       <%- end -%>
     </div>
-    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
+    <%= render 'manifestations/tab_list', manifestation: manifestation %>
   </div>

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

@@ -1,3 +1,4 @@
+<% cache([manifestation, fragment: 'show_holding_html', role: current_user_role_name, locale: @locale]) do %>
 <div class="holding">
 <table class="table table-striped holding">
   <tr>
@@ -10,7 +11,7 @@
     <% end %>
   </tr>
   <% if current_user.try(:has_role?, 'Librarian') %>
-    <% items = manifestation.items.on_shelf %>
+    <% items = manifestation.items %>
   <% else %>
     <% items = manifestation.items.for_checkout.on_shelf %>
   <% end %>
@@ -18,17 +19,17 @@
     <tr>
       <td>
         <%- if item.item_identifier? -%>
-          <%= link_to(item.item_identifier, item, :id => "item_identifier_item_#{item.id}") -%>
+          <%= link_to(item.item_identifier, item, id: "item_identifier_item_#{item.id}") -%>
         <%- else -%>
           (<%= link_to t('item.no_number'), item -%>)
         <%- end -%>
       </td>
       <td>
-        <%= link_to(item.shelf.library.display_name.localize, item.shelf.library, :id => "library_item_#{item.id}") %>
+        <%= link_to(item.shelf.library.display_name.localize, item.shelf.library, id: "library_item_#{item.id}") %>
       </td>
       <td>
-        <%= link_to(item.shelf_display_name.localize, item.shelf, :id => "shelf_item_#{item.id}")-%>
-        <%= render 'items/shelf_picture', :item => item -%>
+        <%= link_to(item.shelf_display_name.localize, item.shelf, id: "shelf_item_#{item.id}")-%>
+        <%= render 'items/shelf_picture', item: item -%>
       </td>
       <td>
         <%= item.call_number -%>
@@ -36,12 +37,12 @@
       <% if defined?(EnjuCirculation) %>
         <td>
           <%= item.circulation_status.display_name.localize if item.circulation_status -%>
-          <%- if item.rent? -%>
+          <% if item.rent? %>
             (
               <%= t('activerecord.attributes.checkout.due_date') -%>:
-              <%= l(item.latest_checkout.due_date, :format => :short) -%>
+              <%= l(item.latest_checkout.due_date, format: :short) -%>
             )
-          <%- end -%>
+          <% end %>
         </td>
       <% end %>
     </tr>
@@ -58,11 +59,12 @@
           });
         });
       </script>
-      <%= render 'items/tooltip', :item => item %>
+      <%= render 'items/tooltip', item: item %>
     <% end %>
   <%- end -%>
 </table>
 <%- if can? :create, Item -%>
-<p><%= link_to t('page.new', :model => t('activerecord.models.item')), new_manifestation_item_path(manifestation) -%></p>
+<p><%= link_to t('page.new', model: t('activerecord.models.item')), new_item_path(manifestation_id: manifestation.id) -%></p>
 <%- end -%>
 </div>
+<% end %>

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

@@ -29,7 +29,7 @@
         <%- if item.rent? -%>
           (
             <%= t('activerecord.attributes.checkout.due_date') -%>:
-            <%= l(item.last_checkout.due_date, :format => :short) -%>
+            <%= l(item.latest_checkout.due_date, format: :short) -%>
           )
         <%- end -%>
       </td>

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

@@ -1,16 +1,18 @@
+<% cache([manifestation, fragment: 'show_index_html', role: current_user_role_name, locale: @locale]) do %>
 <strong>
   <% if manifestation.root_series_statement %>
-    <%= link_to manifestation.original_title, manifestations_path(:parent => manifestation.id, :query => @query) %>
+    <%= link_to manifestation.original_title, manifestations_path(parent_id: manifestation.id, query: @query) %>
   <% else %>
     <%= link_to title_with_volume_number(manifestation), manifestation -%>
   <% end %>
 </strong>
-  <% if manifestation.series_master? %>
-    <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
+  <% if manifestation.periodical? %>
+    <%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
   <%- end -%>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
-  <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
+  <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
   <br />
   <div id="creator_list_<%= manifestation.id -%>">
-    <%= render 'manifestations/show_creators', :manifestation => manifestation -%>
+    <%= render 'manifestations/show_creators', manifestation: manifestation -%>
   </div>
+<% end %>

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

@@ -6,9 +6,9 @@
     <%- end -%>
   <%- end -%>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
-  <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.periodical?')) if manifestation.periodical? -%>
-  <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
+  <%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.periodical?')) if manifestation.periodical? -%>
+  <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
   <br />
   <div id="creator_list_<%= manifestation.id -%>">
-    <%= render 'manifestations/show_creators', :manifestation => manifestation -%>
+    <%= render 'manifestations/show_creators', manifestation: manifestation -%>
   </div>

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

@@ -4,22 +4,22 @@
                       <%- if reserve -%>
                         <%= link_to t('reserve.show'), reserve -%>
                       <%- else -%>
-                        <%= link_to t('activerecord.models.reserve'), new_reserve_path(:manifestation_id => manifestation.id) if can? :create, Reserve -%>
+                        <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%>
                       <%- end -%>
                     <% end %>
                     <br />
                   <% end %>
                 <%- if can? :update, manifestation -%>
                   <% unless params[:mode] == 'add' %>
-                    <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
+                    <%= link_to image_tag('icons/book_edit.png', size: '16x16', alt: t('page.edit')), edit_manifestation_path(manifestation) -%>
                   <% else %>
                     <% case %>
                     <% when @parent %>
-                      <%= link_to t('page.add'), new_manifestation_manifestation_relationship_path(@parent, :child_id => manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
+                      <%= link_to t('page.add'), new_manifestation_manifestation_relationship_path(@parent, child_id: manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
                     <% when @item %>
-                      <%= link_to t('page.change'), edit_exemplify_path(@item.exemplify, :manifestation_id => manifestation.id) unless @item.manifestation == manifestation -%>
+                      <%= link_to t('page.change'), edit_item_path(@item, manifestation_id: manifestation.id) unless @item.manifestation == manifestation -%>
                     <% else %>
-                      <%= link_to image_tag('icons/arrow_divide.png', :size => '16x16', :alt => t('manifestation.add_derivation')), new_manifestation_path(:parent_id => manifestation.id) -%>
+                      <%= link_to image_tag('icons/arrow_divide.png', size: '16x16', alt: t('manifestation.add_derivation')), new_manifestation_path(parent_id: manifestation.id) -%>
                     <% end %>
                   <%- end -%>
                 <% end %>

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

@@ -1,7 +1,10 @@
-<strong><%= link_to manifestation.original_title, manifestations_path(:parent_id => manifestation.id, :query => @query) -%></strong>
+<strong><%= link_to manifestation.original_title, manifestations_path(parent_id: manifestation.id, query: @query) -%></strong>
+  <% if manifestation.periodical? %>
+    <%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
+  <%- end -%>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
-  <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
+  <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
   <br />
   <div id="creator_list_<%= manifestation.id -%>">
-    <%= render 'manifestations/show_creators', :manifestation => manifestation -%>
+    <%= render 'manifestations/show_creators', manifestation: manifestation -%>
   </div>

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

@@ -1,6 +1,6 @@
   <ul>
     <% if can? :create, Manifestation %>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.manifestation')), new_manifestation_path(:parent_id => @parent.id) %></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.manifestation')), new_manifestation_path(parent_id: @parent.id) %></li>
     <% end %>
     <% if can? :update, @parent %>
       <li><%= link_to t('page.edit'), edit_manifestation_path(@parent) %></li>

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

@@ -1,8 +1,8 @@
 <%- if manifestation.original_manifestations.first or manifestation.derived_manifestations.first -%>
-  <%= render 'manifestations/manifestation_list', :manifestation => manifestation -%>
+  <%= render 'manifestations/manifestation_list', manifestation: manifestation -%>
 <%- end -%>
 <%-if defined?(EnjuQuestion) -%>
-  <%- unless manifestation.questions(:user => current_user).empty? -%>
-    <%= render 'manifestations/question_list', :manifestation => manifestation -%>
+  <%- unless manifestation.questions(user: current_user).empty? -%>
+    <%= render 'manifestations/question_list', manifestation: manifestation -%>
   <%- end -%>
 <%- end -%>

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

@@ -4,7 +4,7 @@
     <li><a href="#related_manifestation"><em><%= t('page.related_manifestation') -%> (<%= manifestation.original_manifestations.size + manifestation.derived_manifestations.size -%>)</em></a></li>
   <%- end -%>
   <% if defined?(EnjuQuestion) %>
-    <%- unless manifestation.questions(:user => current_user).empty? -%>
+    <%- unless manifestation.questions(user: current_user).empty? -%>
       <li><a href="#question"><em><%= t('resource.question') -%></em></a></li>
     <%- end -%>
   <% end %>

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

@@ -1,19 +1,22 @@
-<% cache(:manifestation => manifestation.id, :fragment => 'title_html', :role => current_user_role_name, :locale => @locale) do %>
+<% cache([manifestation, fragment: 'title_html', role: current_user_role_name, locale: @locale]) do %>
   <h2 class="resource_title">
     [M]
-    <%= link_to title_with_volume_number(manifestation), manifestation, :itemprop => 'name' -%>
+    <%= link_to title_with_volume_number(manifestation), manifestation, itemprop: 'name' -%>
+    <% if manifestation.periodical? %>
+      <%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
+    <%- end -%>
     <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
   </h2>
   <p>
     <%= manifestation.statement_of_responsibility %><br />
     <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), itemprop: 'author') -%>
     <%- end -%>
     <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), itemprop: 'editor') -%>
     <%- end -%>
     <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />
@@ -22,7 +25,7 @@
     <%- if manifestation.access_address? -%>
       <br />
       <%= link_to manifestation.access_address, manifestation.access_address -%>
-      <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address -%>
+      <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: ('Web')), manifestation.access_address -%>
     <%- end -%>
   </p>
 <% end %>

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

@@ -1,19 +1,19 @@
-<% cache(:manifestation => manifestation.id, :fragment => 'title_mobile', :role => current_user_role_name, :locale => @locale) do %>
+<% cache([manifestation, fragment: 'title_mobile', role: current_user_role_name, locale: @locale]) do %>
   <h2 class="resource_title">
     [M]
-    <%= link_to title_with_volume_number(manifestation), manifestation, :itemprop => 'name' -%>
+    <%= link_to title_with_volume_number(manifestation), manifestation, itemprop: 'name' -%>
     <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
   </h2>
   <p>
     <%= manifestation.statement_of_responsibility %><br />
     <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), itemprop: 'author') -%>
     <%- end -%>
     <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), itemprop: 'editor') -%>
     <%- end -%>
     <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />
@@ -22,7 +22,7 @@
     <%- if manifestation.access_address? -%>
       <br />
       <%= link_to manifestation.access_address, manifestation.access_address -%>
-      <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address -%>
+      <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: ('Web')), manifestation.access_address -%>
     <%- end -%>
   </p>
 <% end %>

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

@@ -1,12 +1,12 @@
-atom_feed(:url => manifestations_url(:format => :atom)) do |feed|
-  feed.title t('manifestation.query_search_result', :query => @query, :library_group_name => @library_group.display_name.localize)
+atom_feed(url: manifestations_url(format: :atom)) do |feed|
+  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)
 
   @manifestations.each do |manifestation|
     feed.entry(manifestation) do |entry|
       entry.title(manifestation.original_title)
       if defined?(EnjuBookmark)
-        entry.content(manifestation.tags.join(' '), :type => 'html')
+        entry.content(manifestation.tags.join(' '), type: 'html')
       end
 
       manifestation.creators.readable_by(current_user).each do |agent|

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

@@ -1,7 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.search_resource', :model => t('page.resource')) -%></h1>
+<h1 class="title"><%= t('page.search_resource', model: t('page.resource')) -%></h1>
 <div id="content_list">
-  <%= render 'manifestations/title', :manifestation => @manifestation if @manifestation -%>
+  <p id="notice"><%= notice %></p>
+  <%= render 'manifestations/title', manifestation: @manifestation if @manifestation -%>
 
   <% case %>
   <% when @index_agent[:creator] %>
@@ -27,10 +28,10 @@
 
   <%- if @manifestations.total_count > 0 -%>
     <p>
-      <%= t('page.number_of_search_results', :count => @count[:query_result], :numdocs => Manifestation.search.total, :seconds => sprintf("%.3f", @seconds)) -%>
+      <%= t('page.number_of_search_results', count: @count[:query_result], numdocs: Manifestation.search.total, seconds: sprintf("%.3f", @seconds)) -%>
       <%- if @count[:query_result] > Setting.max_number_of_results -%>
         <br />
-        <%= t('page.limit_exceeded', :count => Setting.max_number_of_results) -%>
+        <%= t('page.limit_exceeded', count: Setting.max_number_of_results) -%>
       <%- end -%>
     </p>
 
@@ -39,30 +40,30 @@
       <%- if params[:sort_by].blank? -%>
         <strong><%= t('manifestation.date_of_acquisition') -%></strong>
       <%- else -%>
-        <%= link_to t('manifestation.date_of_acquisition'), url_for(params.merge(:sort_by => nil, :only_path => true)) -%>
+        <%= link_to t('manifestation.date_of_acquisition'), url_for(params.merge(sort_by: nil, only_path: true)) -%>
       <%- end -%>
       <%- if params[:sort_by] == 'pub_date' -%>
         <strong><%= t('activerecord.attributes.manifestation.date_of_publication') -%></strong>
       <%- else -%>
-        <%= link_to t('activerecord.attributes.manifestation.date_of_publication'), url_for(params.merge(:sort_by => 'pub_date', :only_path => true)) -%>
+        <%= link_to t('activerecord.attributes.manifestation.date_of_publication'), url_for(params.merge(sort_by: 'pub_date', only_path: true)) -%>
       <%- end -%>
       <%- if params[:sort_by] == 'title' -%>
         <strong><%= t('page.title') -%></strong>
       <%- else -%>
-        <%= link_to t('page.title'), url_for(params.merge(:sort_by => 'title', :only_path => true)) -%>
+        <%= link_to t('page.title'), url_for(params.merge(sort_by: 'title', only_path: true)) -%>
       <%- end -%>
     </p>
 
     <div class="autopagerize_page_element" id="list">
-      <%= render 'manifestations/list', :manifestations => @manifestations -%>
+      <%= render 'manifestations/list', manifestations: @manifestations -%>
     </div>
 
     <% if defined?(EnjuBookmark) %>
       <div id="tag_cloud">
         <h3 class="resource_title"><%= t('activerecord.models.tag') -%></h3>
         <div id="tag_cloud_list"></div>
-        <%= image_tag 'spinner.gif', :id => 'spinner_tag_cloud',
-          :style => 'padding-bottom: 15px; padding-left: 40px;' -%>
+        <%= image_tag 'spinner.gif', id: 'spinner_tag_cloud',
+          style: 'padding-bottom: 15px; padding-left: 40px;' -%>
       </div>
     <% end %>
   <%- else -%>
@@ -78,15 +79,15 @@
   <% if @parent and can?(:update, @parent) %>
     <%= render 'submenu_parent' %>
   <% end %>
-  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.merge(:action => 'index', :view => nil, :carrier_type => nil, :library => nil, :language => nil, :subject => nil, :only_path => true))  -%></h3>
+  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.merge(action: 'index', view: nil, carrier_type: nil, library: nil, language: nil, subject: nil, only_path: true))  -%></h3>
     <%- if @manifestations.total_count > 0 -%>
       <%= render 'manifestations/all_facet' -%>
     <%- end -%>
   <div>
     <%- if params[:library_id].blank? -%>
-      <%= link_to((image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), url_for(params.merge(:format => :rss, :page => nil, :library_id => nil, :only_path => true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(:format => :rss, :page => nil, :library_id => nil, :commit => nil, :only_path => true)) -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, library_id: nil, commit: nil, only_path: true)) -%>
     <%- else -%>
-      <%= link_to((image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), url_for(params.merge(:format => :rss, :page => nil, :only_path => true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(:format => :rss, :page => nil, :commit => nil, :only_path => true)) -%>
+      <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
     <%- end -%>
   </div>
 </div>
@@ -94,7 +95,7 @@
 <% if defined?(EnjuBookmark) %>
   <script type="text/javascript">
     window.onload = function() {
-      $("#tag_cloud_list").load('<%= url_for(params.merge(:view => "tag_cloud", :only_path => true)) -%>', hideTagCloudSpinner);
+      $("#tag_cloud_list").load('<%= url_for(params.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
     }
 
     function hideTagCloudSpinner(){

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

@@ -1,12 +1,12 @@
 <div data-role="header">
-<h1 class="title"><%= t('page.search_resource', :model => t('page.resource')) -%></h1>
+<h1 class="title"><%= t('page.search_resource', model: t('page.resource')) -%></h1>
 </div>
 
 <div data-role="content">
   <div data-role="fieldcontain">
-    <%= form_for :manifestations, :html => {:method => 'get'} do -%>
+    <%= form_for :manifestations, html: {method: 'get'} do -%>
       <%= 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')} -%>
+      <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
       <%= submit_tag t('page.search') -%>
     <% end %>
   </div>

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

@@ -3,6 +3,6 @@ xml.modsCollection(
         'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
         'xmlns' => "http://www.loc.gov/mods/v3"){
   @manifestations.each do |manifestation|
-      xml << render('manifestations/show', :manifestation => manifestation)
+      xml << render('manifestations/show', manifestation: manifestation)
   end
 }

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

@@ -1,17 +1,17 @@
-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)
       if defined?(EnjuBookmark)
-        entry.content(manifestation.tags.join(' '), :type => 'html')
+        entry.content(manifestation.tags.join(' '), type: 'html')
       end
 
       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
 }