enju_biblio 0.3.18 → 0.4.0.beta.1

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

@@ -24,7 +24,7 @@
     </td>
     <td><%= manifestation_relationship_type.name -%></td>
     <td>
-      <%= link_to manifestation_relationship_type.display_name.localize, manifestation_relationship_type -%>
+      <%= link_to manifestation_relationship_type.display_name, manifestation_relationship_type -%>
       <br />
       <%= manifestation_relationship_type.note %>
     </td>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.manifestation_relationship_type.display_name') -%>:</strong>
-  <%= @manifestation_relationship_type.display_name.localize -%>
+  <%= @manifestation_relationship_type.display_name -%>
 </p>
 
 <p>

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

@@ -23,7 +23,7 @@
   </div>
   <div class="field">
     <%= f.label :manifestation_relationship_type_id %><br />
-    <%= f.select(:manifestation_relationship_type_id, @manifestation_relationship_types.collect{|r| [r.display_name.localize, r.id]}) -%>
+    <%= f.select(:manifestation_relationship_type_id, @manifestation_relationship_types.collect{|r| [r.display_name, r.id]}) -%>
   </div>
   <div class="actions">
     <%= f.submit %>

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

@@ -1,9 +1,5 @@
-<% if manifestation %>
-  <%= render 'manifestations/colorbox', manifestation: manifestation %>
-
-  <% if defined?(EnjuManifestationViewer) %>
-    <div id="manifestation_book_jacket">
-      <%= book_jacket(manifestation) -%>
-    </div>
-  <% end %>
-<% end %>
+<div id="manifestation_book_jacket">
+  <%- if manifestation and defined?(EnjuManifestationViewer) -%>
+    <%= book_jacket(manifestation) -%>
+  <%- end -%>
+</div>

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

@@ -1,12 +1,12 @@
 <table class="call_number_table">
   <tr>
     <td class="call_number_table">
-      <%= item.shelf.library.display_name.localize -%>
+      <%= item.shelf.library.display_name -%>
       <br />
-      <%= link_to item.shelf.display_name.localize, item.shelf -%>
+      <%= link_to item.shelf.display_name, item.shelf -%>
       <br />
       <% if defined?(EnjuCirculation) %>
-        <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+        <%= item.circulation_status.display_name if item.circulation_status -%>
       <% end %>
 
     </td>

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

@@ -4,6 +4,6 @@
     <li><%= carrier_type_facet(facet) %></li>
   <%- end -%>
   <%- if params[:carrier_type] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(request.params.merge(carrier_type: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(filtered_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(request.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(filtered_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(request.params.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(classification: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- else -%>

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

@@ -1,5 +1,5 @@
 <script>
   $(document).ready(function(){
-    $('a[rel="manifestation_<%= manifestation.id -%>"]').colorbox({transition:"none", photo:true});
+    $('a[rel="manifestation_<%= @manifestation.id -%>"]').colorbox({transition:"none", photo:true});
   })
 </script>

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

@@ -4,5 +4,4 @@
   <li><%= link_to 'RDF/XML', manifestation_url(@manifestation, format: :rdf) %></li>
   <li><%= link_to 'MODS', manifestation_url(@manifestation, format: :mods) %></li>
   <li><%= link_to 'TSV', manifestation_url(@manifestation, format: :txt) %></li>
-  <li><%= link_to 'JSON', manifestation_url(@manifestation, format: :json) %></li>
 </ul>

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

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

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

@@ -71,7 +71,7 @@
 
   <div class="field" id="creator_form">
     <%= f.label :creator_string -%><br />
-    <%= f.fields_for :creators, @manifestation.creators.order(Create.arel_table[:position].asc) do |creator_form| %>
+    <%= f.fields_for :creators do |creator_form| %>
       <%= render 'creator_fields', f: creator_form %>
     <% end %>
     <div class="links">
@@ -81,7 +81,7 @@
 
   <div class="field" id="contributor_form">
     <%= f.label :contributor_string -%><br />
-    <%= f.fields_for :contributors, @manifestation.contributors.order(Realize.arel_table[:position].asc) do |contributor_form| %>
+    <%= f.fields_for :contributors do |contributor_form| %>
       <%= render 'contributor_fields', f: contributor_form %>
     <% end %>
     <div class="links">
@@ -91,7 +91,7 @@
 
   <div class="field" id="publisher_form">
     <%= f.label :publisher_string -%><br />
-    <%= f.fields_for :publishers, @manifestation.publishers.order(Produce.arel_table[:position].asc) do |publisher_form| %>
+    <%= f.fields_for :publishers do |publisher_form| %>
       <%= render 'publisher_fields', f: publisher_form %>
     <% end %>
     <div class="links">
@@ -116,19 +116,19 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.content_type') -%>
-    <%= f.select(:content_type_id, @content_types.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:content_type_id, @content_types.collect{|c| [c.display_name, c.id]}) -%>
 
     <%= f.label t('activerecord.models.carrier_type') -%>
-    <%= f.select(:carrier_type_id, @carrier_types.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:carrier_type_id, @carrier_types.collect{|c| [c.display_name, c.id]}) -%>
     <!-- TODO: Formの切り替え時に入力項目をAjaxで書き換える -->
   </div>
 
   <div class="field">
     <%= f.label t('activerecord.models.frequency') -%>
-    <%= f.select(:frequency_id, @frequencies.collect{|frequency| [frequency.display_name.localize, frequency.id]}) -%>
+    <%= f.select(:frequency_id, @frequencies.collect{|frequency| [frequency.display_name, frequency.id]}) -%>
 
     <%= f.label t('activerecord.models.language') -%>
-    <%= f.select(:language_id, @languages.collect{|language| [language.display_name.localize, language.id]}) -%>
+    <%= f.select(:language_id, @languages.collect{|language| [language.display_name, language.id]}) -%>
   </div>
 
   <div class="field">
@@ -184,28 +184,10 @@
 
   <div class="field">
     <%= f.label t('role.required_role') -%>
-    <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
+    <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
   </div>
 
-  <% if ManifestationCustomProperty.first %>
-    <div class="field">
-      <% ManifestationCustomProperty.order(:position).each do |c| %>
-        <% @manifestation.manifestation_custom_values.new(manifestation_custom_property: c) unless @manifestation.manifestation_custom_values.map{|value| value.manifestation_custom_property_id}.include?(c.id) %>
-      <% end %>
-      <%= f.fields_for :manifestation_custom_values do |custom_form| %>
-        <%= custom_form.label custom_form.object.manifestation_custom_property.name.to_sym, custom_form.object.manifestation_custom_property.display_name.localize %>
-        <%= custom_form.hidden_field :manifestation_custom_property_id %>
-        <%= custom_form.text_field :value, class: 'form-control' %>
-      <% end %>
-    </div>
-  <% end %>
-
   <div class="field">
-    <%= f.label :abstract -%><br />
-    <%= f.text_area :abstract, class: 'resource_textarea' -%>
-  </div>
-
-  <div class="form-group">
     <%= f.label :description -%><br />
     <%= f.text_area :description, class: 'resource_textarea' -%>
   </div>
@@ -215,11 +197,6 @@
     <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
-  <div class="field">
-    <%= f.label :memo -%><br />
-    <%= f.text_area :memo, class: 'resource_textarea' -%>
-  </div>
-
   <div class="actions">
     <%= f.hidden_field :parent_id %>
     <%= f.hidden_field :lock_version %>

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

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

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

@@ -11,6 +11,6 @@
     <%- end -%>
   <%- end -%>
   <%- if params[:language] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(request.params.merge(language: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(filtered_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(request.params.merge(library: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(library: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -1 +1 @@
-<%= manifestation.to_hash(role: current_user_role_name).values.to_csv(col_sep: "\t") -%>
+<%= manifestation.to_csv(format: :txt, role: current_user_role_name) -%>

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

@@ -1,7 +1,7 @@
 <% if manifestation %>
   <% cache([manifestation, fragment: 'pickup_html', role: current_user_role_name, locale: @locale]) do %>
     <div id="pickup_book_jacket">
-      <%= render 'manifestations/book_jacket', manifestation: manifestation -%>
+      <%= book_jacket(manifestation) -%>
     </div>
     <div style="float: left">
       <% if defined?(EnjuSubject) %>

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

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

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(request.params.merge(page: nil, reservable: facet.value.to_s, view: nil, only_path: true)) -%>
+      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(filtered_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(request.params.merge(reservable: nil, page: nil, view: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(reservable: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -17,6 +17,6 @@
   <%- end -%>
   <% if defined?(EnjuSubject) %>
     <% manifestation.classifications.each_with_index do |classification| %>
-      <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
+      <%= link_to "#{classification.classification_type.display_name}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
     <% end %>
   <% end %>

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

@@ -3,27 +3,23 @@
     <div id="detail">
     <% 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 defined?(EnjuManifestationViewer) -%>
-        <tr>
-          <td style="width: 200px"><%= t('activerecord.attributes.manifestation.original_title') -%>:</td>
-          <td style="width: 500px"><%= manifestation.original_title -%></td>
-        </tr>
+        <%= embed_content(manifestation) -%>
         <% if manifestation.title_transcription? %>
           <tr>
-            <td><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>
-            <td><%= manifestation.title_transcription -%></td>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_transcription -%></td>
           </tr>
         <% end %>
         <% if manifestation.title_alternative? %>
           <tr>
-            <td><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td><%= manifestation.title_alternative -%></td>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
         <%- if manifestation.series_statements.exists? -%>
           <tr>
-            <td><%= t('activerecord.models.series_statement') -%>:</td>
-            <td>
+            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
+            <td style="width: 500px">
               <%= render 'show_series_detail', manifestation: manifestation %>
               <%- unless manifestation.identifier_contents(:issn).empty? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
@@ -33,15 +29,15 @@
         <% end %>
         <%= render 'edition_and_number', manifestation: manifestation %>
         <tr>
-          <td><%= t('page.form') -%>:</td>
-          <td>
-            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
-            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
+          <td style="width: 200px"><%= t('page.form') -%>:</td>
+          <td style="width: 500px">
+            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name -%> /
+            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name if manifestation.manifestation_content_type -%>
           </td>
         </tr>
         <tr>
           <td><%= t('activerecord.models.language') -%>:</td>
-          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
+          <td><span itemprop="inLanguage"><%= manifestation.language.display_name -%></span></td>
         </tr>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.publication_place') -%>:</td>
@@ -75,7 +71,7 @@
             <ul>
               <% manifestation.identifiers.each do |identifier| %>
                 <li>
-                  <%= identifier.identifier_type.display_name.localize %>:
+                  <%= identifier.identifier_type.display_name %>:
                   <%= identifier_link(identifier) %>
                 </li>
               <% end %>
@@ -99,38 +95,18 @@
           <td><%= t('page.updated_at') -%>:</td>
           <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
         </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.manifestation.abstract') -%>:</td>
-          <td>
-            <%= raw simple_format(h(manifestation.abstract)) -%>
-          </td>
-        </tr>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
           <td>
             <%= raw simple_format(h(manifestation.description)) -%>
           </td>
         </tr>
-        <% @manifestation.manifestation_custom_values.each do |value| %>
-          <tr>
-            <td><%= value.manifestation_custom_property.display_name.localize -%>:</td>
-            <td>
-              <%= value.value -%>
-            </td>
-          </tr>
-        <% end %>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
           <td>
             <%= raw simple_format(h(manifestation.note)) -%>
           </td>
         </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.manifestation.memo') -%>:</td>
-          <td>
-            <%= simple_format(manifestation.memo) -%>
-          </td>
-        </tr>
       </table>
     <% end %>
     <% if defined?(EnjuCirculation) %>

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

@@ -3,27 +3,23 @@
     <div id="detail">
     <% 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 defined?(EnjuManifestationViewer) -%>
-        <tr>
-          <td style="width: 200px"><%= t('activerecord.attributes.manifestation.original_title') -%>:</td>
-          <td style="width: 500px"><%= manifestation.original_title -%></td>
-        </tr>
+        <%= embed_content(manifestation) -%>
         <% if manifestation.title_transcription? %>
           <tr>
-            <td><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>
-            <td><%= manifestation.title_transcription -%></td>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_transcription -%></td>
           </tr>
         <% end %>
         <% if manifestation.title_alternative? %>
           <tr>
-            <td><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td><%= manifestation.title_alternative -%></td>
+            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
         <%- if manifestation.series_statements.exists? -%>
           <tr>
-            <td><%= t('activerecord.models.series_statement') -%>:</td>
-            <td>
+            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
+            <td style="width: 500px">
               <%= render 'show_series_detail', manifestation: manifestation %>
               <%- unless manifestation.identifier_contents(:issn).empty? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
@@ -33,15 +29,15 @@
         <% end %>
         <%= render 'edition_and_number', manifestation: manifestation %>
         <tr>
-          <td><%= t('page.form') -%>:</td>
-          <td>
-            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
-            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
+          <td style="width: 200px"><%= t('page.form') -%>:</td>
+          <td style="width: 500px">
+            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name -%> /
+            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name if manifestation.manifestation_content_type -%>
           </td>
         </tr>
         <tr>
           <td><%= t('activerecord.models.language') -%>:</td>
-          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
+          <td><span itemprop="inLanguage"><%= manifestation.language.display_name -%></span></td>
         </tr>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.publication_place') -%>:</td>
@@ -77,7 +73,7 @@
             <ul>
               <% manifestation.identifiers.each do |identifier| %>
                 <li>
-                  <%= identifier.identifier_type.display_name.localize %>:
+                  <%= identifier.identifier_type.display_name %>:
                   <%= identifier_link(identifier) %>
                 </li>
               <% end %>
@@ -95,14 +91,6 @@
           <td><%= t('page.updated_at') -%>:</td>
           <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
         </tr>
-        <% if manifestation.abstract.present? %>
-          <tr>
-            <td><%= t('activerecord.attributes.manifestation.abstract') -%>:</td>
-            <td>
-              <%= raw simple_format(h(manifestation.abstract)) -%>
-            </td>
-          </tr>
-        <% end %>
         <% if manifestation.description.present? %>
           <tr>
             <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>

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

@@ -9,10 +9,10 @@
   <%- items.each do |item| -%>
     <tr>
       <td>
-        <%= item.shelf.library.display_name.localize %>
+        <%= item.shelf.library.display_name %>
       </td>
       <td>
-        <%= item.shelf_display_name.localize -%>
+        <%= item.shelf_display_name -%>
       </td>
       <td>
         <%= item.call_number -%>
@@ -25,7 +25,7 @@
         <%- end -%>
       </td>
       <td>
-        <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+        <%= item.circulation_status.display_name if item.circulation_status -%>
         <%- if item.rent? -%>
           (
             <%= t('activerecord.attributes.checkout.due_date') -%>:

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

@@ -20,10 +20,10 @@
         <%- 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, item.shelf.library, id: "library_item_#{item.id}") %>
       </td>
       <td>
-        <%= link_to(item.shelf_display_name.localize, item.shelf, id: "shelf_item_#{item.id}")-%>
+        <%= link_to(item.shelf_display_name, item.shelf, id: "shelf_item_#{item.id}")-%>
         <%= render 'items/shelf_picture', item: item -%>
       </td>
       <td>

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

@@ -19,7 +19,7 @@
       <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
-      <meta itemprop="datePublished" content="<%= manifestation.date_of_publication.iso8601 %>" />
+      <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />
       (<%= t('activerecord.attributes.manifestation.pub_date') %>: <%= manifestation.pub_date -%>)
     <%- end -%>
     <%- if manifestation.access_address? -%>

data/app/views/manifestations/explain.sru

@@ -0,0 +1,9 @@
+<sru:explainResponse xmlns:sru="http://www.loc.gov/zing/srw/">
+ <sru:version>1.2</sru:version>
+ <sru:record>
+   <sru:recordPacking>XML</sru:recordPacking>
+   <sru:recordSchema>http://explain.z3950.org/dtd/2.1/</sru:recordSchema>
+   <sru:recordData>
+   </sru:recordData>
+ </sru:record>
+</sru:explainResponse>

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

@@ -1,5 +1,5 @@
 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.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name)
   feed.updated(@manifestations.first ? @manifestations.first.created_at : Time.zone.now)
 
   @manifestations.each do |manifestation|

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

@@ -43,7 +43,7 @@
             t('page.per_page', num: 20) => 20,
             t('page.per_page', num: 50) => 50,
             t('page.per_page', num: 100) => 100,
-          }, selected: params[:per_page]) %>
+          }, selected: filtered_params[:per_page]) %>
           <%= select_tag 'sort_by', options_for_select({
             [t('page.sort_criteria.created_at'),
               t('page.sort_criteria.date_desc')].join(" : ") => 'created_at:desc',
@@ -59,10 +59,10 @@
               t('page.sort_criteria.title_asc')].join(" : ") => 'title:asc',
             [t('page.title'),
               t('page.sort_criteria.title_desc')].join(" : ") => 'title:desc',
-          }, selected: request.params[:sort_by] || 'created_at:desc') -%>
+          }, selected: filtered_params[:sort_by] || 'created_at:desc') -%>
           <%= hidden_field_tag 'query', @query -%>
           <% [ :reservable, :carrier_type, :library, :language, :pub_year ].each do |p| -%>
-            <%= hidden_field_tag p, request.params[p] if request.params[p] -%>
+            <%= hidden_field_tag p, filtered_params[p] if filtered_params[p] -%>
           <% end -%>
           <%= submit_tag t('page.show') -%><br />
         </p>
@@ -103,15 +103,15 @@
   <% if @parent and policy(@parent).update? %>
     <%= render 'submenu_parent' %>
   <% end %>
-  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(request.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(filtered_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: 'enju_icon'), url_for(request.params.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(request.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: 'enju_icon'), url_for(filtered_params.merge(format: :rss, page: nil, library_id: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(filtered_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: 'enju_icon'), url_for(request.params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(request.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: 'enju_icon'), url_for(filtered_params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(filtered_params.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
     <%- end -%>
   </div>
   <%= render 'manifestations/export_list' %>
@@ -120,7 +120,7 @@
 <% if defined?(EnjuBookmark) %>
   <script type="text/javascript">
     window.onload = function() {
-      $("#tag_cloud_list").load('<%= url_for(request.params.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
+      $("#tag_cloud_list").load('<%= url_for(filtered_params.merge(view: "tag_cloud", only_path: true)) -%>', hideTagCloudSpinner);
     }
 
     function hideTagCloudSpinner(){

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

@@ -2,7 +2,7 @@ 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)
   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"
 

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: request.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(request.params.merge(format: nil, only_path: true))}"
+  xml.channel("rdf:about" => manifestations_url(params: filtered_params.merge(format: 'rdf', only_path: true))){
+    xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(filtered_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"