enju_biblio 0.1.0.pre55 → 0.1.0.pre56

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

@@ -1,13 +1,16 @@
-<div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.create_type')) -%></h1>
-<div id="content_list">
+<div id="create_detail" class="ui-corner-all ui-widget-create">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.create_type')) -%></h1>
+<div id="create_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.create_type.name') -%></th>
-    <th><%= t('activerecord.attributes.create_type.display_name') -%></th>
-    <th><%= t('activerecord.attributes.create_type.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.create_type.display_name') -%>
+      /
+      <%= t('activerecord.attributes.create_type.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,16 +21,19 @@
         <%= move_position(create_type) -%>
       <%- end -%>
     </td>
-    <td><%= link_to create_type.name, create_type -%></td>
-    <td><%= link_to create_type.display_name.localize, create_type -%></td>
-    <td><%= create_type.note -%></td>
+    <td><%= create_type.name -%></td>
+    <td>
+      <%= link_to create_type.display_name.localize, create_type -%>
+      <br />
+      <%= create_type.note %>
+    </td>
     <td>
       <%- if can? :update, create_type -%>
         <%= link_to t('page.edit'), edit_create_type_path(create_type) -%>
       <% end %>
       <%- if can? :delete, create_type -%>
-        <%= link_to t('page.destroy'), create_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
-      <% end %>
+        <%= link_to t('page.destroy'), create_type_path(create_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+      <%- end -%>
     </td>
   </tr>
 <%- end -%>
@@ -36,8 +42,10 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all ui-widget-content">
+<div id="submenu" class="ui-corner-all ui-widget-create">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.create_type')), new_create_type_path -%></li>
+    <%- if can? :create, ContentType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.create_type')), new_create_type_path -%></li>
+    <%- end -%>
   </ul>
 </div>

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

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

data/app/views/creates/_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.create')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.create')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -16,7 +16,7 @@
     <td>
       <%- if can? :delete, create -%>
         <%= link_to t('page.show'), create -%>
-        <%= link_to t('page.destroy'), create, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), create, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -30,7 +30,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if can? :create, Create -%>
     <ul>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.create')), new_create_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.create')), new_create_path -%></li>
     </ul>
   <%- end -%>
 </div>

data/app/views/creates/_index_agent.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.create')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.create')) -%></h1>
 <div id="content_list">
   <h2 class="resource_title">
     <%= link_to agent.full_name, agent -%>
@@ -18,8 +18,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if can? :delete, create -%>
-        <%= create.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 => create.id, :agent_id => agent.id}, :method => :put) -%>
-        <%= create.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 => create.id, :agent_id => agent.id}, :method => :put) -%>
+        <%= create.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: create.id, :agent_id => agent.id}, method: :put) -%>
+        <%= create.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: create.id, :agent_id => agent.id}, method: :put) -%>
       <%- end -%>
     </td>
     <td><%= link_to create.work.try(:original_title), create.work -%></td>
@@ -27,8 +27,7 @@
     <td><%= l(create.updated_at) -%></td>
     <td>
       <%- if can? :delete, create -%>
-        <%= link_to t('page.show'), agent_create_path(agent, create) -%>
-        <%= link_to t('page.destroy'), agent_create_path(agent, create), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), create_path(create, agent_id: agent.id), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -42,7 +41,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Create -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.create')), new_agent_create_path(agent) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.create')), new_create_path(agent_id: agent.id) -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/creates/_index_work.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.create')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.create')) -%></h1>
 <div id="content_list">
   <h2 class="resource_title">
     <%= link_to work.original_title, work -%>
@@ -17,8 +17,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if can? :delete, create -%>
-        <%= create.first? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), work_create_path(create.work, create, :move => 'higher'), :method => :put) -%>
-        <%= create.last? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), work_create_path(create.work, create, :move => 'lower'), :method => :put) -%>
+        <%= create.first? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), work_create_path(create.work, create, move: 'higher'), method: :put) -%>
+        <%= create.last? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), work_create_path(create.work, create, move: 'lower'), method: :put) -%>
       <%- end-%>
     </td>
     <td><%= link_to create.agent.try(:full_name), create.agent -%></td>
@@ -35,7 +35,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Create -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.create')), new_work_create_path(work) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.create')), new_work_create_path(work) -%></li>
     <%- end -%>
   </ul>
 </div>

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

data/app/views/creates/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.create')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.create')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>
@@ -8,10 +8,10 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @create.agent -%>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.work')), creator_manifestations_path(@create.agent) -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.work')), manifestations_path(creator_id: @create.agent_id) -%></li>
     <%- end -%>
     <%- if @create.work -%>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.agent')), work_agents_path(@create.work) -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.agent')), agents_path(work_id: @create.work_id) -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/creates/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.create')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.create')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -18,7 +18,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.agent')), work_agents_path(@create.work) -%></li>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.work')), creator_manifestations_path(@create.agent) -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.agent')), agents_path(work_id: @create.work_id) -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.work')), manifestations_path(creator_id: @create.agent_id) -%></li>
   </ul>
 </div>

data/app/views/donates/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.donate')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.donate')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@donate) do |f| -%>

data/app/views/donates/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.donate')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.donate')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -15,7 +15,7 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to donate.agent.full_name, donate.agent -%></td>
     <td>
-      <%= render 'manifestations/show_index', :manifestation => donate.item.manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: donate.item.manifestation -%>
     </td>
     <td>
       <%= link_to donate.item.item_identifier, donate.item -%>
@@ -24,7 +24,7 @@
     <td>
       <%- if can? :delete, donate -%>
         <%= link_to t('page.edit'), edit_donate_path(donate) -%>
-        <%= link_to t('page.destroy'), donate, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), donate, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -39,7 +39,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Donate -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.donate')), new_donate_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.donate')), new_donate_path -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/donates/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.donate')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.donate')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@donate) do |f| -%>

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

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

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

@@ -1,13 +1,16 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.extent')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.extent')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.extent.name') -%></th>
-    <th><%= t('activerecord.attributes.extent.note') -%></th>
-    <th></th>
+    <th>
+      <%= t('activerecord.attributes.extent.display_name') -%>
+      /
+      <%= t('activerecord.attributes.extent.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,30 +21,31 @@
         <%= move_position(extent) -%>
       <%- end -%>
     </td>
+    <td><%= extent.name -%></td>
     <td>
       <%= link_to extent.display_name.localize, extent -%>
       <br />
-      (<%= link_to extent.name, extent -%>)
+      <%= extent.note %>
     </td>
-    <td><%= extent.note -%></td>
     <td>
       <%- if can? :update, extent -%>
         <%= link_to t('page.edit'), edit_extent_path(extent) -%>
       <% end %>
       <%- if can? :delete, extent -%>
-        <%= link_to t('page.destroy'), extent, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), extent_path(extent), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
 <%- end -%>
 </table>
 
-<%= paginate(@extents) -%>
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.extent')), new_extent_path -%></li>
+    <%- if can? :create, ContentType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.extent')), new_extent_path -%></li>
+    <%- end -%>
   </ul>
 </div>

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

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

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

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

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

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

@@ -1,13 +1,16 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.form_of_work')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.form_of_work')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.form_of_work.name') -%></th>
-    <th><%= t('activerecord.attributes.form_of_work.display_name') -%></th>
-    <th><%= t('activerecord.attributes.form_of_work.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.form_of_work.display_name') -%>
+      /
+      <%= t('activerecord.attributes.form_of_work.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,15 +21,18 @@
         <%= move_position(form_of_work) -%>
       <%- end -%>
     </td>
-    <td><%= link_to form_of_work.name, form_of_work -%></td>
-    <td><%= link_to form_of_work.display_name.localize, form_of_work -%></td>
-    <td><%= form_of_work.note -%></td>
+    <td><%= form_of_work.name -%></td>
+    <td>
+      <%= link_to form_of_work.display_name.localize, form_of_work -%>
+      <br />
+      <%= form_of_work.note %>
+    </td>
     <td>
       <%- if can? :update, form_of_work -%>
         <%= link_to t('page.edit'), edit_form_of_work_path(form_of_work) -%>
       <% end %>
       <%- if can? :delete, form_of_work -%>
-        <%= link_to t('page.destroy'), form_of_work, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), form_of_work_path(form_of_work), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -38,8 +44,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, FormOfWork -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.form_of_work')), new_form_of_work_path -%></li>
+    <%- if can? :create, ContentType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.form_of_work')), new_form_of_work_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

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

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

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

@@ -1,12 +1,16 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.frequency')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.frequency')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.frequency.name') -%></th>
-    <th><%= t('activerecord.attributes.frequency.display_name') -%></th>
+    <th>
+      <%= t('activerecord.attributes.frequency.display_name') -%>
+      /
+      <%= t('activerecord.attributes.frequency.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -17,14 +21,18 @@
         <%= move_position(frequency) -%>
       <%- end -%>
     </td>
-    <td><%= link_to frequency.name, frequency -%></td>
-    <td><%= link_to frequency.display_name.localize, frequency -%></td>
+    <td><%= frequency.name -%></td>
+    <td>
+      <%= link_to frequency.display_name.localize, frequency -%>
+      <br />
+      <%= frequency.note %>
+    </td>
     <td>
       <%- if can? :update, frequency -%>
         <%= link_to t('page.edit'), edit_frequency_path(frequency) -%>
       <% end %>
       <%- if can? :delete, frequency -%>
-        <%= link_to t('page.destroy'), frequency, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), frequency_path(frequency), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -36,8 +44,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, Frequency -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.frequency')), new_frequency_path -%></li>
+    <%- if can? :create, ContentType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.frequency')), new_frequency_path -%></li>
     <%- end -%>
- </ul>
+  </ul>
 </div>

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

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

@@ -1,8 +1,13 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.frequency')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.frequency')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
+<p>
+  <strong><%= t('activerecord.attributes.frequency.name') -%>:</strong>
+  <%= @frequency.name -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.frequency.display_name') -%>:</strong>
   <%= @frequency.display_name.localize -%>

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

@@ -1,19 +1,19 @@
-<%= simple_form_for(@identifier_type, :validate => true) do |f| -%>
-  <%= f.error_notification -%>
+<%= simple_form_for(@identifier_type, validate: true) do |f| -%>
+  <%= f.error_messages -%>
 
   <div class="field">
     <%= f.label :name -%><br />
-    <%= f.text_field :name, :class => 'resource_title' -%>
+    <%= f.text_field :name, class: 'resource_title' -%>
   </div>
 
   <div class="field">
     <%= f.label :display_name -%><br />
-    <%= f.text_area :display_name, :class => 'resource_textarea' -%>
+    <%= f.text_area :display_name, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
   <div class="actions">

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

data/app/views/identifier_types/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.identifier_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.identifier_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_identifier_type_path(identifier_type) -%>
       <% end %>
       <%- if can? :delete, identifier_type -%>
-        <%= link_to t('page.destroy'), identifier_type_path(identifier_type), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), identifier_type_path(identifier_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -39,7 +39,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, IdentifierType -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.identifier_type')), new_identifier_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.identifier_type')), new_identifier_type_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

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

@@ -1,8 +1,13 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.identifier_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.identifier_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
+<p>
+  <strong><%= t('activerecord.attributes.identifier_type.name') -%>:</strong>
+  <%= @identifier_type.name -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.identifier_type.display_name') -%>:</strong>
   <%= @identifier_type.display_name.localize -%>