umlaut 3.0.5 → 3.1.0.pre1

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

@@ -1,53 +1,32 @@
 <%
-  
-   all_responses = fulltext
-
-
-   (title_level_fulltxt, fulltxt) = 
-      all_responses.partition {|i| i.view_data[:coverage_checked] == false || i.view_data[:can_link_to_article] == false}      
-   # order em with full fulltxt before title_level_fulltxt
-   all_responses = fulltxt + title_level_fulltxt   
-%>
-
-<div class="umlaut_section fulltext <%= unless fulltxt.blank? && title_level_fulltxt.blank?; 'highlighted_section' ; end %>">
+all_responses = fulltext
+(title_level_fulltxt, fulltxt) = 
+  all_responses.partition {|i| i.view_data[:coverage_checked] == false || i.view_data[:can_link_to_article] == false}      
+# order em with full fulltxt before title_level_fulltxt
+all_responses = fulltxt + title_level_fulltxt %>
+<div class="<%= section_css_classes(@user_request, "fulltext", all_responses).join(" ") %>">
 
-  <%= renderer.render_heading %>
-
-  
-<div class="umlaut_section_content">
-  <%= list_with_limit('umlaut_fulltext', 
-          all_responses, 
-          :ul_class => "response_list", 
-          :limit => renderer.list_visible_limit ) do |item, index | %>
-
-        <%
-        # Display special warnign header if it's title-level only,
-        # and it's an article or issue level link. Are we
-        # at the beginning of title level display?
-        if ( index == fulltxt.length && 
-             !title_level_request? )
-           genre = @user_request.referent.metadata['genre']
-           genre = "Journal" if genre && genre.downcase == 'article' %>
-           </ul>
-           <div class="section_subheading">
-             <h4><%= genre ? genre.titlecase : "Title" %>-level Page Only</h4>
-              <p><span class="notice">Can not link directly to citation. Dates or extent of coverage may be unknown.</span></p>
-           </div>
-            <ul class="response_list">
-        <% end %>    
-        <%= render(:partial => "standard_response_item", :object=> item) %>
-  <% end %> 
-      
-  <%
-  if (fulltxt.empty? && title_level_fulltxt.empty? &&
-      ! service_type_in_progress?('fulltext'))
-  %>
-  <ul class="response_list fulltext">
-    <li><p class="notAvailable">Not Available </p></li>
-  </ul>
-  <% end %>
+  <%= render :partial => 'section_heading', :locals => {:presenter => renderer, :force_render => true} %>
   
-  <%= render( renderer.spinner_render_hash) if renderer.services_in_progress? %>
-</div>
-</div>
-
+  <div class="umlaut_section_content"><%=
+    list_with_limit('umlaut_fulltext', all_responses, 
+      :ul_class => "response_list", :limit => renderer.list_visible_limit ) do |item, index | %><%
+      # Display special warnign header if it's title-level only,
+      # and it's an article or issue level link. Are we
+      # at the beginning of title level display?
+      if (index == fulltxt.length && !title_level_request?) %>
+        </ul>
+        <div class="section-subheading title-level-link-warning">
+          <h4><%= @user_request.referent.container_type_of_thing.titlecase %>-level Page Only</h4>
+          <p><span class="notice">Can not link directly to citation. Dates or extent of coverage may be unknown.</span></p>
+        </div>
+        <ul class="response_list"><%
+      end %>    
+      <%= 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><%
+    end %>
+    <%= render( renderer.spinner_render_hash) if renderer.services_in_progress? %>
+  </div>
+</div>

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

@@ -1,17 +1,20 @@
+	<div class="help-text-icon">?</div>
 
+	<div class="section_heading"</div>
+		<h3>
+			Question? Problem? Contact:
+		</h3>
+	</div>
 
+	<ul class="response_list umlaut-help-list">
+		<% help.each do |help|
+		  value_hash = help.view_data %>
+		  <li><%= link_to value_hash[:display_text], {:controller=>'link_router', :id=>help.id}, 'target'=>"_blank" %>
+		  <% unless value_hash[:note].blank? %> 
+		    <br />
+		    <%= value_hash[:note] %>
+		  <% end %>
+		  </li>    
+		<% end %>
+	</ul>
 
-        <span id="helpicon">?</span>
-        <span class="smallText">Question? Problem? Contact:</span>
-        <ul style="text-align: right">
-        <% help.each do |help|
-              value_hash = help.view_data %>
-              <li> <%= link_to value_hash[:display_text], {:controller=>'link_router', :id=>help.id}, 'target'=>"_blank" %>  
-              <% unless value_hash[:note].blank? %>
-                <br />
-                <%= value_hash[:note] %>
-              <% end %>
-              </li>    
-        <% end %>
-        </ul>
-  

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

@@ -1,91 +1,74 @@
-<% 
-=begin
-  jrochkind's alternative partial for displaying holdings. Displays more
-  information to deal with the more information we need to display from
-  our Horizon. In tabular format. Customized for JH's needs, but should
-  be usable by anyone. 
-=end
-%>
+<% holdings = holding.find_all{|response| response.service_type_value_name.eql? "holding" } %>
 
+<% unless holdings.empty? %>
+  <div class="umlaut-holdings"><%
+    # Process each holding.
+    holdings.each do |p|
+      target = p.view_data %>
+      <div class="umlaut-holding">
+        <div class="item_status_row">
+          <div class="collection-and-number row-fluid">
+            <div class="span6 collection-str"><%= target[:collection_str] %></div>
 
-<div class="section_content_indent">
-<% holdings = get_service_type('holding') %>
-<% unless holdings.empty? %>  
-  <table style="width: 100%">
-  <%
-  holdings.each do |p|
-    target = p.view_data
-  %>
-    <tr><td class="holding_heading_row"><h4><%= target[:collection_str] %></h4></td>
-        <td class="holding_heading_row"><span style="white-space: nowrap;"><%= target[:call_number]%></span></td>
-        
-        <% status_class = (target[:status] == "Not Charged" or target[:status] == "Available") ? 'available' : '' %> 
-        
-        <td class="holding_heading_row"><span class="<%= status_class %>"><%= target[:status]   %></span></td>
-        
-        <td class="holding_heading_row"><%= link_to(image_tag("more_info.gif", "border" => 0, "alt" => 'more info'), {:controller=>"link_router", :id=>p.id}, "target" => "_blank") %>
+            <% # Set status class based on configured available statuses
+            status_class = umlaut_config.holdings.available_statuses.include?(target[:status]) ? 'umlaut-available' : '' %>
+            <div class="span6 holding-status <%= status_class %>"> <%= target[:status] %></div>
+          </div>
+
+          <div class="status-and-actions row-fluid">
+            <div class="span6 call-number"><%= target[:call_number]%></div>
+            
+            <div class="holding-actions span6">
+              <%= link_to("More info", {:controller=>"link_router", :id=>p.id}, :target => "_blank", :class=>"more-info btn btn-mini") %>
+              <% if target[:request_url] %>
+                <%= link_to("Request", target[:request_url], :target => "_blank", :class=>"request btn btn-mini btn-primary") %>
+              <% end %>
+            </div>
+           
+          </div>
+
+        </div>
+
+        <% 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] %>
+              <% else %>
+                <em class="note">May be alternate edition.</em>
+              <% end %>            
+          </div>
+        <% end %>
         
-        <% if target[:request_url] %>
-          <br />       
-          <%= link_to( image_tag("request.gif", "border" => "0", "alt" => "request"),  target[:request_url], "target" => "_blank" ) %>      
+        <% if target[:notes].present? %>
+          <div class="umlaut-holding-notes">
+            <%= target[:notes] %>
+          </div>
         <% end %>
         
-        </td>
-    </tr>    
-    
-    <% if (!target[:match_reliability].blank?) && target[:match_reliability] != ServiceResponse::MatchExact %>
-      <tr>
-        <td colspan="4">
-          <div class="section_content_indent edition_warning">
-            <% unless target[:edition_str].blank? %>
-              <em class="note label">Edition information</em> <%= target[:edition_str] %>
-            <% else %>
-              <em class="note label">May be alternate edition.</em>
-            <% end %>
-          <div>
-        </td>
-      </tr>
+        <% if target[:coverage_str_array].present? %>
+          <div class="umlaut-holding-coverage">
+            <%= list_with_limit("copies_#{p.id}", target[:coverage_str_array], :limit => 4) do |item, index| %>
+                <li><%= item %></li>
+            <% end %>            
+          </div>
+        <% end %>
+      </div>
     <% end %>
-    
-    <% unless target[:notes].blank? %>
-    <tr>
-    <td colspan="4"><div class="section_content_indent"><%= target[:notes] %></div> </td>
-    </tr>
+  </div>
+<% end %>
+
+<% if holdings.empty? %>
+  <div class="umlaut-content-indent">
+    <% # 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 %>
-    
-    <% unless target[:coverage_str_array].blank? %>
-    <tr>
-      <td colspan="4">
-            
-            <%=              
-              list_with_limit("copies_#{p.id}", target[:coverage_str_array]) do |item, index|
-            %>
-              <li><%= item %></li>
-            <% end %>
-            
-      </td>
-    </tr>
+    <% 
+    # 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>
     <% end %>
-  <%
-  end %>
-  </table>
+  </div>
 <% end %>
-
-
-<% 
-if holdings.empty?
-   searches = get_service_type('holding_search')
-    searches.each do | result_st |
-      response = result_st.view_data %>
-      <p><%= link_to response[:display_text], {:controller=>'link_router', :id=>result_st.id}, 'target'=>"_blank" %> </p>
-<% 
-   end
-end
-if (holdings.blank? && searches.blank? && ! service_types_in_progress?(['holding', 'holding_search']))
-%>
-<p class="notAvailable">Not Available </p>
-<%
-end %>
-
-
-</div>

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

@@ -0,0 +1,7 @@
+<%= 
+  # 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) %>

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

@@ -0,0 +1,19 @@
+<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>
+    </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/_related_items.html.erb

@@ -1,35 +1,20 @@
-<%
-   cited_by = get_service_type('cited_by')   
-   similar = get_service_type('similar')
-%>
-
-
-  <%= list_with_limit('umlaut_cited_by', 
-          cited_by, 
-          :ul_class => "related_items response_list") do |item, index |  %>           
-        <%= render(:partial => "standard_response_item", :object=> item, :locals => { :show_source => true, :li_class => "related_item"}) %>
-  <%    end %> 
-    
-  <%
-  if (cited_by.length > 0) && (similar.length > 0) %>
-    <!-- a little seperation for readability -->
-    <br class="seperator"/>
-  <% end %>
-
-  <%=  list_with_limit('umlaut_similar_items', 
-          similar, 
-          :ul_class =>"related_items response_list") do |item, index |  %>           
-        <%= render(:partial => "standard_response_item", :object=> item, :locals => { :show_source => true}) %>
-  <%    end %>
-  
-
-
-  <% if (!service_types_in_progress?([ServiceTypeValue['cited_by'], ServiceTypeValue['similar']])) && similar.empty? && cited_by.empty? %>
-    <ul class="related_items response_list">
-      <li><i>No related items found.</i></li>
-    </ul>
-  <% end %>
-
-
-
-
+<%-
+# Get cited by and similar services
+cited_by = get_service_type('cited_by')   
+similar = get_service_type('similar')
+# Render cited by services
+%><%= 
+list_with_limit('umlaut_cited_by', cited_by, :ul_class => "related_items response_list") do |item, index | %><%= 
+  render(:partial => "standard_response_item", :object=> item, :locals => { :show_source => true, :li_class => "related_item"}) %><%
+end 
+# Render similar services (Related items)
+%><%= 
+list_with_limit('umlaut_similar_items', similar, :ul_class =>"related_items response_list") do |item, index | %><%= 
+  render(:partial => "standard_response_item", :object=> item, :locals => { :show_source => true}) %><%
+end
+# If there are no related or cited by services, tell the user.
+if (!service_types_in_progress?([ServiceTypeValue['cited_by'], ServiceTypeValue['similar']])) && similar.empty? && cited_by.empty? -%>
+  <ul class="related_items response_list">
+    <li><em>No related items found.</em></li>
+  </ul><% 
+end %>

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

@@ -1,62 +1,39 @@
-<%
-   search_providers = search_inside  
-%>
+<div class="umlaut-section search_inside">
+  <%
+  search_providers = search_inside  
+  # We don't show this block until ALL possible search inside tools
+  # have been found. Too hard to deal with AJAX update of a DIV
+  # that has a text input box in it otherwise. 
+  # 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>
+    </div>
+    <div class="umlaut_section_content">
+      <%= content_tag("form", :target => "_blank", :action => url_for(:controller=>'link_router', :action=>'index')) do %>
 
-  
-  <%  
-      # We don't show this block until ALL possible search inside tools
-      # have been found. Too hard to deal with AJAX update of a DIV
-      # that has a text input box in it otherwise. 
-      if ( search_providers.length > 0 && 
-         ! service_type_in_progress?('search_inside') ) %>
-    <div class="umlaut_section search_inside">
-      <div class="section_heading">
-        <h3>Search inside this 
-          <%= 
-           thing = @user_request.referent.type_of_thing
-           thing = 'journal' if thing == 'article'
-           thing
-       %></h3>
-      </div>
-    <% # We don't show the search box unless we have a search provider AND
-        # we're completely done loading search providers. Too hard
-        # to deal with AJAX updating of search providers without
-        # interrupting user. 
-        %>
-  <div class="umlaut_section_content">
+        <div class="source input-prepend input-append">
+          <span class="add-on"> via </span> 
 
-    <form target="_blank" action="<%= url_for(:controller=>'link_router', :action=>'index') %>">
-    
-    <span class="source">
-    via 
-    <% if search_providers.length > 1 %>
-      <select name="id">
-      <% search_providers.each do |st| %>
-        <option value="<%= st.id %>"><%= st.view_data[:display_text] %></option>
-      <% end %>
-      </select>
-    <% else  %>
-      <input type="hidden" name="id" value="<%= search_providers[0].id %>">
-      <%= search_providers[0].view_data[:display_text] %>:
-    <% end %>
-    </span>
-    
-    <input name="query" type="text" /> <input value="search" type="submit">
-    </form>    
+          <% 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 %>
 
-  </div>
-</div>
-<%end%>
-  <!-- don't show the spinner unless it's identified as a book, otherwise
-       too likely to be a false promise -->
-  <%
-  if ( @user_request.referent.format == 'book' && service_type_in_progress?('search_inside')) %>
-  
-    <%= render(:partial => "background_progress",
-           :locals => {
-            :svc_type => "search_inside",
-            :progress_message => "Looking for tools to search inside this #{@user_request.referent.type_of_thing}" }) %>
-  
+        </div>
+        <div class="source input-append">
+          <input name="query" type="text" /> 
+          <input value="search" type="submit" class="btn add-on">
+        </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}" }) %>
   <% end %>
 
-
+</div>