enju_biblio 0.0.2 → 0.0.3

data/app/models/series_has_manifestation.rb

@@ -8,7 +8,6 @@ class SeriesHasManifestation < ActiveRecord::Base
   validates_presence_of :series_statement_id
   validates_presence_of :manifestation_id, :on => :update
   validates_uniqueness_of :manifestation_id, :scope => :series_statement_id
-  after_save :reload
   after_save :reindex
   after_destroy :reindex
 
@@ -19,8 +18,8 @@ class SeriesHasManifestation < ActiveRecord::Base
   end
 
   def reindex
-    series_statement.try(:index)
-    manifestation.try(:index)
+    series_statement.reload; series_statement.try(:index)
+    manifestation.reload; manifestation.try(:index)
   end
 end
 

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_carrier_type_path(carrier_type) -%>
       <% end %>
       <%- if can? :destroy, carrier_type -%>
-        <%= link_to t('page.destroy'), carrier_type_path(carrier_type), :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), carrier_type_path(carrier_type), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_content_type_path(content_type) -%>
       <% end %>
       <%- if can? :destroy, content_type -%>
-        <%= link_to t('page.destroy'), content_type_path(content_type), :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), content_type_path(content_type), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_create_type_path(create_type) -%>
       <% end %>
       <%- if can? :destroy, create_type -%>
-        <%= link_to t('page.destroy'), create_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), create_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>
   </tr>

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

@@ -16,7 +16,7 @@
     <td>
       <%- if can? :destroy, create -%>
         <%= link_to t('page.show'), create -%>
-        <%= link_to t('page.destroy'), create, :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>

data/app/views/creates/_index_patron.html.erb

@@ -28,7 +28,7 @@
     <td>
       <%- if can? :destroy, create -%>
         <%= link_to t('page.show'), patron_create_path(patron, create) -%>
-        <%= link_to t('page.destroy'), patron_create_path(patron, create), :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), patron_create_path(patron, create), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/creates/_index_work.html.erb

@@ -11,26 +11,19 @@
     <th><%= t('activerecord.models.patron') -%></th>
     <th><%= t('page.created_at') -%></th>
     <th><%= t('page.updated_at') -%></th>
-    <th></th>
   </tr>
 
 <%- @creates.each do |create| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if can? :destroy, create -%>
-        <%= create.first? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), {:action => 'update', :move => 'higher', :id => create.id, :work_id => work.id}, :method => :put) -%>
-        <%= create.last? ? image_tag('icons/stop.png') : link_to(image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), {:action => 'update', :move => 'lower', :id => create.id, :work_id => work.id}, :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.patron.try(:full_name), create.patron -%></td>
     <td><%= l(create.created_at) -%></td>
     <td><%= l(create.updated_at) -%></td>
-    <td>
-      <%- if can? :destroy, create -%>
-        <%= link_to t('page.show'), work_create_path(work, create) -%>
-        <%= link_to t('page.destroy'), work_create_path(work, create), :confirm => t('page.are_you_sure'), :method => :delete -%>
-      <%- end -%>
-    </td>
   </tr>
 <%- end -%>
 </table>

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

@@ -24,7 +24,7 @@
     <td>
       <%- if can? :destroy, donate -%>
         <%= link_to t('page.edit'), edit_donate_path(donate) -%>
-        <%= link_to t('page.destroy'), donate, :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>

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

@@ -18,7 +18,7 @@
     <%- if can? :destroy, exemplify -%>
       <td>
         <%= link_to t('page.show'), exemplify -%>
-        <%= link_to t('page.destroy'), exemplify, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), exemplify, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       </td>
     <%- end -%>
   </tr>

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

@@ -29,7 +29,7 @@
         <%= link_to t('page.edit'), edit_extent_path(extent) -%>
       <% end %>
       <%- if can? :destroy, extent -%>
-        <%= link_to t('page.destroy'), extent, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), extent, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_form_of_work_path(form_of_work) -%>
       <% end %>
       <%- if can? :destroy, form_of_work -%>
-        <%= link_to t('page.destroy'), form_of_work, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), form_of_work, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -24,7 +24,7 @@
         <%= link_to t('page.edit'), edit_frequency_path(frequency) -%>
       <% end %>
       <%- if can? :destroy, frequency -%>
-        <%= link_to t('page.destroy'), frequency, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), frequency, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -23,7 +23,7 @@
     <td><%= link_to import_request.manifestation.original_title, import_request.manifestation if import_request.manifestation -%></td>
     <td>
       <%- if can? :destroy, import_request -%>
-        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), import_request, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), import_request, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -9,7 +9,7 @@
     <%= f.label :isbn -%><br />
     <%= f.text_field :isbn, :class => 'resource_isbn_issn' -%>
 
-    <%= f.submit :disable_with => t('page.saving') %>
+    <%= f.submit 'data-disable-with' => t('page.saving') %>
   </div>
   <%= javascript_tag("$('#import_request_isbn').focus()") -%>
 <%- end -%>

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

@@ -11,7 +11,7 @@
   <ul>
     <li><%= link_to t('page.show'), @item -%></li>
     <% if can? :destroy, @item %>
-      <li><%= link_to t('page.destroy'), @item, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
     <li><%= link_to t('page.back'), manifestation_items_path(@item.manifestation) -%></li>
   </ul>

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

@@ -142,7 +142,7 @@
       <li><%= link_to t('page.listing', :model => t('activerecord.models.inter_library_loan')), item_inter_library_loans_path(@item) -%></li>
     <% end %>
     <% if can? :destroy, @item %>
-      <li><%= link_to t('page.destroy'), @item, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
     <% if defined?(EnjuInterLibraryLoan) %>
       <%- if @item.inter_library_loans.empty? -%>
@@ -151,6 +151,7 @@
     <% end %>
     <% if defined?(EnjuCirculation) %>
       <li><%= link_to t('page.listing', :model => t('activerecord.models.lending_policy')), item_lending_policies_path(@item) -%></li>
+      <li><%= link_to t('page.checkout_history'), item_checkouts_path(@item) -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -28,7 +28,7 @@
         <%= link_to t('page.edit'), edit_license_path(license) -%>
       <% end %>
       <%- if can? :destroy, license -%>
-        <%= link_to t('page.destroy'), license, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), license, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_manifestation_relationship_type_path(manifestation_relationship_type) -%>
       <% end %>
       <%- if can? :destroy, manifestation_relationship_type -%>
-        <%= link_to t('page.destroy'), manifestation_relationship_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), manifestation_relationship_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>
   </tr>

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

@@ -17,7 +17,7 @@
     <td><%= link_to manifestation_relationship.child.original_title, manifestation_relationship.child %></td>
     <td><%= link_to t('page.show'), manifestation_relationship %></td>
     <td><%= link_to t('page.edit'), edit_manifestation_relationship_path(manifestation_relationship) %></td>
-    <td><%= link_to t('page.destroy'), manifestation_relationship, :confirm => t('page.are_you_sure'), :method => :delete %></td>
+    <td><%= link_to t('page.destroy'), manifestation_relationship, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %></td>
   </tr>
 <% end %>
 </table>

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

@@ -37,7 +37,7 @@
     <%= f.text_field :title_alternative, :class => 'resource_title' -%>
   </div>
 
-  <%- if @manifestation.periodical? -%>
+  <%- if @series_statement.try(:periodical?) -%>
     <%= render :partial => 'manifestations/serial_form', :locals => {:f => f, :manifestation => @manifestation} -%>
   <%- else -%>
     <div class="field">

data/app/views/manifestations/_manifestation.html.erb

@@ -1,24 +1,28 @@
           <tr class="line<%= cycle("0", "1") -%>">
             <td style="width: 30px"><%= itemnum = @manifestations.offset + 1 + manifestation_counter -%></td>
             <td style="480px">
-            <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
-              <%= render 'manifestations/show_index', :manifestation => manifestation -%>
-              <div class="access_address">
-                <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
-              </div>
-                <%- unless manifestation.items.on_shelf.empty? -%>
-                  (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
-                <%- end -%>
-                <% if defined?(EnjuBookmark) %>
-                  <%- if manifestation.tags.first -%>
-                    (<%= link_to_function t('activerecord.models.tag'), "$('#tag_#{manifestation.id}').toggle()" -%>)
+              <% if manifestation.root_of_series? %>
+                <%= render 'manifestations/show_series_index', :manifestation => manifestation -%>
+              <% else %>
+                <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
+                  <%= render 'manifestations/show_index', :manifestation => manifestation -%>
+                  <div class="access_address">
+                    <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
+                  </div>
+                  <%- unless manifestation.items.on_shelf.empty? -%>
+                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
                   <%- end -%>
-                  <%= render 'manifestations/show_tag', :manifestation => manifestation -%>
+                  <% if defined?(EnjuBookmark) %>
+                    <%- if manifestation.tags.first -%>
+                      (<%= link_to_function t('activerecord.models.tag'), "$('#tag_#{manifestation.id}').toggle()" -%>)
+                    <%- end -%>
+                    <%= render 'manifestations/show_tag', :manifestation => manifestation -%>
+                  <% end %>
+                  <%= render 'manifestations/holding', :manifestation => manifestation -%>
+                  <%# グループ表示の部分テンプレート %>
+                  <%= render 'manifestations/show_group', :manifestation => manifestation -%>
                 <% end %>
-                <%= render 'manifestations/holding', :manifestation => manifestation -%>
-                <%# グループ表示の部分テンプレート %>
-                <%= render 'manifestations/show_group', :manifestation => manifestation -%>
-            <% end %>
+              <% end %>
             </td>
             <% if defined?(EnjuCirculation) %>
               <% if signed_in? %>
@@ -39,7 +43,7 @@
                       <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
                       <% if @series_statement %>
                         <% if manifestation.series_statement == @series_statement %>
-                          <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.series_statement, manifestation.series_has_manifestation), :confirm => t('page.are_you_sure'), :method => :delete -%>
+                          <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.series_statement, manifestation.series_has_manifestation), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
                         <% end %>
                       <% end %>
                     <% else %>

data/app/views/manifestations/_paginate_id_link.html.erb

@@ -1,9 +1,27 @@
+<script>
+  $(function(){
+    if(typeof sessionStorage === "undefined"){
+      return;
+    }else{
+      var ids = JSON.parse(sessionStorage.getItem("<%= flash[:search_query] %>"));
+      var index = $.inArray(<%= manifestation.id %>, ids);
+      if(ids[index - 1] > 0){
+        $("#prev_link").html('<a href="<%= root_url %>manifestations/' + ids[index - 1] + '"><%= t('page.previous') %></a>');
+      };
+      if(ids[index + 1] > 0){
+        $("#next_link").html('<a href="<%= root_url %>manifestations/' + ids[index + 1] + '"><%= t('page.next') %></a>');
+      };
+    };
+  });
+</script>
+
 <%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
   <div>
-    <%= paginate_id_link(manifestation, manifestation_ids) if manifestation_ids -%>
+    <span id="next_link"><%= t('page.next') %></span>
+    <span id="prev_link"><%= t('page.previous') %></span>
     <%= back_to_manifestation_index -%>
     <%= t('page.search_term') -%>:
-    <%= search_field_tag 'query', session[:query], {:id => 'search_form_top', :class => 'search_form_short', :placeholder => t('page.search_term')} -%>
+    <%= search_field_tag 'query', @query, {:id => 'search_form_top', :class => 'search_form_short', :placeholder => t('page.search_term')} -%>
     <%= submit_tag t('page.search') -%>
     <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
   </div>

data/app/views/manifestations/_session_ids.html.erb

@@ -0,0 +1,10 @@
+<script>
+  $(function(){
+    if(typeof sessionStorage === "undefined"){
+      return;
+    }else{
+      var ids = <%= @manifestation_ids %>;
+      sessionStorage.setItem("<%= @search_query %>", JSON.stringify(ids));
+    };
+  });
+</script>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -10,16 +10,18 @@
         <% if manifestation.title_alternative? %>
           <tr>
             <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td style="width: 490px"><%= manifestation.title_alternative -%></td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
         <%- if manifestation.series_statement -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
-            <td style="width: 490px"><%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
-            <%- if manifestation.issn.present? -%>
-              (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
-            <%- end -%>
+            <td style="width: 500px">
+              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <%= manifestation.volume_number_string %>
+              <%- if manifestation.issn.present? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- end -%>
             </td>
           </tr>
         <% end %>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -10,16 +10,18 @@
         <% if manifestation.title_alternative? %>
           <tr>
             <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td style="width: 490px"><%= manifestation.title_alternative -%></td>
+            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
         <%- if manifestation.series_statement -%>
           <tr>
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
-            <td style="width: 490px"><%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
-            <%- if manifestation.issn.present? -%>
-              (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
-            <%- end -%>
+            <td style="width: 500px">
+              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
+              <%= manifestation.volume_number_string %>
+              <%- if manifestation.issn.present? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- end -%>
             </td>
           </tr>
         <% end %>

data/app/views/manifestations/_show_index.html.erb

@@ -1,4 +1,10 @@
-  <strong><%= link_to title_with_volume_number(manifestation), manifestation -%></strong>
+<strong>
+  <% if manifestation.root_of_series? %>
+    <%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) %>
+  <% else %>
+    <%= link_to title_with_volume_number(manifestation), manifestation -%>
+  <% end %>
+</strong>
   <% if manifestation.periodical_master? %>
     <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
       <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>

data/app/views/manifestations/_show_series_index.html.erb

@@ -0,0 +1,15 @@
+  <strong><%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) -%></strong>
+  <% if manifestation.periodical_master? %>
+    <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
+      <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>
+      -
+      <%= manifestation.series_statement.latest_issue.date_of_publication.try(:year) -%>
+    <%- end -%>
+    <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
+  <%- end -%>
+  <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
+  <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
+  <br />
+  <div id="creator_list_<%= manifestation.id -%>">
+    <%= render 'manifestations/show_creators', :manifestation => manifestation -%>
+  </div>

data/app/views/manifestations/_show_series_statement.html.erb

@@ -0,0 +1,30 @@
+      <table id="resource_detail">
+        <tr>
+          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
+          <td style="width: 490px"><%= @series_statement.title_transcription %></td>
+        </tr>
+        <tr>
+          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_subseries') -%></td>
+          <td style="width: 490px"><%= @series_statement.title_subseries %>
+            <% if @series_statement.title_subseries_transcription? %>
+              (<%= @series_statement.title_subseries_transcription %>)
+            <% end %>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.periodical') -%></td>
+          <td><%= localized_boolean(@series_statement.periodical) %></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.issn') -%></td>
+          <td><%= @series_statement.issn %></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></td>
+          <td><%= @series_statement.series_statement_identifier %></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.note') -%></td>
+          <td><%= @series_statement.note %></td>
+        </tr>
+    </table>

data/app/views/manifestations/_submenu_series_statement.html.erb

@@ -0,0 +1,8 @@
+  <ul>
+    <% if can? :create, Manifestation %>
+      <li><%= link_to t('page.new', :model => t('activerecord.models.manifestation')), new_series_statement_manifestation_path(@series_statement) %></li>
+    <% end %>
+    <% if can? :update, @series_statement %>
+      <li><%= link_to t('page.edit'), edit_series_statement_path(@series_statement) %></li>
+    <% end %>
+  </ul>