enju_flower 0.1.0.pre16 → 0.1.0.pre17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bde6cb170d186ff7704b504b226d11add963357
-  data.tar.gz: a3d1d54f28bb280616c7a293b366c3dc66b43209
+  metadata.gz: a8d4dd5cc70b13f9fe9cfb051cbe37facd5c7160
+  data.tar.gz: 6d6238411097af5374feb62ee82ea679c30a893c
 SHA512:
-  metadata.gz: 1f79043997dcb5b7fd870b0c212c7cb3cd03e01885c141feeec76d8a2d2a16e0ae07d8d1dda311c9a2956d694bbd0a06310fe6479c0ec87656fb216fbddb7274
-  data.tar.gz: 09fc6adab782515eea1e76c5e8dfbbb2036eb82cfe880a1443fb3b298f2bf6aeee82cf80ae8247780b5d07bcd4ddb014f9810b9bad9e189148e747db83eb6ebd
+  metadata.gz: e67efff7b89cf736ed92ed181f3037a0f177504b0cc684f67ad102781931dbc1863616c066c88796d22892d9333e51e56ae02848ee00d79844d35f5077d1917d
+  data.tar.gz: 0068bc61e23930557dfb0c8c7bf67841032ff085c9f425c15a8a299e265a1b85980598585903e327a7411a6a7a24511723f90aed8023b539c3283e819e9d5e3e

data/app/helpers/manifestations_helper.rb

@@ -12,7 +12,7 @@ module ManifestationsHelper
 
   def back_to_manifestation_index
     if session[:params]
-      params = session[:params].merge(:view => nil, :controller => :manifestations)
+      params = session[:params].merge(view: nil, :controller => :manifestations)
       link_to t('page.back_to_search_results'), url_for(params)
     else
       link_to t('page.back'), :back
@@ -69,41 +69,41 @@ module ManifestationsHelper
     current = true if languages.include?(language.name)
     if current
       content_tag :strong do
-        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, language: language.name, view: nil, only_path: true)))
       end
     else
-      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
   def library_facet(current_libraries, facet)
-    library = Library.where(:name => facet.value).select([:name, :display_name]).first
+    library = Library.where(name: facet.value).select([:name, :display_name]).first
     return nil unless library
     string = ''
     current = true if current_libraries.include?(library.name)
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library => (current_libraries << library.name).uniq.join(' '), :view => nil, :only_path => true)))
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library => (current_libraries << library.name).uniq.join(' '), :view => nil, :only_path => true)))
+        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
 
   def carrier_type_facet(facet)
     string = ''
-    carrier_type = CarrierType.where(:name => facet.value).select([:name, :display_name]).first
+    carrier_type = CarrierType.where(name: facet.value).select([:name, :display_name]).first
     if carrier_type
       string << form_icon(carrier_type)
       current = true if params[:carrier_type] == carrier_type.name
       if current
         content_tag :strong do
-          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:carrier_type => carrier_type.name, :page => nil, :view => nil, :only_path => true)))
+          link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:carrier_type => carrier_type.name, :page => nil, :view => nil, :only_path => true)))
+        link_to("#{carrier_type.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
@@ -113,10 +113,10 @@ module ManifestationsHelper
     current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_to.to_i
     if current
       content_tag :strong do
-        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => facet.value.last.to_i - 1, :page => nil, :view => nil, :only_path => true)))
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
       end
     else
-      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(:pub_date_from => facet.value.first.to_i, :pub_date_to => facet.value.last.to_i - 1, :page => nil, :view => nil, :only_path => true)))
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 
@@ -127,7 +127,7 @@ module ManifestationsHelper
     end
     if manifestation.periodical?
       if manifestation.issue_number_string?
-        title <<  " " + manifestation.issue_number_string
+        title <<  " (#{manifestation.issue_number_string})"
       end
       if manifestation.serial_number?
         title << " " + manifestation.serial_number.to_s
@@ -139,7 +139,7 @@ module ManifestationsHelper
   if defined?(EnjuBookmark)
     def link_to_bookmark(manifestation)
       if manifestation.bookmarked?(current_user)
-        link_to t('bookmark.remove_from_my_bookmark'), bookmark_path(Bookmark.where(:user_id => current_user.id, :manifestation_id => manifestation.id).first), :confirm => t('page.are_you_sure'), :method => :delete
+        link_to t('bookmark.remove_from_my_bookmark'), bookmark_path(Bookmark.where(:user_id => current_user.id, manifestation_id: manifestation.id).first), confirm: t('page.are_you_sure'), method: :delete
       else
         link_to t('bookmark.add_to_my_bookmark'), new_bookmark_path(:bookmark => {:url => manifestation_url(manifestation)})
       end
@@ -150,19 +150,19 @@ module ManifestationsHelper
     def link_to_reservation(manifestation, reserve)
       unless current_user
         unless manifestation.items.for_checkout.empty?
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
+          link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
         end
       else
         if current_user.has_role?('Librarian')
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
+          link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
         else
           if manifestation.is_checked_out_by?(current_user)
             I18n.t('manifestation.currently_checked_out')
           else
             if manifestation.is_reserved_by?(current_user)
-              link_to t('manifestation.cancel_reservation'), reserve, :confirm => t('page.are_you_sure'), :method => :delete 
+              link_to t('manifestation.cancel_reservation'), reserve, confirm: t('page.are_you_sure'), method: :delete 
             else
-              link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
+              link_to t('manifestation.reserve_this'), new_reserve_path(manifestation_id: manifestation.id)
             end
           end
         end

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

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

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.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.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.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- else -%>

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

@@ -1,3 +1,3 @@
 <div class="holding_index" id="holding_<%= manifestation.id -%>" style="display: none">
-  <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
+  <%= render 'manifestations/show_holding', manifestation: manifestation -%>
 </div>

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path, 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')} -%>
+    <%= 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 -%>
     <%= submit_tag t('page.search') -%>
     <br />

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => contributor_manifestations_path(@index_agent[:contributor]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: contributor_manifestations_path(@index_agent[:contributor]), 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')} -%>
+    <%= 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 %>
       <%= render 'page/add' %>

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => creator_manifestations_path(@index_agent[:creator]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: creator_manifestations_path(@index_agent[:creator]), 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')} -%>
+    <%= 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 %>
       <%= render 'page/add' %>

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => item_manifestations_path(@item), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: item_manifestations_path(@item), 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')} -%>
+    <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <% if can? :create, Create %>
       <%= render 'page/add' %>
     <% end %>

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

@@ -1,7 +1,7 @@
-<%= form_for :manifestations, :url => manifestation_manifestations_path(@manifestation), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: manifestation_manifestations_path(@manifestation), 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')} -%>
+    <%= 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, ManifestationRelationship %>
       <%= render 'page/add' %>

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

@@ -1,13 +1,19 @@
+<%= render 'paginate_id_link', manifestation: @parent, manifestation_ids: @manifestation_ids %>
+
 <h2 class="resource_title">
   [M]
-  <%= link_to @parent.original_title, @parent, :itemprop => 'name' -%>
+  <%= link_to @parent.original_title, @parent, itemprop: 'name' -%>
+  <% if @parent.periodical? %>
+    <%= image_tag('icons/newspaper.png', size: '16x16', alt: t('manifestation.serial')) -%>
+  <%- end -%>
+  <%= link_to form_icon(@parent.carrier_type), @parent -%>
 </h2>
 
 <div class="search_form">
-<%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path, 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')} -%>
+    <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'parent_id', @parent.id -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
     <% if can? :update, Manifestation %>

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => publisher_manifestations_path(@index_agent[:publisher]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: publisher_manifestations_path(@index_agent[:publisher]), 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')} -%>
+    <%= 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, Produce %>
       <%= render 'page/add' %>

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

@@ -1,13 +1,13 @@
 <h2 class="resource_title">
   [S]
-  <%= link_to @series_statement.original_title, @series_statement, :itemprop => 'name' -%>
+  <%= link_to @series_statement.original_title, @series_statement, itemprop: 'name' -%>
 </h2>
 
 <div class="search_form">
-<%= form_for :manifestations, :url => series_statement_manifestations_path(@series_statement), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: series_statement_manifestations_path(@series_statement), 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')} -%>
+    <%= 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? :update, Manifestation %>
       <%= render 'page/add' %>

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

@@ -3,7 +3,7 @@
   <%- languages = params[:language].to_s.split -%>
   <%- current_languages = languages.dup -%>
   <%- @language_facet.each do |facet| -%>
-    <%- language = Language.where(:name => facet.value).select([:name, :display_name]).first -%>
+    <%- language = Language.where(name: facet.value).select([:name, :display_name]).first -%>
     <%- if language -%>
       <li>
         <%= language_facet(language, current_languages, facet) %>
@@ -11,6 +11,6 @@
     <%- end -%>
   <%- end -%>
   <%- if params[:language] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:language => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(language: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

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

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

@@ -7,10 +7,10 @@
 
 <div>
   <%- if manifestations and manifestations.size > @manifestations.limit_value.div(2) -%>
-    <%= form_for :manifestations, :html => {:method => 'get'} do -%>
+    <%= form_for :manifestations, html: {method: 'get'} do -%>
       <p>
         <%= label_tag :search_form_bottom, t('page.search_term') -%>:
-        <%= search_field_tag 'query', h(@query), {:id => 'search_form_bottom', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+        <%= search_field_tag 'query', h(@query), {id: 'search_form_bottom', class: 'search_form', placeholder: t('page.search_term')} -%>
         <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
         <%= submit_tag t('page.search') -%>
         <br />

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

@@ -1,60 +1,62 @@
-        <tr class="line<%= cycle("0", "1") -%>">
-          <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
+        <% cache([manifestation, fragment: 'manifestation_html', role: current_user_role_name, locale: @locale]) do %>
           <td style="480px">
-              <% if manifestation.root_series_statement %>
-                <%= render 'manifestations/show_series_index', :manifestation => manifestation, :series_statement => manifestation.root_series_statement -%>
+            <% if manifestation.root_series_statement %>
+              <%= render 'manifestations/show_series_index', manifestation: manifestation, series_statement: manifestation.root_series_statement -%>
+            <% else %>
+              <%= render 'manifestations/show_index', manifestation: manifestation -%>
+              <div class="access_address">
+                <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
+              </div>
+              <% if current_user.try(:has_role?, 'Librarian') %>
+                <%- unless manifestation.items.empty? -%>
+                  (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
+                <% end %>
               <% else %>
-                <%= render 'manifestations/show_index', :manifestation => manifestation -%>
-                <div class="access_address">
-                  <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
-                </div>
-                <% if current_user.try(:has_role?, 'Librarian') %>
-                  <%- unless manifestation.items.on_shelf.empty? -%>
-                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
-                  <% end %>
-                <% else %>
-                  <%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
-                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
-                  <%- end -%>
+                <%- unless manifestation.items.for_checkout.on_shelf.empty? -%>
+                  (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
                 <%- end -%>
-                <% if defined?(EnjuBookmark) %>
-                  <%- if manifestation.tags.first -%>
-                    (<%= link_to_function t('activerecord.models.tag'), "$('#tag_#{manifestation.id}').toggle()" -%>)
-                  <%- end -%>
-                  <%= render 'manifestations/show_tag', :manifestation => manifestation -%>
-                <% end %>
+              <%- end -%>
+              <% if defined?(EnjuBookmark) %>
+                <%- if manifestation.tags.first -%>
+                  (<%= link_to_function t('activerecord.models.tag'), "$('#tag_#{manifestation.id}').toggle()" -%>)
+                <%- end -%>
+                <%= render 'manifestations/show_tag', manifestation: manifestation -%>
               <% end %>
-              <%= render 'manifestations/holding', :manifestation => manifestation -%>
+            <% end %>
+            <%= render 'manifestations/holding', manifestation: manifestation -%>
           </td>
-            <% if signed_in? %>
-              <td id="edit_icons">
-                <% if defined?(EnjuCirculation) %>
-                  <% unless params[:mode] == 'add' %>
-                    <% if manifestation.is_reservable_by?(current_user) %>
-                      <%- reserve = manifestation.is_reserved_by?(current_user) -%>
-                      <%- 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 -%>
-                      <%- end -%>
-                    <% end %>
-                    <br />
+          <% if signed_in? %>
+            <td id="edit_icons">
+              <% if defined?(EnjuCirculation) %>
+                <% unless params[:mode] == 'add' %>
+                  <% if manifestation.is_reservable_by?(current_user) %>
+                    <%- reserve = manifestation.is_reserved_by?(current_user) -%>
+                    <%- 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 -%>
+                    <%- 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) -%>
+              <% 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) -%>
+                <% else %>
+                  <% case %>
+                  <% when @parent %>
+                    <%= link_to t('page.add'), new_manifestation_relationship_path(manifestation_id: @parent.id, child_id: manifestation.id) unless @parent.derived_manifestations.include?(manifestation) or @parent == manifestation -%>
+                  <% when @item %>
+                    <%= link_to t('page.change'), edit_item_path(@item, manifestation_id: manifestation.id) unless @item.manifestation == 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 -%>
-                    <% when @item %>
-                      <%= link_to t('page.change'), edit_exemplify_path(@item.exemplify, :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) -%>
-                    <% end %>
-                  <%- end -%>
+                    <%= link_to image_tag('icons/arrow_divide.png', size: '16x16', alt: t('manifestation.add_derivation')), new_manifestation_path(parent_id: manifestation.id) -%>
+                  <% end %>
                 <%- end -%>
-              </td>
-            <% end %>
-        </tr>
+              <%- end -%>
+            </td>
+          <% end %>
+        <% end %>
+      </tr>

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

@@ -5,7 +5,7 @@
           [M]
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
-          <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address if manifestation.access_address? -%>
+          <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: ('Web')), manifestation.access_address if manifestation.access_address? -%>
           <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
           <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
           <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
@@ -19,7 +19,7 @@
           [M]
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
-          <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address if manifestation.access_address? -%>
+          <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: ('Web')), manifestation.access_address if manifestation.access_address? -%>
           <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
           <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
           <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>

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

@@ -17,13 +17,13 @@
 </script>
 <% end %>
 
-<%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
   <div>
     <span id="next_link"><%= t('page.next') %></span>
     <span id="prev_link"><%= t('page.previous') %></span>
     <%= back_to_manifestation_index -%>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
-    <%= search_field_tag 'query', @query, {:id => 'search_form_top', :class => 'search_form_short', :placeholder => t('page.search_term')} -%>
+    <%= search_field_tag 'query', @query, {id: 'search_form_top', class: 'search_form_short', placeholder: t('page.search_term')} -%>
     <%= submit_tag t('page.search') -%>
     <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
   </div>

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

@@ -1,5 +1,5 @@
 <% if manifestation %>
-  <% cache(:manifestation => manifestation.id, :fragment => 'pickup_html', :role => current_user_role_name, :locale => @locale) do %>
+  <% cache([manifestation, fragment: 'pickup_html', role: current_user_role_name, locale: @locale]) do %>
     <div id="pickup_book_jacket">
       <%= book_jacket(manifestation) -%>
     </div>
@@ -8,7 +8,7 @@
         <p>
           <strong><%= t('activerecord.models.subject') -%>:</strong>
           <%- manifestation.subjects.each do |subject| -%>
-            <%= link_to subject.term, manifestations_path(:query => "subject_sm:\"#{h(subject.term)}\"") -%>
+            <%= link_to subject.term, manifestations_path(query: "subject_sm:\"#{h(subject.term)}\"") -%>
           <%- end -%>
         </p>
       <% end %>
@@ -16,15 +16,15 @@
         <p>
           <strong><%= t('page.tag') -%>:</strong>
           <%- manifestation.tags.each do |tag| -%>
-            <%= link_to tag.name, manifestations_path(:tag => tag.name) -%>
+            <%= link_to tag.name, manifestations_path(tag: tag.name) -%>
          <%- end -%>
         </p>
       <% end %>
     </div>
     <div style="clear: both"></div>
     <div style="margin-top: 5px">
-      <%= render 'manifestations/show_index', :manifestation => manifestation -%>
-      <%= render 'manifestations/holding', :manifestation => manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: manifestation -%>
+      <%= render 'manifestations/holding', manifestation: manifestation -%>
     </div>
   <% end %>
 <% end %>

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

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

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

@@ -8,6 +8,6 @@
         </li>
       <% end %>
     </ul>
-    <%= paginate(@questions, :param_name => :question_page, :remote => true) -%>
+    <%= paginate(@questions, param_name: :question_page, remote: true) -%>
   </div>
 </div>

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

@@ -4,11 +4,11 @@
     <% facet.value ? facet_reservable = true : facet_reservable = false %>
     <li>
       <%- if @reservable == facet_reservable -%><strong><%- end -%>
-      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(:page => nil, :reservable => facet.value.to_s, :view => nil, :only_path => true)) -%>
+      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(page: nil, reservable: facet.value.to_s, view: nil, only_path: true)) -%>
       <%- if @reservable == facet_reservable -%></strong><%- end -%>
     </li>
   <%- end -%>
   <%- unless @reservable.nil? -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:reservable => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(reservable: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -1,6 +1,6 @@
 <%- @search_engines.each do |search_engine| -%>
   <p>
-    <%= form_tag search_engine.base_url, :method => search_engine.http_method do -%>
+    <%= form_tag search_engine.base_url, method: search_engine.http_method do -%>
       <%= link_to search_engine.name, search_engine.url -%>
       <%= submit_tag t('page.search') -%>
       <br />

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

@@ -1,12 +1,12 @@
   <%- if params[:mode] == 'show_all_creators' -%>
     <%= agents_list(manifestation.creators.readable_by(current_user)) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
+      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
     <%- end -%>
   <%- else -%>
     <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
+      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
     <%- end -%>
   <%- end -%>
 

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

@@ -1,12 +1,12 @@
   <%- if params[:mode] == 'show_all_creators' -%>
     <%= agents_list(manifestation.creators.readable_by(current_user)) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
+      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
     <%- end -%>
   <%- else -%>
     <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
-      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
+      (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, index_num: manifestation.id, mode: 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
     <%- end -%>
   <%- end -%>