umlaut 3.3.1 → 4.0.0.beta1

data/app/assets/stylesheets/umlaut/_results.scss

@@ -3,14 +3,18 @@
    background-color: $umlautResultsBackgroundColor;
 }
 
+.umlaut-search-container .pagination {
+  margin: 10px 0;
+}
+
 .umlaut-result {
   background-color: $umlautResultItemBackgroundColor;
   border-color:     $umlautResultItemBorderColor;
-  margin-bottom: $baseLineHeight/2;
+  margin-bottom: $line-height-computed/2;
   dl {
     margin: 0;
     dt, dd {
-      margin-bottom: $baseLineHeight/4;
+      margin-bottom: $line-height-computed/4;
     }
   }
 
@@ -21,11 +25,7 @@
   }
 }
 
-.umlaut-pagination {
-  font-size: 125%;
-}
-
-@media (max-width: 767px) {
+@media (max-width: $screen-sm-min) {
   .umlaut-result {
     .umlaut-citation-link {
       text-align: left;

data/app/assets/stylesheets/umlaut/_search.scss

@@ -2,13 +2,24 @@
   padding: 10px;
   border: 1px solid $umlautSearchFormBorderColor;
   background-color: $umlautSearchFormBackgroundColor;
-  margin-top: $baseLineHeight;
-  margin-bottom: $baseLineHeight;
-  @include border-radius($baseBorderRadius);
+  margin-top: $line-height-computed;
+  margin-bottom: $line-height-computed;
+  border-radius: $border-radius-base;
   legend {
     border-color: $umlautSearchFormBorderColor;
   }
-  .row-fluid {
-    margin-bottom: $baseLineHeight;
+  .row {
+    margin-bottom: $line-height-computed;
+  }
+
+  .form-control.year, .form-control.month, .form-control.day, .form-control.doi {
+    width: 90px;
+  }
+  label {
+    font-weight: normal;
+  }
+
+  input.title_search {
+    width: 20em;
   }
 }

data/app/assets/stylesheets/umlaut/_spinner.scss

@@ -1,5 +1,5 @@
 .background_progress_spinner {
-  @extend .muted;
+  @extend .text-muted;
   img {
     vertical-align: top;
     margin-top: 1px;

data/app/assets/stylesheets/umlaut/_variables.scss

@@ -31,7 +31,7 @@ $umlautUnavailableColor:                    #FF3E00 !default; // Unavailable Col
 // container padding used for page margins/gutters and between columns. 
 // at large screens, sometimes *2. 
 $umlautContainerPadding:    20px !default;
-$umlautContainerMaxWidth:		1100px !default;
+$umlautContainerMaxWidth:		1100px + ($umlautContainerPadding * 4)!default;
 // important that umlautIndent is exactly enough to indent past umlaut
 // list item icons in hanging indents
 $umlautIndent:  														20px !default;  
@@ -49,7 +49,7 @@ $umlautResultItemBackgroundColor:						$umlautAltBackgroundColor !default;
 $umlautResultItemBorderColor:								$umlautBorderColor !default;
 
 // A-Z List input -- actual list of A,B..Z buttons
-$umlautAzLinkColor:                         $linkColor !default;
+$umlautAzLinkColor:                         $link-color !default;
 $umlautAzBorderColor:                       $umlautBorderColor !default;
 $umlautAzBackgroundColor:                   $umlautBackgroundColor !default;
 $umlautAzHoverBackgroundColor:              $umlautAltBackgroundColor !default;

data/app/controllers/export_email_controller.rb

@@ -3,9 +3,7 @@ class ExportEmailController < UmlautController
   before_filter :load_objects
   layout :search_layout_except_xhr
 
-  def load_objects
-    @svc_response = ServiceResponse.find(params[:id])
-    @user_request = @svc_response.request if @svc_response
+  def email
   end
 
   def send_email
@@ -20,6 +18,9 @@ class ExportEmailController < UmlautController
     end
   end
 
+  def txt
+  end
+
   def send_txt
     @number = params[:number]
     # Remove any punctuation or spaces etc
@@ -35,7 +36,13 @@ class ExportEmailController < UmlautController
     end
   end
 
-  private
+  protected
+
+  def load_objects
+    @svc_response = ServiceResponse.find(params[:id])
+    @user_request = @svc_response.request if @svc_response
+  end
+
   def valid_txt_number?
     ((not @number.blank?) && @number.length == 10)
   end

data/app/controllers/resolve_controller.rb

@@ -20,7 +20,9 @@ class ResolveController < UmlautController
   layout :resolve_layout, :except => [:partial_html_sections]
 
   def index
-    self.service_dispatch()
+    # saving the bg Thread object mostly so testing environment
+    # can wait on it. 
+    @bg_thread = self.service_dispatch()
     # check for menu skipping configuration. link is a ServiceResponse
     link = should_skip_menu
     if ( ! link.nil? )
@@ -49,28 +51,7 @@ class ResolveController < UmlautController
     end    
   end
 
-  # inputs an OpenURL request into the system and stores it, but does
-  # NOT actually dispatch services to provide a response. Will usually
-  # be called by software, not a human browser. Sometimes
-  # it's useful to do this as a first step before redirecting the user
-  # to the actual resolve action for the supplied request--for instance,
-  # when the OpenURL metadata comes in a POST and can't be redirected.
-  def register_request
-    # init before filter already took care of setting up the request.
-    @user_request.save!
-
-    # Return data in headers allowing client to redirect user
-    # to view actual response.
-    headers["x-umlaut-request_id"] = @user_request.id
-    headers["x-umlaut-resolve_url"] = url_for( :controller => 'resolve', 'umlaut.request_id'.to_sym => @user_request.id )
-    headers["x-umlaut-permalink_url"] = current_permalink_url()
-
-    # Return empty body. Once we have the xml response done,
-    # this really ought to return an xml response, but with
-    # no service responses yet available.
-    render(:nothing => true)
-  end
-
+  
   # Useful for developers, generate a coins. Start from
   # search/journals?umlaut.display_coins=true
   # or search/books?umlaut.display_coins=true
@@ -129,12 +110,18 @@ class ResolveController < UmlautController
     api_render()
   end
 
-  def rescue_action_in_public(exception)
-    render(:template => "error/resolve_error", :status => 500 )
+  # Not an action method. Used only in test environment, get the Thread object executing
+  # background services, so you can #join on it to wait for bg
+  # services to complete. 
+  def bg_thread
+    @bg_thread
   end
 
+
   protected
 
+
+
   def post_to_get
     if request.method == "POST"
       redirect_to url_for(params)
@@ -155,7 +142,7 @@ class ResolveController < UmlautController
     # no end of problems later. We can't just refuse to process, sources
     # do send us bad bytes, I'm afraid.
     params.values.each do |v|
-      EnsureValidEncoding.ensure_valid_encoding!(v, :invalid => :replace)
+      v.scrub!
     end
     # Create an UmlautRequest object.
     options = {}
@@ -201,10 +188,7 @@ class ResolveController < UmlautController
       # Services to skip for?
       skip[:service_types].each do | service |
         service = ServiceTypeValue[service] unless service.kind_of?(ServiceTypeValue)
-        candidates =
-        @user_request.service_responses.find(:all,
-          :conditions => ["service_type_value_name = ?", service.name])
-        return_value = candidates.first
+        return_value = @user_request.service_responses.where(:service_type_value_name => service.name).first
       end
 
       # But wait, make sure it's included in :services if present.

data/app/controllers/search_controller.rb

@@ -31,7 +31,7 @@ class SearchController < UmlautController
   @@az_batch_size = 20
   @@autocomplete_limit = 15
 
-  layout :layout_name, :except => [ :opensearch, :opensearch_description ]
+  layout :layout_name
 
   before_filter :normalize_params
 
@@ -41,7 +41,7 @@ class SearchController < UmlautController
   end
 
   def index
-    @page_title = "Journals"
+    @page_title = t('umlaut.search.journals_page_name')
     journals()
   end
 
@@ -120,8 +120,7 @@ class SearchController < UmlautController
     if @end_result_num > @hits
       @end_result_num = @hits
     end
-    # TODO: Make page titles configurable
-    @page_title = "Browse by Journal Title: #{params['id']}"
+    @page_title = t('umlaut.search.browse_by_jtitle', :query => params['id'])
     # Use our ordinary search displayer to display
     # It'll notice the action and do just a bit of special stuff.
     render(:template => "search/journal_search")
@@ -145,10 +144,6 @@ class SearchController < UmlautController
    render :text => @titles.to_json, :content_type => "application/json"
   end
 
-  def opensearch_description
-    @headers['Content-Type'] = 'application/opensearchdescription+xml'
-  end
-
   protected
 
   # We intentionally use a method calculated at request-time for layout,

data/app/controllers/umlaut/controller_behavior.rb

@@ -2,6 +2,9 @@
 # so that we can generate a local UmlautController that includes
 # this module, and local app can configure or over-ride default behavior.
 #
+#
+# This is really only intended to be included'd by UmlautController;
+# other controllers may sub-class UmlautController
 module Umlaut::ControllerBehavior
   extend ActiveSupport::Concern
 
@@ -13,12 +16,38 @@ module Umlaut::ControllerBehavior
     controller.helper Umlaut::Helper # global umlaut view helpers
     # init default configuration values
     UmlautConfigurable.set_default_configuration!(controller.umlaut_config)
+    # Set locale from request param
+    controller.before_filter :set_locale
+  end
+
+
+  # Set the current locale based on request param umlaut.locale
+  # Local app can override this in UmlautController if you'd like to
+  # base locale on HTTP headers or IP address or other things. 
+  def set_locale
+    I18n.locale = params['umlaut.locale'.to_sym] || I18n.default_locale
   end
 
+  # Rails over-ride to ensure locale is always included in
+  # generated URLs. We choose to explicitly include locale's
+  # only for non-default locale. 
+  # Local app may override this in UmlautController to make
+  # other choices. 
+  def default_url_options(*arguments)
+    if I18n.locale == I18n.default_locale
+      # Don't add in param for default locale
+      super
+    else
+      super.merge({ 'umlaut.locale'.to_sym => I18n.locale })
+    end
+  end
+
+
+
   # Returns the search layout name unless this is an XML HTTP Request.
   def search_layout_except_xhr
     @layout_name ||= (request.xhr? || params["X-Requested-With"] == "XmlHttpRequest") ?
-      nil : umlaut_config.search_layout
+      false : umlaut_config.search_layout
   end
   protected :search_layout_except_xhr
 

data/app/controllers/umlaut/error_handling.rb

@@ -18,7 +18,7 @@ module Umlaut::ErrorHandling
     # Only render this if we haven't done anything else
     # e.g. if some other gem may be handling its own errors    
     unless performed?  
-      if params[:format] == "html"
+      if request.format.html?
         render "error", :status => 500  
       else
         render :text => "Unexpected fatal error, has been logged.", :status => 500

data/app/controllers/umlaut_configurable.rb

@@ -253,7 +253,19 @@ module UmlautConfigurable
           list
         end
       end
-      
+
+      ##########
+      #
+      # Names of these sections can be given in Rails i18n, under key
+      #   umlaut.display_sections.#{section_div_id}.title
+      # If not given there, will be automatically calculated from
+      # the display_name of the ServiceType Value included. 
+      #
+      # Optional sub-head prompts can also be given in i18n, under
+      #   umlaut.display_sections.#{section_div_id}.prompt
+      #
+      ###########
+
       add_resolve_sections! do
         div_id "cover_image"
         partial "cover_image"
@@ -264,7 +276,6 @@ module UmlautConfigurable
             
       add_resolve_sections! do
         div_id "fulltext"    
-        section_title "Online Access"
         html_area :main
         partial :fulltext
         show_partial_only true
@@ -279,7 +290,6 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "excerpts"
-        section_prompt "A limited preview which may include table of contents, index, and other selected pages."
         html_area :main
         list_visible_limit 5
         visibility :responses_exist
@@ -293,7 +303,6 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "holding"
-        section_title ServiceTypeValue[:holding].display_name_pluralize
         html_area :main
         partial 'holding'
         service_type_values ["holding","holding_search"]
@@ -301,7 +310,6 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "document_delivery"
-        section_title "Request a copy from Inter-Library Loan"
         html_area :main
         visibility :responses_exist
         #bg_update false
@@ -321,7 +329,6 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "help"
-        section_title "Question? Problem? Contact:"
         html_area :sidebar
         bg_update false
         partial "help"
@@ -345,15 +352,12 @@ module UmlautConfigurable
         div_id "export_citation"
         html_area :sidebar
         visibility :in_progress
-        item_name_plural "Export tools"
       end
       
       add_resolve_sections! do
         div_id "related_items"
         html_area :sidebar
         partial "related_items"
-        section_title "More like this"
-        item_name_plural "Related Items"
         # custom visibility, show it for item-level cites,
         # or if we actually have some
         visibility(  lambda do |renderer|
@@ -366,7 +370,6 @@ module UmlautConfigurable
       
       add_resolve_sections! do
         div_id "highlighted_link"
-        section_title "See also"
         html_area :sidebar
         visibility :in_progress
         partial_locals( :show_source => true )

data/app/controllers/umlaut_controller.rb

@@ -50,6 +50,10 @@ class UmlautController < ApplicationController
       # typo?
       # entry_not_in_kb_warning true
 
+      # uncomment this line to show localization (language) selector
+      # in default umlaut layout header. 
+      # show_localization_selector true
+
       # rfr_ids used for umlaut generated pages.
       # rfr_ids do
       #   opensearch  "info:sid/umlaut.code4lib.org:opensearch"

data/app/helpers/emailer_helper.rb

@@ -14,22 +14,22 @@ module EmailerHelper
     rv << title
     rv << "\n"
     if cite[:author]
-      rv << "Author: " if options[:include_labels]
+      rv << "#{t 'umlaut.citation.author_label'}:" if options[:include_labels]
       rv << cite[:author].strip
       rv << "\n"
     end
-    if cite[:subtitle]
-      rv << (cite[:subtitle_label].strip + ": ") if options[:include_labels] && cite[:subtitle_label]
-      rv << cite[:subtitle].strip
+    if cite[:container_title]
+      rv << (cite[:container_label].strip + ": ") if options[:include_labels] && cite[:container_label].present?
+      rv << cite[:container_title].strip
       rv << "\n"
     end
     pub = []
     pub << date_format(cite[:date]) unless cite[:date].blank?
-    pub << 'Vol: '+cite[:volume].strip unless cite[:volume].blank?
-    pub << 'Iss: '+cite[:issue].strip unless cite[:issue].blank?
-    pub << 'p. '+cite[:page].strip unless cite[:page].blank?
+    pub << "#{t 'umlaut.citation.volume_abbr' }: " + cite[:volume].strip unless cite[:volume].blank?
+    pub << "#{t 'umlaut.citation.issue_abbr'}: " + cite[:issue].strip unless cite[:issue].blank?
+    pub << "#{t 'umlaut.citation.page_abbr'} " + cite[:page].strip unless cite[:page].blank?
     if pub.length > 0
-      rv << "Published: " if options[:include_labels]
+      rv << "#{t 'umlaut.citation.published'}: " if options[:include_labels]
       rv << pub.join('  ')
     end
     return rv
@@ -39,8 +39,8 @@ module EmailerHelper
     citation = request.referent.to_citation
     str = ""
 
-    str << "ISSN: #{citation[:issn]}\n" if citation[:issn]
-    str << "ISBN: #{citation[:isbn]}\n" if citation[:isbn]
+    str << "#{t 'umlaut.citation.issn'}: #{citation[:issn]}\n" if citation[:issn]
+    str << "#{t 'umlaut.citation.isbn'}: #{citation[:isbn]}\n" if citation[:isbn]
     citation[:identifiers].each do |identifier|
       str << "#{identifier}\n"
     end

data/app/helpers/export_email_helper.rb

@@ -24,7 +24,7 @@ module ExportEmailHelper
   end
 
   def validation_error(errors)
-    validation_errors = content_tag(:div, :class => "alert alert-error") do
+    validation_errors = content_tag(:div, :class => "alert alert-danger") do
       content_tag(:span, "Please provide the following:") + content_tag(:ul) do 
         e = "".html_safe
         errors.each do |error|