enju_biblio 0.2.0.beta.3 → 0.2.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea59edbf251f3e333c951d033c681a9c30c5b6be
-  data.tar.gz: 91346d1bc9ca5dbd3b15f87e256b99e538551a64
+  metadata.gz: 5222027fd1307cb67a413384660ea0cacbbb646d
+  data.tar.gz: e25563e07fb2bed77a91767889bb1a7bfdd9fdd3
 SHA512:
-  metadata.gz: b7be9fb7f85eee62d19dc95209096d003d3dfaaac329375575dc241f008e67861ea53177a7405f8ad64990923519f8c7ce7b4311a9d9fb416935fe457ef44704
-  data.tar.gz: f3e7168f32382603521f76f678b7de75415b825ffdb4f9af4c49d7ff40912ee15f105c780f26695ae563aabd584ac5ca18b15eac32f6d94e961794edea46d706
+  metadata.gz: 6363146e0e014ae3d7b223a3a4aadb24da3279c61aeef4c242e12e67c7118bfed70036749b3333ad705b4ea05f22700af19b4a978a69e759c9c8c8da9bf6081b
+  data.tar.gz: 9344322cf8ac5d3b811430d70d0f48252279da09d731164617289f05ae84805ec3d6ad384dc0ad5c09ec47f93064d88b944e75642b1e7a96f17a6b6ba494c3b4

data/app/controllers/agents_controller.rb

@@ -227,4 +227,10 @@ class AgentsController < ApplicationController
     @languages = Language.all
     @agent_type = AgentType.where(name: 'person').first
   end
+
+  def filtered_params
+    params.permit([:view, :format, :page, :language, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/carrier_types_controller.rb

@@ -17,9 +17,20 @@ class CarrierTypesController < ApplicationController
   # GET /carrier_types/1
   # GET /carrier_types/1.json
   def show
+    if @carrier_type.attachment.path
+      if ENV['ENJU_STORAGE'] == 's3'
+        file = Faraday.get(@carrier_type.attachment.expiring_url).body.force_encoding('UTF-8')
+      else
+        file = @carrier_type.attachment.path(size)
+      end
+    end
+
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @carrier_type }
+      format.download {
+        render_image(file)
+      }
     end
   end
 
@@ -99,6 +110,7 @@ class CarrierTypesController < ApplicationController
   def carrier_type_params
     params.require(:carrier_type).permit(
       :name, :display_name, :note, :position,
+      :attachment,
       # EnjuCirculation
       {
         :carrier_type_has_checkout_types_attributes => [
@@ -113,4 +125,16 @@ class CarrierTypesController < ApplicationController
       @checkout_types = CheckoutType.select([:id, :display_name, :position])
     end
   end
+
+  def render_image(file)
+    if @carrier_type.picture.path
+      if ENV['ENJU_STORAGE'] == 's3'
+        send_data file, filename: File.basename(@carrier_type.attachment_file_name), type: @carrier_type.attachment_content_type, disposition: 'inline'
+      else
+        if File.exist?(file) && File.file?(file)
+          send_file file, filename: File.basename(@carrier_type.attachment_file_name), type: @carrier_type.attachment_content_type, disposition: 'inline'
+        end
+      end
+    end
+  end
 end

data/app/controllers/import_requests_controller.rb

@@ -45,12 +45,12 @@ class ImportRequestsController < ApplicationController
 
     respond_to do |format|
       if @import_request.save
-        @import_request.import!
+        @error_type = @import_request.import!
         format.html {
           if @import_request.manifestation
             redirect_to @import_request.manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.import_request'))
-          else
-            redirect_to new_import_request_url, notice: t('import_request.record_not_found')
+          elsif @error_type
+            redirect_to new_import_request_url, notice: t("import_request.#{@error_type}")
           end
         }
         #format.html.phone {

data/app/controllers/items_controller.rb

@@ -278,24 +278,30 @@ class ItemsController < ApplicationController
   end
 
   def prepare_options
-    @libraries = Library.real << Library.web
+    @libraries = Library.order(:position)
     if @item
       @library = @item.shelf.library
     else
       @library = Library.real.includes(:shelves).order(:position).first
     end
     @shelves = @library.try(:shelves)
-    @bookstores = Bookstore.all
-    @budget_types = BudgetType.all
+    @bookstores = Bookstore.order(:position)
+    @budget_types = BudgetType.order(:position)
     @roles = Role.all
     if defined?(EnjuCirculation)
-      @circulation_statuses = CirculationStatus.all
+      @circulation_statuses = CirculationStatus.order(:position)
       @use_restrictions = UseRestriction.available
       if @manifestation
         @checkout_types = CheckoutType.available_for_carrier_type(@manifestation.carrier_type)
       else
-        @checkout_types = CheckoutType.all
+        @checkout_types = CheckoutType.order(:position)
       end
     end
   end
+
+  def filtered_params
+    params.permit([:view, :format, :page, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/manifestations_controller.rb

@@ -147,24 +147,13 @@ class ManifestationsController < ApplicationController
       all_result = search.execute
       @count[:query_result] = all_result.total
       @reservable_facet = all_result.facet(:reservable).rows if defined?(EnjuCirculation)
-      max_number_of_results = @library_group.settings[:max_number_of_results].to_i
+      max_number_of_results = @library_group.max_number_of_results
       if max_number_of_results == 0
         @max_number_of_results = @count[:query_result]
       else
         @max_number_of_results = max_number_of_results
       end
 
-      if session[:search_params]
-        unless search.query.to_params == session[:search_params]
-          clear_search_sessions
-        end
-      else
-        clear_search_sessions
-        session[:params] = params
-        session[:search_params] = search.query.to_params
-        session[:query] = @query
-      end
-
       if params[:format] == 'html' or params[:format].nil?
         @search_query = Digest::SHA1.hexdigest(Marshal.dump(search.query.to_params).force_encoding('UTF-8'))
         if flash[:search_query] == @search_query
@@ -220,7 +209,7 @@ class ManifestationsController < ApplicationController
         if params[:pub_year_range_interval]
           pub_year_range_interval = params[:pub_year_range_interval].to_i
         else
-          pub_year_range_interval = @library_group.settings[:pub_year_facet_range_interval] || 10
+          pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
         end
 
         search.build do
@@ -491,7 +480,7 @@ class ManifestationsController < ApplicationController
     params.require(:manifestation).permit(
       :original_title, :title_alternative, :title_transcription,
       :manifestation_identifier, :date_copyrighted,
-      :access_address, :language_id, :carrier_type_id, :extent, :start_page,
+      :access_address, :language_id, :carrier_type_id, :start_page,
       :end_page, :height, :width, :depth, :publication_place,
       :price, :fulltext, :volume_number_string,
       :issue_number_string, :serial_number_string, :edition, :note,
@@ -501,7 +490,7 @@ class ManifestationsController < ApplicationController
       :ndl_bib_id, :pub_date, :edition_string, :volume_number, :issue_number,
       :serial_number, :content_type_id, :attachment, :lock_version,
       :dimensions, :fulltext_content, :extent,
-      :number_of_page_string, :parent_id,
+      :parent_id,
       :serial, :statement_of_responsibility,
       {:creators_attributes => [
         :id, :last_name, :middle_name, :first_name,
@@ -850,4 +839,10 @@ class ManifestationsController < ApplicationController
     end
     query
   end
+
+  def filtered_params
+    params.permit([:view, :format, :library, :carrier_type, :reservable, :pub_date_from, :pub_date_until, :language, :sort_by, :per_page])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/picture_files_controller.rb

@@ -2,6 +2,7 @@ class PictureFilesController < ApplicationController
   before_action :set_picture_file, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
   before_action :get_attachable, only: [:index, :new]
+  skip_before_action :store_current_location, only: :show
 
   # GET /picture_files
   # GET /picture_files.json

data/app/helpers/manifestations_helper.rb

@@ -71,10 +71,10 @@ 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.permit.merge(page: nil, language: language.name, view: nil, only_path: true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_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.permit.merge(page: nil, language: language.name, view: nil, only_path: true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, language: language.name, view: nil, only_path: true)))
     end
   end
 
@@ -86,10 +86,10 @@ module ManifestationsHelper
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.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(filtered_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.permit.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(filtered_params.merge(page: nil, library: (current_libraries << library.name).uniq.join(' '), view: nil, only_path: true)))
       end
     end
   end
@@ -102,10 +102,10 @@ module ManifestationsHelper
       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.permit.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(filtered_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.permit.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(filtered_params.merge(carrier_type: carrier_type.name, page: nil, view: nil, only_path: true)))
       end
     end
   end
@@ -115,10 +115,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_until.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.permit.merge(pub_date_from: facet.value.first.to_i, pub_date_until: 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(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: 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.permit.merge(pub_date_from: facet.value.first.to_i, pub_date_until: 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(filtered_params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 

data/app/models/agent.rb

@@ -82,7 +82,7 @@ class Agent < ActiveRecord::Base
 
   def set_full_name
     if full_name.blank?
-      if LibraryGroup.site_config.settings[:family_name_first]
+      if LibraryGroup.site_config.family_name_first
         self.full_name = [last_name, middle_name, first_name].compact.join(" ").to_s.strip
       else
         self.full_name = [first_name, last_name, middle_name].compact.join(" ").to_s.strip
@@ -224,7 +224,9 @@ class Agent < ActiveRecord::Base
       if agent_list[:agent_identifier].present?
         agent = Agent.where(agent_identifier: agent_list[:agent_identifier]).first
       else
-        agent = Agent.where(full_name: name_and_role[0]).first
+        agents_matched = Agent.where(full_name: name_and_role[0])
+        agents_matched = agents_matched.where(place: agent_list[:place]) if agent_list[:place]
+        agent = agents_matched.first
       end
       role_type = name_and_role[1].to_s.strip
       unless agent
@@ -232,13 +234,15 @@ class Agent < ActiveRecord::Base
           full_name: name_and_role[0],
           full_name_transcription: agent_list[:full_name_transcription],
           agent_identifier: agent_list[:agent_identifier],
-          language_id: 1
+          place: agent_list[:place],
+          language_id: 1,
         )
         agent.required_role = Role.where(name: 'Guest').first
         agent.save
       end
       agents << agent
     end
+    agents.uniq!
     agents
   end
 

data/app/models/agent_import_file.rb

@@ -11,7 +11,8 @@ class AgentImportFile < ActiveRecord::Base
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME'],
-        s3_host_name: ENV['S3_HOST_NAME']
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV['S3_REGION']
       },
       s3_permissions: :private
   else

data/app/models/carrier_type.rb

@@ -2,6 +2,23 @@ class CarrierType < ActiveRecord::Base
   include MasterModel
   default_scope { order("carrier_types.position") }
   has_many :manifestations
+  if ENV['ENJU_STORAGE'] == 's3'
+    has_attached_file :attachment, storage: :s3,
+      styles: { thumb: "16x16#" },
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV['S3_REGION']
+      },
+      s3_permissions: :private
+  else
+    has_attached_file :attachment,
+      styles: { thumb: "16x16#" },
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
+  validates_attachment_content_type :attachment, content_type: /\Aimage\/.*\Z/
 
   def mods_type
     case name

data/app/models/import_request.rb

@@ -36,29 +36,31 @@ class ImportRequest < ActiveRecord::Base
   end
 
   def import!
-    return nil unless Manifestation.respond_to?(:import_isbn)
-    unless manifestation
-      manifestation = Manifestation.import_isbn(isbn)
-      if manifestation
-        self.manifestation = manifestation
-        transition_to!(:completed)
-        manifestation.index
-        Sunspot.commit
-      else
-        transition_to!(:failed)
+    exceptions = [ ActiveRecord::RecordInvalid, NameError, URI::InvalidURIError ]
+    not_found_exceptions = []
+    not_found_exceptions << EnjuNdl::RecordNotFound if defined? EnjuNdl
+    not_found_exceptions << EnjuNii::RecordNotFound if defined? EnjuNii
+    begin
+      return nil unless Manifestation.respond_to?(:import_isbn)
+      unless manifestation
+        manifestation = Manifestation.import_isbn(isbn)
+        if manifestation
+          self.manifestation = manifestation
+          transition_to!(:completed)
+          manifestation.index
+          Sunspot.commit
+        else
+          transition_to!(:failed)
+        end
       end
-    #else
-    #  transition_to!(:failed)
+      save
+    rescue *not_found_exceptions => e
+      transition_to!(:failed)
+      return :record_not_found
+    rescue *exceptions => e
+      transition_to!(:failed)
+      return :error
     end
-    save
-  rescue ActiveRecord::RecordInvalid
-    transition_to!(:failed)
-  rescue NameError
-    transition_to!(:failed)
-  rescue EnjuNdl::RecordNotFound
-    transition_to!(:failed)
-  rescue EnjuNii::RecordNotFound
-    transition_to!(:failed)
   end
 
   private

data/app/models/manifestation.rb

@@ -35,8 +35,15 @@ class Manifestation < ActiveRecord::Base
     text :title, default_boost: 2 do
       titles
     end
-    text :fulltext, :note, :creator, :contributor, :publisher, :description,
-      :statement_of_responsibility
+    [ :fulltext, :note, :creator, :contributor, :publisher, :description, :statement_of_responsibility ].each do |field|
+      text field do
+        if series_master?
+          derived_manifestations.map{|c| c.send(field) }.flatten.compact
+        else
+          self.send(field)
+        end
+      end
+    end
     text :item_identifier do
       if series_master?
         root_series_statement.root_manifestation.items.pluck(:item_identifier, :binding_item_identifier).flatten.compact
@@ -205,7 +212,8 @@ class Manifestation < ActiveRecord::Base
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME'],
-        s3_host_name: ENV['S3_HOST_NAME']
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV["S3_REGION"]
       },
       s3_permissions: :private
   else
@@ -531,6 +539,8 @@ class Manifestation < ActiveRecord::Base
       manifestation_identifier
       access_address
       note
+      extent
+      dimensions
     )
 
     header += IdentifierType.order(:position).pluck(:name)
@@ -600,6 +610,8 @@ class Manifestation < ActiveRecord::Base
         item_lines << manifestation_identifier
         item_lines << access_address
         item_lines << note
+        item_lines << extent
+        item_lines << dimensions
 
         IdentifierType.order(:position).pluck(:name).each do |identifier_type|
           if identifier_contents(identifier_type.to_sym).first
@@ -673,6 +685,8 @@ class Manifestation < ActiveRecord::Base
       line << manifestation_identifier
       line << access_address
       line << note
+      line << extent
+      line << dimensions
 
       IdentifierType.order(:position).pluck(:name).each do |identifier_type|
         if identifier_contents(identifier_type.to_sym).first

data/app/models/picture_file.rb

@@ -9,7 +9,8 @@ class PictureFile < ActiveRecord::Base
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME'],
-        s3_host_name: ENV['S3_HOST_NAME']
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV['S3_REGION']
       },
       s3_permissions: :private
   else

data/app/models/resource_export_file.rb

@@ -8,7 +8,8 @@ class ResourceExportFile < ActiveRecord::Base
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME'],
-        s3_host_name: ENV['S3_HOST_NAME']
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV['S3_REGION']
       },
       s3_permissions: :private
   else

data/app/models/resource_import_file.rb

@@ -11,7 +11,8 @@ class ResourceImportFile < ActiveRecord::Base
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME'],
-        s3_host_name: ENV['S3_HOST_NAME']
+        s3_host_name: ENV['S3_HOST_NAME'],
+        s3_region: ENV['S3_REGION']
       },
       s3_permissions: :private
   else

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

@@ -39,10 +39,10 @@
   <ul>
     <li>
     <% if @agent_import_file %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), agent_import_results_path(agent_import_file_id: @agent_import_file.id, format: :txt)) -%>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV', class: 'icon'), agent_import_results_path(agent_import_file_id: @agent_import_file.id, format: :txt)) -%>
       (<%= link_to 'TSV', agent_import_results_path(agent_import_file_ud: @agent_import_file.id, format: :txt) -%>)
     <% else %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), agent_import_results_path(format: :txt, locale: @locale.to_s)) -%>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV', class: 'icon'), agent_import_results_path(format: :txt, locale: @locale.to_s)) -%>
       (<%= link_to 'TSV', agent_import_results_path(format: :txt, locale: @locale.to_s) -%>)
     <% end %>
     </li>

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

@@ -9,7 +9,7 @@
 
   <div class="field">
     <span id="name_person">
-      <%- if @library_group.settings[:family_name_first] -%>
+      <%- if @library_group.family_name_first -%>
         <%= render 'agents/form_family_name_first', f: f -%>
       <%- else -%>
         <%= render 'agents/form_family_name_last', f: f -%>

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

@@ -4,11 +4,11 @@ xml.rss('version' => "2.0",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('agent.library_group_agent', library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
+    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"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: agents_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?

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

@@ -9,6 +9,10 @@
     <%= f.label :display_name %><br />
     <%= f.text_area :display_name %>
   </div>
+  <div class="field">
+    <%= f.label t('page.file') -%>
+    <%= f.file_field :attachment -%>
+  </div>
   <% if defined?(EnjuCirculation) and !@carrier_type.new_record? %>
     <%= render 'carrier_types/checkout_form', f: f %>
   <% end %>

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

@@ -13,6 +13,11 @@
   <%= @carrier_type.display_name.localize -%>
 </p>
 
+<p>
+  <strong><%= t('page.file') -%>:</strong>
+  <%= link_to @carrier_type.attachment_file_name, carrier_type_path(@carrier_type, format: :download, size: 'thumb') -%><br />
+</p>
+
 <% if defined?(EnjuCirculation) %>
   <p>
     <strong><%= t('activerecord.models.checkout_type') -%>:</strong>

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

@@ -18,8 +18,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if policy(create).destroy? -%>
-        <%= create.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: create.id, agent_id: agent.id}, method: :put) -%>
-        <%= create.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: create.id, agent_id: agent.id}, method: :put) -%>
+        <%= create.first? ? image_tag('icons/stop.png', size: '16x16', class: 'enju_icon') : link_to(image_tag('icons/arrow_up.png', size: '16x16', class: 'enju_icon', alt: t('page.asc')), {action: 'update', move: 'higher', id: create.id, agent_id: agent.id}, method: :put) -%>
+        <%= create.last? ? image_tag('icons/stop.png', size: '16x16', class: 'enju_icon') : link_to(image_tag('icons/arrow_down.png', size: '16x16', class: 'enju_icon', alt: t('page.desc')), {action: 'update', move: 'lower', id: create.id, agent_id: agent.id}, method: :put) -%>
       <%- end -%>
     </td>
     <td><%= link_to create.work.try(:original_title), create.work -%></td>

data/app/views/creates/_index_work.html.erb

@@ -17,8 +17,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if policy(create).destroy? -%>
-        <%= create.first? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), work_create_path(create.work, create, move: 'higher'), method: :put) -%>
-        <%= create.last? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), work_create_path(create.work, create, move: 'lower'), method: :put) -%>
+        <%= create.first? ? image_tag('icons/stop.png', size: '16x16', class: 'enju_icon') : link_to(image_tag('icons/arrow_up.png', size: '16x16', class: 'enju_icon', alt: t('page.asc')), work_create_path(create.work, create, move: 'higher'), method: :put) -%>
+        <%= create.last? ? image_tag('icons/stop.png', size: '16x16', class: 'enju_icon') : link_to(image_tag('icons/arrow_down.png', size: '16x16', class: 'enju_icon', alt: t('page.desc')), work_create_path(create.work, create, move: 'lower'), method: :put) -%>
       <%- end-%>
     </td>
     <td><%= link_to create.agent.try(:full_name), create.agent -%></td>

data/app/views/items/_shelf_picture.html+phone.erb

@@ -1,5 +1,5 @@
 <%- item.shelf.picture_files.each do |picture_file| -%>
-  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
+  <%= link_to image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
 <%- end -%>
 <script type="text/javascript">
   $(document).ready(function(){

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

@@ -1,5 +1,5 @@
 <%- item.shelf.picture_files.each do |picture_file| -%>
-  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
+  <%= link_to image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "item_#{item.id}_manifestation_#{item.manifestation_id}" -%>
 <%- end -%>
 <script type="text/javascript">
   $(document).ready(function(){

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

@@ -83,7 +83,7 @@
         <li><%= circulation_status_facet(facet) %></li>
       <%- end -%>
       <%- if params[:circulation_status] -%>
-        <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
+        <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(circulation_status: nil, page: nil, view: nil, only_path: true)) -%></li>
       <%- end -%>
     </ul>
   <% end %>

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

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

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

@@ -5,7 +5,7 @@
   <%= render 'page/include' %>
   <title><%= title(controller.controller_name) %></title>
   <% if %w(index show new edit).include?(controller.action_name) %>
-    <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>
+    <%= book_jacket_header(@library_group.book_jacket_source) %>
   <% end %>
 </head>
 <body itemscope itemtype="http://schema.org/WebPage">

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

@@ -5,11 +5,11 @@
   <title><%= resource_title(@manifestation, controller.action_name) %></title>
   <%= render 'page/include' %>
   <%- if controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: :rss, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(filtered_params.merge(format: :rss, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(filtered_params.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
   <% if %w(show edit).include?(controller.action_name) %>
-    <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>
+    <%= book_jacket_header(@library_group.book_jacket_source) %>
   <% end %>
   <link rel="search" type="application/opensearchdescription+xml" title="<%= LibraryGroup.site_config.display_name.localize %>" href="<%= page_opensearch_url(format: :xml) %>" />
 </head>

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.permit.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>