enju_leaf 1.1.0.rc12 → 1.1.0.rc13

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

@@ -11,7 +11,7 @@
           </ul>
         </li>
         <li><%= link_to t('activerecord.models.user_group'), user_groups_path -%></li>
-        <li><%= link_to t('activerecord.models.user'), users_path -%>
+        <li><%= link_to t('activerecord.models.profile'), profiles_path -%>
           <ul>
             <li><%= link_to t('activerecord.models.user_import_file'), user_import_files_path -%></li>
           </ul>
@@ -27,7 +27,7 @@
         <% if defined?(EnjuEvent) %>
           <li><%= link_to t('activerecord.models.event_category'), event_categories_path -%>
             <ul>
-              <li><%= link_to t('page.new', :model => t('activerecord.models.event_import_file')), new_event_import_file_path %></li>
+              <li><%= link_to t('page.new', model: t('activerecord.models.event_import_file')), new_event_import_file_path %></li>
             </ul>
           </li>
         <% end %>
@@ -126,7 +126,9 @@
     <h2 class="title"><%= t('page.system') -%></h2>
     <div class="config_box">
       <ul>
-        <li><%= link_to 'Resque', resque_path %></li>
+        <% if current_user.has_role?('Administrator') %>
+          <li><%= link_to 'Resque', resque_path %></li>
+        <% end %>
       </ul>
     </div>
   </div>

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

@@ -3,29 +3,19 @@
 <div id="content_list">
 
 <ul>
-  <!--
   <li>
-    <%= t('activerecord.models.agent') -%>
-    (<%= link_to 'CSV', agents_path(:format => :csv) -%>)
+    <%= link_to t('activerecord.models.resource_export_file'), resource_export_files_path -%>
   </li>
   <% if defined?(EnjuEvent) %>
     <li>
-      <%= t('activerecord.models.event') -%>
-      (<%= link_to 'CSV', events_path(:format => :csv) -%>)
+      <%= link_to t('activerecord.models.event_export_file'), event_export_files_path -%>
+    </li>
+  <% end %>
+  <% if current_user.try(:has_role?, 'Administrator') %>
+    <li>
+      <%= link_to t('activerecord.models.user_export_file'), user_export_files_path -%>
     </li>
   <% end %>
-  <li>
-    <%= t('activerecord.models.manifestation') -%>
-    (<%= link_to 'CSV', manifestations_path(:format => :csv) -%>)
-  </li>
-  <li>
-    <%= t('activerecord.models.item') -%>
-    (<%= link_to 'CSV', items_path(:format => :csv) -%>)
-  </li>
-  -->
-  <li>
-    <%= link_to t('activerecord.models.resource_export_file'), resource_export_files_path -%>
-  </li>
 </ul>
 </div>
 </div>

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

@@ -4,7 +4,7 @@
 
 <ul>
   <li><%= link_to t('activerecord.models.user'), user_import_files_path -%>
-  <li><%= link_to t('page.resource'), resource_import_files_path -%></li>
+  <li><%= link_to t('page.manifestation_and_item'), resource_import_files_path -%></li>
   <li><%= link_to t('activerecord.models.event'), event_import_files_path -%></li>
   <!--
   <li><%= link_to t('activerecord.models.agent'), agent_import_files_path -%></li>
@@ -14,7 +14,4 @@
 </div>
 
 <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>
 </div>

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

@@ -1,5 +1,5 @@
 <% if user_signed_in? %>
-  <%= render 'page/index' %>
+  <%= render 'profiles/show', profile: current_user.profile -%>
 <% else %>
-  <%= render 'users/show', :user => current_user -%>
+  <%= render 'page/index' %>
 <% end %>

data/app/views/page/msie_acceralator.builder

@@ -2,7 +2,7 @@ xml.openServiceDescription("xmlns" => "http://www.microsoft.com/schemas/openserv
   xml.homepageUrl LibraryGroup.site_config.url
   xml.display do
     xml.name LibraryGroup.system_name(@locale)
-    xml.description t('page.search_catalog_at', :library_name => LibraryGroup.system_name(@locale))
+    xml.description t('page.search_catalog_at', library_name: LibraryGroup.system_name(@locale))
   end
   xml.activity("category" => t('page.search')) do
     xml.activityAction do

data/app/views/page/opensearch.builder

@@ -6,8 +6,8 @@ xml.OpenSearchDescription(
   xml.Description @library_group.display_name.localize
   xml.Tags 'Library Catalog'
   xml.Contact @library_group.email
-  xml.Url :type => 'text/html', :template => "#{manifestations_url}?query={searchTerms}&pages={startPage?}"
-  xml.Url :type => 'application/rss+xml', :template => "#{manifestations_url(:format => :rss)}?query={searchTerms}&pages={startPage?}"
+  xml.Url type: 'text/html', template: "#{manifestations_url}?query={searchTerms}&pages={startPage?}"
+  xml.Url type: 'application/rss+xml', template: "#{manifestations_url(format: :rss)}?query={searchTerms}&pages={startPage?}"
   xml.Query :role => 'example', :searchTerms => 'enju'
   xml.Language @locale
   xml.OutputEncoding 'UTF-8'

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

@@ -0,0 +1,78 @@
+<%= f.fields_for :user do |user_form| %>
+  <div id="left_pane_detail">
+
+    <div class="field">
+      <%= user_form.label :username -%><br />
+      <%= profile.user.username -%>
+    </div>
+
+    <div class="field">
+      <%= user_form.label :email -%><br />
+      <%= user_form.text_field :email %>
+    </div>
+
+    <div class="field">
+      <%= user_form.label :auto_generated_password -%>
+      <%= user_form.check_box :auto_generated_password -%>
+    </div>
+
+    <div class="field">
+      <%= f.label :expired_at -%><br />
+      <%- if current_user.has_role?('Librarian') -%>
+        <%= 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">
+      <%= 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 %>
+      <% 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' -%>
+      <%- else -%>
+        <%= 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>
+
+      <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 :locale -%><br />
+      <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,42 @@
+  <% if defined?(EnjuCirculation) %>
+    <div class="field">
+      <%= f.label t('user.checkout_history_icalendar_url') -%><br />
+      <div id="feed_token">
+        <%- if profile.checkout_icalendar_token? -%>
+          <%= link_to checkouts_url(icalendar_token: profile.checkout_icalendar_token, format: :ics), checkouts_url(icalendar_token: profile.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.label :save_search_history %>
+      <%= f.check_box :save_search_history %>
+    </div>
+  <% end %>
+
+  <% if defined?(EnjuCirculation) %>
+    <div class="field">
+      <%= f.label :save_checkout_history %>
+      <%= f.check_box :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 %>
+  </div>
+
+

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

@@ -0,0 +1,36 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<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(@profile, validate: true) do |f| -%>
+  <%= f.error_messages -%>
+
+  <%= render partial: 'profiles/edit_credential', locals: {f: f, profile: @profile} -%>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<div style="clear: both">
+  <div class="field">
+    <%= f.label :keyword_list -%><br />
+    <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
+  </div>
+
+  <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
+</div>
+  <%- end -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.show'), @profile -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.profile')), profiles_path -%></li>
+    <%- if current_user.has_role?('Librarian') -%>
+      <%- unless current_user == @profile.user -%>
+        <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+      <%- end -%>
+    <%- end -%>
+  </ul>
+</div>

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

@@ -0,0 +1,61 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.profile')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<div class="search_form">
+<%= form_for :profiles, url: profiles_path, html: {method: 'get'} do -%>
+  <p>
+    <%= label_tag :query, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), class: 'search_form', placeholder: t('page.search_term') -%>
+    <%= submit_tag t('page.search') -%>
+  </p>
+<%- end -%>
+</div>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.attributes.user.username') -%>
+      <%= link_to image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), url_for(params.merge(sort_by: 'username', order: 'asc', only_path: true)) -%>
+      <%= link_to image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), url_for(params.merge(sort_by: 'username', order: 'desc', only_path: true)) -%>
+    </th>
+    <th><%= t('activerecord.attributes.profile.user_number') -%></th>
+    <th>
+      <%= t('page.created_at') -%>
+      <%= link_to image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), url_for(params.merge(sort_by: 'created_at', order: 'asc', only_path: true)) -%>
+      <%= link_to image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), url_for(params.merge(sort_by: 'created_at', order: 'desc', only_path: true)) -%>
+    </th>
+    <th></th>
+  </tr>
+
+<%- @profiles.each_with_index do |profile, i| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td>
+      <%= link_to profile.user.username, profile -%>
+    </td>
+    <td><%= profile.user_number -%></td>
+    <td><%= l(profile.created_at) -%></td>
+    <td>
+      <%= link_to t('page.edit'), edit_profile_path(profile) -%>
+    </td>
+  </tr>
+<%- end -%>
+</table>
+
+<br />
+<%= paginate(@profiles) -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <%- if current_user.try(:has_role?, 'Librarian') -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.user_import_file')), user_import_files_path -%></li>
+      <%- if current_user.has_role?('Administrator') -%>
+        <li><%= link_to t('activerecord.models.user_export_file'), user_export_files_path -%></li>
+      <%- end -%>
+    <%- end -%>
+  </ul>
+</div>

data/app/views/{users → profiles}/new.html.erb

@@ -1,29 +1,30 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.profile')) -%></h1>
 <div id="content_list">
 <%= render 'page/required_field' %>
-<%= simple_form_for(@user, :validate => true) do |f| -%>
+<%= simple_form_for(@profile, validate: true) do |f| -%>
   <%= f.error_messages -%>
 
-  <%- if @agent -%>
-    <h2 class="resource_title">
-      [P]
-      <%= link_to @agent.full_name, @agent -%>
-    </h2>
-    <%= f.hidden_field :agent_id -%>
-  <%- end -%>
+  <%= f.fields_for :user do |user_form| %>
+    <div class="field">
+      <%= user_form.label :username -%>
+      <%= user_form.text_field :username, class: 'resource_user' -%>
+    </div>
+
+    <div class="field">
+      <%= user_form.label :email -%>
+      <%= user_form.email_field :email, class: 'resource_email' -%>
+    </div>
+
+    <div class="field">
+      <%= user_form.label :email_confirmation -%>
+      <%= user_form.email_field :email_confirmation, class: 'resource_email' -%>
+    </div>
+  <% end %>
 
   <div class="field">
-    <%= f.label :username -%>
-    <%= f.text_field :username, :class => 'resource_user' -%>
-  </div>
-  <div class="field">
-    <%= f.label :email -%>
-    <%= f.email_field :email, :class => 'resource_email' -%>
-  </div>
-  <div class="field">
-    <%= f.label :email_confirmation -%>
-    <%= f.email_field :email_confirmation, :class => 'resource_email' -%>
+    <%= f.label :expired_at -%>
+    <%= f.text_field :expired_at, class: 'date_text_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
   <div class="field">
@@ -31,55 +32,52 @@
     <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
   </div>
 
-  <%- if current_user.has_role?('Librarian') -%>
-    <div class="field">
-      <%= f.label t('activerecord.models.library') -%>
-      <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
-    </div>
-
-  <%- end -%>
   <div class="field">
-    <%= f.label :locale -%>
-    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
+    <%= f.label t('activerecord.models.library') -%>
+    <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
   </div>
 
   <div class="field">
-    <%= f.label :user_number -%>
-    <%= f.text_field :user_number, :value => "", :class => 'resource_user' -%>
+    <%= f.label :locale -%>
+    <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
   </div>
 
   <% if defined?(EnjuSearchLog) %>
     <div class="field">
-      <%= f.check_box :save_search_history %>
       <%= f.label :save_search_history %>
+      <%= f.check_box :save_search_history %>
     </div>
   <% end %>
 
   <% if defined?(EnjuCirculation) %>
     <div class="field">
-      <%= f.check_box :save_checkout_history %>
       <%= f.label :save_checkout_history %>
+      <%= f.check_box :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' -%>
+      <%= f.text_area :note, class: 'resource_textarea' -%>
     </div>
   <% end %>
 
+  <div class="field">
+    <%= f.label :user_number -%>
+    <%= f.text_field :user_number, class: 'resource_user' -%>
+  </div>
+
   <div class="actions">
     <%= f.submit t('user.sign_up') -%>
   </div>
 <%- end -%>
-<%= javascript_tag("$(function(){$('#user_username').focus()})") %>
 </div>
 </div>
 
 <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>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.profile')), profiles_path -%></li>
+    <li><%= link_to t('page.import'), new_user_import_file_path -%></li>
   </ul>
 </div>

data/app/views/{users → profiles}/show.html.erb

@@ -1,17 +1,17 @@
 <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>
 
   <h2 class="resource_title">
     [U]
-    <%= @user.username -%>
-    <% if @user.full_name %>
-      (<%= @user.full_name %>)
+    <%= @profile.user.username -%>
+    <% if @profile.full_name %>
+      (<%= @profile.full_name %>)
     <% end %>
   </h2>
 
-  <p><%= t('activerecord.attributes.user.user_number') %>: <%= @user.user_number %></p>
+  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= @profile.user_number %></p>
   <%- if flash[:temporary_password] -%>
     <p><%= t('user.your_temporary_password_is') -%>: </p>
     <p style="font-size: 200%"><%= flash[:temporary_password] -%></p>
@@ -24,14 +24,15 @@
         <th><%= t('activerecord.models.item') %></th>
         <th><%= t('activerecord.attributes.checkout.due_date') %></th>
       </tr>
-      <% @user.checkouts.not_returned.each do |checkout| %>
+      <% if @profile.user %>
+      <% @profile.user.checkouts.not_returned.each do |checkout| %>
         <tr class="line<%= cycle("0", "1") -%>">
           <td>
             <%= link_to checkout.item.item_identifier, checkout.item %><br />
             (<%= 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 %>
@@ -41,6 +42,7 @@
           </td>
         </tr>
       <% end %>
+      <% end %>
     </table>
   <% end %>
 </div>
@@ -49,46 +51,46 @@
 <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| -%>
+      <%- @profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
         <li>
           <%= available_checkout_type.checkout_type.display_name.localize -%>:
-          <%= @user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
+          <%= @profile.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
         </li>
       <%- end -%>
     </ul>
   <% end %>
   <ul>
     <%- if flash[:query] -%>
-      <li><%= link_to t('page.back'), users_path(:query => flash[:query]) -%></li>
+      <li><%= link_to t('page.back'), profiles_path(query: flash[:query]) -%></li>
     <% else %>
       <li><%= back_to_index %></li>
     <% end %>
     <% if user_signed_in? %>
-      <% if can? :update, @user %>
-        <li><%= link_to t('page.edit'), edit_user_path(@user) -%></li>
+      <% if can? :update, @profile %>
+        <li><%= link_to t('page.edit'), edit_profile_path(@profile) -%></li>
       <% end %>
       <% if defined?(EnjuMessage) %>
-        <li><%= link_to t('message.send'), new_message_path(:recipient => @user.username) -%></li>
+        <li><%= link_to t('message.send'), new_message_path(recipient: @profile.user.username) -%></li>
       <% end %>
-      <%- if can? :create, @user -%>
-        <li><%= link_to t('page.new', :model => t('activerecord.models.user')), new_user_path -%></li>
+      <%- if can? :create, @profile -%>
+        <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
       <% end %>
-      <%- if can? :destroy, @user -%>
-        <li><%= link_to t('page.destroy'), @user, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+      <%- if can? :destroy, @profile -%>
+        <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
       <% end %>
     <%- end -%>
     <% if defined?(EnjuCirculation) %>
-      <li><%= link_to t('activerecord.models.checkout'), user_checkouts_path(@user) %></li>
-      <li><%= link_to t('activerecord.models.reserve'), user_reserves_path(@user) %></li>
+      <li><%= link_to t('activerecord.models.checkout'), checkouts_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuQuestion) %>
-      <li><%= link_to t('activerecord.models.question'), user_questions_path(@user) %></li>
+      <li><%= link_to t('activerecord.models.question'), questions_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuBookmark) %>
-      <li><%= link_to t('activerecord.models.bookmark'), user_bookmarks_path(@user) %></li>
+      <li><%= link_to t('activerecord.models.bookmark'), bookmarks_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuPurchaseRequest) %>
-      <li><%= link_to t('activerecord.models.purchase_request'), user_purchase_requests_path(@user) %></li>
+      <li><%= link_to t('activerecord.models.purchase_request'), purchase_requests_path(user_id: @profile.user.username) %></li>
     <% end %>
   </ul>
 </div>

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

@@ -14,6 +14,6 @@
     <%= f.text_area :note %>
   </div>
   <div class="actions">
-    <%= f.submit :data => {:confirm => t('page.are_you_sure')} %>
+    <%= f.submit data: {confirm: t('page.are_you_sure')} %>
   </div>
 <% end %>

data/app/views/roles/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.role')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.role')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/roles/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.role')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.role')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -15,7 +15,7 @@
     <td><%= link_to role.display_name.localize, role -%></td>
     <td>
       <%= link_to t('page.edit'), edit_role_path(role) -%>
-      <%= link_to t('page.destroy'), role, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), role, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     </td>
   </tr>
 <%- end -%>

data/app/views/roles/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.role')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.role')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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