enju_library 0.1.0.pre33 → 0.1.0.pre34

data/app/views/accepts/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.accept')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -13,7 +13,7 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @accept.librarian.username, @accept.librarian if @accept.librarian -%>
+  <%= link_to @accept.librarian.username, @accept.librarian.profile if @accept.librarian.try(:profile) -%>
 </p>
 
 <p>

data/app/views/baskets/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.basket')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@basket) do |f| -%>
@@ -12,7 +12,7 @@
 
   <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/baskets/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.basket')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -7,6 +7,7 @@
     <th><%= t('activerecord.models.user') -%></th>
     <th><%= t('activerecord.attributes.basket.note') -%></th>
     <th><%= t('page.updated_at') -%></th>
+    <th></th>
   </tr>
 
 <%- @baskets.each do |basket| -%>
@@ -26,6 +27,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.basket')), new_basket_path -%></li>
   </ul>
 </div>

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

@@ -1,20 +1,20 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.basket')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.basket')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@basket, :html => {:name => 'basket_form'}) do |f| -%>
+<%= form_for(@basket, html: {name: 'basket_form'}) do |f| -%>
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label t('activerecord.attributes.user.user_number') -%>
-    <%= f.search_field :user_number, :class => 'resource_user_number' -%>
+    <%= f.search_field :user_number, class: 'resource_user_number' -%>
 
   <!--
   <div class="field">
   <%= f.label :note -%><br />
-  <%= f.text_area :note, :class => 'resource_textarea' -%>
+  <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   -->
-    <%= f.submit t('page.read') -%>
+    <%= f.submit t('page.read'), data: {disable_with: t('page.saving')} -%>
   </div>
 <%- end -%>
 <%= javascript_tag("$(function(){$('#basket_user_number').focus().select()})") %>
@@ -24,6 +24,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('activerecord.models.checkin'), new_checkin_path -%></li>
-    <li><%= link_to t('page.search_resource', :model => t('activerecord.models.user')), users_path -%></li>
+    <li><%= link_to t('page.search_resource', model: t('activerecord.models.profile')), profiles_path -%></li>
   </ul>
 </div>

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

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

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

@@ -13,7 +13,7 @@
 
   <div class="field">
     <%= f.label :address -%><br />
-    <%= f.text_area :address, :class => 'resource_textarea' -%>
+    <%= f.text_area :address, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
@@ -28,12 +28,12 @@
 
   <div class="field">
     <%= f.label :url -%><br />
-    <%= f.url_field :url, :class => 'resource_url' -%>
+    <%= f.url_field :url, class: 'resource_url' -%>
   </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/bookstores/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.bookstore')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

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

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

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

@@ -7,11 +7,11 @@
   </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">
     <%= f.submit %>

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

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

@@ -1,11 +1,12 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.budget_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.budget_type.name') -%></th>
+    <th><%= t('activerecord.attributes.budget_type.display_name') -%></th>
     <th><%= t('activerecord.attributes.budget_type.note') -%></th>
     <th></th>
   </tr>
@@ -17,16 +18,15 @@
         <%= move_position(budget_type) -%>
       <%- end -%>
     </td>
-    <td>
-      <%= link_to budget_type.name, budget_type -%>
-    </td>
+    <td><%= link_to budget_type.name, budget_type -%></td>
+    <td><%= link_to budget_type.display_name.localize, budget_type -%></td>
     <td><%= budget_type.note -%></td>
     <td>
       <%- if can? :update, budget_type -%>
         <%= link_to t('page.edit'), edit_budget_type_path(budget_type) -%>
       <% end %>
       <%- if can? :delete, budget_type -%>
-        <%= link_to t('page.destroy'), budget_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), budget_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -38,6 +38,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.budget_type')), new_budget_type_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.budget_type')), new_budget_type_path -%></li>
   </ul>
 </div>

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

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

data/app/views/libraries/_calendar.html.erb

@@ -1,5 +1,5 @@
 <div id="event_list">
-  (<%= link_to t('page.calendar'), :controller => :calendar, :action => :index, :library_id => @library.name -%>)
+  (<%= link_to t('page.calendar'), controller: :calendar, action: :index, library_id: @library.name -%>)
   <ul>
     <%- @events.each do |event| -%>
       <li>
@@ -9,5 +9,5 @@
     <%- end -%>
   </ul>
 
-  <%= paginate(@events, :param_name => :event_page, :remote => true) -%>
+  <%= paginate(@events, param_name: :event_page, remote: true) -%>
 </div>

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

@@ -1,26 +1,26 @@
 <%= render 'page/required_field' %>
 <%= simple_form_for(@library) do |f| -%>
-  <%= f.error_notification -%>
+  <%= f.error_messages -%>
 
   <div class="field">
     <%= f.label :name -%><br />
-    <%= f.text_field :name, :class => 'short_name' -%>
+    <%= f.text_field :name, class: 'short_name' -%>
   </div>
 
   <div class="field">
     <%= f.label :short_display_name -%><br />
-    <%= f.text_area :short_display_name, :class => 'resource_textarea' -%>
+    <%= f.text_area :short_display_name, class: 'resource_textarea' -%>
   </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>
 
   <% unless @library.web? %>
   <div class="field">
     <%= f.label :isil -%><br />
-    <%= f.text_field :isil, :class => 'resource_identifierr' -%>
+    <%= f.text_field :isil, class: 'resource_identifierr' -%>
   </div>
 
   <div class="field">
@@ -35,17 +35,17 @@
 
   <div class="field">
     <%= f.label :region -%><br />
-    <%= f.text_area :region, :class => 'resource_textarea' -%>
+    <%= f.text_area :region, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :locality -%><br />
-    <%= f.text_area :locality, :class => 'resource_textarea' -%>
+    <%= f.text_area :locality, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :street -%><br />
-    <%= f.text_area :street, :class => 'resource_textarea' -%>
+    <%= f.text_area :street, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
@@ -65,22 +65,22 @@
 
   <div class="field">
     <%= f.label :call_number_rows -%><br />
-    <%= f.text_field :call_number_rows, :class => 'resource_integer' -%>
+    <%= f.text_field :call_number_rows, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :call_number_delimiter -%><br />
-    <%= f.text_field :call_number_delimiter, :class => 'resource_integer' -%>
+    <%= f.text_field :call_number_delimiter, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :opening_hour -%><br />
-    <%= f.text_area :opening_hour, :class => 'resource_textarea' -%>
+    <%= f.text_area :opening_hour, 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>
   <% end %>
 

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

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

@@ -1,18 +1,18 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.library')) -%></h1>
 <div id="content_list">
 
-<%= form_for :libraries, :url => libraries_path, :html => {:method => 'get'} do -%>
+<%= form_for :libraries, url: libraries_path, html: {method: 'get'} do -%>
   <p>
-    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= submit_tag t('page.search') -%>
   </p>
 <%- end -%>
 
 <p>
   <%= t('page.sort_by') -%>:
-  <%= link_to t('activerecord.attributes.library.name'), libraries_path(:order => 'name') -%>
-  <%= link_to t('page.created_at'), libraries_path(:sort_by => 'created_at') -%>
+  <%= link_to t('activerecord.attributes.library.name'), libraries_path(order: 'name') -%>
+  <%= link_to t('page.created_at'), libraries_path(sort_by: 'created_at') -%>
 </p>
 
 <table class="table table-striped index">
@@ -38,11 +38,11 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if can?(:update, library) and params[:query].blank? -%>
-        <%= library.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 => library.name}, :method => :put) -%>
-        <%= library.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 => library.name}, :method => :put) -%>
+        <%= library.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: library.name}, method: :put) -%>
+        <%= library.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: library.name}, method: :put) -%>
       <%- end -%>
     </td>
-    <td><%= link_to library.name, library -%></td>
+    <td><%= library.name -%></td>
     <td>
       <%= link_to library.display_name.localize, library -%>
       <br />
@@ -50,20 +50,24 @@
       <%= library.address -%>
     </td>
     <td>
-      tel: <%= library.telephone_number_1 -%>
+      <% if library.telephone_number_1.present? %>
+        tel: <%= library.telephone_number_1 -%>
+        <br />
+      <% end %>
       <% if library.telephone_number_2.present? %>
-      <br />
         tel: <%= library.telephone_number_2 -%>
+        <br />
+      <% end %>
+      <% if library.fax_number.present? %>
+        fax: <%= library.fax_number -%>
       <% end %>
-      <br />
-      fax: <%= library.fax_number -%>
     </td>
     <td>
       <%- if can? :update, library -%>
         <%= link_to t('page.edit'), edit_library_path(library) -%>
       <% end %>
       <%- if can? :delete, library -%>
-        <%= link_to t('page.destroy'), library, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), library, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -77,7 +81,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, Library -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.library')), new_library_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.library')), new_library_path -%></li>
     <%- end -%>
   </ul>
 </div>

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

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

@@ -39,14 +39,14 @@
         <%- end -%>
       </ul>
       <div id="tab1">
-        <%= render 'libraries/map', :library => @library if @library.latitude and @library.longitude -%>
+        <%= render 'libraries/map', library: @library if @library.latitude and @library.longitude -%>
       </div>
       <div id="tab2">
         <%- if @library.users.librarians.exists? -%>
           <ul>
             <%- @library.users.librarians.each do |librarian| -%>
               <li>
-                <%= link_to librarian.username, librarian -%>
+                <%= link_to librarian.username, librarian.profile -%>
                 <%- unless librarian.note.blank? -%>
                   <br />
                   <%= librarian.note -%>
@@ -66,9 +66,9 @@
           <%- @library.shelves.each do |shelf| -%>
             <tr class="line<%= cycle("0", "1") -%>">
               <td>
-                <%= link_to shelf.display_name.localize, library_shelf_path(@library, shelf) -%>
+                <%= link_to shelf.display_name.localize, shelf_path(shelf, library_id: @library.id) -%>
                 <%- shelf.picture_files.each do |picture_file| -%>
-                  <%= link_to image_tag('icons/picture.png', :size => '16x16', :alt => t('page.picture')), picture_file_path(picture_file, :format => :download), :rel => "shelf_#{h(shelf.id)}" -%>
+                  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "shelf_#{h(shelf.id)}" -%>
                 <%- end -%>
                 <script type="text/javascript">
                   $(document).ready(function(){
@@ -119,13 +119,13 @@
   <%- end -%>
 
   <%- if can? :create, Shelf and !@library.web? -%>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.shelf')), new_library_shelf_path(@library) -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.shelf')), new_shelf_path(library_id: @library.id) -%></li>
   <%- end -%>
   <% if defined?(EnjuEvent) %>
     <%- if can? :create, Event and !@library.web? -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.event')), new_library_event_path(@library) -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.event')), new_event_path(library_id: @library.id) -%></li>
     <%- end -%>
   <%- end -%>
-  <li><%= link_to t('page.listing', :model => t('activerecord.models.library')), libraries_path -%></li>
+  <li><%= link_to t('page.listing', model: t('activerecord.models.library')), libraries_path -%></li>
   </ul>
 </div>