umlaut 3.3.1 → 4.0.0.beta1

data/app/service_adaptors/txt_holding_export.rb

@@ -3,13 +3,14 @@
 class TxtHoldingExport < AjaxExport
 
   def initialize(config)
-    @display_text = "Send to phone"
+    @display_text = 'Send to phone'
+    @display_text_i18n = "display_text"
     @form_controller = "export_email"
     @form_action = "txt"
     # providers is a hash of:
     # user-presentable-string => hostname for email to txt service. 
     @providers = {
-     "Cingular/AT&T" => "cingularme.com",
+     "AT&T" => "txt.att.net",
      "Nextel" => "messaging.nextel.com",     
      "Sprint" => "messaging.sprintpcs.com",
      "T-Mobile"=> "tmomail.net",

data/app/service_adaptors/ulrichs_link.rb

@@ -3,7 +3,7 @@
 # Does not actually look up first to make sure there are results, it's
 # a blind link.
 # config params:
-# link_name: Name to put on the link. Defaults to "Periodical Information from Ulrich's Directory". 
+# display_text: Name to put on the link. Defaults to "Periodical information". Can also be changed via i18n tranlsations. 
 class UlrichsLink < Service
 
   def initialize(config)
@@ -16,7 +16,8 @@ class UlrichsLink < Service
     @base_url ||= "https://ulrichsweb.serialssolutions.com/api/openurl?issn="
     # Old one
     #@base_url ||= "http://www.ulrichsweb.com/ulrichsweb/Search/call_fullCitation.asp?/vendor_redirect.asp?oVendor=#{@vendor}&oIssn="
-    @link_name = "Periodical information"
+    @display_text ||= "Periodical information"
+    @display_text_i18n ||= "display_text"
   end
   
   def service_types_generated
@@ -25,14 +26,13 @@ class UlrichsLink < Service
 
   def handle(request)
     unless (request.referent.issn.blank?)
-      display_text = @link_name
-
       url = url_for_issn( request.referent.issn )
       
       request.add_service_response(
         :service=>self, 
         :url=>url, 
-        :display_text=>display_text,
+        :display_text=>@display_text,
+        :display_text_i18n => @display_text_i18n,
         :service_type_value => :highlighted_link)
     end
 

data/app/service_adaptors/worldcat.rb

@@ -16,6 +16,7 @@ class Worldcat < Service
     @suppress_precheck = false # it seems unneccesary to pre-check worldcat, it's mostly ALWAYS a positive hit. And pre-checking against worldcat is running into Worldcat's rate limiting defenses. If neccesary, you can turn this off. Really, we should be using the Worldcat API anyway. 
     @base_url = 'http://www.worldcat.org/'
     @display_text = 'Find in other libraries'
+    @display_text_i18n = 'display_text'
     @display_name = 'OCLC WorldCat.org'
     
     @credits = {
@@ -107,7 +108,8 @@ class Worldcat < Service
     request.add_service_response(
       :service=>self, 
       :url=>worldcat_uri.to_s,
-      :display_text=>@display_text, 
+      :display_text=>@display_text,
+      :display_text_i18n => @display_text_i18n,
       :service_type_value => :highlighted_link
       )
     

data/app/views/export_email/email.html.erb

@@ -2,17 +2,18 @@
   <%
   unless @user_request.nil?
     cite = @user_request.referent.to_citation %>
-    <%= form_tag({:controller => "export_email", :action => "send_email", :id => params[:id]}, :class => "form-inline" ) do  %>
-      <h2>Email the title and locations</h2>
+    <%= form_tag({:controller => "export_email", :action => "send_email", :id => params[:id]}, :class => "form-horizontal" ) do  %>
+      <h4 class="modal-title"><%=t 'umlaut.services.email_export.header' %></h4>
       <%= validation_error flash[:alert] if flash[:alert] %>
-      <fieldset>
-        <legend>Title: <%= h(cite[:title]) %>/<%= h(cite[:author]) %></legend>
-        <div class="control-group">
-          <%= label_tag 'email', 'Enter your email address:' %>
-          <%= text_field_tag 'email', params[:email], :class => "input-xlarge" %>
+        <h4><%= cite[:title] %> / <%= cite[:author] %></h4>
+        <div class="form-group">
+          <%= label_tag 'email', t('umlaut.services.email_export.enter_your_email'), :class => "control-label col-xs-4" %>
+          <div class="col-xs-8">
+            <%= text_field_tag 'email', params[:email], :class => "form-control" %>
+          </div>
         </div>
-        <%= submit_tag 'Send!', :class => "btn btn-inverse" %>
-      </fieldset><%
+        <%= submit_tag t('umlaut.services.email_export.send_action'), :class => "btn btn-primary" %>
+      <%
     end
   end %>
 </div>

data/app/views/export_email/send_txt.html.erb

@@ -1,2 +1,4 @@
-<h2>Sent</h2>
-<div id="txt_success" class="alert alert-success">Sent to <%= @number %>.</div>
+<h2><%=t('umlaut.services.txt_holding_export.text_sent', :number => @number)%></h2>
+<div id="txt_success" class="alert alert-success">
+    <%=t('umlaut.services.txt_holding_export.text_sent', :number => @number)%>
+</div>

data/app/views/export_email/txt.html.erb

@@ -1,30 +1,52 @@
 <div class="txt">
   <%
   unless @user_request.nil? %>
-    <%= form_tag( {:controller => "export_email", :action => "send_txt", :id => params[:id]}, :class => "form-inline" ) do %>
-      <h2>Send the title and location of an item to your mobile phone</h2>
+    <%= form_tag( {:controller => "export_email", :action => "send_txt", :id => params[:id]}, :class => "form-horizontal" ) do %>
+      <h2><%= @svc_response.service.translate 'header' %></h2>
       <%= validation_error flash[:alert] if flash[:alert] %>
-      <fieldset>
-        <legend>Title: <%= h(brief_citation(@user_request)) %></legend>
-        <%= label_tag('number', 'Enter your mobile phone number:') %>
-        <%= text_field_tag('number', params[:number], :size => 14) %>
-        <small><em>10 digit US cell phone number</em></small><br />
-        <%= label_tag('provider', 'Select your provider:') %>
-        <% providers = @svc_response.service.instance_variable_get("@providers") %>
-        <%= select_tag "provider", options_for_select(providers.sort, params[:provider]) %>
+      
+        <h4><%= brief_citation(@user_request) %></h4>
+
+        <div class="form-group">
+          <%= label_tag('number', @svc_response.service.translate('enter_your_number'), :class => "control-label col-xs-6") %>
+          <div class="col-xs-6">
+            <%= text_field_tag('number', params[:number], :size => 14, :class => "form-control") %>
+            <p>
+              <small><em><%= @svc_response.service.translate 'number_format_description' %> </em></small><br />
+            </p>
+          </div>
+        </div>
+        
+
+        <div class="form-group">
+          <%= label_tag('provider', @svc_response.service.translate('select_provider'), :class => "control-label col-xs-6") %>
+          <div class="col-xs-6">
+            <% providers = @svc_response.service.instance_variable_get("@providers") %>          
+            <%= select_tag "provider", options_for_select(providers.sort, params[:provider]), :class => "form-control" %>
+          </div>
+        </div>
+
         <% holdings = @user_request.get_service_type('holding', {}) %>
-        <p>Choose the item you want to send:</p>
-        <ul><%
-          holdings.each do |p|
-            target = p.view_data %>
-            <li>
-              <%= radio_button_tag 'holding', p.id, (params[:holding].to_s == p.id.to_s) || holdings.length == 1 %>
-              <%= label_tag "holding_#{p.id}", formatted_html_holding_status(target) %>
-            </li><%
-          end %>
-        </ul>
-        <small><em>Note: charges may apply if your service plan does not cover unlimited texting</em></small>
-        <%= submit_tag 'Send!', :class => "btn btn-inverse" %>
+        <div class="form-group">
+            <%= label_tag('holding', @svc_response.service.translate('choose_item_to_send'), :class => "control-label col-xs-6") %></p>
+            <div class="col-xs-6">
+              <ul class="list-unstyled"><%
+                holdings.each do |p|
+                  target = p.view_data %>
+                  <li>
+                    <div class="radio">
+                      <label>
+                        <%= radio_button_tag 'holding', p.id, (params[:holding].to_s == p.id.to_s) || holdings.length == 1 %>
+                        <%= formatted_html_holding_status(target) %>
+                      </label>
+                    </div>
+                  </li><%
+                end %>
+              </ul>
+            </div>
+          </div>
+        <small><em><%= @svc_response.service.translate 'charges_may_apply' %></em></small>
+        <%= submit_tag @svc_response.service.translate 'send_action', :class => "btn btn-primary" %>
       </fieldset><%
     end
   end %>

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

@@ -2,21 +2,21 @@
 
 <%= form_tag(feedback_path(params[:request_id], :contact_id => params[:contact_id]) , :method => :post, :class => "feedback-form form-horizontal") do %>
     
-    <div class="control-group">
+    <div class="form-group">
         <label class="control-label" for="name">Your Name</label>
         <div class="controls">
           <input type="text" id="name" name="name">
         </div>
     </div>
 
-    <div class="control-group">
+    <div class="form-group">
         <label class="control-label" for="email">Your Email</label>
         <div class="controls">
           <input type="text" id="email" name="email">
         </div>
     </div>
 
-    <div class="control-group">
+    <div class="form-group">
         <label class="control-label" for="feedback">Question or Comment</label>
         <div class="controls">
           <textarea id="feedback" name="feedback" class="input-xxlarge" rows=6></textarea>
@@ -24,9 +24,9 @@
     </div>
 
 
-    <div class="control-group">
+    <div class="form-group">
         <div class="controls">
-          <button type="submit" class="btn">Send</button>
+          <button type="submit" class="btn btn-default">Send</button>
         </div>
     </div>
     

data/app/views/resolve/_background_progress.html.erb

@@ -1,4 +1,4 @@
-<%   
+<%#
 # Partial to display spinner for background services in progress. 
 # Also degrades fairly nicely to non-javascript. 
 #
@@ -22,22 +22,41 @@
 # Further investigation may need to be done to optimize specifically
 # for JAWS (which is neither full js nor non js, but some js--right
 # now I think they'll just get the non-js version, but we can do better.)
+%>
+
+<%
 svc_types = [] if svc_types.nil?
 svc_types.push(svc_type).uniq! if defined?(svc_type) && ! svc_type.nil?
 # convert any Strings to ServiceTypeValues. 
 svc_types = svc_types.collect { |t| t.kind_of?(ServiceTypeValue) ? t : ServiceTypeValue[t] }
 div_id = "progress_#{svc_types[0].name}" unless div_id
 current_set_empty = false if current_set_empty.nil?
+
 item_name ||= svc_types[0].display_name_pluralize
-progress_message ||= "Searching for #{current_set_empty ? "" : "more "} #{item_name}"
-# only display if there are more! 
+
+progress_message ||= if current_set_empty
+    I18n.t("umlaut.resolve.background_load.progress_initial", :x => item_name)
+else
+    I18n.t("umlaut.resolve.background_load.progress_more", :x => item_name)
+end
+
+
+load_message ||= if current_set_empty
+    I18n.t("umlaut.resolve.background_load.load_initial", :x => item_name)
+else
+    I18n.t("umlaut.resolve.background_load.load_more", :x => item_name)
+end
+%>
+
+
+<% # only display if there are more! 
 if service_types_in_progress?(svc_types) %>
   <div id="<%= div_id %>" class="background_progress_spinner">
     <%= image_tag('spinner.gif', :alt =>"") %>
     <span class="message"><%= progress_message %></span>
     <noscript>
       <div>
-        <%= link_to "Load #{current_set_empty ? "" : "more"} #{item_name}.", {:action => "background_status", :"umlaut.request_id" => @user_request.id, :"umlaut.skip_resolve_menu" => params['umlaut.skip_resolve_menu']} %> 
+        <%= link_to load_message, {:action => "background_status", :"umlaut.request_id" => @user_request.id, :"umlaut.skip_resolve_menu" => params['umlaut.skip_resolve_menu']} %> 
       </div>
     </noscript>
   </div><%

data/app/views/resolve/_background_updater.html.erb

@@ -1,27 +1,27 @@
-<%-
+<%- 
 # Include this partial to put the background updater device on your page.
 # This actually just sets up the Umlaut JQuery background updater, for
-# unobtrusive adding of background html content to menu page.
+# unobtrusive adding of background html content to menu page.  
 
 # Only include if we have any background services. We could check to make
 # sure we only have background services we care about, but it's more work--
 # the updater will only run ONCE at most wrongly, then the
-# background_update action will stop it.
+# background_update action will stop it. 
 -%>
 <% if (any_services_in_progress?) %>
   <script type="text/javascript">
     //<![CDATA[
     jQuery(document).ready(function ($) {
-      var updater = new Umlaut.HtmlUpdater("<%= root_url %>", "umlaut.request_id=<%= user_request.id %>");
+      var updater = new Umlaut.HtmlUpdater("<%= root_url %>", "umlaut.request_id=<%= user_request.id %>", "<%= I18n.locale %>");
       <% bg_update_sections.collect do |section| %>
         updater.add_section_target({ umlaut_section_id: "<%= section[:div_id] %>" });
       <% end %>
       <%-
-        # Wait the designated number of seconds before kicking off the first bg
-        # update request. Future requests will be automatically made with delay.
+      # Wait the designated number of seconds before kicking off the first bg
+      # update request. Future requests will be automatically made with delay. 
       -%>
       setTimeout(function () { updater.update(); }, <%= umlaut_config.lookup!("initial_poll_wait_seconds", 4)*1000 %>);
     });
     //]]>
-  </script>
-<% end %>
+  </script><% 
+end %>

data/app/views/resolve/_citation.html.erb

@@ -1,10 +1,10 @@
 <%
 # Get the citation from the user request
 cite = user_request.referent.to_citation
-# Set the page title to the citation's title
 @page_title = cite[:title] %>
+
 <% if user_request.referent.type_of_thing.present? %>
-  <p class="resource-type"><%= user_request.referent.type_of_thing.titlecase %></p>
+  <p class="resource-type"><%=user_request.referent.type_of_thing.titlecase %></p>
 <% end %>
 <h2 class="title"><%= cite[:title] %></h2>
 <% if cite[:author].present? || cite[:date].present? %>
@@ -22,31 +22,32 @@ cite = user_request.referent.to_citation
 <% end %>
 <p class="published_in">
   <% if [:container_title, :volume, :issue, :page].find {|k| cite[k].present? } %>
-    <span class="published-label">Published in <%= cite[:container_label] %></span>
+
+    <span class="published-label"><%="#{t('umlaut.citation.published_in')} #{cite[:container_label]}"%></span> 
     <span class="container-title"><%= cite[:container_title] %></span>. 
   <% end %>
   <% if cite[:volume].present? %>
-    <span class="volume">Volume <%= cite[:volume] %></span>.
+      <span class="volume"><%="#{t('umlaut.citation.volume').titlecase} #{cite[:volume]}" %></span>.
   <% end %>
   <% if cite[:issue].present? %>
-    <span class="issue">Issue <%= cite[:issue] %></span>.
+      <span class="issue"><%="#{t('umlaut.citation.issue').titlecase}  #{cite[:issue]}" %></span>.
   <% end %>
   <% if cite[:page].present? %>
-    <span class="page">Page <%= cite[:page] %></span>.
+      <span class="page"><%="#{t('umlaut.citation.page').titlecase} #{cite[:page]}" %></span>.
   <% end %>
 </p>
 <dl class="citation-info">
   <%= if cite[:pub].present? 
-    content_tag(:dt, "Publisher:", :class => "publisher") +
+    content_tag(:dt, "#{t('umlaut.citation.publisher')}:", :class => "publisher") +
       content_tag(:dd, cite[:pub], :class => "publisher")
   end %>
   <%= if cite[:issn].present?
-    content_tag(:dt, "ISSN:", :class => "issn") +
+    content_tag(:dt, "#{t('umlaut.citation.issn')}:", :class => "issn") +
       content_tag(:dd, cite[:issn], :class => "issn")
   end %>
   <%= if cite[:isbn].present?
-    content_tag(:dt, "ISBN:", :class => "isbn") +
+    content_tag(:dt, "#{t('umlaut.citation.isbn')}:", :class => "isbn") +
       content_tag(:dd, cite[:isbn], :class => "isbn")
   end %>
   <%# todo, doi %>
-</dl>
+</dl>

data/app/views/resolve/_compact_citation.html.erb

@@ -4,9 +4,9 @@
   cite = @user_request.referent.to_citation 
   pub = []
   pub << '.' << date_format(cite[:date]) unless cite[:date].blank?	
-  pub << '. Volume:&nbsp;'+cite[:volume] unless cite[:volume].blank?
-  pub << '. Issue:&nbsp;'+cite[:issue] unless cite[:issue].blank?	
-  pub << '. Page:&nbsp;'+cite[:page] unless cite[:page].blank? %>
+  pub << '. ' + t(:volume).titlecase + ':&nbsp;'+cite[:volume] unless cite[:volume].blank?
+  pub << '. ' + t(:issue).titlecase + ':&nbsp;'+cite[:issue] unless cite[:issue].blank?
+  pub << '. ' + t(:page).titlecase + ':&nbsp;'+cite[:page] unless cite[:page].blank? %>
 <%= content_tag(:span, h(cite[:author].chomp), :class => "text-small") if cite[:author] %>
 <%= content_tag(:span, h(truncate(cite[:title], :length => 70, :seperator => '...'), :class => "text-small") %>
 <%= content_tag(((@user_request.referent.format =~ /article|journal|issue|report/i) ? 'em' : 'span'), cite[:subtitle], :class => "text-small") if cite[:subtitle] %>

data/app/views/resolve/_cover_image.html.erb

@@ -16,10 +16,10 @@ fix_size ||= true
 # but we let the width be more than the height for weird ratio'd covers
 # that are wider than square. 
 dimensions_style = { 
-          "small"       => "max-height: 80px; max-width: 100px;",
-          "medium"      => "max-height: 160px; max-width: 200px;",
-          "large"       => "max-height: 200px; max-width: 240px;",
-          "extra-large" => "max-height: 475px; max-width: 570px;" }
+          "small"       => "max-height: 80px; max-width: 100px; box-sizing: content-box;",
+          "medium"      => "max-height: 160px; max-width: 200px; box-sizing: content-box;",
+          "large"       => "max-height: 200px; max-width: 240px; box-sizing: content-box;",
+          "extra-large" => "max-height: 475px; max-width: 570px; box-sizing: content-box;" }
 
 img_st = cover_image_response(size)
 if img_st 

data/app/views/resolve/_fulltext.html.erb

@@ -27,7 +27,7 @@ all_responses = fulltxt + title_level_fulltxt
       <%= render :partial => "standard_response_item", :object => item %>
     <% end %>
     <% if (fulltxt.empty? && title_level_fulltxt.empty? && !service_type_in_progress?('fulltext')) %>
-      <p class="umlaut-unavailable umlaut-content-indent">Not Available</p>
+      <p class="umlaut-unavailable umlaut-content-indent"><%= t('umlaut.resolve.not_available') %></p>
     <% end %>
     <%= render renderer.spinner_render_hash if renderer.services_in_progress? %>
   </div>

data/app/views/resolve/_holding.html.erb

@@ -7,22 +7,22 @@
       target = p.view_data %>
       <div class="umlaut-holding">
         <div class="item_status_row">
-          <div class="collection-and-number row-fluid">
-            <div class="span7 collection-str"><i class="umlaut_icons-famfamfam-book"></i> 
+          <div class="collection-and-number row">
+            <div class="col-sm-7 collection-str"><i class="umlaut_icons-famfamfam-book"></i> 
 <%= target[:collection_str] %></div>
 
             <% # Set status class based on configured available statuses
             status_class = umlaut_config.holdings.available_statuses.include?(target[:status]) ? 'umlaut-available' : '' %>
-            <div class="span5 holding-status <%= status_class %>"> <%= target[:status] %></div>
+            <div class="col-sm-5 holding-status <%= status_class %>"> <%= target[:status] %></div>
           </div>
 
-          <div class="status-and-actions row-fluid">
-            <div class="span7 call-number"><%= target[:call_number]%></div>
+          <div class="status-and-actions row">
+            <div class="col-sm-7 call-number"><%= target[:call_number]%></div>
             
-            <div class="holding-actions span5">
-              <%= link_to("More info", {:controller=>"link_router", :id=>p.id}, :target => "_blank", :class=>"more-info btn btn-mini") %>
+            <div class="holding-actions col-sm-5">
+              <%= link_to(t('umlaut.holding.more_info'), {:controller=>"link_router", :id=>p.id}, :target => "_blank", :class=>"more-info btn btn-xs btn-default") %>
               <% if target[:request_url] %>
-                <%= link_to("Request", target[:request_url], :target => "_blank", :class=>"request btn btn-mini btn-primary") %>
+                <%= link_to(t('umlaut.holding.request'), target[:request_url], :target => "_blank", :class=>"request btn btn-xs btn-primary") %>
               <% end %>
             </div>
            
@@ -33,9 +33,9 @@
         <% if target[:match_reliability].present? && target[:match_reliability] != ServiceResponse::MatchExact %>
           <div class="umlaut-holding-match-reliability">            
               <% unless target[:edition_str].blank? %>
-                <em class="note">Edition information</em> <%= target[:edition_str] %>
+                <em class="note"><%=t('umlaut.resolve.edition_info')%></em> <%= target[:edition_str] %>
               <% else %>
-                <em class="note">May be alternate edition.</em>
+                <em class="note"><%t('umlaut.resolve.maybe_alt_edition')%></em>
               <% end %>            
           </div>
         <% end %>
@@ -60,16 +60,16 @@
 
 <% if holdings.empty? %>
   <div class="umlaut-content-indent">
-    <% # Get and display holding searches        
+    <% # Get and display holding searches
       searches = holding.find_all{|response| response.service_type_value_name.eql? "holding_search"}
       searches.each do | result_st |
         response = result_st.view_data %>
         <p class="umlaut-holding-search"><%= link_to response[:display_text], {:controller=>'link_router', :id=>result_st.id}, 'target'=>"_blank" %></p>
     <% end %>
-    <% 
+    <%
     # Display "Not Available" if we've completed our service run and both holdings and holding searches are empty
     if (holdings.blank? and searches.blank? and (not service_types_in_progress?(['holding', 'holding_search']))) %>
-      <p class="umlaut-unavailable">Not Available</p>
+      <p class="umlaut-unavailable"><%=t('umlaut.resolve.not_available')%></p>
     <% end %>
   </div>
 <% end %>