enju_circulation 0.1.0.pre36 → 0.1.0.pre37

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.manifestation_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.manifestation_reserve_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/manifestation_reserve_stats/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.manifestation_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.manifestation_reserve_stat')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -31,7 +31,7 @@
   <%- @stats.each do |stat| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= render 'manifestations/show_index', :manifestation => stat.manifestation if stat.manifestation -%>
+        <%= render 'manifestations/show_index', manifestation: stat.manifestation if stat.manifestation -%>
       </td>
       <td><%= stat.reserves_count -%></td>
     </tr>
@@ -46,12 +46,11 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@manifestation_reserve_stat) do |f| %>
   <ul>
-    <li><%= link_to t('page.edit'), edit_manifestation_reserve_stat_path(@manifestation_reserve_stat) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
   <% end %>
   <h4><%= t('page.export') -%></h4>
   <ul>
-    <li><%= link_to 'CSV', manifestation_reserve_stat_path(@manifestation_reserve_stat, :format => :csv, :locale => @locale.to_s) -%></li>
+    <li><%= link_to 'TSV', manifestation_reserve_stat_path(@manifestation_reserve_stat, format: :txt, locale: @locale.to_s) -%></li>
   </ul>
 </div>

data/app/views/manifestation_reserve_stats/show.txt.erb

@@ -0,0 +1,4 @@
+<%= @manifestation_reserve_stat.start_date -%>	<%= @manifestation_reserve_stat.end_date %>
+<%- @stats.each do |stat| -%>
+"<%= stat.manifestation.original_title if stat.manifestation -%>"	"<%=h stat.reserves_count -%>"<%= "\n" -%>
+<%- end -%>

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

@@ -1,14 +1,14 @@
 <%- if @user.checkout_icalendar_token? -%>
-  <%= checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics) -%>
+  <%= checkouts_url(icalendar_token: @user.checkout_icalendar_token, format: :ics) -%>
   <%= hidden_field_tag 'user[checkout_icalendar_token]', @user.checkout_icalendar_token -%>
 <%- end -%>
 <br />
 <%- if @user.checkout_icalendar_token? -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(@user, :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_my_account_path(@user, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_activate_feed_url') -%>
 <%- else -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_my_account_path(@user, :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(@user, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_deactivate_feed_url') -%>
 <%- end -%>

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

@@ -17,7 +17,7 @@
   <div class="field">
     <%= f.label :manifestation_id %><br />
     <% if @reserve.manifestation %>
-      <%= render 'manifestations/title', :manifestation => @reserve.manifestation -%>
+      <%= render 'manifestations/title', manifestation: @reserve.manifestation -%>
       <%= f.hidden_field :manifestation_id %>
     <% else %>
       <%= f.text_field :manifestation_id %>

data/app/views/reserves/_new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.reserve')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@reserve) do |f| -%>
@@ -7,7 +7,7 @@
 
   <div class="field">
     <%- if @reserve.manifestation -%>
-      <%= render 'manifestations/title', :manifestation => @reserve.manifestation -%>
+      <%= render 'manifestations/title', manifestation: @reserve.manifestation -%>
       <%= f.hidden_field :manifestation_id -%>
     <%- else -%>
       <%= f.label t('activerecord.models.manifestation') -%><br />
@@ -17,16 +17,16 @@
 
   <div class="field">
     <%= f.label :expired_at -%><br />
-    <%= f.text_field :expired_at, :value => @reserve.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
+    <%= f.text_field :expired_at, value: @reserve.expired_at.try(:strftime, "%Y-%m-%d"), class: 'date_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
   <% if current_user.has_role?('Librarian') %>
     <div class="field">
-      <%= f.label t('activerecord.attributes.user.user_number') -%><br />
-      <%= f.text_field :user_number, :class => 'resource_user_number' -%>
+      <%= f.label t('activerecord.attributes.profile.user_number') -%><br />
+      <%= f.text_field :user_number, class: 'resource_user_number' -%>
     </div>
   <% else %>
-    <%= f.hidden_field :user_number, :class => 'resource_user_number' -%>
+    <%= f.hidden_field :user_number, class: 'resource_user_number' -%>
   <% end %>
 
   <div class="actions">
@@ -38,11 +38,11 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%= render 'manifestations/book_jacket', :manifestation => @reserve.manifestation -%>
+  <%= render 'manifestations/book_jacket', manifestation: @reserve.manifestation -%>
   <ul>
-    <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>
     <%- if @reserve.manifestation -%>
-      <li><%= link_to t('page.showing', :model => t('activerecord.models.manifestation')), @reserve.manifestation -%></li>
+      <li><%= link_to t('page.showing', model: t('activerecord.models.manifestation')), @reserve.manifestation -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/reserves/_new_user.html.erb

@@ -1,18 +1,18 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.reserve')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@reserve, :url => user_reserves_path(@user)) do |f| -%>
+<%= form_for(@reserve, url: reserves_path(user_id: @user.username)) do |f| -%>
   <%= f.error_messages -%>
 
   <div class="field">
     <%- if @item -%>
-      <%= render 'manifestations/title', :manifestation => @reserve.manifestation -%>
+      <%= render 'manifestations/title', manifestation: @reserve.manifestation -%>
       (<%= link_to @item.item_identifier, @item -%>)
-      <%= f.hidden_field :manifestation_id, :value => @item.manifestation.id -%>
-      <%= f.hidden_field :item_id, :value => @item.id -%>
+      <%= f.hidden_field :manifestation_id, value: @item.manifestation.id -%>
+      <%= f.hidden_field :item_id, value: @item.id -%>
     <%- elsif @manifestation -%>
-      <%= render 'manifestations/title', :manifestation => @manifestation -%>
+      <%= render 'manifestations/title', manifestation: @manifestation -%>
       <%= f.hidden_field :manifestation_id -%>
     <%- else -%>
       <%= f.label t('activerecord.models.manifestation') -%><br />
@@ -22,14 +22,14 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.user') -%>
-    <%= link_to @reserve.user.username, @reserve.user -%>
-    (<%= @reserve.user.user_number %>)
-    <%= f.hidden_field :user_number, :value => @user.user_number -%>
+    <%= link_to @reserve.user.username, @reserve.user.profile -%>
+    (<%= @reserve.user.profile.user_number %>)
+    <%= f.hidden_field :user_number, value: @user.profile.user_number -%>
   </div>
 
   <div class="field">
     <%= f.label :expired_at -%><br />
-    <%= f.text_field :expired_at, :value => @reserve.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
+    <%= f.text_field :expired_at, value: @reserve.expired_at.try(:strftime, "%Y-%m-%d"), class: 'date_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
   <div class="actions">
@@ -40,11 +40,11 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%= render 'manifestations/book_jacket', :manifestation => @reserve.manifestation -%>
+  <%= render 'manifestations/book_jacket', manifestation: @reserve.manifestation -%>
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.reserve')), user_reserves_path(@reserve.user) -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path(user_id: @reserve.user.username) -%></li>
     <%- if @manifestation -%>
-      <li><%= link_to t('page.showing', :model => t('activerecord.models.manifestation')), @manifestation -%></li>
+      <li><%= link_to t('page.showing', model: t('activerecord.models.manifestation')), @manifestation -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/reserves/_state_facet.html.erb

@@ -4,12 +4,12 @@
     <% @state_facet.each do |state| %>
       <li>
         <% if state.value == params[:state].to_s.downcase %><strong><% end %>
-        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(params.merge(:state => state.value, :page => nil, :view => nil, :only_path => true)) %>
+        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(params.merge(state: state.value, page: nil, view: nil, only_path: true)) %>
         <% if state.value == params[:state].to_s.downcase %></strong><% end %>
       </li>
     <% end %>
     <%- if params[:state] -%>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:state => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(state: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- end -%>

data/app/views/reserves/_title.html.erb

@@ -17,6 +17,6 @@
     <%- if reserve.manifestation.access_address? -%>
       <br />
       <%= link_to reserve.manifestation.access_address, reserve.manifestation.access_address -%>
-      <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => 'Web'), reserve.manifestation.access_address -%>
+      <%= link_to image_tag('icons/world_go.png', size: '16x16', alt: 'Web'), reserve.manifestation.access_address -%>
     <%- end -%>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.reserve')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@reserve) do |f| -%>
@@ -7,7 +7,7 @@
 
   <div class="field">
     <%- if @reserve.manifestation -%>
-      <%= render 'manifestations/title', :manifestation => @reserve.manifestation -%>
+      <%= render 'manifestations/title', manifestation: @reserve.manifestation -%>
       <%= f.hidden_field :manifestation_id -%>
     <%- else -%>
       <%= f.label t('activerecord.models.manifestation') -%><br />
@@ -17,8 +17,8 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.user') -%>
-    <%= link_to @reserve.user.username, @reserve.user -%>
-    (<%= @reserve.user.user_number %>)
+    <%= link_to @reserve.user.username, @reserve.user.profile -%>
+    (<%= @reserve.user.profile.user_number %>)
   </div>
 
   <% unless @reserve.completed? %>
@@ -30,12 +30,12 @@
 
   <div class="field">
     <%= f.label :expired_at -%><br />
-    <%= f.text_field :expired_at, :value => @reserve.expired_at.try(:strftime, "%Y-%m-%d"), :class => 'date_field', :placeholder => "#{t('page.example')}: 2011-04-12"-%>
+    <%= f.text_field :expired_at, value: @reserve.expired_at.try(:strftime, "%Y-%m-%d"), class: 'date_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
   <p>
     <strong><%= t('activerecord.attributes.reserve.state') -%>:</strong>
-    <%= i18n_state(@reserve.state) -%>
+    <%= i18n_state(@reserve.current_state) -%>
   </p>
 
   <% unless @reserve.errors[:base].empty? %>
@@ -47,7 +47,7 @@
 
   <div class="actions">
     <% if @reserve.retained? %>
-      <%= f.submit :confirm => "#{t('reserve.attempt_to_update_retained_reservation')} #{t('page.continue')}" %>
+      <%= f.submit confirm: "#{t('reserve.attempt_to_update_retained_reservation')} #{t('page.continue')}" %>
     <% else %>
       <%= f.submit %>
     <% end %>

data/app/views/reserves/index.atom.builder

@@ -1,8 +1,8 @@
-atom_feed(:url => reserves_url(:format => :atom)) do |feed|
+atom_feed(url: reserves_url(format: :atom)) do |feed|
   if @user
-    feed.title t('reserve.user_reserve', :login_name => @user.username)
+    feed.title t('reserve.user_reserve', login_name: @user.username)
   else
-    feed.title t('reserve.library_group_reserve', :library_group_name => @library_group.display_name.localize)
+    feed.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name.localize)
   end
   feed.updated(@reserves.first ? @reserves.first.created_at : Time.zone.now)
 

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

@@ -1,16 +1,16 @@
 <div style="color: red"><%= flash[:message] -%></div>
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.reserve')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
 
 <div class="search_form">
-<%= form_for :reserves, :url => reserves_path, :html => {:method => 'get'} do -%>
+<%= form_for :reserves, url: reserves_path, html: {method: 'get'} do -%>
   <p>
-    <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <br />
     <%= t('activerecord.attributes.reserve.created_at') %>:
-    <%= t('reserve.reserved_from') %> <%= text_field_tag 'reserved_from', @reserved_from, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-04-12"} -%>
-    <%= t('reserve.reserved_to') %> <%= text_field_tag 'reserved_to', @reserved_to, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-05-11"} -%>
+    <%= t('reserve.reserved_from') %> <%= text_field_tag 'reserved_from', @reserved_from, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-04-12"} -%>
+    <%= t('reserve.reserved_to') %> <%= text_field_tag 'reserved_to', @reserved_to, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-05-11"} -%>
     <%= submit_tag t('page.search') -%>
   </p>
 <%- end -%>
@@ -21,12 +21,12 @@
   <%- if @sort_by == :created_at -%>
     <strong><%= t('activerecord.attributes.reserve.created_at') -%></strong>
   <%- else -%>
-    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.merge(:sort_by => nil, :only_path => true)) -%>
+    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.merge(sort_by: nil, only_path: true)) -%>
   <% end %>
   <%- if @sort_by == :title -%>
     <strong><%= t('page.title') -%></strong>
   <%- else -%>
-    <%= link_to t('page.title'), url_for(params.merge(:sort_by => 'title', :only_path => true)) -%>
+    <%= link_to t('page.title'), url_for(params.merge(sort_by: 'title', only_path: true)) -%>
   <%- end -%>
 </p>
 
@@ -44,15 +44,15 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to reserve.id, reserve -%></td>
     <td>
-      <%= render 'title', :reserve => reserve -%>
+      <%= render 'title', reserve: reserve -%>
       <br />
-      <%= t('activerecord.models.user') -%>: <%= link_to reserve.user.username, reserve.user -%>
-      <%= t('activerecord.attributes.reserve.created_at') %>: <%= l(reserve.created_at, :format => :short) -%>
+      <%= t('activerecord.models.user') -%>: <%= link_to reserve.user.username, reserve.user.profile -%>
+      <%= t('activerecord.attributes.reserve.created_at') %>: <%= l(reserve.created_at, format: :short) -%>
       <br />
-      <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, :format => :short) -%>
+      <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, format: :short) -%>
     </td>
     <td>
-      <%= i18n_state(reserve.state) -%>
+      <%= i18n_state(reserve.current_state) -%>
       <% if reserve.item %>
         <br />
         (<%= link_to reserve.item.item_identifier, reserve.item %>)
@@ -63,10 +63,10 @@
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
         <%- if reserve.user.reserves.waiting.include?(reserve) -%>
           <br />
-          <%= link_to t('page.cancel'), reserve_path(reserve, :mode => 'cancel'), :data => {:confirm => t('page.are_you_sure')}, :method => :put -%>
+          <%= link_to t('page.cancel'), reserve_path(reserve, mode: 'cancel'), data: {confirm: t('page.are_you_sure')}, method: :put -%>
         <%- else -%>
           <br />
-          <%= link_to t('page.destroy'), reserve, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), reserve, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     <%- end -%>
@@ -82,16 +82,16 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li>
-    <%= link_to t('page.new', :model => t('activerecord.models.reserve')), manifestations_path(:reservable => true) -%>
+    <%= link_to t('page.new', model: t('activerecord.models.reserve')), manifestations_path(reservable: true) -%>
     <br />
-    (<%= t('page.search_resource', :model => t('page.resource')) -%>)
+    (<%= t('page.search_resource', model: t('page.resource')) -%>)
     </li>
     <%- if current_user.has_role?('Librarian') -%>
       <li><%= link_to t('reserve.all_reservation'), reserves_path -%></li>
-      <li><%= link_to t('reserve.my_reservation'), user_reserves_path(current_user) -%></li>
+      <li><%= link_to t('reserve.my_reservation'), reserves_path(user_id: current_user.username) -%></li>
     <%- end -%>
     <%- if @user -%>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.checkout')), user_checkouts_path(@user) -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.checkout')), checkouts_path(user_id: @user.username) -%></li>
     <%- end -%>
   </ul>
 
@@ -99,15 +99,15 @@
 
   <p>
     <%- if @user -%>
-      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), user_reserves_path(@user, :format => :rss) -%>
-      (<%= link_to 'RSS', user_reserves_path(@user, :format => :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_reserves_path(@user, :format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', user_reserves_path(@user, :format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), reserves_path(user_id: @user.username, format: :rss) -%>
+      (<%= link_to 'RSS', reserves_path(user_id: @user.username, format: :rss) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>)
     <%- else -%>
-      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), reserves_path(:format => :rss) -%>
-      (<%= link_to 'RSS', reserves_path(:format => :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), reserves_path(:format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', reserves_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), reserves_path(format: :rss) -%>
+      (<%= link_to 'RSS', reserves_path(format: :rss) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), reserves_path(format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', reserves_path(format: :txt, locale: @locale.to_s) -%>)
     <%- end -%>
   </p>
 </div>

data/app/views/reserves/index.rss.builder

@@ -4,23 +4,23 @@ xml.rss('version' => "2.0",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     if @user
-      xml.title t('reserve.user_reserve', :login_name => @user.username)
-      xml.link user_reserves_url(@user, :format => :rss)
+      xml.title t('reserve.user_reserve', login_name: @user.username)
+      xml.link reserves_url(user_id: @user.username, format: :rss)
     else
-      xml.title t('reserve.library_group_reserve', :library_group_name => @library_group.display_name.localize)
-      xml.link reserves_url(:format => :rss)
+      xml.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name.localize)
+      xml.link reserves_url(format: :rss)
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
     if @user
-      xml.tag! "atom:link", :rel => 'self', :href => user_reserves_url(@user, :format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => user_reserves_url(@user)
+      xml.tag! "atom:link", rel: 'self', href: reserves_url(user_id: @user.username, format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: reserves_url(user_id: @user.username)
     else
-      xml.tag! "atom:link", :rel => 'self', :href => reserves_url(:format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => reserves_url
+      xml.tag! "atom:link", rel: 'self', href: reserves_url(format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: reserves_url
     end
-    #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
+    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @reserves.offset + 1
@@ -34,7 +34,7 @@ xml.rss('version' => "2.0",
         # rfc822
         xml.pubDate reserve.created_at.utc.rfc822
         xml.link reserve_url(reserve)
-        xml.guid reserve_url(reserve), :isPermaLink => "true"
+        xml.guid reserve_url(reserve), isPermaLink: "true"
       end
     end
   }

data/app/views/reserves/index.txt.erb

@@ -0,0 +1,4 @@
+id	title	isbn	item_identifier	call_number	username	created_at	expired_at	state
+<%- @reserves.each do |reserve| -%>
+<%= reserve.id %>	"<%= reserve.manifestation.original_title.gsub(/"/, '""') %>"	<%= reserve.manifestation.identifier_contents(:isbn).first %>	<%= reserve.item.try(:item_identifier) %>	<%= reserve.item.try(:call_number) %>	<%= reserve.user.try(:username) %>	<%= reserve.created_at %>	<%= reserve.expired_at %>	<%= i18n_state(reserve.current_state) %><%= "\n" -%>
+<%- end -%>

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

@@ -1,9 +1,9 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.reserve')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
-<%= render 'manifestations/title', :manifestation => @reserve.manifestation if @reserve.manifestation -%>
+<%= render 'manifestations/title', manifestation: @reserve.manifestation if @reserve.manifestation -%>
 
 <p>
   <strong><%= t('activerecord.models.manifestation') -%>:</strong>
@@ -12,13 +12,13 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @reserve.user.username, @reserve.user -%>
-  (<%= @reserve.user.user_number %>)
+  <%= link_to @reserve.user.username, @reserve.user.profile -%>
+  (<%= @reserve.user.profile.user_number %>)
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.reserve.state') -%>:</strong>
-  <%= i18n_state(@reserve.state) -%>
+  <%= i18n_state(@reserve.current_state) -%>
 </p>
 
 <p>
@@ -60,15 +60,15 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%= render 'manifestations/book_jacket', :manifestation => @reserve.manifestation if @reserve.manifestation -%>
+  <%= render 'manifestations/book_jacket', manifestation: @reserve.manifestation if @reserve.manifestation -%>
   <ul>
     <li><%= link_to t('page.edit'), edit_reserve_path(@reserve) -%></li>
     <%- if @reserve.user.reserves.waiting.include?(@reserve) -%>
-      <li><%= link_to t('page.cancel'), reserve_path(@reserve, :mode => 'cancel'), :data => {:confirm => t('page.are_you_sure')}, :method => :put -%></li>
+      <li><%= link_to t('page.cancel'), reserve_path(@reserve, mode: 'cancel'), data: {confirm: t('page.are_you_sure')}, method: :put -%></li>
     <%- else -%>
-      <li><%= link_to t('page.destroy'), @reserve, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @reserve, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <%- end -%>
-    <li><%= link_to t('page.back'), reserves_path(:page => flash[:page] ||= nil) -%></li>
+    <li><%= link_to t('page.back'), reserves_path(page: flash[:page] ||= nil) -%></li>
   </ul>
   <!--
   <p>TODO: 予約取り消し時に、次の予約者に連絡する</p>

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

@@ -1,5 +1,5 @@
-<%= simple_form_for(@use_restriction, :validate => true) do |f| %>
-  <%= f.error_notification %>
+<%= simple_form_for(@use_restriction, validate: true) do |f| %>
+  <%= f.error_messages %>
 
   <div class="field">
     <%= f.label :name %><br />

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.use_restriction')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.use_restriction')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.use_restriction')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.use_restriction')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -24,7 +24,7 @@
         <%= link_to t('page.edit'), edit_use_restriction_path(use_restriction) -%>
       <% end %>
       <%- if can? :delete, use_restriction -%>
-        <%= link_to t('page.destroy'), use_restriction, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), use_restriction, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -37,7 +37,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, UseRestriction -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.use_restriction')), new_use_restriction_path -%></li >
+      <li><%= link_to t('page.new', model: t('activerecord.models.use_restriction')), new_use_restriction_path -%></li >
     <%- end -%>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.use_restriction')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.use_restriction')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/use_restrictions/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.use_restriction')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.use_restriction')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -15,6 +15,6 @@
   </div>
   <div class="actions">
     <%= f.hidden_field :mode, value: 'import' %>
-    <%= f.submit t('page.start_import') %>
+    <%= f.submit t('page.start_counting') %>
   </div>
 <%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.user_checkout_stat')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.user_checkout_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_checkout_stat')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_checkout_stat')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -17,8 +17,7 @@
     <td><%= localized_state(user_checkout_stat.current_state) -%></td>
     <td>
       <%= link_to t('page.show'), user_checkout_stat -%>
-      <%= link_to t('page.edit'), edit_user_checkout_stat_path(user_checkout_stat) -%>
-      <%= link_to t('page.destroy'), user_checkout_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), user_checkout_stat, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     </td>
   </tr>
 <%- end -%>
@@ -30,6 +29,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.user_checkout_stat')), new_user_checkout_stat_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_checkout_stat')), new_user_checkout_stat_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_checkout_stat')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_checkout_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>