enju_leaf 1.1.0.rc10 → 1.1.0.rc11

data/app/views/page/add_on.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.add_on') -%></h1>
 <div id="content_list">
 
@@ -7,7 +7,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
   </ul>
 </div>

data/app/views/page/advanced_search.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.advanced_search') -%></h1>
 <div id="content_list">
 
@@ -9,9 +9,15 @@
       <td><%= search_field_tag 'query', nil, :class => 'search_form_short', :placeholder => t('page.search_term') -%></td>
     </tr>
     <tr>
-      <td><label><%= t('page.tag') -%>:</label></td>
-      <td><%= text_field_tag 'tag' -%></td>
+      <td><label><%= t('page.title') -%>:</label></td>
+      <td><%= text_field_tag 'title' -%></td>
     </tr>
+    <% if defined?(EnjuBookmark) %>
+      <tr>
+        <td><label><%= t('page.tag') -%>:</label></td>
+        <td><%= text_field_tag 'tag' -%></td>
+      </tr>
+    <% end %>
     <tr>
       <td><label><%= t('agent.creator') -%>:</label></td>
       <td><%= text_field_tag 'creator' -%></td>
@@ -73,5 +79,5 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

data/app/views/page/export.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.export') -%></h1>
 <div id="content_list">
 
@@ -24,13 +24,13 @@
   </li>
   -->
   <li>
-    <%= link_to t('activerecord.models.resource_export_file'), new_resource_export_file_path -%>
+    <%= link_to t('activerecord.models.resource_export_file'), resource_export_files_path -%>
   </li>
 </ul>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
   </ul>
 </div>

data/app/views/page/import.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.import_from_file') -%></h1>
 <div id="content_list">
 
@@ -13,7 +13,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.add_resource_manually'), new_import_request_path -%></li>
   </ul>

data/app/views/page/statistics.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.statistics') -%></h1>
 <div id="content_list">
   <table class="index">
@@ -99,7 +99,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
   </ul>
 </div>

data/app/views/roles/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.role')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), role_path(@role) -%></li>
     <li><%= link_to t('page.back'), roles_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.role')) -%></h1>
 <div id="content_list">
 
@@ -24,5 +24,5 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.role')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), roles_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.role')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_role_path(@role) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), user_group_path(@user_group) -%></li>
     <li><%= link_to t('page.back'), user_groups_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
 
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.user_group')), new_user_group_path -%></li>
   </ul>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), user_groups_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_group')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -55,7 +55,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_user_group_path(@user_group) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -5,7 +5,7 @@
 <table class="table table-striped index">
   <thead>
     <tr>
-      <th>ID</th>
+      <th>Id</th>
       <th><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.executed_at') -%></th>
       <th><%= t('activerecord.models.user') -%></th>
@@ -23,7 +23,7 @@
         <td><%= l(user_import_file.executed_at) if user_import_file.executed_at -%></td>
         <td><%= link_to user_import_file.user.username, user_import_file.user -%></td>
         <td><%= user_import_file.edit_mode -%></td>
-        <td><%= localized_state(user_import_file.state) -%></td>
+        <td><%= localized_state(user_import_file.current_state) -%></td>
         <td>
           <%= link_to t('page.show'), user_import_file -%>
           <%= link_to t('page.destroy'), user_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>

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

@@ -12,16 +12,29 @@
 
   <div class="field">
     <%= f.label :edit_mode -%><br />
-    <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
-    <%= f.label :edit_mode, t('page.create'), :value => 'create' %>
-    <%= f.radio_button :edit_mode, 'update' %>
-    <%= f.label :edit_mode, t('page.update'), :value => 'update' %>
+    <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
+    <%= f.label :edit_mode, t('page.create'), value: 'create' %>
+    <%= f.radio_button :edit_mode, 'update', disabled: true %>
+    <%= f.label :edit_mode, t('page.update'), value: 'update' %>
     <%= f.radio_button :edit_mode, 'destroy' %>
-    <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
+    <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
+  </div>
+
+  <div class="field">
+    <%= f.label :user_encoding -%><br />
+    <%= f.radio_button :user_encoding, 'auto_detect', checked: 'checked' %>
+    <%= f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect' %>
+    <%= f.radio_button :user_encoding, 'utf-8' %>
+    <%= f.label :user_encoding, 'UTF-8', value: 'utf-8' %>
+    <%= f.radio_button :user_encoding, 'shift_jis' %>
+    <%= f.label :user_encoding, 'Shift_JIS', value: 'shift_jis' %>
+    <%= f.radio_button :user_encoding, 'euc-jp' %>
+    <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
   </div>
 
   <div class="actions">
-    <%= f.submit %>
+    <%= f.hidden_field :mode, value: 'import' %>
+    <%= f.submit t('page.start_import') %>
   </div>
 <% end %>
 

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

@@ -43,9 +43,14 @@
   <%= @user_import_file.edit_mode -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.user_import_file.user_encoding') -%>:</strong>
+  <%= @user_import_file.user_encoding -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.state') -%>:</strong>
-  <%= localized_state(@user_import_file.state) -%>
+  <%= localized_state(@user_import_file.current_state) -%>
 </p>
 
 <p>
@@ -62,8 +67,13 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
+  <%= form_for(@user_import_file) do |f| %>
   <ul>
     <li><%= link_to t('activerecord.models.user_import_result'), user_import_file_user_import_results_path(@user_import_file) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
+    <% if current_user.has_role?('Administrator') %>
+      <li><%= link_to 'Resque', resque_path %></li>
+    <% end %>
   </ul>
+  <% end %>
 </div>

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

@@ -39,11 +39,11 @@
   <ul>
     <li>
     <% if @user_import_file %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_file_user_import_results_path(@user_import_file, :format => :csv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_file_user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_file_user_import_results_path(@user_import_file, :format => :tsv, :locale => @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_file_user_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
     <% else %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_import_results_path(:format => :csv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_results_path(:format => :tsv, :locale => @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
     <% end %>
     </li>
   </ul>

data/app/views/user_import_results/{index.csv.erb → index.tsv.erb}

@@ -1,4 +1,4 @@
 username
 <%- @user_import_results.each do |user_import_result| -%>
-<%= user_import_result.user.try(:username) %>	<%= user_import_result.body %>
+"<%= user_import_result.user.try(:username) %>"	<%= user_import_result.body %>
 <%- end -%>

data/app/views/users/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.edit_user_profile', :login_name => @user.username) -%></h1>
 <div id="content_list">
 <%= render 'page/required_field' %>
@@ -63,7 +63,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @user -%></li>
     <li><%= link_to t('page.listing', :model => t('activerecord.models.user')), users_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user')) -%></h1>
 <div id="content_list">
 
@@ -47,7 +47,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if user_signed_in? && current_user.has_role?('Librarian') -%>
       <li><%= link_to t('page.new', :model => t('activerecord.models.user')), new_user_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.user')) -%></h1>
 <div id="content_list">
 <%= render 'page/required_field' %>
@@ -77,7 +77,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', :model => t('activerecord.models.user')), users_path -%></li>
     <li><%= link_to t('page.import'), new_agent_import_file_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -46,7 +46,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <% if defined?(EnjuCirculation) %>
     <ul>
       <%- @user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>

data/app/workers/user_import_file_queue.rb

@@ -0,0 +1,7 @@
+class UserImportFileQueue
+  @queue = :user_import_file
+
+  def self.perform(user_import_file_id)
+    UserImportFile.find(user_import_file_id).import_start
+  end
+end

data/config/initializers/mime_types.rb

@@ -3,6 +3,7 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register "text/tab-separated-values", :tsv
 Mime::Type.register "image/jpeg", :jpg
 Mime::Type.register "application/octet-stream",  :download
 Mime::Type.register "application/xml",  :sru

data/config/initializers/paperclip.rb

@@ -0,0 +1,12 @@
+module Paperclip
+  class MediaTypeSpoofDetector
+    private
+    def type_from_file_command
+      begin
+        Paperclip.run("LANG=C file", "-b --mime-type :file", :file => @file.path)
+      rescue Cocaine::CommandLineError
+        ""
+      end
+    end
+  end
+end

data/config/initializers/resque.rb

@@ -0,0 +1 @@
+Resque.after_fork = Proc.new { ActiveRecord::Base.establish_connection }

data/config/locales/translation_en.yml

@@ -70,6 +70,7 @@ en:
         state: State
         edit_mode: Edit mode
         error_message: Error message
+        user_encoding: Encoding
       user_import_result:
         body: Body
 
@@ -126,6 +127,7 @@ en:
     feed: "Feed"
     back_to_index: "Back to index"
     import: "Import from file"
+    start_import: "Start import"
     import_record: "Import records"
     export: "Export"
     detail: "Detail"
@@ -364,6 +366,7 @@ en:
     will_be_imported:
       one: "Resource will be impored in a %{minute} minute."
       other: "Resource will be impored in %{minute} minutes."
+    auto_detect: "Auto detect"
   user:
     current_password: "Current password"
     new_password: "New password"

data/config/locales/translation_ja.yml

@@ -70,6 +70,7 @@ ja:
         state: 状態
         edit_mode: 編集モード
         error_message: エラーメッセージ
+        user_encoding: 文字コード
       user_import_result:
         body: 本文
 
@@ -117,6 +118,7 @@ ja:
     feed: "フィード"
     back_to_index: "一覧に戻る"
     import: "インポート"
+    start_import: "インポートを開始"
     import_record: "書誌レコードのインポート"
     export: "エクスポート"
     detail: "詳細"
@@ -345,6 +347,7 @@ ja:
     from_file: "ファイルから"
     from_isbn: "ISBNから"
     will_be_imported: "%{minute} 分以内にインポートされます。"
+    auto_detect: "自動判別"
   user:
     current_password: "現在のパスワード"
     new_password: "新しいパスワード"