RubyGems - enju_biblio - Versions diffs - 0.1.0.pre15 → 0.1.0.pre16 - Mend

enju_biblio 0.1.0.pre15 → 0.1.0.pre16

Files changed (48) hide show

data/app/models/item.rb +27 -26
data/app/models/manifestation.rb +1 -1
data/app/views/layouts/manifestations.html.erb +32 -0
data/app/views/layouts/manifestations.mobile.erb +18 -0
data/app/views/layouts/patrons.html.erb +26 -0
data/app/views/layouts/patrons.mobile.erb +18 -0
data/app/views/manifestations/_show_detail_librarian.html.erb +0 -3
data/app/views/manifestations/_show_detail_user.html.erb +0 -3
data/config/locales/translation_en.yml +239 -0
data/config/locales/translation_ja.yml +239 -0
data/config/routes.rb +2 -0
data/lib/enju_biblio/version.rb +1 -1
data/spec/dummy/app/controllers/application_controller.rb +11 -1
data/spec/dummy/app/models/ability.rb +0 -2
data/spec/dummy/app/views/page/_footer.html.erb +4 -0
data/spec/dummy/app/views/page/_header.html.erb +2 -0
data/spec/dummy/app/views/page/_include.html.erb +4 -0
data/spec/dummy/app/views/page/_menu.html.erb +2 -0
data/spec/dummy/app/views/page/_select_locale.html.erb +2 -0
data/spec/dummy/db/schema.rb +0 -11
data/spec/dummy/db/test.sqlite3 +0 -0
data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
data/spec/dummy/tmp/cache/6E4/420/search_engine_all +0 -0
metadata +19 -42
data/app/controllers/accepts_controller.rb +0 -83
data/app/models/accept.rb +0 -37
data/app/views/accepts/_form.html.erb +0 -11
data/app/views/accepts/_list.html.erb +0 -31
data/app/views/accepts/edit.html.erb +0 -13
data/app/views/accepts/index.csv.erb +0 -4
data/app/views/accepts/index.html.erb +0 -49
data/app/views/accepts/index.js.erb +0 -1
data/app/views/accepts/new.html.erb +0 -14
data/app/views/accepts/show.html.erb +0 -31
data/db/migrate/20120319173203_create_accepts.rb +0 -14
data/spec/controllers/accepts_controller_spec.rb +0 -304
data/spec/dummy/solr/data/test/index/segments.gen +0 -0
data/spec/dummy/solr/data/test/index/segments_8c +0 -0
data/spec/dummy/solr/data/test/spellchecker/segments.gen +0 -0
data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
data/spec/factories/accepts.rb +0 -9
data/spec/models/accept_spec.rb +0 -23
data/spec/requests/accepts_spec.rb +0 -11
data/spec/routing/accepts_routing_spec.rb +0 -27
data/spec/views/accepts/edit.html.erb_spec.rb +0 -18
data/spec/views/accepts/index.html.erb_spec.rb +0 -25
data/spec/views/accepts/new.html.erb_spec.rb +0 -31
data/spec/views/accepts/show.html.erb_spec.rb +0 -17

data/app/models/item.rb CHANGED Viewed

@@ -6,7 +6,6 @@ class Item < ActiveRecord::Base
     :manifestation_id, :library_id, :required_role_id #,:exemplify_attributes
   scope :on_shelf, where('shelf_id != 1')
   scope :on_web, where(:shelf_id => 1)
-  scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
   has_one :exemplify, :dependent => :destroy
   has_one :manifestation, :through => :exemplify
   has_many :owns
@@ -18,7 +17,6 @@ class Item < ActiveRecord::Base
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id', :validate => true
   has_one :resource_import_result
   belongs_to :budget_type
-  has_one :accept
   #accepts_nested_attributes_for :exemplify
   #before_save :create_manifestation
@@ -102,34 +100,10 @@ class Item < ActiveRecord::Base
     manifestation.try(:publisher)
   end
-  if defined?(EnjuLibrary)
-    belongs_to :shelf, :counter_cache => true, :validate => true
-    validates_associated :shelf
-    searchable do
-      string :library do
-        shelf.library.name if shelf
-      end
-    end
-    def shelf_name
-      shelf.name
-    end
-  end
-  def hold?(library)
-    return true if self.shelf.library == library
-    false
-  end
   def owned(patron)
     owns.where(:patron_id => patron.id).first
   end
-  def library_url
-    "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
-  end
   def manifestation_url
     Addressable::URI.parse("#{LibraryGroup.site_config.url}manifestations/#{self.manifestation.id}").normalize.to_s if self.manifestation
   end
@@ -151,6 +125,33 @@ class Item < ActiveRecord::Base
       self.manifestation = Manifestation.find(manifestation_id)
     end
   end
+  if defined?(EnjuLibrary)
+    has_one :accept
+    scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
+    belongs_to :shelf, :counter_cache => true, :validate => true
+    validates_associated :shelf
+    searchable do
+      string :library do
+        shelf.library.name if shelf
+      end
+    end
+    def shelf_name
+      shelf.name
+    end
+    def hold?(library)
+      return true if self.shelf.library == library
+      false
+    end
+    def library_url
+      "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
+    end
+  end
 end
 # == Schema Information

data/app/models/manifestation.rb CHANGED Viewed

@@ -186,7 +186,7 @@ class Manifestation < ActiveRecord::Base
     time :acquired_at
   end
-  enju_manifestation_viewer
+  enju_manifestation_viewer if defined?(EnjuManifestationViewer)
   enju_ndl_search if defined?(EnjuNdl)
   #enju_amazon
   enju_oai if defined?(EnjuOai)

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

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @locale.to_s -%>" lang="<%= @locale.to_s -%>">
+<head>
+  <meta charset="UTF-8" />
+  <title><%= resource_title(@manifestation, controller.action_name) %></title>
+  <%= render 'page/include' %>
+  <%- if controller.action_name == 'index' -%>
+    <%= auto_discovery_link_tag(:rss, url_for(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(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 controller.action_name == 'show' %>
+    <% if Setting.book_jacket.source == :google %>
+      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+      <%= render 'manifestations/google_book_thumbnail_header' %>
+    <% end %>
+  <% end %>
+</head>
+<body>
+<%= render 'page/header' %>
+<%= render 'page/menu' %>
+<div id="content">
+<%= yield %>
+</div>
+<%= render 'page/footer' %>
+</body>
+</html>

data/app/views/layouts/manifestations.mobile.erb ADDED Viewed

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title><%= resource_title(@manifestation, controller.action_name) %></title>
+<%= render 'page/mobile' %>
+</head>
+<body>
+<div data-role="page">
+<%= yield %>
+<%= render 'page/footer' %>
+</div>
+</body>
+</html>

data/app/views/layouts/patrons.html.erb ADDED Viewed

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @locale.to_s -%>" lang="<%= @locale.to_s -%>">
+<head>
+  <meta charset="UTF-8" />
+  <title><%= title(controller.controller_name) %></title>
+  <%= render 'page/include' %>
+  <%- if controller.action_name == 'index' -%>
+    <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
+  <%- end -%>
+</head>
+<body>
+<%= render 'page/header' %>
+<%= render 'page/menu' %>
+<div id="content">
+<%= yield %>
+</div>
+<%= render 'page/footer' %>
+</body>
+</html>

data/app/views/layouts/patrons.mobile.erb ADDED Viewed

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title><%= title(controller.controller_name) %></title>
+<%= render 'page/mobile' %>
+</head>
+<body>
+<div data-role="page">
+<%= yield %>
+<%= render 'page/footer' %>
+</div>
+</body>
+</html>

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

@@ -1,9 +1,6 @@
   <div id="tabs">
     <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
     <div id="detail">
-      <%- if manifestation.isbn -%>
-        <%= google_book_search_preview(manifestation.isbn) -%>
-      <%- end -%>
     <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale]) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>

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

@@ -1,9 +1,6 @@
   <div id="tabs">
     <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
     <div id="detail">
-      <%- if manifestation.isbn -%>
-        <%= google_book_search_preview(manifestation.isbn) -%>
-      <%- end -%>
     <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale]) do %>
       <table class="table table-striped" id="resource_detail">
         <%= embed_content(manifestation) -%>

data/config/locales/translation_en.yml CHANGED Viewed

@@ -37,9 +37,248 @@ en:
       series_statement_relationship: Series statement relationship
     attributes:
+      manifestation:
+        original_title: Original title
+        title_alternative: Titlte alternative
+        title_transcription: Title transcription
+        classification_number: Classification number
+        manifestation_identifier: Manifestation identifier
+        date_of_publication: Date of publication
+        pub_date: Date of publication
+        deleted_at: Deleted at
+        access_address: Access address
+        start_page: Start page
+        end_page: End page
+        height: Height
+        width: Width
+        depth: Depth
+        isbn: ISBN
+        isbn10: ISBN 10
+        wrong_isbn: Wrong ISBN
+        nbn: NBN
+        price: Price
+        volume_number: Volume number (integer)
+        volume_number_string: Volume number
+        issue_number: Issue number (integer)
+        issue_number_string: Issue number
+        serial_number: Serial number
+        serial_number_string: Serial number (string)
+        edition: Edition (integer)
+        edition_string: Edition
+        note: Note
+        repository_content: Repository content
+        lock_version: Lock version
+        carrier_type: Manifestation form
+        language: Language
+        lccn: LCCN
+        issn: ISSN
+        subscription_master: Subscription master
+        description: Description
+      item:
+        call_number: Call number
+        item_identifier: Item identifier
+        deleted_at: Deleted at
+        include_supplements: Include supplements
+        note: Note
+        url: URL
+        price: Price
+        lock_version: Lock version
+        checkout_type: Checkout type
+        acquired_at: Acquired at
+        donation: Donation
+      patron:
+        last_name: Last name
+        middle_name: Middle name
+        first_name: Name
+        last_name_transcription: Last name transcription
+        middle_name_transcription: Middle name transcription
+        first_name_transcription: First name transcription
+        corporate_name: Corporate name
+        corporate_name_transcription: Corporate name transcription
+        full_name: Full name
+        full_name_transcription: Full name transcription
+        full_name_alternative: Full name alternative
+        deleted_at: Deleted at
+        zip_code_1: Zip code 1
+        zip_code_2: Zip code 2
+        address_1: Address 1
+        address_2: Address 2
+        address_1_note: Address 1 note
+        address_2_note: Address 2 note
+        telephone_number_1: Telephone number 1
+        telephone_number_2: Telephone number 2
+        fax_number_1: Fax number 1
+        fax_number_2: Fax number 2
+        other_designation: Other designation
+        place: Place
+        date_of_birth: Date of birth
+        date_of_death: Date of death
+        lock_version: Lock version
+        note: Note
+        country: Country
+        patron_type: Patron type
+        language: Language
+        email: Email
+        url: URL
       series_statement_relationship:
         parent_id: Parent
         child_id: Child
+      patron_import_file:
+        patron_import_file_name: Filename
+        patron_import_content_type: Content type
+        patron_import_file_size: Size
+        patron_import_fingerprint: File hash
+        note: Note
+        executed_at: Executed at
+        patron_import_updated_at: Updated at
+        state: State
+        edit_mode: Edit mode
+        error_message: Error message
+      language:
+        name: Name
+        native_name: Native name
+        display_name: Display name
+        iso_639_1: ISO 639 1
+        iso_639_2: ISO 639 2
+        iso_639_3: ISO 639 3
+        note: Note
+        position: Position
+      resource_import_file:
+        resource_import_file_name: Filename
+        resource_import_content_type: Content type
+        resource_import_file_size: Size
+        resource_import_fingerprint: File hash
+        note: Note
+        executed_at: Executed at
+        resource_import_updated_at: Updated at
+        state: State
+        edit_mode: Edit mode
+        error_message: Error message
+      series_statement:
+        original_title: Title
+        numbering: Numbering
+        title_subseries: Title subseries
+        title_subseries_transcription: Title subseries transcription
+        numbering_subseries: Numbering subseries
+        work: Work
+        series_statement_identifier: Series statement identifier
+        issn: ISSN
+        periodical: Periodical
+        title_transcription: Title transcription
+        note: Note
+      country:
+        name: Name
+        display_name: Display name
+        alpha_2: Alpha 2
+        alpha_3: Alpha 3
+        numeric_3: Numeric 3
+        note: Note
+        position: Position
+      medium_of_performance:
+        name: Name
+        display_name: Displayname
+        note: Note
+        position: Position
+      content_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      extent:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      patron_relationship_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      manifestation_relationship_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      license:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      import_request:
+        isbn: ISBN
+        state: State
+      patron_relationship:
+        parent_id: Parent
+        child_id: Child
+        patron_relationship_type_id: Patron relationship type
+      manifestation_relationship:
+        parent_id: Parent
+        child_id: Child
+        manifestation_relationship_type_id: Manifestation relationship type
+      carrier_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      picture_file:
+        picture_attachable_type: Picture attachable type
+        picture_file_size: Size
+        picture_content_type: Content type
+        title: Title
+        picture_file_name: Filename
+        height: Height
+        width: Width
+        thumbnail: Thumbnail
+        picture_fingerprint: File hash
+        picture_updated_at: Updated at
+      form_of_work:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      exemplify:
+        position: Position
+      own:
+        position: Position
+      produce:
+        position: Position
+      realize:
+        position: Position
+      frequency:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      content_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      patron_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      embody:
+        position: Position
+      create:
+        position: Position
+      resource_import_result:
+        body: Body
+      patron_import_result:
+        body: Body
+      create_type:
+        name: Name
+        display_name: Display name
+        note: Note
+      realize_type:
+        name: Name
+        display_name: Display name
+        note: Note
+      produce_type:
+        name: Name
+        display_name: Display name
+        note: Note
   resource_import_file:
     update_relationship: Update relationship