enju_biblio 0.1.0.pre45 → 0.1.0.pre46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3fd1c5d37cc6a0cb7fdfe7daf9020e3b42e2b87
-  data.tar.gz: 4e7aced7c8b57d398445c76492e01c33132b2a10
+  metadata.gz: 0c9f724ae9bc949082a242108f0b9763eca797c1
+  data.tar.gz: 0655a86c9ca4d9b17402c083cd2c36ffb5f2e90b
 SHA512:
-  metadata.gz: 15cfbbab7bf4fd1cb6d39fe0843c677e7b031fc1897a1d4f5fa37f1f8acae6c00ddde81104b2ac369cce7703e075491df2d2c92342b73008e5a6245ef27104b6
-  data.tar.gz: e0c585fdad372c6a062221b64b94dd21f59f39d79e8cab9f22e8181b8cb26ec9e1248f75f53651201be215b09d67399001ce7d8c87fc485811b3196d1544c585
+  metadata.gz: c1b83d9791c1147dccbbdd1e56e0b97aa771d0f8b323109f13211c5d3b79ce031796fa5146edeeebcb737ec32c1319fab791dc3192ce3903098776bec66f4bc3
+  data.tar.gz: 215fa31378a4b9ec227c65c0aedfa70d8545f038c2688d26ca952ce4d2266cfa3128899f2ab3e2625759394f30468667f44c50fe3bfa3cb3f92c4d15bc6c16e8

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

@@ -8,29 +8,12 @@
     <%= @agent.full_name -%>
   </h2>
 
-  <%- if @version -%>
-    <p>(<%= l(@agent.versions.find(@version).created_at) -%>)</p>
-  <%- end -%>
-  <p>
-    (<%= link_to_wikipedia(@agent.full_name_without_space) -%>)
-  </p>
-
 <div id="tabs">
   <ul>
     <li title="active" class="selected"><a href="#detail"><em><%= t('page.detail') -%></em></a></li>
     <%- if @agent.derived_agents.exists? or @agent.original_agents.exists? -%>
       <li><a href="#related"><em><%= t('page.related') -%></em></a></li>
     <%- end -%>
-    <%- if @agent.works.exists? -%>
-      <li><a href="#work"><em><%= t('activerecord.models.work') -%></em></a></li>
-    <%- end -%>
-    <%- if @agent.expressions.exists? -%>
-      <li><a href="#expression"><em><%= t('activerecord.models.expression') -%></em></a></li>
-    <%- end -%>
-    <%- if @agent.manifestations.exists? -%>
-      <li><a href="#manifestation"><em><%= t('activerecord.models.manifestation') -%></em></a></li>
-    <%- end -%>
-    <li><a href="#history"><em><%= t('page.history') -%></em></a></li>
   </ul>
   <div id="detail">
     <table class="table table-striped index vcard">
@@ -95,16 +78,6 @@
   <%- unless @agent.derived_agents.empty? and @agent.original_agents.empty? -%>
     <%= render 'agents/agent_list' -%>
   <%- end -%>
-  <%- unless @works.blank? -%>
-    <%= render 'agents/work_list' -%>
-  <%- end -%>
-  <%- unless @expressions.blank? -%>
-    <%= render 'agents/expression_list' -%>
-  <%- end -%>
-  <%- unless @manifestations.blank? -%>
-    <%= render 'agents/manifestation_list' -%>
-  <%- end -%>
-  <%= render 'history_list' -%>
   </div>
 </div>
 </div>
@@ -145,8 +118,6 @@
     <%- end -%>
   </ul>
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.work')), creator_manifestations_path(@agent) -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.expression')), contributor_manifestations_path(@agent) -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), publisher_manifestations_path(@agent) -%></li>
+    <li><%= link_to t('page.listing', :model => t('activerecord.models.manifestation')), manifestations_path(:query => @agent.full_name) -%></li>
   </ul>
 </div>

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

@@ -6,6 +6,3 @@
     <%= render 'manifestations/question_list', :manifestation => manifestation -%>
   <%- end -%>
 <%- end -%>
-<%- if current_user.try(:has_role?, 'Librarian') -%>
-  <%= render 'manifestations/history_list', :manifestation => manifestation -%>
-<%- end -%>

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

@@ -8,7 +8,4 @@
       <li><a href="#question"><em><%= t('resource.question') -%></em></a></li>
     <%- end -%>
   <% end %>
-  <%- if current_user.try(:has_role?, 'Librarian') -%>
-    <li><a href="#history"><em><%= t('page.history') -%></em></a></li>
-  <%- end -%>
 </ul>

data/config/locales/translation_en.yml

@@ -19,12 +19,12 @@ en:
       manifestation_relationship_type: Resource relationship type
       medium_of_performance: Medium of performance
       own: Own
-      patron: Patron
-      patron_import_file: Patron import file
-      patron_import_result: Patron Import Result
-      patron_relationship: Patron relationship
-      patron_relationship_type: Patron relationship type
-      patron_type: Patron type
+      agent: Agent
+      agent_import_file: Agent import file
+      agent_import_result: Agent Import Result
+      agent_relationship: Agent relationship
+      agent_relationship_type: Agent relationship type
+      agent_type: Agent type
       picture_file: Picture file
       produce: Produce
       produce_type: Produce type
@@ -103,7 +103,7 @@ en:
         lock_version: Lock version
         acquired_at: Acquired at
         donation: Donation
-      patron:
+      agent:
         last_name: Last name
         middle_name: Middle name
         first_name: First name
@@ -133,18 +133,18 @@ en:
         lock_version: Lock version
         note: Note
         country: Country
-        patron_type: Patron type
+        agent_type: Agent type
         language: Language
         email: Email
         url: URL
-      patron_import_file:
-        patron_import_file_name: Filename
-        patron_import_content_type: Content type
-        patron_import_file_size: Size
-        patron_import_fingerprint: File hash
+      agent_import_file:
+        agent_import_file_name: Filename
+        agent_import_content_type: Content type
+        agent_import_file_size: Size
+        agent_import_fingerprint: File hash
         note: Note
         executed_at: Executed at
-        patron_import_updated_at: Updated at
+        agent_import_updated_at: Updated at
         state: State
         edit_mode: Edit mode
         error_message: Error message
@@ -205,7 +205,7 @@ en:
         display_name: Display name
         note: Note
         position: Position
-      patron_relationship_type:
+      agent_relationship_type:
         name: Name
         display_name: Display name
         note: Note
@@ -223,10 +223,10 @@ en:
       import_request:
         isbn: ISBN
         state: State
-      patron_relationship:
+      agent_relationship:
         parent_id: Parent
         child_id: Child
-        patron_relationship_type_id: Patron relationship type
+        agent_relationship_type_id: Agent relationship type
       manifestation_relationship:
         parent_id: Parent
         child_id: Child
@@ -270,7 +270,7 @@ en:
         display_name: Display name
         note: Note
         position: Position
-      patron_type:
+      agent_type:
         name: Name
         display_name: Display name
         note: Note
@@ -281,7 +281,7 @@ en:
         position: Position
       resource_import_result:
         body: Body
-      patron_import_result:
+      agent_import_result:
         body: Body
       create_type:
         name: Name
@@ -307,7 +307,7 @@ en:
   resource_import_file:
     update_relationship: Update relationship
  
-  patron:
+  agent:
     creator: Creator
     contributor: Contributor
     publisher: Publisher

data/config/locales/translation_ja.yml

@@ -19,12 +19,12 @@ ja:
       license: ライセンス
       import_request: ISBNインポートのリクエスト
       own: 所有関係
-      patron: 人物・団体
-      patron_import_file: 人物・団体のインポート用ファイル
-      patron_import_result: 人物・団体インポートの結果
-      patron_relationship: 著者・編者・出版社の関係
-      patron_relationship_type: 人物・団体の関係の種類
-      patron_type: 人物・団体の種類
+      agent: 人物・団体
+      agent_import_file: 人物・団体のインポート用ファイル
+      agent_import_result: 人物・団体インポートの結果
+      agent_relationship: 著者・編者・出版社の関係
+      agent_relationship_type: 人物・団体の関係の種類
+      agent_type: 人物・団体の種類
       picture_file: 画像ファイル
       produce: 出版関係
       produce_type: 体現の関係
@@ -103,7 +103,7 @@ ja:
         lock_version: ロックバージョン
         acquired_at: 受入日
         donation: 寄贈情報
-      patron:
+      agent:
         last_name: 姓
         middle_name: ミドルネーム
         first_name: 名
@@ -133,18 +133,18 @@ ja:
         lock_version: ロックバージョン
         note: 注記
         country: 国籍
-        patron_type: 人物・団体の種類
+        agent_type: 人物・団体の種類
         language: 言語
         email: 電子メール
         url: URL
-      patron_import_file:
-        patron_import_file_name: ファイル名
-        patron_import_content_type: Content-Type
-        patron_import_file_size: ファイルサイズ
-        patron_import_fingerprint: ファイルのハッシュ
+      agent_import_file:
+        agent_import_file_name: ファイル名
+        agent_import_content_type: Content-Type
+        agent_import_file_size: ファイルサイズ
+        agent_import_fingerprint: ファイルのハッシュ
         note: 注記
         executed_at: 実行時刻
-        patron_import_updated_at: 更新時刻
+        agent_import_updated_at: 更新時刻
         state: 状態
         edit_mode: 編集モード
         error_message: エラーメッセージ
@@ -200,12 +200,12 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
-      patron_type:
+      agent_type:
         name: 名前
         display_name: 表示名
         note: 注記
         position: 位置
-      patron_relationship_type:
+      agent_relationship_type:
         name: 名前
         display_name: 表示名
         note: 注記
@@ -223,10 +223,10 @@ ja:
       import_request:
         isbn: ISBN
         state: 状態
-      patron_relationship:
+      agent_relationship:
         parent: 派生元の人物・団体
         child: 派生先の人物・団体
-        patron_relationship_type_id: 人物・団体の関係の種類
+        agent_relationship_type_id: 人物・団体の関係の種類
       manifestation_relationship:
         parent: 派生元の資料
         child: 派生先の資料
@@ -270,7 +270,7 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
-      patron_type:
+      agent_type:
         name: 名前
         display_name: 表示名
         note: 注記
@@ -281,7 +281,7 @@ ja:
         position: 位置
       resource_import_result:
         body: 本文
-      patron_import_result:
+      agent_import_result:
         body: 本文
       create_type:
         name: 名称
@@ -307,7 +307,7 @@ ja:
   resource_import_file:
     update_relationship: 関連を更新
 
-  patron:
+  agent:
     creator: 著者
     contributor: 協力者・編者
     publisher: 出版社

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre45"
+  VERSION = "0.1.0.pre46"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre45
+  version: 0.1.0.pre46
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -559,20 +559,19 @@ files:
 - app/views/agent_types/index.html.erb
 - app/views/agent_types/new.html.erb
 - app/views/agent_types/show.html.erb
+- app/views/agents/_agent.html.erb
+- app/views/agents/_agent_list.html.erb
 - app/views/agents/_expression_list.html.erb
 - app/views/agents/_form.html.erb
 - app/views/agents/_form_family_name_first.html.erb
 - app/views/agents/_form_family_name_last.html.erb
 - app/views/agents/_history_list.html.erb
 - app/views/agents/_index.html.erb
+- app/views/agents/_index_agent.html.erb
 - app/views/agents/_index_expression.html.erb
 - app/views/agents/_index_manifestation.html.erb
-- app/views/agents/_index_patron.html.erb
-- app/views/agents/_index_patron_merge_list.html.erb
 - app/views/agents/_index_work.html.erb
 - app/views/agents/_manifestation_list.html.erb
-- app/views/agents/_patron.html.erb
-- app/views/agents/_patron_list.html.erb
 - app/views/agents/_work_list.html.erb
 - app/views/agents/edit.html.erb
 - app/views/agents/index.atom.builder
@@ -605,7 +604,7 @@ files:
 - app/views/create_types/show.html.erb
 - app/views/creates/_form.html.erb
 - app/views/creates/_index.html.erb
-- app/views/creates/_index_patron.html.erb
+- app/views/creates/_index_agent.html.erb
 - app/views/creates/_index_work.html.erb
 - app/views/creates/edit.html.erb
 - app/views/creates/index.html.erb
@@ -662,10 +661,10 @@ files:
 - app/views/languages/index.html.erb
 - app/views/languages/new.html.erb
 - app/views/languages/show.html.erb
+- app/views/layouts/agents.html.erb
+- app/views/layouts/agents.mobile.erb
 - app/views/layouts/manifestations.html.erb
 - app/views/layouts/manifestations.mobile.erb
-- app/views/layouts/patrons.html.erb
-- app/views/layouts/patrons.mobile.erb
 - app/views/licenses/_form.html.erb
 - app/views/licenses/edit.html.erb
 - app/views/licenses/index.html.erb
@@ -755,9 +754,9 @@ files:
 - app/views/owns/new.html.erb
 - app/views/owns/show.html.erb
 - app/views/picture_files/_index.html.erb
+- app/views/picture_files/_index_agent.html.erb
 - app/views/picture_files/_index_event.html.erb
 - app/views/picture_files/_index_manifestation.html.erb
-- app/views/picture_files/_index_patron.html.erb
 - app/views/picture_files/_index_shelf.html.erb
 - app/views/picture_files/_link.html.erb
 - app/views/picture_files/_link.mobile.erb
@@ -773,8 +772,8 @@ files:
 - app/views/produce_types/show.html.erb
 - app/views/produces/_form.html.erb
 - app/views/produces/_index.html.erb
+- app/views/produces/_index_agent.html.erb
 - app/views/produces/_index_manifestation.html.erb
-- app/views/produces/_index_patron.html.erb
 - app/views/produces/edit.html.erb
 - app/views/produces/index.html.erb
 - app/views/produces/new.html.erb
@@ -786,8 +785,8 @@ files:
 - app/views/realize_types/show.html.erb
 - app/views/realizes/_form.html.erb
 - app/views/realizes/_index.html.erb
+- app/views/realizes/_index_agent.html.erb
 - app/views/realizes/_index_expression.html.erb
-- app/views/realizes/_index_patron.html.erb
 - app/views/realizes/edit.html.erb
 - app/views/realizes/index.html.erb
 - app/views/realizes/new.html.erb

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

@@ -1,53 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.agent')) -%></h1>
-<div id="content_list">
-
-<div class="search_form">
-<%= form_for :agents, :url => agent_merge_list_agents_path(@agent_merge_list), :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')} -%>
-    <%- if can? :update, @agent_merge_list -%>
-      <%= render 'page/add' %>
-    <%- end -%>
-    <%= submit_tag t('page.search') -%>
-    <%= link_to t('page.back_to_index'), agent_merge_list_agents_path(@agent_merge_list) -%>
-  </p>
-<%- end -%>
-</div>
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.attributes.agent.full_name') -%></th>
-    <th><%= t('activerecord.models.agent_type') -%></th>
-    <th><%= t('activerecord.attributes.agent.date_of_birth') -%></th>
-    <th id="edit_icons"></th>
-  </tr>
-
-<%- @agents.each do |agent| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to agent.full_name, agent_merge_list_agent_path(@agent_merge_list, agent) -%></td>
-    <td><%= agent.agent_type.display_name.localize -%></td>
-    <td><%=l agent.date_of_birth if agent.date_of_birth -%></td>
-    <td>
-      <%- if can? :delete, agent -%>
-        <%- if params[:mode] == 'add' -%>
-          <%= link_to t('page.add'), new_agent_merge_list_agent_merge_path(@agent_merge_list, :agent_id => agent.id) unless @agent_merge_list.agents.include?(agent) -%>
-        <%- else -%>
-          <%- agent_merge = @agent_merge_list.agent_merges.where(:agent_id => agent.id).first -%>
-          <%= link_to t('page.destroy'), agent_merge_list_agent_merge_path(@agent_merge_list, agent_merge), :data => {:confirm => t('page.are_you_sure')}, :method => :delete if agent_merge -%>
-        <%- end -%>
-      <%- end -%>
-    </td>
-  </tr>
-<%- end -%>
-</table>
-
-<%= paginate(@agents) -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.agent_merge_list')), @agent_merge_list -%></li>
-  </ul>
-</div>