enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/app/views/my_accounts/_edit_credential.html.erb

@@ -1,87 +1,95 @@
+<%= f.fields_for :user do |user_form| %>
   <div id="left_pane_detail">
 
-  <div class="field">
-    <%= f.label :username -%><br />
-    <%= user.username -%>
-  </div>
+    <div class="field">
+      <%= user_form.label :username -%><br />
+      <%= profile.user.username -%>
+    </div>
 
-  <div class="field">
-    <%= f.label :email -%><br />
-    <%= f.email_field :email, :class => 'resource_email' -%>
-  </div>
-  <div class="field">
-    <abbr title="required"><%= t('simple_form.required.mark') %></abbr>
-    <%= f.label :current_password -%><br />
-    <%= f.password_field :current_password, :class => 'resource_email', :autocomplete => 'off' -%>
-  </div>
-  <div class="field">
-    <%= f.label :password -%><br />
-    <%= f.password_field :password, :class => 'resource_email', :autocomplete => 'off' -%>
-  </div>
-  <div class="field">
-    <%= f.label :password_confirmation -%><br />
-    <%= f.password_field :password_confirmation, :class => 'resource_email', :autocomplete => 'off' -%>
-  </div>
+    <div class="field">
+      <%= user_form.label :email -%><br />
+      <%= user_form.text_field :email %>
+    </div>
 
-  <div class="field">
-    <%= f.label :expired_at -%><br />
-    <%- if current_user.has_role?('Librarian') -%>
-      <%= f.text_field :expired_at, :value => user.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_text_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
-    <%- else -%>
-      <%= l(user.expired_at) if user.expired_at -%>
-    <%- end -%>
-  </div>
+    <div class="field">
+      <%= user_form.label :current_password -%><br />
+      <%= user_form.password_field :current_password, class: 'resource_email' %>
+    </div>
 
-  <div class="field">
-    <%= f.check_box :locked, :disabled => 'disabled' -%>
-    <%= f.label :locked -%>
-  </div>
+  <% if profile.user == current_user %>
+    <div class="field">
+      <%= user_form.label :password -%><br />
+      <%= user_form.password_field :password, class: 'resource_email' %>
+    </div>
 
-  </div>
+    <div class="field">
+      <%= user_form.label :password_confirmation -%><br />
+      <%= user_form.password_field :password_confirmation, class: 'resource_email' %>
+    </div>
+  <% else %>
+    <div class="field">
+      <%= user_form.label :auto_generated_password -%>
+      <%= user_form.check_box :auto_generated_password -%>
+    </div>
+  <% end %>
 
-  <div id="right_pane_detail">
     <div class="field">
-      <%= f.label t('activerecord.models.user_group') -%><br />
+      <%= f.label :expired_at -%><br />
       <%- if current_user.has_role?('Librarian') -%>
-        <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
-      <% else %>
-        <%= current_user.user_group.display_name.localize %>
-      <% end %>
+        <%= f.text_field :expired_at, value: profile.expired_at.try(:strftime, "%Y-%m-%d"), class: 'date_text_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
+      <%- else -%>
+        <%= l(profile.expired_at) if profile.expired_at -%>
+      <%- end -%>
     </div>
 
     <div class="field">
-      <%= f.label t('activerecord.models.role') -%><br />
-      <%- if current_user.has_role?('Administrator') and current_user != user -%>
-        <%= f.fields_for :user_has_role do |u| %>
+      <%= user_form.label :locked -%>
+      <%= user_form.check_box :locked -%>
+    </div>
+
+    <div class="field">
+      <%= user_form.label t('activerecord.models.role') -%><br />
+      <%= user_form.fields_for :user_has_role do |u| %>
+        <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
           <%= u.select :role_id, @roles.collect{|r| [r.display_name.localize, r.id]} %>
+        <% else %>
+          <%= u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled'}) -%>
         <% end %>
-      <% else %>
-        <%= current_user.role.display_name.localize %>
       <% end %>
     </div>
+  </div>
+
+  <div id="right_pane_detail">
+    <%- if current_user.has_role?('Librarian') -%>
+      <div class="field">
+        <%= f.label t('activerecord.models.user_group') -%><br />
+        <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
+      </div>
+    <%- end -%>
 
     <div class="field">
       <%= f.label :user_number -%><br />
       <%- if current_user.has_role?('Librarian') -%>
-        <%= f.text_field :user_number, :class => 'resource_user_number' -%>
+        <%= f.text_field :user_number, class: 'resource_user_number' -%>
       <%- else -%>
-        <%= user.user_number -%>
+        <%= profile.user_number -%>
       <%- end -%>
     </div>
 
-  <%- if current_user.has_role?('Librarian') -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.library') -%><br />
-      <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
-    </div>
+    <%- if current_user.has_role?('Librarian') -%>
+      <div class="field">
+        <%= f.label t('activerecord.models.library') -%><br />
+        <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
+      </div>
 
+      <div class="field">
+        <%= f.label t('role.required_role') -%><br />
+        <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
+      </div>
+    <%- end -%>
     <div class="field">
-      <%= f.label t('role.required_role') -%><br />
-      <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
+      <%= f.label :locale -%><br />
+      <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
     </div>
-  <%- end -%>
-  <div class="field">
-    <%= f.label :locale -%><br />
-    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
-  </div>
   </div>
+<% end %>

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

@@ -1,11 +1,11 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.edit_user_profile', :login_name => @user.username) -%></h1>
+<h1 class="title"><%= t('page.edit_user_profile', login_name: @profile.user.username) -%></h1>
 <div id="content_list">
 <%= render 'page/required_field' %>
-<%= simple_form_for(@user, :url => my_account_path) do |f| -%>
+<%= simple_form_for(@profile, url: my_account_path) do |f| -%>
   <%= f.error_messages -%>
 
-  <%= render :partial => 'edit_credential', :locals => {:f => f, :user => @user} -%>
+  <%= render partial: 'edit_credential', locals: {f: f, profile: @profile} -%>
 
   <div class="actions">
     <%= f.submit %>
@@ -13,50 +13,10 @@
 <div style="clear: both">
   <div class="field">
     <%= f.label :keyword_list -%><br />
-    <%= f.text_area :keyword_list, :class => 'resource_textarea' -%>
-  </div>
-
-  <% if defined?(EnjuCirculation) %>
-    <div class="field">
-      <%= f.label t('user.checkout_history_icalendar_url') -%><br />
-      <div id="feed_token">
-        <%- if @user.checkout_icalendar_token? -%>
-          <%= link_to checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics), checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics) -%>
-          <%= 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') %>" />
-      </div>
-      <br />
-    </div>
-  <% end %>
-
-  <% if defined?(EnjuSearchLog) %>
-    <div class="field">
-      <%= f.check_box :save_search_history %>
-      <%= f.label :save_search_history %>
-    </div>
-  <% end %>
-
-  <% if defined?(EnjuCirculation) %>
-    <div class="field">
-      <%= f.check_box :save_checkout_history %>
-      <%= f.label :save_checkout_history %>
-    </div>
-  <% end %>
-
-  <% if current_user.has_role?('Librarian') %>
-    <div class="field">
-      <%= f.label :note -%><br />
-      <%= f.text_area :note, :class => 'resource_textarea' -%>
-    </div>
-  <% end %>
-
-  <div class="actions">
-    <%= f.submit %>
+    <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
   </div>
 
+  <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
 </div>
   <%- end -%>
 
@@ -67,7 +27,7 @@
   <ul>
     <li><%= link_to t('page.show'), my_account_path -%></li>
     <% if current_user.has_role?('Librarian') %>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.user')), users_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.user')), profiles_path -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -8,14 +8,14 @@
     <%= current_user.username -%>
   </h2>
 
-  <p><%= t('activerecord.attributes.user.user_number') %>: <%= current_user.user_number %></p>
+  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= current_user.profile.user_number %></p>
 
   <% if defined?(EnjuCirculation) %>
     <h2>
       <%= t('activerecord.models.checkout') %>
-      <%= link_to image_tag('icons/date.png', :size => '16x16', :alt => 'iCalendar', :class => 'icon'), checkouts_url(:icalendar_token => current_user.checkout_icalendar_token, :format => :ics) if current_user.checkout_icalendar_token? %>
-      <%= link_to image_tag('icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), user_checkouts_url(current_user, :format => :rss) %>
-      <%= link_to image_tag('icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_checkouts_url(current_user, :format => :csv) %>
+      <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_url(icalendar_token: current_user.checkout_icalendar_token, format: :ics) if current_user.checkout_icalendar_token? %>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_url(user_id: current_user.username, format: :rss) %>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_url(user_id: current_user.username, format: :txt) %>
     </h2>
     <table class="table table-striped index">
       <tr>
@@ -29,7 +29,7 @@
             (<%= link_to checkout.item.manifestation.original_title, checkout.item.manifestation %>)
           </td>
           <td>
-            <%=l checkout.due_date, :formats => :only_date %>
+            <%=l checkout.due_date, formats: :only_date %>
             <br />
             <%- if can? :update, checkout -%>
               <% unless checkout.checkin %>
@@ -47,7 +47,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <% if defined?(EnjuCirculation) %>
     <ul>
-      <%- current_user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
+      <%- current_user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
         <li>
           <%= available_checkout_type.checkout_type.display_name.localize -%>:
           <%= current_user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
@@ -58,7 +58,7 @@
   <ul>
     <li><%= link_to t('page.edit'), edit_my_account_path -%></li>
     <%- if can? :destroy, current_user -%>
-      <%= link_to t('page.destroy'), curent_user, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), curent_user, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     <%- end -%>
     <% if defined?(EnjuSearchLog) %>
       <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>

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

@@ -1,10 +1,10 @@
 <%- if params[:mode] == 'add' -%>
   <%= radio_button_tag 'mode', 'show' -%>
   <%= label_tag 'mode_show', t('page.show') %>
-  <%= radio_button_tag 'mode', 'add', :checked => true -%>
+  <%= radio_button_tag 'mode', 'add', checked: true -%>
   <%= label_tag 'mode_add', t('page.add') %>
 <%- else -%>
-  <%= radio_button_tag 'mode', 'show', :checked => true -%>
+  <%= radio_button_tag 'mode', 'show', checked: true -%>
   <%= label_tag 'mode_show', t('page.show') %>
   <%= radio_button_tag 'mode', 'add' -%>
   <%= label_tag 'mode_add', t('page.add') %>

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

@@ -3,9 +3,10 @@
     <a href="https://github.com/next-l/enju_leaf">Next-L Enju Leaf <%= EnjuLeaf::VERSION %></a>,
     <%= t('page.open_source_integrated_library_system') -%> |
     <%= link_to t('page.about_this_system'), page_about_path -%> |
-    <%= link_to t('page.report_bugs'), "https://github.com/next-l/enju_leaf/issues" -%>
+    <%= link_to t('page.report_bugs'), "https://github.com/next-l/enju_leaf/issues" -%> |
+    <%= link_to t('page.manual'), "https://next-l.github.io/manual/" %>
     <% if is_mobile_request? %>
-      | <%= link_to t('page.mobile_view'), url_for(:mobile_view => 'true') %>
+      | <%= link_to t('page.mobile_view'), url_for(mobile_view: 'true') %>
     <% end %>
     <br />
     Developed by <a href="https://github.com/nabeta">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a>.

data/app/views/page/_footer.mobile.erb

@@ -1,3 +1,3 @@
 <div data-role="footer">
-  <%= link_to t('page.standard_view'), url_for(:mobile_view => 'false'), "data-ajax" => false %>
+  <%= link_to t('page.standard_view'), url_for(mobile_view: 'false'), "data-ajax" => false %>
 </div>

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

@@ -1,7 +1,7 @@
 <div class="header_and_footer">
   <div id="header_left">
     <div id="library_system_name">
-      <h1 class="resource_title"><%= link_to LibraryGroup.system_name(@locale), root_path, :title => LibraryGroup.system_name(@locale) %></h1>
+      <h1 class="resource_title"><%= link_to LibraryGroup.system_name(@locale), root_path, title: LibraryGroup.system_name(@locale) %></h1>
     </div>
     <div id="header_micro_advertisement"></div>
   </div>
@@ -10,10 +10,10 @@
   <div id="header_right">
     <div id="user_account">
       <% if user_signed_in? %>
-        <%= t('page.logged_in_as', :login_name => current_user.username) -%>
+        <%= t('page.logged_in_as', login_name: current_user.username) -%>
         <br />
         <% if defined?(EnjuMessage) %>
-          <%= link_to image_tag('icons/email.png', :size => '16x16', :alt => t('activerecord.models.message')), messages_path %>
+          <%= link_to image_tag('icons/email.png', size: '16x16', alt: t('activerecord.models.message')), messages_path %>
           <% if current_user.received_messages.unread.size > 0 %>
             <%= link_to "(#{h(current_user.received_messages.unread.size)})", messages_path %>
           <% else %>
@@ -21,7 +21,7 @@
           <% end %>
         <% end %>
         <%= link_to t('page.account'), my_account_path -%>
-        <%= link_to t('page.sign_out'), destroy_user_session_path, :method => :delete -%>
+        <%= link_to t('page.sign_out'), destroy_user_session_path, method: :delete -%>
         <br />
       <% else %>
         <% unless controller_name == 'sessions' %>

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

@@ -1,4 +1,4 @@
 <%= stylesheet_link_tag 'application' %>
-<%= stylesheet_link_tag 'print', :media => :print %>
+<%= stylesheet_link_tag 'print', media: :print %>
 <%= javascript_include_tag 'application' %>
 <%= csrf_meta_tag %>

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

@@ -2,7 +2,7 @@
   <div class="portlet" id="search">
     <h2 class="title">
       <% if user_signed_in? %>
-        <%= t('page.user_title', :login_name => current_user.username) -%>
+        <%= t('page.user_title', login_name: current_user.username) -%>
       <% else %>
         <%= t('page.catalog_search') -%>
       <% end %>
@@ -11,11 +11,11 @@
       <p id="notice"><%= notice %></p>
 
       <%= render 'page/search_form' -%>
-      <p><%= t('page.number_of_manifestations', :numdocs => Manifestation.search.total, :count => Manifestation.search.total) -%></p>
-      <h3 style="display: inline"><%= link_to t('page.new_resource'), manifestations_path(:mode => 'recent') -%></h3>
+      <p><%= t('page.number_of_manifestations', numdocs: Manifestation.search.total, count: Manifestation.search.total) -%></p>
+      <h3 style="display: inline"><%= link_to t('page.new_resource'), manifestations_path(mode: 'recent') -%></h3>
       <% if defined?(EnjuBookmark) %>
         <% if user_signed_in? %>
-         <h4 style="display: inline"><%= link_to t('activerecord.models.bookmark'), user_bookmarks_path(current_user) %></h4>
+         <h4 style="display: inline"><%= link_to t('activerecord.models.bookmark'), bookmarks_path(user_id: current_user.username) %></h4>
         <% end %>
       <% end %>
     </div>
@@ -25,7 +25,7 @@
     <div class="portlet" id="news_feed">
       <h3 class="title"><%= t('page.news') -%></h3>
       <div id="news_feed_box">
-        <%= render :partial => 'news_feeds/list', :locals => {:news_feeds => @news_feeds} -%>
+        <%= render partial: 'news_feeds/list', locals: {news_feeds: @news_feeds} -%>
       </div>
     </div>
   <% end %>
@@ -35,7 +35,7 @@
   <div class="portlet" id="pickup">
     <h3 class="title"><%= t('manifestation.pickup') -%></h3>
     <div id="picked_up_box">
-      <%= render 'manifestations/pickup', :manifestation => @manifestation -%>
+      <%= render 'manifestations/pickup', manifestation: @manifestation -%>
     </div>
   </div>
 
@@ -49,8 +49,8 @@
         <% end %>
       </h3>
       <div id="tag_cloud_box">
-        <%= render 'bookmarks/tag_cloud', :tags => @tags -%>
-        <p>(<%= link_to t('page.listing', :model => t('activerecord.models.tag')), tags_path -%>)</p>
+        <%= render 'bookmarks/tag_cloud', tags: @tags -%>
+        <p>(<%= link_to t('page.listing', model: t('activerecord.models.tag')), tags_path -%>)</p>
       </div>
     </div>
   <% end %>

data/app/views/page/_index.mobile.erb

@@ -4,21 +4,21 @@
   <div data-role="content">
     <h2 class="title">
       <% if user_signed_in? %>
-        <%= t('page.user_title', :login_name => current_user.username) -%>
+        <%= t('page.user_title', login_name: current_user.username) -%>
       <% else %>
         <%= t('page.catalog_search') -%>
       <% end %>
     </h2>
     <div id="user_search_form">
       <%= render 'page/search_form' -%>
-      <p><%= t('page.number_of_manifestations', :numdocs => Manifestation.search.total, :count => Manifestation.search.total) -%></p>
-      <h3 style="display: inline"><%= link_to t('page.new_resource'), manifestations_path(:mode => 'recent') -%></h3>
+      <p><%= t('page.number_of_manifestations', numdocs: Manifestation.search.total, count: Manifestation.search.total) -%></p>
+      <h3 style="display: inline"><%= link_to t('page.new_resource'), manifestations_path(mode: 'recent') -%></h3>
       <% if defined?(EnjuQuestion) %>
         <h4 style="display: inline"><%= link_to t('activerecord.models.question'), questions_path %></h4>
       <% end %>
       <% if defined?(EnjuBookmark) %>
         <% if user_signed_in? %>
-          <h4 style="display: inline"><%= link_to t('activerecord.models.bookmark'), user_bookmarks_path(current_user) %></h4>
+          <h4 style="display: inline"><%= link_to t('activerecord.models.bookmark'), bookmarks_path(user_id: current_user.username) %></h4>
         <% end %>
       <% end %>
     </div>

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

@@ -16,7 +16,7 @@
               <li><%= link_to t('page.checkin'), new_checkin_path -%></li>
             <% end %>
             <li>
-              <%= link_to t('page.listing', :model => t('activerecord.models.reserve')), reserves_path -%>
+              <%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path -%>
             </li>
             <% if defined?(EnjuInterLibraryLoan) %>
               <% if current_user.has_role?('Librarian') -%>
@@ -26,7 +26,7 @@
             <li><%= link_to t('page.checkout_history'), checkouts_path -%></li>
           <%- else -%>
             <li><%= link_to t('page.checkout_history'), checkouts_path -%></li>
-            <li><%= link_to t('page.listing', :model => t('activerecord.models.reserve')), reserves_path -%></li>
+            <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path -%></li>
           <%- end -%>
         </ul>
       <% end %>
@@ -40,16 +40,19 @@
             <% if defined?(EnjuNdl) %>
               <li><%= link_to t('enju_ndl.import_from_ndl_search'), ndl_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(:periodical => true) -%></li>
+            <li><%= link_to t('page.serial'), manifestations_path(periodical: 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?(EnjuBookmark) %>
-              <li><%= link_to t('page.listing', :model => t('activerecord.models.bookmark')), bookmarks_path -%></li>
+              <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>
+              <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path -%></li>
             <% end %>
           <%- end -%>
         </ul>
@@ -105,7 +108,7 @@
       <ul>
         <%- if user_signed_in? -%>
           <%- if current_user.has_role?('Librarian') -%>
-            <li><%= link_to t('user.management'), users_path -%></li>
+            <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>

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

@@ -1,4 +1,4 @@
-<h2><%= t('msie.acceralator', :library_name => h(LibraryGroup.system_name(@locale))) -%></h2>
+<h2><%= t('msie.acceralator', library_name: h(LibraryGroup.system_name(@locale))) -%></h2>
 <%- if request.env["HTTP_USER_AGENT"] =~ /Mozilla\/4.0 \(compatible; MSIE 8.\d/ -%>
   <button onclick="window.external.addService('<%= LibraryGroup.site_config.url -%>page/msie_acceralator')"><%= t('msie.install_acceralator') -%></button>
 <%- else -%>

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

@@ -1,2 +1,2 @@
-<%= object.first? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), {:action => 'update', :move => 'higher', :id => object.id}, :method => :put) -%>
-<%= object.last? ? image_tag('icons/stop.png', :size => '16x16') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), {:action => 'update', :move => 'lower', :id => object.id}, :method => :put) -%>
+<%= object.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: object.id}, method: :put) -%>
+<%= object.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: object.id}, method: :put) -%>

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

@@ -1,8 +1,8 @@
 <div class="search_form">
-  <%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+  <%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
     <p>
       <%= label_tag :query, t('page.search_term') -%>:
-      <%= search_field_tag 'query', nil, :class => 'search_form_short', :placeholder => t('page.search_term') -%>
+      <%= search_field_tag 'query', nil, class: 'search_form_short', placeholder: t('page.search_term') -%>
       <%= submit_tag t('page.search') -%><br />
       (<%= link_to t('page.advanced_search'), page_advanced_search_path -%>)
     </p>

data/app/views/page/_search_form.mobile.erb

@@ -1,8 +1,8 @@
 <div data-role="fieldcontain">
-<%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
   <p>
     <%= label_tag :query, t('page.search_term') -%>:
-    <%= search_field_tag 'query', nil, :class => 'search_form_short', :placeholder => t('page.search_term') -%>
+    <%= search_field_tag 'query', nil, class: 'search_form_short', placeholder: t('page.search_term') -%>
     <%= submit_tag t('page.search') -%><br />
   </p>
 <%- end -%>

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

@@ -1,12 +1,12 @@
 <div id="header_select_locale">
   <%- if request.get? -%>
     <a href="#" id="select_locale_menu">Other languages</a>
-    <div id="select_locale">
+    <div id="select_locale" class="ui-corner-all ui-widget-content">
       <% @available_languages.each do |language| %>
         <% if language.iso_639_1 == I18n.locale.to_s %>
           <strong><%= language.native_name || language.name %></strong>
         <% else %>
-          <%= link_to "#{language.native_name || language.name}", url_for(params.merge(:locale => language.iso_639_1, :only_path => true)) %>
+          <%= link_to "#{language.native_name || language.name}", url_for(params.merge(locale: language.iso_639_1, only_path: true)) %>
         <% end %>
       <% end %>
     </div>

data/app/views/page/about.en.html.erb

@@ -10,8 +10,8 @@
 <h2>Contact information</h2>
 
 <ul>
-  <li>Kosuke Tanabe: <%= mail_to 'nabeta@fastmail.fm', nil, :replace_at => '_at_' -%></li>
-  <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, :replace_at => '_at_' -%></li>
+  <li>Kosuke Tanabe: <%= mail_to 'nabeta@fastmail.fm', nil, replace_at: '_at_' -%></li>
+  <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, replace_at: '_at_' -%></li>
 </ul>
 
 <h2>Acknowledgment</h2>

data/app/views/page/about.ja.html.erb

@@ -10,8 +10,8 @@
 <h2>連絡先</h2>
 
 <ul>
-  <li>田辺浩介: <%= mail_to 'nabeta@fastmail.fm', nil, :replace_at => '_at_' -%></li>
-  <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, :replace_at => '_at_' -%></li>
+  <li>田辺浩介: <%= mail_to 'nabeta@fastmail.fm', nil, replace_at: '_at_' -%></li>
+  <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, replace_at: '_at_' -%></li>
 </ul>
 
 <h2>謝辞</h2>

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

@@ -2,11 +2,11 @@
 <h1 class="title"><%= t('page.advanced_search') -%></h1>
 <div id="content_list">
 
-<%= form_tag({:controller => 'manifestations'}, {:method => 'get'}) do -%>
+<%= form_tag({controller: 'manifestations'}, {method: 'get'}) do -%>
   <table style="width: 100%">
     <tr>
       <td><%= label_tag :query, t('page.search_term') -%>:</td>
-      <td><%= search_field_tag 'query', nil, :class => 'search_form_short', :placeholder => t('page.search_term') -%></td>
+      <td><%= search_field_tag 'query', nil, class: 'search_form_short', placeholder: t('page.search_term') -%></td>
     </tr>
     <tr>
       <td><label><%= t('page.title') -%>:</label></td>
@@ -40,18 +40,18 @@
     </tr>
     <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: '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>
     </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>
+      <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>
     </tr>
     <tr>
       <td><label><%= t('page.number_of_pages') -%>:</label></td>
-        <td><%= t('advanced_search.from') -%> <%= text_field_tag 'number_of_pages_at_least', nil, :size => 5 -%>
-          <%= t('advanced_search.to') -%> <%= text_field_tag 'number_of_pages_at_most', nil, :size => 5 -%></td>
+        <td><%= t('advanced_search.from') -%> <%= text_field_tag 'number_of_pages_at_least', nil, size: 5 -%>
+          <%= t('advanced_search.to') -%> <%= text_field_tag 'number_of_pages_at_most', nil, size: 5 -%></td>
     </tr>
     <!--
     <tr>