umlaut 3.3.1 → 4.0.0.beta1

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

@@ -1,7 +1,11 @@
-<%= 
-  # Try to warn if this could be a typo. If we have an rft.object_id, then
+<%# Try to warn if this could be a typo. If we have an rft.object_id, then
   # SFX recognized it as an actually existing journal. If not, then it
   # might be a typo. If it came from a manually entered citation, warn them.
-  content_tag(:div, content_tag(:i, "", :class => "umlaut_icons-famfamfam-error") +
-    " Warning: #{umlaut_config.app_name} does not know about a #{user_request.referent.format.downcase} with this name. Please check your entry.",
-      :class=>"alert alert-error") if display_not_found_warning?(user_request) %>
+%>
+
+<% if display_not_found_warning?(user_request) %>
+    <div class="alert alert-danger">
+        <i class="umlaut_icons-famfamfam-error"/>
+        <%= t("umlaut.resolve.not_found_warning", :app_name => umlaut_config.app_name, :resource_type => user_request.referent.container_type_of_thing.downcase) %>
+    </div>
+<% end %>

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

@@ -1,19 +1,23 @@
-<div id="modal" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 class="ajax-loader" style="display:none">Loading</h3>
-    <h3 class="content"></h3>
-  </div>
-  <div class="modal-body">
-    <div class="ajax-loader" style="display:none">
-      <div class="progress progress-striped active">
-        <div class="bar" style="width: 95%;"></div>
+<div id="modal" class="modal fade" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3 class="ajax-loader" style="display:none"><%=t('umlaut.misc.loading').titlecase%></h3>
+        <h4 class="modal-title" data-role='modal-title-content'></h4>
+      </div>
+      <div class="modal-body">
+        <div class="ajax-loader" style="display:none">
+          <div class="progress progress-striped active">
+            <div class="bar" style="width: 95%;"></div>
+          </div>
+        </div>
+        <div class="content" data-role='modal-body-content'></div>
+      </div>
+      <div class="modal-footer">
+        <span class="content" data-role='modal-footer-content'></span>
+        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><%=t('umlaut.misc.close').titlecase%></button>
       </div>
     </div>
-    <div class="content"></div>
-  </div>
-  <div class="modal-footer">
-    <span class="content"></span>
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
   </div>
 </div>

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

@@ -7,33 +7,36 @@
   # TODO: Make this a helper function!?
   if (search_providers.length > 0 and (not service_type_in_progress?('search_inside'))) %>
     <div class="section_heading">
-      <h3>Search inside this <%= @user_request.referent.container_type_of_thing %></h3>
+      <%= content_tag :h3, t('umlaut.display_sections.search_inside.search_inside_this_x', :x => @user_request.referent.container_type_of_thing.try(:downcase)) %>      
     </div>
     <div class="umlaut_section_content">
-      <%= content_tag("form", :target => "_blank", :action => url_for(:controller=>'link_router', :action=>'index')) do %>
-
-        <div class="search-inside-source input-prepend input-append">
-          <span class="add-on"> via </span> 
-
-          <% if search_providers.length > 1 %>
-            <%= select_tag("id", options_for_select(search_providers.collect {|st| [st.view_data[:display_text], st.id]}), 
-                            :class =>"input-medium id") %>
-          <% else %>
-            <input type="hidden" name="id" value="<%= search_providers[0].id %>">
-            <span class="add-on"><%= search_providers[0].view_data[:display_text] %></span>
-          <% end %>
+      <%= content_tag("form", :target => "_blank", :action => url_for(:controller=>'link_router', :action=>'index'), :class => "form-inline") do %>
 
+        <div class="search-inside-source form-group">
+            <%=t 'umlaut.display_sections.search_inside.via' %>        
+            <% if false && search_providers.length > 1 %>
+              <%= select_tag("id", options_for_select(search_providers.collect {|st| [st.view_data[:display_text], st.id]}), 
+                              :class =>"form-control id") %>
+            <% else %>
+                <input type="hidden" name="id" value="<%= search_providers[0].id %>">
+                <%= search_providers[0].view_data[:display_text] %>
+            <% end %>
         </div>
-        <div class="search-inside-query input-append">
-          <input name="query" type="text" /> 
-          <input value="search" type="submit" class="btn add-on">
+
+        <div class="search-inside-query form-group">
+            <div class='input-group'>
+              <input name="query" type="text" class="form-control" /> 
+              <span class="input-group-btn">
+                <input value="<%=t 'umlaut.display_sections.search_inside.action_label' %>" type="submit" class="btn btn-default input-group-add-on">
+              </span>
+            </div>
         </div>     
       <% end %>
     </div>
   <% elsif (@user_request.referent.format == 'book' && service_type_in_progress?('search_inside')) %>
     <%# don't show the spinner unless it's identified as a book, otherwise too likely to be a false promise %>
     <%= render(:partial => "background_progress", :locals => {:svc_type => "search_inside", 
-      :progress_message => "Looking for tools to search inside this #{@user_request.referent.container_type_of_thing}" }) %>
+      :progress_message => "#{t 'umlaut.display_sections.search_inside.progress_message'} #{@user_request.referent.container_type_of_thing}" }) %>
   <% end %>
 
 </div>

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

@@ -2,17 +2,17 @@
 failed_dispatches = failed_service_dispatches()
 unless ( failed_dispatches.nil? || failed_dispatches.empty? ) %>
   <div id="service_errors_content">
-    <h5 class="warning"><i class="umlaut_icons-famfamfam-error"></i> Some content may not be included due to errors:</h5>
-    <ul>
+    <h5 class="warning"><i class="umlaut_icons-famfamfam-error"></i> <%= t 'umlaut.error.service_errors_title' %></h5>
+    <ul class="list-unstyled">
       <% failed_dispatches.each do | dispatch | %>
         <li class="text-small">
-          Some <strong><%= dispatch.service.service_types_generated.collect { |type|
-            type.display_name_pluralize.downcase}.join(",") %></strong>
-          from <a class="collapse-toggle" data-target="<%= "#failed_dispatch_#{dispatch.id}"%>" data-toggle="collapse"><strong><%= dispatch.service.display_name %></strong></a>
+          <%= t 'umlaut.error.services_missing' %><strong> <%= dispatch.service.service_types_generated.collect { |type|
+            type.display_name_pluralize}.join(", ")%></strong>
+          <%= t 'umlaut.resolve.from_service' %> <a class="collapse-toggle" data-target="<%= "#failed_dispatch_#{dispatch.id}"%>" data-toggle="collapse"><strong><%= dispatch.service.display_name %></strong></a>
           <% exception_info = dispatch.exception_info %>
           <div id="<%= "failed_dispatch_#{dispatch.id}"%>" class="collapse">
             <ul class="nav nav-list">
-              <li class="nav-header">Technical Error Information</li>
+              <li class="nav-header"><%= t 'umlaut.error.technical_error_info' %></li>
               <%= content_tag("li") do
                 content_tag("pre", :class=>"pre-scrollable") do
                   error_message = (exception_info) ? "#{exception_info[:class_name]}: #{exception_info[:message]}\n" : ""

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

@@ -11,26 +11,26 @@
 %>
 <li class="response_item">
   <%= content_tag :i, nil %>
-  <% 
+  <%
   # Fancy schmancy ajax? But not if we're generating embed partials, won't work.
   # Generate a hyperlink that will call our standard service action
-  # due to special class for unobtrusive JS. 
+  # due to special class for unobtrusive JS.
   if view_data[:link_supports_ajax_call] %>
     <%= link_to(view_data[:display_text], {:controller=>'link_router', :id=>service_response.id},
           {:id => "svctype_link_#{service_response.id}", :target => "_blank", :class => "response_link ajax_window"}) %>
   <% #Collapsible content on page 
   elsif (content = response_content(view_data )) %>
-    <%= expand_contract_section(view_data[:display_text], 
+    <%= expand_contract_section(view_data[:display_text],
           "svc_id_#{service_response.id}") { content_tag(:div, content, :class => "umlaut-content-indent") } %>
   <% # Ordinary href link
-  else %>      
+  else %>
     <%= link_to({:controller=>'link_router', :id=>service_response.id}, 
           {:id => "svctype_link_#{service_response.id}", :target=>"_blank", :class => "response_link"}) do %>
       <%= coverage_summary(view_data) %>
       <%= view_data[:display_text] %><%
     end
   end %>
-  <%= content_tag(:div, "from #{view_data[:source] || service_response.service.display_name}", :class => "response_source") if show_source %>
+  <%= content_tag(:div, "#{t('umlaut.resolve.from_service')} #{view_data[:source] || service_response.service.display_name}", :class => "response_source") if show_source %>
   <%= content_tag(:div, view_data[:coverage], :class => "response_coverage_statement") unless view_data[:coverage].blank? %>
   <%-
     # legacy, the 'notes' field can take raw html, we need to leave it that way for
@@ -46,8 +46,8 @@
   -%>
   <%= (content_tag(:div, :class => "edition_warning") {
         (view_data[:edition_str].blank?) ? 
-          content_tag(:em, "May be alternate edition.", :class => ["note"]) : 
-            (content_tag(:em, "Edition information",:class => ["note"]) + " #{view_data[:edition_str]}")
+          content_tag(:em, t('umlaut.resolve.maybe_alt_edition'), :class => ["note"]) :
+            (content_tag(:em, t('umlaut.resolve.edition_info'),:class => ["note"]) + " #{view_data[:edition_str]}")
         }) if ((not view_data[:match_reliability].blank?) && view_data[:match_reliability] != ServiceResponse::MatchExact) %>
   <%-
   # Debug info, hidden with explicit style, can be made visible with javascript.

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

@@ -1,6 +1,6 @@
 <dl class="permalink">
-	<dt>Short link:</dt>
+	<dt><%=t('umlaut.permalink.name')%>:</dt>
 	<dd><%= link_to current_permalink_url, current_permalink_url %></dd>
 </dl>
 
-<%= link_to 'Back', :back %>
+<%= link_to t('umlaut.permalink.back'), :back %>

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

@@ -1,6 +1,6 @@
 <%= render 'background_updater', :user_request => @user_request %>
-<div class="row-fluid">
-  <div class="span8 umlaut-main"> 
+<div class="row">
+  <div class="col-sm-8 umlaut-main"> 
     <div class="umlaut-resource-info">
       <div class="resource_info_sections">
         <%= render 'manually_entered_warning', :user_request => @user_request %>
@@ -24,16 +24,18 @@
       <% end %>
     </div>
   </div>
-  <div class="span4 umlaut-sidebar">
-    <% html_sections(:sidebar).each do |section| %>
-      <%= content_tag "div", :id => section[:div_id] do %>
-        <%= render_section(section) %>
-      <% end %>
-    <% end %>
-    <div id="service_errors">
-      <% html_sections(:service_errors).each do |section| %>
-        <%= render_section(section) %>
+  <div class="col-sm-4 umlaut-sidebar-container">
+    <div class="umlaut-sidebar">
+      <% html_sections(:sidebar).each do |section| %>
+        <%= content_tag "div", :id => section[:div_id] do %>
+          <%= render_section(section) %>
+        <% end %>
       <% end %>
+      <div id="service_errors">
+        <% html_sections(:service_errors).each do |section| %>
+          <%= render_section(section) %>
+        <% end %>
+      </div>
     </div>
   </div>
   <%= render 'modal' %>

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

@@ -3,11 +3,11 @@
   ref_meta = @current_context_object.referent.metadata  
   labels = referent_labels
 %>
-<div class="row-fluid">
-  <dl class="dl-horizontal span8">
-    <%= # Article Title
+<div class="row">
+  <dl class="dl-horizontal col-sm-8">
+        <%= # Article Title
     if ref_meta.has_key?("atitle") and (not ref_meta["atitle"].blank?)
-      content_tag(:dt, "#{labels.atitle}:", :class => "atitle") +
+      content_tag(:dt, labels.atitle, :class => "atitle") +
         content_tag(:dd, ref_meta["atitle"], :class => "atitle")
     end %>
     <%= # Author
@@ -16,58 +16,58 @@
       if ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"]
         author << ", #{(ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"])}"
       end
-      content_tag(:dt, "Author:", :class => "author") +
+      content_tag(:dt, t('umlaut.citation.author_label'), :class => "author") +
         content_tag(:dd, author, :class => "author")
     end %>
     <%=# Journal/Book Title
     if ref_meta.has_key?("jtitle")  or ref_meta.has_key?("title") or ref_meta.has_key?("btitle")
-      content_tag(:dt, "#{labels.title}:", :class => "title") +
+      content_tag(:dt, "#{labels.title}", :class => "title") +
         content_tag(:dd, :class => "title") {
-          link_to(ref_meta["title"] || ref_meta["btitle"] || ref_meta["jtitle"], 
-            url_for_with_co({:controller => 'resolve'}, @current_context_object), 
+          link_to(ref_meta["title"] || ref_meta["btitle"] || ref_meta["jtitle"],
+            url_for_with_co({:controller => 'resolve'}, @current_context_object),
               {:target => search_result_target_window}) }
     end %>
     <%= # ISSN
     if ref_meta.has_key?("issn") and (not ref_meta["issn"].blank?)
-      content_tag(:dt, "ISSN:", :class => "issn") +
+      content_tag(:dt, "ISSN", :class => "issn") +
         content_tag(:dd, ref_meta["issn"], :class => "issn")
     end %>
     <%= # ISBN
     if ref_meta.has_key?("isbn") and (not ref_meta["isbn"].blank?)
-      content_tag(:dt, "ISBN:", :class => "isbn") +
+      content_tag(:dt, "ISBN", :class => "isbn") +
         content_tag(:dd, ref_meta["isbn"], :class => "isbn")
     end %>
     <%= # Publisher
     if ref_meta.has_key?("pub") and (not ref_meta["pub"].blank?)
       publisher = (ref_meta.has_key?("place") and (not ref_meta["place"].blank?)) ? "#{ref_meta['place']} : " : ""
       publisher << ref_meta["pub"]
-      content_tag(:dt, "Publisher", :class => "publisher") +
+      content_tag(:dt, t('umlaut.citation.publisher'), :class => "publisher") +
         content_tag(:dd, publisher, :class => "publisher")
     end %>
     <%= # Publishing info, etc.
     if ref_meta.has_key?("date") and (not ref_meta["date"].blank?)
-      content_tag(:dt, "Published:", :class => "published") +
+      content_tag(:dt, t('umlaut.citation.published'), :class => "published") +
         content_tag(:dd, date_format(ref_meta["date"]), :class => "published")
     end %>
     <%= # Volume
     if ref_meta.has_key?("volume")
-      content_tag(:dt, "Volume:", :class => "volume") +
+      content_tag(:dt, t('umlaut.citation.volume'), :class => "volume") +
         content_tag(:dd, ref_meta["volume"], :class => "volume")
     end %>
     <%= # Issue
     if ref_meta.has_key?("issue")
-      content_tag(:dt, "Issue:", :class => "issue") +
+      content_tag(:dt, t('umlaut.citation.issue'), :class => "issue") +
         content_tag(:dd, ref_meta["issue"], :class => "issue")
     end %>
     <%= # Pages
     if ref_meta.has_key?("spage")
       pages = ref_meta["spage"]
       pages = "#{pages} - #{ref_meta["epage"]}" if ref_meta.has_key?("epage")
-      content_tag(:dt, "Page:", :class => "page") +
+      content_tag(:dt, t('umlaut.citation.page'), :class => "page") +
         content_tag(:dd, pages, :class => "page")
     end %>
   </dl>
-  <div class="umlaut-citation-link span3">
+  <div class="umlaut-citation-link col-sm-4">
     <%= resolver_link(@current_context_object, {:target => search_result_target_window}) %>
   </div>
 </div>

data/app/views/search/_pager.html.erb

@@ -37,23 +37,23 @@
       unless n - prev > 1
         prev = n
         if ( n != @page )
-           links << (content_tag :li, (link_to n, args.merge({'page' => n })), :class => "hidden-phone")
+           links << (content_tag :li, (link_to n, args.merge({'page' => n })), :class => "hidden-xs")
         else
-           links << (content_tag :li, (content_tag :span, n) )
+           links << (content_tag :li, (content_tag :span, n), :class => "active" )
         end
       else
         # ellipsis represents the gap between windows
         prev = n - 1
-        links <<  (content_tag :li, (content_tag :span, "&hellip;".html_safe), :class => "hidden-phone")
+        links <<  (content_tag :li, (content_tag :span, "&hellip;".html_safe), :class => "hidden-xs disabled")
         redo
       end
     end
     
     # Next and previous buttons
-    links.unshift( content_tag :li, (link_to('Previous', args.merge({'page' => @page -1 })))) if @page > 1
-    links.push( content_tag :li, (link_to('Next', args.merge({'page' => @page + 1})))) if @page < total_pages
+    links.unshift( content_tag :li, (link_to(t('umlaut.search.previous'), args.merge({'page' => @page -1 })))) if @page > 1
+    links.push( content_tag :li, (link_to(t('umlaut.search.next'), args.merge({'page' => @page + 1})))) if @page < total_pages
 %>
-<%= content_tag :ul, links.join(' ').html_safe %>
+<%= content_tag :ul, links.join(' ').html_safe, :class => "pagination" %>
 <%
   end
 %>

data/app/views/search/books.html.erb

@@ -1,6 +1,7 @@
 <div class="oneColumn">
-  <h2>Books</h2>
-  <%= form_tag({:controller=>'resolve', :action=>@submit_action}, {:method=>'get'}) %>
+
+  <h1>Books</h1>
+  <%= form_tag({:controller=>'resolve', :action=>@submit_action}, {:method=>'get', :class=>"form-horizontal"}) %>
     <fieldset class="citationLinker">                                      
       <%= hidden_field_tag "rfr_id", "info:sid/umlaut.code4lib.org:citation" %> 
       <%= hidden_field_tag "url_ver", "Z39.88-2004" %> 
@@ -8,28 +9,67 @@
       <%= hidden_field_tag "ctx_ver", "Z39.88-2004" %> 
       <%= hidden_field_tag "rft_val_fmt", "info:ofi/fmt:kev:mtx:book" %> 
       <%= hidden_field_tag "rft.genre", "book" %> 
-      <%= label :book, :title, "Book Title:" %>
-      <%= text_field :book, :title, {:name=>'rft.btitle', :class=>"title_search"} %>
-      <%= label :book, :date, "Year:" %>
-      <%= text_field :book, :date, {:name=>'rft.date', :class=>"date"} %>
-      <%= label :book, :volume, "Volume:" %>
-      <%= text_field :book, :volume, {:name=>'rft.volume', :max_length => "5", :class=>"volume"} %>
-      <%= label :book, :part, "Part:" %>
-      <%= text_field :book, :part, {:name=>'rft.part', :class=>"part"} %>
-      <%= label :book, :isbn, "ISBN:" %>
-      <%= text_field :book, :isbn, {:name=>'rft.isbn', :max_length => "17", :class=>"isbn"} %>
+
+
+      <div class="form-group">
+        <%= label :book, :title, t('umlaut.citation.title_of_x', :x => t('umlaut.citation.genre.book')), :class => "control-label col-sm-3" %>
+        <div class="col-sm-9">
+          <%= text_field :book, :title, {:name=>'rft.btitle', :class=>"title_search form-control"} %>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <%= label :book, :date, t('datetime.prompts.year'), :class=> "control-label col-sm-3"  %>
+        <div class="col-sm-9">
+          <%= text_field :book, :date, {:name=>'rft.date', :class=>"date form-control"} %>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <%= label :book, :volume, t('umlaut.citation.volume'), :class=>"control-label col-sm-3"  %>
+        <div class="col-sm-9">
+          <%= text_field :book, :volume, {:name=>'rft.volume', :max_length => "5", :class=>"volume form-control"} %>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <%= label :book, :part, t('umlaut.citation.title_of_x', :x => t('umlaut.citation.genre.bookitem'))   , :class => "control-label col-sm-3" %>
+        <div class="col-sm-9">
+          <%= text_field :book, :part, {:name=>'rft.part', :class=>"part form-control"} %>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <%= label :book, :isbn, t('umlaut.citation.isbn'), :class => "control-label col-sm-3" %>
+        <div class="col-sm-9">
+          <%= text_field :book, :isbn, {:name=>'rft.isbn', :max_length => "17", :class=>"isbn form-control"} %>
+        </div>
+      </div>
     </fieldset>
+
     <fieldset class="citationLinker">                                      
       <legend>Author</legend>
-      <%= label :book, :aulast, "Last Name:" %>
-      <%= text_field :book, :aulast, {:name=>'rft.aulast', :class=>"aulast"} %>
-      <%= label :book, :aufirst, "First Name:" %>
-      <%= text_field :book, :aufirst, {:name=>'rft.aufirst', :class=>"aufirst"} %>
-      <%= label :book, :auinit, "Initials:" %>
-      <%= text_field :book, :auinit, {:name=>'rft.auinit', :class=>"auinit"} %>
+
+      <div class="form-group">
+        <%= label :book, :aulast, t('umlaut.citation.author.last'), :class => "control-label col-sm-3" %>
+        <div class="col-sm-9">
+          <%= text_field :book, :aulast, {:name=>'rft.aulast', :class=>"aulast form-control"} %>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <%= label :book, :aufirst, t('umlaut.citation.author.first'), :class => "control-label col-sm-3" %>
+        <div class="col-sm-9">
+          <%= text_field :book, :aufirst, {:name=>'rft.aufirst', :class=>"aufirst form-control"} %>
+        </div>
+      </div>
+
     </fieldset>
+
     <fieldset>                                      
-      <%= submit_tag "Search", :class => "btn" %>
+      <div class="col-sm-offset-3 col-sm-9">
+        <%= submit_tag t('umlaut.search.action_label'), :class => "btn btn-default" %>
+      </div>
     </fieldset>
   </form>
 </div>

data/app/views/search/journal_search.html.erb

@@ -1,4 +1,4 @@
-<h2><%= @page_title %></h2>
+<h1><%= @page_title %></h1>
 <%= form_tag({:controller=>'search', :action=>'journal_search'}, {:method=>'get', :name=>'OpenURL', :id=>'OpenURL', :class => "form-inline form-very-inline"})  %>
   <div class="umlaut-search-form">
     <fieldset>
@@ -13,16 +13,16 @@
       <% params.slice("rft.date", "__year", "__month", "__day", "rft.volume", "rft.issue", "rft.spage").each_pair do |key, value| %>
         <%= hidden_field_tag key, value %>
       <% end %>
-      <div class="control-group">
-        <%= label :journal, :title, "Journal Title:" %>
-        <%= text_field :journal, :title, {:name=>'rft.jtitle', :value=>params['rft.jtitle'], :class=>"title_search input-xlarge", :autocomplete => "off"} %>
-        <select name="umlaut.title_search_type" class="title_search_type input-medium">
-          <%= options_for_select({"contains" => "contains", "begins with" => "begins", "exact match" => "exact"}, params["umlaut.title_search_type"])  %>
+      <div class="form-group">
+        <%= label :journal, :title, t('umlaut.search.journal_title') + ':' %>
+        <%= text_field :journal, :title, {:name=>'rft.jtitle', :value=>params['rft.jtitle'], :class=>"title_search form-control", :autocomplete => "off"} %>
+        <select name="umlaut.title_search_type" class="title_search_type form-control">
+          <%= options_for_select({t('umlaut.search.contains') => "contains", t('umlaut.search.begins_with') => "begins", t('umlaut.search.exact_match') => "exact"}, params["umlaut.title_search_type"])  %>
         </select>
       </div>
-      <div class="control-group">
-        <%= submit_tag "Search", {:name=>"Generate_OpenURL2", :class => "btn"} %>
-        <%= link_to('More search options', {:controller=>'search'}, :class => "inline-help") %>
+      <div class="form-group">
+        <%= submit_tag t('umlaut.search.action_label'), {:name=>"Generate_OpenURL2", :class => "btn btn-default"} %>
+        <%= link_to(t('umlaut.search.more_search_options'), {:controller=>'search'}, :class => "inline-help") %>
       </div>
     </fieldset>
   </div>
@@ -31,10 +31,10 @@
   <%= render :partial=>"a_to_z" %>
 <% end %>
 <% unless @hits == 0%>
-  <h3>Showing results <%= @start_result_num %> through <%= @end_result_num %> of <%= @hits %></h3>
+  <h3><%= t( 'umlaut.search.showing_results', start: @start_result_num, until:  @end_result_num, total: @hits) %></h3>
 <% end %>
 <% if params["rft.jtitle"] %>
-  <div class="note"><em><strong>Note:</strong> Alternate titles might have matched your search terms</em></div>
+  <div class="note"><em><strong><%= t 'umlaut.search.note' %>:</strong> <%= t 'umlaut.search.other_titles_might' %> </em></div>
 <% end %>
 <div class='umlaut-pagination pagination'>
   <%= render :partial=>'pager' %>