umlaut 3.0.5 → 3.1.0.pre1

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

@@ -0,0 +1,34 @@
+.umlaut-results {
+  @extend .umlaut-separator;
+   background-color: $umlautResultsBackgroundColor;
+}
+
+.umlaut-result {
+  background-color: $umlautResultItemBackgroundColor;
+  border-color:     $umlautResultItemBorderColor;
+  margin-bottom: $baseLineHeight/2;
+  dl {
+    margin: 0;
+    dt, dd {
+      margin-bottom: $baseLineHeight/4;
+    }
+  }
+
+  padding: $umlautIndent;
+
+  .umlaut-citation-link {
+    text-align: right;
+  }
+}
+
+.umlaut-pagination {
+  font-size: 125%;
+}
+
+@media (max-width: 767px) {
+  .umlaut-result {
+    .umlaut-citation-link {
+      text-align: left;
+    }
+  }
+}

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

@@ -0,0 +1,14 @@
+.umlaut-search-form {  
+  padding: 10px;
+  border: 1px solid $umlautSearchFormBorderColor;
+  background-color: $umlautSearchFormBackgroundColor;
+  margin-top: $baseLineHeight;
+  margin-bottom: $baseLineHeight;
+  @include border-radius($baseBorderRadius);
+  legend {
+    border-color: $umlautSearchFormBorderColor;
+  }
+  .row-fluid {
+    margin-bottom: $baseLineHeight;
+  }
+}

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

@@ -0,0 +1,12 @@
+.background_progress_spinner {
+  @extend .muted;
+  img {
+    vertical-align: top;
+    margin-top: 1px;
+  }
+}
+
+.umlaut-resource-info .background_progress_spinner { 
+  padding-left: 24px;
+  padding-top: 8px;
+}

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

@@ -0,0 +1,72 @@
+// See also, possible umlaut theme over-ride of default bootstrap
+// variables in umalut.scss
+
+// Basic colors, all other colors by default are defined in terms of these
+// Overall Border and Background
+$umlautBorderColor:                         #c7c7c7 !default; //#d1d1d1
+$umlautBackgroundColor:                     #f9f9f7 !default;
+$umlautAltBackgroundColor:									#e1e1e1 !default; // Sidebar and navbar #dadada
+$umlautHighlightedBackgroundColor:					white   !default;
+$umlautAvailableColor:                      #00CC33 !default; // Available Color, used for text
+$umlautUnavailableColor:                    #FF3E00 !default; // Unavailable Color, used for text
+
+// Closer to old Umlaut colors, for nostaligia or for a change:
+// $umlautBorderColor:                         #ebb211;
+// $umlautBackgroundColor:                     #fffdea;
+// $umlautAltBackgroundColor:									#fcf1d4;
+// $umlautHighlightedBackgroundColor:					white;
+// $umlautHighlightedSectionBorderColor:				#dedede;
+// $umlautAvailableColor:                      #00CC33;
+// $umlautUnavailableColor:                    red;
+
+// And another possibility
+// $umlautBackgroundColor:                     #FEF9ED; #f8f3ea
+//  $umlautAltBackgroundColor:									#e1d3cc;
+// $umlautBorderColor:                         darken($umlautAltBackgroundColor, 10%);
+// $umlautHighlightedBackgroundColor:					white;
+// $umlautAvailableColor:                      #00CC33;
+// $umlautUnavailableColor:                    red;
+
+
+// container padding used for page margins/gutters and between columns. 
+// at large screens, sometimes *2. 
+$umlautContainerPadding:    20px !default;
+$umlautContainerMaxWidth:		1100px !default;
+// important that umlautIndent is exactly enough to indent past umlaut
+// list item icons in hanging indents
+$umlautIndent:  														20px !default;  
+$umlautBorderRadiusExtraLarge:							12px !default;
+
+// Header nav bar. 
+$umlautHeaderBackgroundColor:								$umlautAltBackgroundColor !default;
+$umlautHeaderBorderColor:										$umlautBorderColor !default;
+// Search Border and Background
+$umlautSearchFormBackgroundColor:           $umlautAltBackgroundColor !default;
+$umlautSearchFormBorderColor:               $umlautBorderColor !default;
+// Search Results
+$umlautResultsBackgroundColor:              $umlautBackgroundColor !default;
+$umlautResultItemBackgroundColor:						$umlautAltBackgroundColor !default;
+$umlautResultItemBorderColor:								$umlautBorderColor !default;
+
+// A-Z List input -- actual list of A,B..Z buttons
+$umlautAzLinkColor:                         $linkColor !default;
+$umlautAzBorderColor:                       $umlautBorderColor !default;
+$umlautAzBackgroundColor:                   $umlautBackgroundColor !default;
+$umlautAzHoverBackgroundColor:              $umlautAltBackgroundColor !default;
+// Auto Complete Border and Background
+$umlautAutoCompleteBorderColor:             $umlautAzBorderColor !default;
+$umlautAutoCompleteBackgroundColor:         $umlautHighlightedBackgroundColor !default;
+
+// Resolve Border and Backgrounds
+$umlautMainBackgroundColor:                 $umlautBackgroundColor !default;
+$umlautSidebarBorderColor:                  $umlautBorderColor !default;
+$umlautSidebarBackgroundColor:              $umlautAltBackgroundColor !default;
+// Highlighted Sections Border and Backgrounds
+$umlautHighlightedSectionBorderColor: 			$umlautBorderColor !default;
+$umlautHighlightedSectionBackgroundColor:   $umlautHighlightedBackgroundColor !default;
+// Resolve Errors Border and Backgrounds
+$umlautResolveErrorBorderColor:             $umlautBorderColor !default;
+$umlautResolveErrorBackgroundColor:         $umlautHighlightedBackgroundColor !default;
+// Debug Info Border and Backgrounds
+$umlautDebugInfoBorderColor:                $umlautBorderColor !default;
+$umlautDebugInfoBackgroundColor:            $umlautHighlightedBackgroundColor !default;

data/app/controllers/export_email_controller.rb

@@ -1,77 +1,60 @@
 class ExportEmailController < UmlautController
-  
+
   before_filter :load_objects
-  layout Proc.new { |controller|         
-     if (controller.request.xhr? || controller.params["X-Requested-With"] == "XmlHttpRequest")
-       nil
-     else
-       umlaut_config.layout
-     end
-  }
+  layout :search_layout_except_xhr
 
   def load_objects
     @svc_response = ServiceResponse.find(params[:id])
     @user_request = @svc_response.request if @svc_response
   end
-  
-  def email    
-  end 
-  
-  def txt    
-  end
-    
+
   def send_email
     @email = params[:email]
     @fulltexts = @user_request.get_service_type('fulltext', { :refresh=>true })
     @holdings = @user_request.get_service_type('holding', { :refresh=>true })
     if valid_email?
-      Emailer.citation(@email, @user_request, @fulltexts, @holdings).deliver 
-      respond_to do |format|
-        format.html {  render }
-      end
+      Emailer.citation(@email, @user_request, @fulltexts, @holdings).deliver
     else
-      @partial = "email"
-      flash[:error] = email_validation_error
-      redirect_to params_preserve_xhr(params.merge(:action => "email"))        
+      flash[:alert] = email_validation_error
+      render :email and return
     end
   end
-  
+
   def send_txt
     @number = params[:number]
     # Remove any punctuation or spaces etc
     @number.gsub!(/[^\d]/, '') if @number
     @provider = params[:provider]
     @email = "#{@number}@#{@provider}" unless @number.nil? or @provider.nil?
-    @holding_id = params[:holding]
+    @holding = params[:holding]
     if valid_txt_number? && valid_txt_holding?
-      Emailer.short_citation(@email, @user_request, holding_location(@holding_id), call_number(@holding_id)).deliver 
-      render # send_txt.rhtml       
-    else        
-      flash[:error] = txt_validation_error        
-      redirect_to params_preserve_xhr(params.merge(:action => "txt"))
-    end    
+      Emailer.short_citation(@email, @user_request, holding_location(@holding), call_number(@holding)).deliver
+    else
+      flash[:alert] = txt_validation_error
+      render :txt and return
+    end
   end
-  
+
   private
   def valid_txt_number?
-    return (! @number.blank?) && @number.length == 10
+    ((not @number.blank?) && @number.length == 10)
   end
 
   def valid_txt_holding?
-     return ! @holding_id.blank?
+    (not @holding.blank?)
   end
-  
+
   def valid_email?
-    return @email =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+    (@email =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
   end
-  
+
   def txt_validation_error
     errors = []
     errors << "a valid number" unless valid_txt_number?
     errors << "the item you wish to send" unless valid_txt_holding?
     errors
   end
-  
+
   def email_validation_error
     errors = []
     errors << "a valid email address"
@@ -81,11 +64,11 @@ class ExportEmailController < UmlautController
   def holding(id)
     return ServiceResponse.find(id) unless id.nil?
   end
-  
+
   def holding_location(id)
     return holding(id).view_data[:collection_str] unless holding(id).nil?
   end
-    
+
   def call_number(id)
     return holding(id).view_data[:call_number] unless holding(id).nil?
   end

data/app/controllers/journal_tocs_controller

@@ -0,0 +1,90 @@
+# register an email address at: http://www.journaltocs.ac.uk/index.php?action=register
+
+class JournalTocsController < UmlautController
+
+  def show
+    @issn  = params["rft.issn"] || params["issn"]
+
+    if @issn.blank?
+      render :status => 500, :text => "Client must supply an ISSN"
+      return
+    end
+    @title = params["rft.title"] || params["title"]
+
+    fetcher = JournalTocsFetcher.new(@issn)
+    @results = fetcher.items
+
+    if @results.empty?
+      render :status => 404, :text => "No current articles available for #{@title} #{@issn}"
+      return
+    end
+
+    # direct to use our custom decorator
+    @results.each {|r| r.decorator = "JournalTocsController::ArticleDecorator" }
+
+    # No title given? Let's try to sniff one from the results.
+    if @title.blank?
+      @title = @results.first.try(:journal_title)
+    end
+
+
+    respond_to do |format|
+      format.html # journal_tocs/show.html.erb
+      format.atom do
+        render( :template => "bento_search/atom_results",
+                :locals   => {
+                  :atom_results     => @results,
+                  :feed_name        => "Recent Articles from #{@title || @issn}",
+                  :feed_author_name => "MyCorp"
+              }
+        )
+      end
+    end
+
+  end
+
+  # A article decorator from BentoSearch, where we customize our links:
+  # If we have enough info for an OpenURL, do a self-pointing OpenURL
+  # to us, set with redirect to fulltext. If there is not enough info
+  # for an openurl, no link at all at present.
+  #
+  # Possible enhancements: Refworks link. Find It link without auto redirect.
+  #   link to publisher link if it's open access?
+  #   link to publisher link through ezproxy even if it's not, on a wing and a prayer?
+  class ArticleDecorator < BentoSearch::StandardDecorator
+    def link
+      if sufficient_for_openurl?
+        _h.resolve_url + "?#{self.to_openurl_kev}&umlaut.skip_resolve_menu_for_type=fulltext"
+      else
+        nil
+      end
+    end
+
+    def sufficient_for_openurl?
+      doi.present? || (issn.present? && volume.present? && issue.present? && start_page.present?)
+    end
+
+    # We don't want to display format
+    def display_format
+      nil
+    end
+
+    # force display of complete date if present, even for journals.
+    def display_date
+      if self.publication_date
+        I18n.localize(self.publication_date, :format => "%d %b %Y")
+      elsif self.year
+        self.year.to_s
+      else
+        nil
+      end
+    end
+
+  end
+
+
+
+
+
+end
+

data/app/controllers/js_helper_controller.rb

@@ -1,10 +1,9 @@
 # Controller that just has one helper action for external sites using
-# our Javascript HTML updater stuff. 
+# our Javascript HTML updater stuff.
 class JsHelperController < UmlautController
 
   def loader
     @generate_urls_with_host = true
     render :template => "js_helper/loader.erb.js"
   end
-  
-end
+end

data/app/controllers/link_router_controller.rb

@@ -1,73 +1,62 @@
 # All clicks on a ServiceResponse are actually sent through this controller,
 # which redirects to actual destination. That allows statistic logging,
 # as well as special behavior (like EZProxy redirection, or showing in a
-# bannered frameset). 
+# bannered frameset).
 require 'cgi'
 class LinkRouterController < UmlautController
-  def index
+  # Add resolve layout for handling errors.
+  layout :resolve_layout
 
-    # Capture mysterious exception for better error reporting. 
+  def index
+    # Capture mysterious exception for better error reporting.
     begin
       svc_response = ServiceResponse.find(params[:id])
-    rescue ActiveRecord::RecordNotFound => exception 
+    rescue ActiveRecord::RecordNotFound => exception
       # Usually this happens when it's a spider trying an old link. "go" links
       # don't stay good forever! Bad spider, ignoring our robots.txt.
-      log_error_with_context(exception, :warn)      
-
-      raise exception# will be caught by top level rescue_from            
+      log_error_with_context(exception, :warn)
+      raise exception# will be caught by top level rescue_from
     end
-
-
-    @collection = self.create_collection         
-
+    @collection = self.create_collection
     clickthrough = Clickthrough.new
     clickthrough.request_id = svc_response.request_id
     clickthrough.service_response_id = svc_response.id
     clickthrough.save
-
-
     redirect_to calculate_url_for_response(svc_response)
   end
-  
-  protected
-  
-  
-  
+
   # Used to calculate a destination/target url for an Umlaut response item.
   #
   # Pass in a ServiceType join object (not actually a ServiceResponse, sorry)
   # Calculates the URL for it, and then runs our link_out_filters on it,
-  # returning the final calculated url. 
+  # returning the final calculated url.
   #
   # Also requires a rails 'params' object, since url calculation sometimes
   # depends on submitted HTTP params.
   #
   # Used from LinkController's index,
   def calculate_url_for_response(svc_response)
-      svc = ServiceStore.instantiate_service!(svc_response.service_id, nil)
-      
-      destination =  svc.response_url(svc_response, params)
-
-      # if response_url returned a string, it's an external url and we're
-      # done. If it's something else, usually a hash, then pass it to
-      # url_for to generate a url.
-      if destination.kind_of?(String)
-        url = destination
-
-        # Call link_out_filters, if neccesary.
-        # These are services listed as  task: link_out_filter  in services.yml
-        (1..9).each do |priority|
-          @collection.link_out_service_level( priority ).each do |filter|
-            filtered_url = filter.link_out_filter(url, svc_response)
-            url = filtered_url if filtered_url
-          end
+    svc = ServiceStore.instantiate_service!(svc_response.service_id, nil)
+    destination =  svc.response_url(svc_response, params)
+
+    # if response_url returned a string, it's an external url and we're
+    # done. If it's something else, usually a hash, then pass it to
+    # url_for to generate a url.
+    if destination.kind_of?(String)
+      url = destination
+
+      # Call link_out_filters, if neccesary.
+      # These are services listed as  task: link_out_filter  in services.yml
+      (1..9).each do |priority|
+        @collection.link_out_service_level( priority ).each do |filter|
+          filtered_url = filter.link_out_filter(url, svc_response)
+          url = filtered_url if filtered_url
         end
-        return url
-      else        
-        return url_for(params_preserve_xhr(destination))
       end
+      return url
+    else
+      return url_for(params_preserve_xhr(destination))
+    end
   end
-
-  
-   
-end
+  protected :calculate_url_for_response
+end