enju_leaf 1.1.0.rc20 → 1.1.0.rc21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3273d500f23e9cc91fa3e7f5bb4326b487f82ece
-  data.tar.gz: a85ea982da6df34bc0ec54854af71dbd878e271e
+  metadata.gz: 814060a69ff014c4f6109974273e83e7afa7bda6
+  data.tar.gz: a69228eb3e3734622b2d34c7b2c47feb2fae2268
 SHA512:
-  metadata.gz: 3e49feb51fe8ec0fb8f99c5585f3392b0ec50e96bbee9b9b9593c6ebf0c7cbfa25182a27cc33ab62f9a64b05407e27c286492cfa1b36d3eb6df1c5b0f586e1e9
-  data.tar.gz: 7da97d2101393d48658fc87f380975b90087812e5df3a8075a84aa3325a655d51c185af9d16795d726383212cebfc31fcc10a38b91da719259970b47c51756ee
+  metadata.gz: 8fa95c3a8e7b904e9b949752723aa12d33b0035e7f4f99997c1c5775a914462293aa89ca84c16792798b80681964a4471b71c7c73b5fb79a102074c2ef94e172
+  data.tar.gz: c2d52a9face2180054eff01c1d85ee74a4ae3fb7b9c94dfda0662bf29cd4d3e0faea9cd5a0040989adbe2e0ef976538b0cd49700e5de38665c51bae11aab265f

data/app/controllers/my_accounts_controller.rb

@@ -12,17 +12,6 @@ class MyAccountsController < ApplicationController
 
   def edit
     @profile = current_user.profile
-    if defined?(EnjuCirculation)
-      if params[:mode] == 'feed_token'
-        if params[:disable] == 'true'
-          @profile.delete_checkout_icalendar_token
-        else
-          @profile.reset_checkout_icalendar_token
-        end
-        render partial: 'feed_token'
-        return
-      end
-    end
     prepare_options
   end
 

data/app/controllers/page_controller.rb

@@ -5,6 +5,7 @@ class PageController < ApplicationController
   before_filter :check_librarian, except: [:index, :advanced_search, :about, :add_on, :msie_accelerator, :opensearch, :statistics, :routing_error]
   helper_method :get_libraries
 
+  # トップページを表示します。
   def index
     if user_signed_in?
       session[:user_return_to] = nil
@@ -42,51 +43,62 @@ class PageController < ApplicationController
     end
   end
 
+  # Internet Explorer用のアクセラレータを表示します。
   def msie_accelerator
     respond_to do |format|
       format.xml { render layout: false }
     end
   end
 
+  # OpenSearch Descriptionファイルを表示します。
   def opensearch
     respond_to do |format|
       format.xml { render layout: false }
     end
   end
 
+  # 詳細検索画面を表示します。
   def advanced_search
     get_libraries
     @title = t('page.advanced_search')
   end
 
+  # 統計画面を表示します。
   def statistics
     @title = t('page.statistics')
   end
 
+  # システム設定画面を表示します。
   def configuration
     @title = t('page.configuration')
   end
 
+  # システム情報画面を表示します。
   def system_information
     @specs = Bundler.load.specs.sort!
   end
 
+  # インポート画面を表示します。
   def import
     @title = t('page.import')
   end
 
+  # エクスポート画面を表示します。
   def export
     @title = t('page.export')
   end
 
+  # 「このシステムについて」を表示します。
   def about
     @title = t('page.about_this_system')
   end
 
+  # 「アドオン」を表示します。
   def add_on
     @title = t('page.add_on')
   end
 
+  # ルーティングエラー画面を表示します。
   def routing_error
     render_404
   end

data/app/controllers/profiles_controller.rb

@@ -7,6 +7,13 @@ class ProfilesController < ApplicationController
   # GET /profiles
   # GET /profiles.json
   def index
+    if params[:username].present?
+      profile = User.where(username: params[:username]).first.try(:profile)
+      if profile
+        redirect_to profile
+        return
+      end
+    end
     query = flash[:query] = params[:query].to_s
     @query = query.dup
     @count = {}
@@ -73,6 +80,17 @@ class ProfilesController < ApplicationController
 
   # GET /profiles/1/edit
   def edit
+    if defined?(EnjuCirculation)
+      if params[:mode] == 'feed_token'
+        if params[:disable] == 'true'
+          @profile.delete_checkout_icalendar_token
+        else
+          @profile.reset_checkout_icalendar_token
+        end
+        render partial: 'feed_token', locals: {profile: @profile}
+        return
+      end
+    end
     if @profile.user == current_user
       redirect_to edit_my_account_url
       return
@@ -154,9 +172,9 @@ class ProfilesController < ApplicationController
     ]
     attrs += [
       :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :locked, :user_number, {
+      :user_group_id, :required_role_id, :note, :user_number, {
         :user_attributes => [
-          :id, :username, :email, :current_password,
+          :id, :username, :email, :current_password, :locked,
           {:user_has_role_attributes => [:id, :role_id]}
         ]
       }
@@ -168,14 +186,14 @@ class ProfilesController < ApplicationController
     attrs = [
       :full_name, :full_name_transcription,
       :keyword_list, :locale,
-      :save_checkout_history, # EnjuCirculation
+      :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
     attrs += [
       :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :locked, :user_number, {
+      :user_group_id, :required_role_id, :note, :user_number, {
         :user_attributes => [
-          :id, :email, :current_password, :auto_generated_password,
+          :id, :email, :current_password, :auto_generated_password, :locked,
           {:user_has_role_attributes => [:id, :role_id]}
         ]
       }

data/app/controllers/user_import_files_controller.rb

@@ -21,6 +21,7 @@ class UserImportFilesController < ApplicationController
         file = @user_import_file.user_import.path
       end
     end
+    @user_import_results = @user_import_file.user_import_results.page(params[:page])
 
     respond_to do |format|
       format.html # show.html.erb

data/app/helpers/page_helper.rb

@@ -1,2 +1,16 @@
 module PageHelper
+  def check_all_button( param, label )
+    html = <<-EOF
+    <button type="button" id="check_all_#{ param }">#{ label }</button>
+    <script>
+      $(function(){
+        $("#check_all_#{ param }").click(function(e){
+          var checkboxes = $("input##{ param }");
+          checkboxes.prop("checked", !checkboxes.prop("checked"));
+        });
+      });
+    </script>
+    EOF
+    html.html_safe
+  end
 end

data/app/models/profile.rb

@@ -20,7 +20,7 @@ class Profile < ActiveRecord::Base
 
   normalize_attribute :user_number
 
-  attr_accessor :birth_date, :locked
+  attr_accessor :birth_date
 
   searchable do
     text :user_number, :full_name, :full_name_transcription, :note
@@ -49,11 +49,15 @@ class Profile < ActiveRecord::Base
   before_save :set_expired_at, :set_date_of_birth
   accepts_nested_attributes_for :user
 
+  # 既定のユーザ権限を設定します。
+  # @return [void]
   def set_role_and_agent
     self.required_role = Role.where(name: 'Librarian').first unless required_role
     self.locale = I18n.default_locale.to_s unless locale
   end
 
+  # ユーザの有効期限を設定します。
+  # @return [Time]
   def set_expired_at
     if expired_at.blank?
       if user_group.valid_period_for_new_user > 0
@@ -62,6 +66,8 @@ class Profile < ActiveRecord::Base
     end
   end
 
+  # ユーザの誕生日を設定します。
+  # @return [Time]
   def set_date_of_birth
     self.date_of_birth = Time.zone.parse(birth_date) if birth_date
   rescue ArgumentError

data/app/models/user_export_file.rb

@@ -27,6 +27,7 @@ class UserExportFile < ActiveRecord::Base
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
 
+  # エクスポートの処理を実行します。
   def export!
     transition_to!(:started)
     tempfile = Tempfile.new(['user_export_file_', '.txt'])

data/app/models/user_import_file.rb

@@ -43,6 +43,7 @@ class UserImportFile < ActiveRecord::Base
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
 
+  # 利用者情報をTSVファイルを用いて作成します。
   def import
     transition_to!(:started)
     num = { user_imported: 0, user_found: 0, failed: 0 }
@@ -79,14 +80,11 @@ class UserImportFile < ActiveRecord::Base
           new_user.role = Role.find(2) # User
         end
         new_user.username = username
-        new_user.assign_attributes(set_user_params(new_user, row))
+        new_user.assign_attributes(set_user_params(row))
         profile = Profile.new
         profile.assign_attributes(set_profile_params(row))
 
         if new_user.save
-          if profile.locked
-            new_user.lock_access!
-          end
           new_user.profile = profile
           if profile.save
             num[:user_imported] += 1
@@ -115,6 +113,7 @@ class UserImportFile < ActiveRecord::Base
     raise e
   end
 
+  # 利用者情報をTSVファイルを用いて更新します。
   def modify
     transition_to!(:started)
     num = { user_updated: 0, user_not_found: 0, failed: 0 }
@@ -136,7 +135,7 @@ class UserImportFile < ActiveRecord::Base
       username = row['username']
       new_user = User.where(username: username).first
       if new_user.try(:profile)
-        new_user.assign_attributes(set_user_params(new_user, row))
+        new_user.assign_attributes(set_user_params(row))
         new_user.profile.assign_attributes(set_profile_params(row))
         Profile.transaction do
           if new_user.save and new_user.profile.save
@@ -155,6 +154,7 @@ class UserImportFile < ActiveRecord::Base
     rows.close
     transition_to!(:completed)
     Sunspot.commit
+    send_message
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
@@ -163,6 +163,7 @@ class UserImportFile < ActiveRecord::Base
     raise e
   end
 
+  # 利用者情報をTSVファイルを用いて削除します。
   def remove
     transition_to!(:started)
     row_num = 1
@@ -185,6 +186,7 @@ class UserImportFile < ActiveRecord::Base
       end
     end
     transition_to!(:completed)
+    send_message
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
@@ -201,6 +203,8 @@ class UserImportFile < ActiveRecord::Base
     :pending
   end
 
+  # インポート作業用のファイルを読み込みます。
+  # @param [File] tempfile 作業用のファイル
   def open_import_file(tempfile)
     file = CSV.open(tempfile.path, 'r:utf-8', col_sep: "\t")
     header_columns = %w(
@@ -231,6 +235,7 @@ class UserImportFile < ActiveRecord::Base
     rows
   end
 
+  # 未処理のインポート作業用のファイルを一括で処理します。
   def self.import
     UserImportFile.not_imported.each do |file|
       file.import_start
@@ -240,7 +245,9 @@ class UserImportFile < ActiveRecord::Base
   end
 
   private
-  def set_user_params(_new_user, row)
+  # ユーザ情報のパラメータを設定します。
+  # @param [Hash] row 利用者情報のハッシュ
+  def set_user_params(row)
     params = {}
     params[:email] = row['email'] if row['email'].present?
 
@@ -249,9 +256,16 @@ class UserImportFile < ActiveRecord::Base
     else
       params[:password] = Devise.friendly_token[0..7]
     end
+
+    if %w(t true).include?(row['locked'].to_s.downcase.strip)
+      params[:locked] = '1'
+    end
+
     params
   end
 
+  # 利用者情報のパラメータを設定します。
+  # @param [Hash] row 利用者情報のハッシュ
   def set_profile_params(row)
     params = {}
     user_group = UserGroup.where(name: row['user_group']).first
@@ -280,10 +294,6 @@ class UserImportFile < ActiveRecord::Base
 
     params[:note] = row['note'] if row['note']
 
-    if %w(t true).include?(row['locked'].to_s.downcase.strip)
-      params[:locked] = true 
-    end
-
     if I18n.available_locales.include?(row['locale'].to_s.to_sym)
       params[:locale] = row['locale']
     end

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

@@ -28,10 +28,11 @@
             <li><%= link_to t('page.checkout_history'), checkouts_path -%></li>
             <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path -%></li>
           <%- end -%>
+	  <li><%= link_to t('page.catalog_search'), manifestations_path %></li>
         </ul>
       <% end %>
     </li>
-    <%- if user_signed_in? -%>
+    <%- if user_signed_in? and (current_user.has_role?('Librarian') or defined?(EnjuBookmark)) -%>
       <li>
         <a href="#acquisition_menu"><%= t('page.acquisition') -%></a>
         <ul>
@@ -40,27 +41,23 @@
             <% if defined?(EnjuNdl) %>
               <li><%= link_to t('enju_ndl.import_from_ndl_search'), ndl_books_path -%></li>
             <% end %>
-	    <% if defined?(EnjuNii) %>
-	      <li><%= link_to t('enju_nii.import_from_cinii_books'), cinii_books_path -%></li>
-	    <% end %>
-	    <% if defined?(EnjuLoc) %>
-	      <li><%= link_to t('enju_loc.import_from_loc_search'), loc_search_index_path -%></li>
-	    <% end %>
+            <% if defined?(EnjuNii) %>
+              <li><%= link_to t('enju_nii.import_from_cinii_books'), cinii_books_path -%></li>
+            <% end %>
+            <% if defined?(EnjuLoc) %>
+              <li><%= link_to t('enju_loc.import_from_loc_search'), loc_search_index_path -%></li>
+            <% end %>
             <li><%= link_to t('page.add_resource_manually'), new_manifestation_path -%></li>
             <li><%= link_to t('page.serial'), manifestations_path(serial: true) -%></li>
             <li><%= link_to t('page.import_from_file'), new_resource_import_file_path -%></li>
             <li><%= link_to t('activerecord.models.accept'), new_accept_path -%></li>
-	          <% if defined?(EnjuIr) %>
-	            <li><%= link_to t('activemodel.models.resource'), resources_path -%></li>
-	          <% end %>
-            <% if defined?(EnjuBookmark) %>
-              <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path -%></li>
-            <% end %>
-          <%- else -%>
-            <% if defined?(EnjuBookmark) %>
-              <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path -%></li>
+            <% if defined?(EnjuIr) %>
+              <li><%= link_to t('activemodel.models.resource'), resources_path -%></li>
             <% end %>
           <%- end -%>
+          <% if defined?(EnjuBookmark) %>
+            <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path -%></li>
+          <% end %>
         </ul>
       </li>
     <% end %>
@@ -103,41 +100,33 @@
         </ul>
       </li>
     <% end %>
-    <li>
-      <a href="#configuration_menu">
-        <% if current_user.try(:has_role?, 'Librarian') %>
-          <%= t('page.management') -%>
-        <% else %>
-          <%= t('page.configuration') -%>
-        <% end %>
-      </a>
-      <ul>
-        <%- if user_signed_in? -%>
-          <%- if current_user.has_role?('Librarian') -%>
-            <li><%= link_to t('user.management'), profiles_path -%></li>
-            <li><%= link_to t('page.agent_management'), agents_path -%></li>
-            <li><%= link_to t('page.import'), page_import_path -%></li>
-            <li><%= link_to t('page.export'), page_export_path -%></li>
-            <% if defined?(EnjuPurchaseRequest) %>
-              <li><%= link_to t('activerecord.models.order_list'), order_lists_path -%></li>
-            <% end %>
-            <li><%= link_to t('page.statistics'), page_statistics_path -%></li>
-            <% if defined?(EnjuSearchLog) %>
-              <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
-            <% end %>
-            <% if @library_group.settings[:erms_url] %>
-              <li><%= link_to t('page.electronic_resource_management'), @library_group.settings[:erms_url] -%></li>
-            <% end %>
-            <li><%= link_to t('page.configuration'), page_configuration_path -%></li>
+    <%- if current_user.try(:has_role?, 'Librarian') -%>
+      <li>
+        <a href="#configuration_menu">
+          <% if current_user.try(:has_role?, 'Librarian') %>
+            <%= t('page.management') -%>
           <% else %>
-            <ul>
-              <li><%= link_to t('user.account_management'), edit_my_account_path -%></li>
-            </ul>
-          <%- end -%>
-        <%- else -%>
-          <li><%= link_to t('page.sign_in'), new_user_session_path -%></li>
-        <%- end -%>
-      </ul>
-    </li>
+            <%= t('page.configuration') -%>
+          <% end %>
+        </a>
+        <ul>
+          <li><%= link_to t('user.management'), profiles_path -%></li>
+          <li><%= link_to t('page.agent_management'), agents_path -%></li>
+          <li><%= link_to t('page.import'), page_import_path -%></li>
+          <li><%= link_to t('page.export'), page_export_path -%></li>
+          <% if defined?(EnjuPurchaseRequest) %>
+            <li><%= link_to t('activerecord.models.order_list'), order_lists_path -%></li>
+          <% end %>
+          <li><%= link_to t('page.statistics'), page_statistics_path -%></li>
+          <% if defined?(EnjuSearchLog) %>
+            <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
+          <% end %>
+          <% if @library_group.settings[:erms_url] %>
+            <li><%= link_to t('page.electronic_resource_management'), @library_group.settings[:erms_url] -%></li>
+          <% end %>
+          <li><%= link_to t('page.configuration'), page_configuration_path -%></li>
+        </ul>
+      </li>
+    <% end %>
   </ul>
 </div>

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

@@ -10,6 +10,7 @@
         <% @libraries.sort_by{|l| l.position }.each do |library| %>
           <label><%= check_box_tag "library_adv[]", library.name %><%= library.display_name.localize %></label>
         <% end %>
+        <div class="check_all"><%= check_all_button "library_adv_", t('advanced_search.check_all') %></div>
       </td>
     </tr>
     <tr>
@@ -50,15 +51,25 @@
       <td><label><%= t('activerecord.attributes.item.item_identifier') -%>:</label></td>
       <td><%= text_field_tag 'item_identifier' -%></td>
     </tr>
+    <% if defined?(EnjuSubject) %>
+      <tr>
+        <td><label><%= t('activerecord.models.classification') %>:</label></td>
+        <td>
+          <%- types = ClassificationType.all.select{|t| ! t.classifications.empty? } -%> 
+          <%= select_tag 'classification_type', options_from_collection_for_select( types, :id, Proc.new{|e| e.display_name.localize } ) -%>
+          <%= text_field_tag 'classification' -%>
+        </td>
+      </tr>
+    <% end %>
     <tr>
       <td><label><%= t('activerecord.attributes.manifestation.date_of_publication') -%>:</label></td>
-      <td><%= t('advanced_search.from') -%> <%= text_field_tag 'pub_date_from', nil, class: 'date_text_field', placeholder: "#{t('page.example')}: 1978, 1978-04-12" -%>
-        <%= t('advanced_search.to') -%> <%= text_field_tag 'pub_date_to', nil, class: 'date_text_field', placeholder: "#{t('page.example')}: 2011, 2011-04-12"-%></td>
+      <td><%= t('advanced_search.from') -%> <%= text_field_tag 'pub_date_from', nil, class: 'wide_date_text_field', placeholder: "#{t('page.example')}: 1978, 1978-04-12" -%>
+        <%= t('advanced_search.to') -%> <%= text_field_tag 'pub_date_until', nil, class: 'wide_date_text_field', placeholder: "#{t('page.example')}: 2011, 2011-04-12"-%></td>
     </tr>
     <tr>
       <td><label><%= t('activerecord.attributes.item.acquired_at') -%>:</label></td>
       <td><%= t('advanced_search.from') -%> <%= text_field_tag 'acquired_from', nil, class: 'wide_date_text_field', placeholder: "#{t('page.example')}: 2005, 2005-04-01" -%>
-        <%= t('advanced_search.to') -%> <%= text_field_tag 'acquired_to', nil, class: 'wide_date_text_field', placeholder: "#{t('page.example')}: 2011, 2011-03-31"-%></td>
+        <%= t('advanced_search.to') -%> <%= text_field_tag 'acquired_until', nil, class: 'wide_date_text_field', placeholder: "#{t('page.example')}: 2011, 2011-03-31"-%></td>
     </tr>
     <tr>
       <td><label><%= t('page.number_of_pages') -%>:</label></td>

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

@@ -51,6 +51,9 @@
           <ul>
             <li><%= link_to t('item.all_item'), items_path %></li>
             <li><%= link_to t('activerecord.models.resource_import_file'), resource_import_files_path -%></li>
+            <% if respond_to? :new_withdraw_path %>
+            <li><%= link_to t('activerecord.models.withdraw'), new_withdraw_path -%></li>
+            <% end %>
           </ul>
         </li>
         <li><%= link_to t('activerecord.models.identifier_type'), identifier_types_path -%>

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

@@ -5,33 +5,27 @@
     <tr>
       <th><%= t('page.model') -%></th>
       <th><%= t('page.number_of_record') -%></th>
-      <th><%= t('page.note') -%></th>
     </tr>
     <tr>
       <td><%= link_to t('activerecord.models.agent'), agents_path -%></td>
       <td><%= Agent.count -%></td>
-      <td></td>
     </tr>
     <tr>
       <td><%= link_to t('activerecord.models.profile'), profiles_path -%></td>
       <td><%= Profile.count -%></td>
-      <td></td>
     </tr>
     <tr>
       <td><%= link_to t('activerecord.models.manifestation'), manifestations_path -%></td>
       <td><%= Manifestation.count -%></td>
-      <td></td>
     </tr>
     <tr>
       <td><%= link_to t('activerecord.models.item'), items_path -%></td>
       <td><%= Item.count -%></td>
-      <td></td>
     </tr>
     <% if defined?(EnjuSearchLog) %>
       <tr>
         <td><%= link_to t('activerecord.models.search_history'), search_histories_path -%></td>
         <td><%= SearchHistory.count -%></td>
-        <td></td>
       </tr>
     <% end %>
     <% if defined?(EnjuBookmark) %>
@@ -41,19 +35,16 @@
           <%= Bookmark.count -%>
           (<%= link_to t('activerecord.attributes.bookmark_stat_has_manifestation.bookmarks_count'), bookmark_stats_path -%>)
         </td>
-        <td></td>
       </tr>
       <tr>
         <td><%= link_to t('activerecord.models.tag'), tags_path -%></td>
         <td><%= Tag.count -%></td>
-        <td></td>
       </tr>
     <% end %>
     <% if defined?(EnjuSubject) %>
       <tr>
         <td><%= link_to t('activerecord.models.subject'), subjects_path -%></td>
         <td><%= Subject.count -%></td>
-        <td></td>
       </tr>
     <% end %>
     <% if defined?(EnjuCirculation) %>
@@ -64,7 +55,6 @@
           (<%= link_to t('activerecord.attributes.checkout_stat_has_user.checkouts_count'), user_checkout_stats_path -%>)
           (<%= link_to t('activerecord.attributes.checkout_stat_has_manifestation.checkouts_count'), manifestation_checkout_stats_path -%>)
         </td>
-        <td></td>
       </tr>
       <tr>
         <td><%= link_to t('activerecord.models.reserve'), reserves_path -%></td>
@@ -73,26 +63,22 @@
           (<%= link_to t('activerecord.attributes.reserve_stat_has_user.reserves_count'), user_reserve_stats_path -%>)
           (<%= link_to t('activerecord.attributes.reserve_stat_has_manifestation.reserves_count'), manifestation_reserve_stats_path -%>)
         </td>
-        <td></td>
       </tr>
     <% end %>
     <% if defined?(EnjuPurchaseRequest) %>
       <tr>
         <td><%= link_to t('activerecord.models.purchase_request'), purchase_requests_path -%></td>
         <td><%= PurchaseRequest.count -%></td>
-        <td></td>
       </tr>
     <% end %>
     <% if defined?(EnjuQuestion) %>
       <tr>
         <td><%= link_to t('activerecord.models.question'), questions_path -%></td>
         <td><%= Question.count -%></td>
-        <td></td>
       </tr>
       <tr>
         <td><%= link_to t('activerecord.models.answer'), answers_path -%></td>
         <td><%= Answer.count -%></td>
-        <td></td>
       </tr>
     <% end %>
   </table>

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

@@ -3,14 +3,26 @@
 <div id="content_list">
 
   <ul>
+    <li>Ruby: <%= RUBY_DESCRIPTION %></li>
     <li>Environment: <%= Rails.env %></li>
     <li>Gems:
     <ul>
-      <% @specs.each do |spec| %>
+      <% @specs.sort_by{|e| e.name }.each do |spec| %>
         <li><%= spec.name %>: <%= spec.version.to_s %></li>
       <% end %>
     </ul>
     </li>
+    <li>Languages:
+    <ul>
+      <% @available_languages.each do |language| %>
+        <li><%= language.iso_639_1 %>: <%= language.native_name || language.name %>
+        <% if language.iso_639_1 == I18n.locale.to_s %>
+          (<%= t('page.default_locale') %>)
+        <% end %>
+        </li>
+      <% end %>
+    </ul>
+    </li>
   </ul>
 
 </div>

data/app/views/profiles/_edit_profile.html.erb

@@ -7,8 +7,8 @@
           <%= f.hidden_field :checkout_icalendar_token -%>
         <%- end -%>
         <br />
-        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
-        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
+        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_profile_path(profile, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
+        <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_profile_path(profile, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
       </div>
       <br />
     </div>