umlaut 3.0.5 → 3.1.0.pre1

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

@@ -1,167 +1,73 @@
-  
-  
-  <div class="oneColumn">
-  <h1>Journals</h1>
-    
-<%= render :partial=>"a_to_z" %>
-
-  <% if flash[:error] %>
-    <div id="error" class="notice citationLinker"><strong>(!) Problems:</strong> <%= flash[:error] %></div>
-  <% end %>
-
-  <h2 class="cl_header">Looking for a specific journal or article</h2>
-
-
-                                  
-  <%= form_tag(@submit_hash, {:method=>'get', :class=>"OpenURL", :name=>'OpenURL', :id=>'OpenURL'})  %>
-  <div class="citationLinker">                                      
-
-      <input type=hidden name="rfr_id" value="info:sid/sfxit.com:citation"> 
-      <!-- <input type=hidden name="rfr_id" value="info:sid/umlaut"> -->
-
-      <table width="100%" border="0" cellspacing="0" cellpadding="5">
-        <tr>
-          <td colspan="3" valign="bottom"><strong>Enter
-              the journal title or the ISSN.
-              If you have both the journal
-              title
-      and ISSN, use the ISSN.</strong></td>
-        <input type="hidden" class="rft_title" name="rft.title">
-          <input type="hidden" class="rft_object_id" name="rft.object_id">
-          <input type="hidden" id="date" name="rft.date">
-        </tr>
-        <tr>
-
-                                            
-          <td width="89%">Journal Title:
-
-            <%= text_field :journal, :title, {:name=>'rft.jtitle', :autocomplete=>'off', :size=>'40', :class=>"title_search"} %>
-                    
-            
-            <select name="umlaut.title_search_type" class="sfx_title_search">
-              <option value="contains">contains</option>
-              <option value="begins">begins
-              with</option>
-              <option value="exact">exact match</option>
-            </select>
-            &nbsp;&nbsp;&nbsp;&nbsp;ISSN:
-            <input type=text name="rft.issn" size="10" maxlength="9">
-            
-           
-          </td>
-            
-        </tr>
-                                          
-    </table>
-  </div>
-  <div class="citationLinker">
-    <table width="100%" border="0" cellspacing="0" cellpadding="5">
-      <tr>
-        <td><strong>Optional information - Enter as much as you know of the following: </strong></td>
-      </tr>
-      <tr>
-       
-        <td width="46%">Date: 
-          <select name="__year">
-
-          <option value="" selected>Year</option>
-            <% (-1*Time.now.year..-1*1950).each do |year| %>
-            <option value="<%= year.abs.to_s %>"><%= year.abs.to_s %></option>
-            <% end %>
-          </select>
-
-          <select name="__month">
-            <option value="" selected>Month
-            <option value="01">Jan
-            <option value="02">Feb
-            <option value="03">Mar
-            <option value="04">Apr
-            <option value="05">May
-            <option value="06">Jun
-            <option value="07">Jul
-            <option value="08">Aug
-            <option value="09">Sep
-            <option value="10">Oct
-            <option value="11">Nov
-            <option value="12">Dec
-          </select>
-
-          <select name="__day">
-            <option value="" selected>Day
-            <option value="01">01
-            <option value="02">02
-            <option value="03">03
-            <option value="04">04
-            <option value="05">05
-            <option value="06">06
-            <option value="07">07
-            <option value="08">08
-            <option value="09">09
-            <option value="10">10
-            <option value="11">11
-            <option value="12">12
-            <option value="13">13
-            <option value="14">14
-            <option value="15">15
-            <option value="16">16
-            <option value="17">17
-            <option value="18">18
-            <option value="19">19
-            <option value="20">20
-            <option value="21">21
-            <option value="22">22
-            <option value="23">23
-            <option value="24">24
-            <option value="25">25
-            <option value="26">26
-            <option value="27">27
-            <option value="28">28
-            <option value="29">29
-            <option value="30">30
-          </select>
-
-          &nbsp;&nbsp;&nbsp;Volume:
-          <input type=text name="rft.volume" size="5" maxlength="5" value="" class='volume'>&nbsp;&nbsp;&nbsp;Issue:
-          <input type=text name="rft.issue" size="5" value="" class="issue">
-          &nbsp;&nbsp;&nbsp;Start page:
-          <input type=text name="rft.spage" size="5" value="" class='spage'>
-</td>
-      
-      </tr>
-      <tr>
-        <td><strong>DOI or Pubmed Identifier: </strong></td>
-      </tr>
-      <tr>
-        <td>
-
-          <select name='rft_id_type'>
-            <option value='doi'>DOI:</option>
-            <option value='pmid'>PMID:</option>
-          </select>&nbsp;&nbsp;&nbsp;
-           <input name="rft_id_value" type=text value="" size=25>
-        </td>
-      </tr>      
-      <tr>      
-    </table>
-  </div> 
-    <p class="cl_submit">
-
-      <input type="submit" name="Generate_OpenURL2" value="Search">
-    </p>
-                                      </form>
-<div class="line2"></div>
-<p><strong><span id="helpicon">?</span> Having
-    Trouble?</strong></p>
-<p>&nbsp;</p>
-<ul class="bullets">
-  <li>Try entering less information
-    about your article. If one piece of information is wrong, it could be causing
-    the problem.</li>
-  <% if umlaut_config.help_url %>
-  <li>For technical support, including access problems, please <a href="<%= umlaut_config.help_url %>">contact us</a>.</li>
-  <% end %>
-  </ul>
-
-<p>&nbsp;</p>
-<!--close oneColumn-->
-  </div>
+<h2>Journals</h2>
+<%= render :partial=>"a_to_z" %>
+<% if flash[:error] %>
+  <div id="error" class="notice citationLinker"><strong>(!) Problems:</strong> <%= flash[:error] %></div>
+<% end %>
+<h3>Looking for a specific journal or article</h3>
+<%= form_tag(@submit_hash, {:method => "get", :class => "OpenURL form-inline form-very-inline", :name => "OpenURL", :id=>"OpenURL"})  %>
+  <div class="umlaut-search-form">
+    <fieldset>                                      
+      <legend>Enter the journal title or the ISSN. If you have both the journal title and ISSN, use the ISSN.</legend>
+      <%= hidden_field_tag "rfr_id", "info:sid/sfxit.com:citation" %> 
+      <%= hidden_field_tag "rft.date", "" %> 
+      <%= hidden_field_tag "rft.title", "", {:class => "rft_title"} %> 
+      <%= hidden_field_tag "rft.object_id", "", {:class => "rft_object_id"} %> 
+      <div class="control-group">
+        <%= label :journal, :title, "Journal Title:", :class => "control-label" %>
+        <%= text_field :journal, :title, {:name=>'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"])  %>
+        </select>
+      </div>
+      <div class="control-group">
+        <%= label :journal, :isbn, "ISSN:", :class=> "control-label" %>
+        <%= text_field :journal, :isbn, {:name=>'rft.issn', :max_length => "9", :class=>"issn input-small"} %>
+      </div>
+    </fieldset>
+  </div>
+  <div class="umlaut-search-form">
+    <fieldset>
+      <legend>Optional information - Enter as much as you know of the following:</legend>
+      <div class="control-group">
+        <label for="year" class="control-label">Date:</label>
+        <%= date %>
+      </div>
+      <div class="control-group">
+        <span class="control-sub-group">
+          <%= label :journal, :volume, "Volume:", :class => "control-label" %>
+          <%= text_field :journal, :volume, {:name=>'rft.volume', :max_length => "5", :class=>"volume input-tiny"} %>
+        </span>
+        <span class="control-sub-group">
+          <%= label :journal, :issue, "Issue:", :class => "control-label" %>
+          <%= text_field :journal, :issue, {:name=>'rft.issue', :class=>"issue input-tiny"} %>
+        </span>
+        <span class="control-sub-group">
+          <%= label :journal, :spage, "Start page:", :class => "control-label" %>
+          <%= text_field :journal, :spage, {:name=>'rft.spage', :class=>"spage input-tiny"} %>
+        </span>
+      </div>
+      
+      <div class="control-group">
+        <label for="rft_id_type">DOI or Pubmed Identifier:</label>
+        <select id="rft_id_type" name="rft_id_type" class="input-small">
+          <option value="doi">DOI:</option>
+          <option value="pmid">PMID:</option>
+        </select>
+        <input name="rft_id_value"  type="text" value="">
+      </div>
+    </fieldset>
+  </div> 
+  <%= submit_tag "Search", {:name=>"Generate_OpenURL2", :class => "btn"} %>
+</form>
+
+<div class="umlaut-separator help-block">
+  <h3><span>Having Trouble?</span></h3>
+  <p>
+    Try entering less information about your article. If one piece of information is wrong, it could be causing the problem.
+  </p>
+  <% if umlaut_config.help_url %>
+    <p>
+      For technical support, including access problems, please <a href="<%= umlaut_config.help_url %>">contact us</a>.
+    </p>
+  <% end %>
+</div>

data/app/views/umlaut/_header.html.erb

@@ -0,0 +1,9 @@
+<%# local implementers may over-ride this partial for custom local header. 
+    This partial is called by default umlaut layout.  %>
+
+<div id="header" class="header">
+  <h1><%= umlaut_config.header_title   %></h1>
+
+  <%= render_umlaut_permalink %>
+	
+</div>

data/app/views/umlaut/error.html.erb

@@ -1,45 +1,45 @@
-<div class="oneColumn">
-
-<div class="error_section">
-
-    <div class="heading">
-      <%= image_tag "error.gif" %>
-      <h1>Sorry, there was an error processing your request.</h1>
-    </div>
-   
-    
-    <h2>Please try one of the following options:</h2>
-     <ol>       
-          <li>If you entered this URL yourself, please check your URL for errors. </li>
-                    
-               
-          <% if params[:controller] # Unless this is really a 404 and we had no controller.
-          %>
-            <li>Sometimes it works to just <%= link_to "try again", params 
-            -%>. It may be a temporary problem which will be resolved if you come back later.</li>
-          <% end %>
-          
-          <% if ( umlaut_config.lookup!("sfx.sfx_base_url") && 
-                  params[:controller] == "resolve" && 
-                  params[:action] == "index")  %>
-            <li>If that doesn't work: <%= 
-                link_to("Try your request against backup link resolver", 
-                  umlaut_config.sfx.sfx_base_url.chomp("?") + '?' + 
-                  (request.fullpath.split("?")[1] || "") +
-                  '&sfx.ignore_date_threshold=1') %> 
-            </li>          
-          <% end %>
-        
-          
-          
-          <% if umlaut_config.help_url %>
-          <li>For more help, or to report a problem, please feel free to <%= 
-            link_to "contact us for help", umlaut_config.help_url
-            %>.</li>
-          <% end %>
-          
-      </ol>
-      
-      <br/>
-    
+<div class="oneColumn">
+
+<div class="error_section">
+
+    <div class="heading">
+      <%= image_tag "error.gif" %>
+      <h1>Sorry, there was an error processing your request.</h1>
+    </div>
+   
+    
+    <h2>Please try one of the following options:</h2>
+     <ol>       
+          <li>If you entered this URL yourself, please check your URL for errors. </li>
+                    
+               
+          <% if params[:controller] # Unless this is really a 404 and we had no controller.
+          %>
+            <li>Sometimes it works to just <%= link_to "try again", params 
+            -%>. It may be a temporary problem which will be resolved if you come back later.</li>
+          <% end %>
+          
+          <% if ( umlaut_config.lookup!("sfx.sfx_base_url") && 
+                  params[:controller] == "resolve" && 
+                  params[:action] == "index")  %>
+            <li>If that doesn't work: <%= 
+                link_to("Try your request against backup link resolver", 
+                  umlaut_config.sfx.sfx_base_url.chomp("?") + '?' + 
+                  (request.fullpath.split("?")[1] || "") +
+                  '&sfx.ignore_date_threshold=1') %> 
+            </li>          
+          <% end %>
+        
+          
+          
+          <% if umlaut_config.help_url %>
+          <li>For more help, or to report a problem, please feel free to <%= 
+            link_to "contact us for help", umlaut_config.help_url
+            %>.</li>
+          <% end %>
+          
+      </ol>
+      
+      <br/>
+    
 </div>

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  umlaut:
+    coverage_summary:
+      open_start: "first"
+      open_end: "latest"

data/lib/generators/templates/umlaut_services.yml

@@ -9,6 +9,10 @@
   # all options are neccesarily listed as examples here, see source
   # or source-generated docs for more info.   
 
+  # The services in the 'default' group are loaded every time. 
+  # You can optionally create other groups of services, that can be loaded
+  # by URL query params, or based on other request params. More info?
+
 default:
     services:
       
@@ -45,6 +49,10 @@ default:
           
       
       # Priority c  : Background          
+
+      # Suggest that any background services that may produce `fulltext` responses
+      # be put in the same bg wave, to increase perceived responsiveness
+      # by ending the spinner in the fulltext area. 
       
       # Second half of Amazon. It's Slow to lookup highlighted_link and search_inside
       # availability, so we do it in a bg wave.  
@@ -83,19 +91,7 @@ default:
         type: GoogleBookSearch
         disabled: true
         priority: c        
-        api_key: 'YOUR_GBS_API_KEY'
-                
-      Ulrichs:
-        display_name: "Ulrich's Directory"
-        type: UlrichsLink
-        priority: c
-        
-      IsbnDb:
-        display_name: isbndb.com
-        disabled: true
-        type: IsbnDb
-        priority: c
-        access_key: YOUR_ISBNDB_ACCESS_KEY
+        api_key: 'YOUR_GBS_API_KEY'                
         
       InternetArchive:
         display_name: the Internet Archive
@@ -105,38 +101,9 @@ default:
         #num_results_for_types:
         #  audio: 0
 
-      
-      ScopusCitations:
-        type: Scopus
-        disabled: true
-        priority: c
-        json_api_key: YOUR_SCOPUS_API_KEY
-        partner_id: YOUR_SCOPUS_PARTNER_ID
-        link_salt_key: "YOUR_SCOPUS_LINK_SALT_KEY"
-        
-      # Web of Knowledge API has no api key, but your
-      # IP needs to be registered with them. See source docs
-      # for how. 
-      IsiCitations:
-        type: Isi
-        disabled: true
-        priority: c
-        
-      # Thomson JCR LAMR api has no api key, but your
-      # IP needs to be registered with them. Same registraiton
-      # as for ISI WoK generally. 
-      Jcr:
-        type: Jcr
-        disabled: true
-        priority: c
-        
-
-      
-      # Priority d
-                
       HathiTrust:
         type: HathiTrust
-        priority: d
+        priority: c
         # Uncomment to link through this 'internal' URL instead
         # of following permalinks. jrochkind does this to use
         # a WAYFless shibboleth login with EZProxy. 
@@ -151,6 +118,29 @@ default:
           existing_service: GoogleBookSearch
           existing_type: fulltext
           
+      
+ 
+        
+
+      
+      # Priority d
+
+      # You might be able to pack a lot of these in 'c' too, simultaneously.
+      # But to avoid trying to do too much at once, we put most 'see also'
+      # type services later, in 'd'. 
+
+      Ulrichs:
+        display_name: "Ulrich's Directory"
+        type: UlrichsLink
+        priority: d
+        
+      IsbnDb:
+        display_name: isbndb.com
+        disabled: true
+        type: IsbnDb
+        priority: d
+        access_key: YOUR_ISBNDB_ACCESS_KEY
+                
       EmailExport:
         type: EmailExport
         priority: d
@@ -158,6 +148,30 @@ default:
       TxtHoldingExport:
         type: TxtHoldingExport
         priority: d
+
+      ScopusCitations:
+        type: Scopus
+        disabled: true
+        priority: d
+        json_api_key: YOUR_SCOPUS_API_KEY
+        partner_id: YOUR_SCOPUS_PARTNER_ID
+        link_salt_key: "YOUR_SCOPUS_LINK_SALT_KEY"
+        
+      # Web of Knowledge API has no api key, but your
+      # IP needs to be registered with them. See source docs
+      # for how. 
+      IsiCitations:
+        type: Isi
+        disabled: true
+        priority: d
+        
+      # Thomson JCR LAMR api has no api key, but your
+      # IP needs to be registered with them. Same registraiton
+      # as for ISI WoK generally. 
+      Jcr:
+        type: Jcr
+        disabled: true
+        priority: d