enju_library 0.3.9 → 0.4.0.beta.1

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

@@ -12,7 +12,7 @@
 
 <%- @library_groups.each do |library_group| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to h(library_group.display_name.localize), library_group -%></td>
+    <td><%= link_to h(library_group.display_name), library_group -%></td>
     <td><%= library_group.name -%></td>
     <td><%= library_group.user.email -%></td>
     <td>

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.library_group.display_name') -%>:</strong>
-  <%= @library_group.display_name.localize -%>
+  <%= @library_group.display_name -%>
 </p>
 
 <p>
@@ -92,7 +92,7 @@
 
 <ul>
   <%- @library_group.real_libraries.each do |library| -%>
-    <li><%= link_to library.display_name.localize, library -%></li>
+    <li><%= link_to library.display_name, library -%></li>
   <%- end -%>
 </ul>
 

data/app/views/picture_files/_index_shelf.html.erb

@@ -3,7 +3,7 @@
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
-<h2 class="resource_title"><%= link_to shelf.display_name.localize, shelf -%></h2>
+<h2 class="resource_title"><%= link_to shelf.display_name, shelf -%></h2>
 
 <table class="table table-striped index">
   <tr>

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -18,7 +18,7 @@
       <%- end -%>
     </td>
     <td><%= link_to request_status_type.name, request_status_type -%></td>
-    <td><%= link_to request_status_type.display_name.localize, request_status_type -%></td>
+    <td><%= link_to request_status_type.display_name, request_status_type -%></td>
     <td>
       <%- if policy(request_status_type).update? -%>
         <%= link_to t('page.edit'), edit_request_status_type_path(request_status_type) -%>

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

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

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

@@ -18,7 +18,7 @@
       <%- end -%>
     </td>
     <td><%= link_to request_type.name, request_type -%></td>
-    <td><%= link_to request_type.display_name.localize, request_type -%></td>
+    <td><%= link_to request_type.display_name, request_type -%></td>
     <td>
       <%- if policy(request_type).update? -%>
         <%= link_to t('page.edit'), edit_request_type_path(request_type) -%>

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

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

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

@@ -26,7 +26,7 @@
     <%= f.label t('activerecord.models.library') -%><br />
     <select id="library_id" name="library_id">
       <%- @libraries.each do |library| -%>
-        <option value="<%= library.name -%>"<%= " selected='selected'" if @shelf.library == library -%>><%= library.display_name.localize -%></option>
+        <option value="<%= library.name -%>"<%= " selected='selected'" if @shelf.library == library -%>><%= library.display_name -%></option>
       <%- end -%>
     </select>
   </div>

data/app/views/shelves/_select_form.html.erb

@@ -1 +1 @@
-<%= options_for_select @shelves.collect{|s| [s.display_name.localize, s.id]} %>
+<%= options_for_select @shelves.collect{|s| [s.display_name, s.id]} %>

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

@@ -3,7 +3,7 @@
 <div id="content_list">
   <% if @library %>
     <h2 class="resource_title">
-      <%= link_to @library.display_name.localize, @library -%>
+      <%= link_to @library.display_name, @library -%>
     </h2>
   <% end %>
   
@@ -35,12 +35,12 @@
       <% end %>
     </td>
     <td>
-      <%= link_to shelf.display_name.localize, shelf -%>
+      <%= link_to shelf.display_name, shelf -%>
       <br />
       <%= shelf.name if current_user.try(:has_role?, 'Librarian') %>
     </td>
     <td>
-      <%= link_to shelf.library.display_name.localize, library_path(shelf.library) -%>
+      <%= link_to shelf.library.display_name, library_path(shelf.library) -%>
       <% if shelf.closed? %>
         <%= t('activerecord.attributes.shelf.closed') %>
       <% end %>

data/app/views/shelves/show.html+phone.erb

@@ -1,6 +1,6 @@
 <div data-role="header">
   <a href="javascript:history.back()" data-icon="back" data-iconpos="notext" class="ui-btn-left"><%= t('page.back') %></a>
-  <h1 class="title"><%= @shelf.display_name.localize -%></h1>
+  <h1 class="title"><%= @shelf.display_name -%></h1>
 </div>
 <div data-role="content">
   <div id="detail">

data/app/views/shelves/show.html+phone.slim

@@ -2,7 +2,7 @@ div[data-role="header"]
   a.ui-btn-left[href="javascript:history.back()" data-icon="back" data-iconpos="notext"]
     = t('page.back')
   .panel-heading
-    = @shelf.display_name.localize
+    = @shelf.display_name
   div[data-role="content"]
     #detail
       - if current_user.try(:has_role?, 'Librarian')

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

@@ -4,8 +4,8 @@
 <p id="notice"><%= notice %></p>
 
   <h2 class="resource_title">
-    <%= link_to @shelf.library.display_name.localize, @shelf.library -%>
-    <%= @shelf.display_name.localize -%>
+    <%= link_to @shelf.library.display_name, @shelf.library -%>
+    <%= @shelf.display_name -%>
   </h2>
 
 <% if current_user.try(:has_role?, 'Librarian') %>

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

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

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

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

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

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_group.display_name') -%>:</strong>
-  <%= @user_group.display_name.localize -%>
+  <%= @user_group.display_name -%>
 </p>
 
 <p>
@@ -40,7 +40,7 @@
   <ul>
     <%- @user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
-        <%= link_to available_checkout_type.checkout_type.display_name.localize, available_checkout_type.checkout_type -%>
+        <%= link_to available_checkout_type.checkout_type.display_name, available_checkout_type.checkout_type -%>
         (<%= link_to t('page.number_of_days', count: available_checkout_type.checkout_period), edit_user_group_user_group_has_checkout_type_path(@user_group, available_checkout_type) -%>)
       </li>
     <%- end -%>

data/app/views/user_import_files/_results.html.erb

@@ -1,9 +1,4 @@
 <h2><%= t('activerecord.models.user_import_result') %></h2>
-<p>
-  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
-  (<%= link_to 'TSV', user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s) -%>)
-</p>
-
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.user_import_result.lineno') %></th>

data/app/views/user_import_files/new.html.erb

@@ -34,13 +34,13 @@
 
   <div class="field">
     <%= f.label :default_user_group_id -%>
-    <%= f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%><br />
+    <%= f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%><br />
     <%= t('user_import_file.default_user_group') %>
   </div>
 
   <div class="field">
     <%= f.label :default_library_id -%>
-    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
+    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%><br />
     <%= t('user_import_file.default_library') %>
   </div>
 

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

@@ -43,12 +43,12 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.default_user_group_id') -%>:</strong>
-  <%= link_to @user_import_file.default_user_group.display_name.localize, @user_import_file.default_user_group if @user_import_file.default_user_group.try(:display_name) -%>
+  <%= link_to @user_import_file.default_user_group.display_name, @user_import_file.default_user_group if @user_import_file.default_user_group.try(:display_name) -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.default_library_id') -%>:</strong>
-  <%= link_to @user_import_file.default_library.display_name.localize, @user_import_file.default_library if @user_import_file.default_library.try(:display_name) -%>
+  <%= link_to @user_import_file.default_library.display_name, @user_import_file.default_library if @user_import_file.default_library.try(:display_name) -%>
 </p>
 
 <p>

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

@@ -11,4 +11,15 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li>
+    <% if @user_import_file %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s) -%>)
+    <% else %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
+    <% end %>
+    </li>
+  </ul>
 </div>

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

@@ -20,8 +20,8 @@
       <td>
         <%= render 'manifestations/show_index', manifestation: withdraw.item.manifestation %>
         <%= link_to withdraw.item.item_identifier, withdraw.item -%> / <%= withdraw.item.call_number %>
-        (<%= link_to withdraw.item.shelf.library.display_name.localize, withdraw.item.shelf.library %> /
-        <%= link_to withdraw.item.shelf.display_name.localize, withdraw.item.shelf %>)<br />
+        (<%= link_to withdraw.item.shelf.library.display_name, withdraw.item.shelf.library %> /
+        <%= link_to withdraw.item.shelf.display_name, withdraw.item.shelf %>)<br />
         <%=l withdraw.created_at %>
       </td>
     </tr>

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

@@ -23,8 +23,8 @@
         <% if withdraw.item %>
           <%= render 'manifestations/show_index', manifestation: withdraw.item.manifestation %>
           <%= link_to withdraw.item.item_identifier, withdraw.item -%> / <%= withdraw.item.call_number %>
-          (<%= link_to withdraw.item.shelf.library.display_name.localize, withdraw.item.shelf.library %> /
-          <%= link_to withdraw.item.shelf.display_name.localize, withdraw.item.shelf %>)<br />
+          (<%= link_to withdraw.item.shelf.library.display_name, withdraw.item.shelf.library %> /
+          <%= link_to withdraw.item.shelf.display_name, withdraw.item.shelf %>)<br />
           <%=l withdraw.created_at %>
         <% end %>
       </td>
@@ -45,6 +45,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', model: t('activerecord.models.withdraw')), new_withdraw_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
   </ul>
 </div>

data/app/views/withdraws/new.html.erb

@@ -10,6 +10,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.withdraw')), withdraws_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name.localize) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
   </ul>
 </div>

data/config/locales/translation_en.yml

@@ -26,8 +26,8 @@ en:
         telephone_number_1: Telephone number 1
         telephone_number_2: Telephone number 2
         fax_number: Fax number
-        latitude: Latitude
-        longitude: Longitude
+        lat: Lat
+        lng: Lng
         note: Note
         call_number_rows: Call number rows
         call_number_delimiter: Call number delimiter
@@ -59,8 +59,6 @@ en:
         max_number_of_results: Max number of results
         book_jacket_source: Book jacket source
         header_logo: Header logo
-        default_custom_manifestation_label: Default custom properties (Manifestation)
-        default_custom_item_label: Default custom properties (Item)
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/translation_ja.yml

@@ -26,8 +26,8 @@ ja:
         telephone_number_1: 電話番号1
         telephone_number_2: 電話番号2
         fax_number: ファックス番号
-        latitude: 緯度
-        longitude: 経度
+        lat: 緯度
+        lng: 経度
         note: 注記
         call_number_rows: 請求記号の列数
         call_number_delimiter: 請求番号の区切り文字
@@ -59,8 +59,6 @@ ja:
         max_number_of_results: 検索結果の最大件数
         book_jacket_source: 書影の取得元
         header_logo: ヘッダーのロゴ
-        default_custom_manifestation_label: 既定のカスタム項目（書誌）
-        default_custom_item_label: 既定のカスタム項目（所蔵）
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -1,5 +1,5 @@
 class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration[4.2]
   def change
-    add_column :library_groups, :max_number_of_results, :integer, default: 1000
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
   end
 end

data/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb

@@ -0,0 +1,12 @@
+class AddDisplayNameTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :budget_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :libraries, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_status_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :search_engines, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :shelves, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :user_groups, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb

@@ -0,0 +1,6 @@
+class AddLoginBannerTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :library_groups, :login_banner_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :footer_banner_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.9".freeze
+  VERSION = "0.4.0.beta.1"
 end

data/lib/generators/enju_library/setup/setup_generator.rb

@@ -5,13 +5,8 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
     return if file == 'fixture'
-    inject_into_class 'app/controllers/application_controller.rb', ApplicationController,
-      "  include EnjuLibrary::Controller\n"
+    inject_into_file 'app/controllers/application_controller.rb',
+      "  include EnjuLibrary::Controller\n", after: "include EnjuLeaf::Controller\n"
     append_to_file("app/models/user.rb", "Item.include(EnjuLibrary::EnjuItem)\n")
-    gsub_file 'app/models/user.rb', /, :validatable$/, <<EOS
-, # :validatable,
-      :lockable, lock_strategy: :none, unlock_strategy: :none
-  include EnjuSeed::EnjuUser
-EOS
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/budget_types.yml

@@ -0,0 +1,4 @@
+default:
+  name: default
+  display_name: "既定の予算"
+  position: 1

data/lib/generators/enju_library/setup/templates/db/fixtures/libraries.yml

@@ -2,7 +2,7 @@
 library_00001: 
   name: web
   short_display_name: Web
-  display_name: World Wide Web
+  display_name_translations: {"en": "World Wide Web", "ja": "ウェブ"}
   fax_number: 
   telephone_number_1: 
   telephone_number_2: 
@@ -14,7 +14,7 @@ library_00001:
 library_00002: 
   name: yours
   short_display_name: your_library
-  display_name: Your Library
+  display_name_translations: {"en": "Your Library", "ja": "自分の図書館"}
   fax_number: 
   telephone_number_1: 
   telephone_number_2: 

data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml

@@ -1,12 +1,18 @@
-library_group_00001:
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
   id: 1
   name: enju_library
-  display_name: "en: Enju Library\r\n\
-    ja: えんじゅ図書館"
-  short_name: enju
+  display_name_translations: {"en": "Enju Library", "ja": "えんじゅ図書館"}
+  short_name: enju_library
   note: 
   my_networks: "0.0.0.0/0\r\n\
     ::/0"
+  url: "http://localhost:3000/"
+  position: 1
+  login_banner_translations: {"ja": "オープンソース図書館システム Next-L Enju です。このメッセージは管理者としてログインした後に変更することができます。",
+    "en": "Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator."}
+  footer_banner_translations: {"en":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](https://next-l.github.io/manual/)",
+    "ja":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/)"}
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
-  settings: "{\"max_number_of_results\":500, \"family_name_first\":true, \"skip_mobile_agents\":\"ipad\"}"
+  pub_year_facet_range_interval: 10