umlaut 3.1.0.pre1 → 3.1.0.pre2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzY5Mzk3NDBhZjdkNGUxMDlkNWEyYmI2MzliNTU1OTM3NzUzM2RhNQ==
+    ZmJhZjg0NmE2MDAxZTZiODZkOWE3Yzg1YzczM2I2MDUxYzc0MzM5Nw==
   data.tar.gz: !binary |-
-    YWQ1M2NjMDliOTQxODhjODg0YWY2MjY2MTg2ODkwYTNlNmIzOGMyMw==
+    OWU2MTA2NzMwMDE3NDFmZTBhZTZkMjk1NjhmYzczNmU3NmY0YThjYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTcyNDJkOTA3NGMyOWQxMDQ2NjVmZjkyYzkzYTM2OGI5MDNlY2I3MDFmOWU3
-    NGY2MzQ3YzdiNDI4NTUzZjg3ZTQyMzE0ZDAzNzEyZWVhODEwMjlhODFkNWFj
-    MjFhMTkwMDdiNTdiYWE2ZmIwOGRmMTBkZTZkNDg4NzE4ZDEwMjA=
+    MjkxODY1ZGFjMjFkOTliN2RmYjU0OTUxN2MxOTQxYzY0OGExY2U5ODg3ZTc2
+    MDY2YmM5MmIxMDEyYTVjNjg5NDA4YjE4YmQ5NzI0ZDUzNDExYTkxMmMyNThh
+    ZTIzZmQ4YTgyMWIyYzcxYTM3ZDI3MDQxZGU5N2UwMjc2ODIyMDk=
   data.tar.gz: !binary |-
-    YTVhNjI2MzI4Y2FkOWQzMmM0YjVjM2QyNGNlMDViOGExYWI3YTliYmUxNjZj
-    NWEyMDhkODg2Mzc3ZjE1ZjNkYzQxZTIyZGIwMTQ4YWMxNWUwNjliZTlkZGYw
-    MDUxYmU0OTZlZmY3YTcxNTZiMWQxY2Q4MDRkYWQ5Y2FlMmZlZjU=
+    ZTg3NzMxZDlhMWY1Mjc0MjIyOGY4OGZiMTNjNGViMzQzZTdjMmNiMDNhYzA4
+    ZWJkNzU5ZDEyYWQ4MjU4Mjk1MTY0YWJlMzhkMGExMDEyNWU5Y2I0MGU2NmQ3
+    YjdjNTVkOGM0YzlkMWUxNmRmMzc2ZWY0OWYyZDc4NzBjYzUyZDg=

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

@@ -52,9 +52,9 @@
   background-color: $backgroundColor;
   min-height: 20px;
 
-  padding: 9px;
-  margin-left: -9px; /* so left edge of text still lines up */
-  margin-right: -9px;
+  padding: 12px;
+  margin-left: -12px; /* so left edge of text still lines up */
+  margin-right: -12px;
 
 
   border: 1px solid $borderColor;

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

@@ -75,6 +75,9 @@
       }
       .collection-str {
         font-weight: bold;
+        //leave room for book icon
+        padding-left: $umlautIndent;
+        text-indent: -$umlautIndent;
       }
       .umlaut-holding-notes {
         @extend .muted;
@@ -86,8 +89,10 @@
         min-height: 0;
       }  
       .collection_str, .call-number, .holding-status, .holding-actions {
-        min-height: 0;
         margin-left: 0;
+        @media (max-width: 767px) {
+          min-height: 0;
+        }
       }
       .call-number, .holding-status, .holding-actions {        
         padding-left: $umlautIndent;        
@@ -263,13 +268,11 @@
 
 .umlaut-available {
   color: $umlautAvailableColor;
-  font-style: italic;
   font-size: $baseFontSize;
 }
 
 .umlaut-unavailable {
   color: $umlautUnavailableColor;
-  font-style: italic;
   font-size: $baseFontSize;
 }
 

data/app/helpers/resolve_helper.rb

@@ -191,7 +191,7 @@ module ResolveHelper
         content_tag(:ul, :class=>options[:ul_class]) do
           safe_join(
             hidden_list.enum_for(:each_with_index).collect do |item, index|
-              yield(item, index + options[:limit])
+              yield(item, index + options[:limit] - 1)
             end, " \n    "
           )
         end
@@ -268,4 +268,4 @@ module ResolveHelper
       "#{start} – #{finish}:"
     end
   end
-end
+end

data/app/presentation/section_renderer.rb

@@ -413,6 +413,29 @@ class SectionRenderer
     @options[:section_prompt]
   end
 
+  # For a given resonse type section, returns a string that will change 
+  # if the rendered HTML has changed, HTTP etag style. 
+  #
+  # Output in API responses, used by partial html updater
+  # to know if a section needs to be updated on page. 
+  #
+  # tag is created by appending:
+  # * the progress status for the section (in progress or not)
+  # * The current visibility status of the section
+  # * Number of responses in section
+  # * the timestamp of most recent response in section, if any. 
+  def section_etag
+    parts = []
+
+    parts << self.services_in_progress?.to_s
+    parts << self.visible?.to_s
+    parts << responses_list.length
+    max = responses_list.max_by {|response| response.created_at}    
+    parts << (max ? max.created_at.utc.strftime("%Y-%m-%d-%H:%M:%S") : "")
+
+    return parts.join("_")
+  end
+
 
   protected
 

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

@@ -1,6 +1,6 @@
 	<div class="help-text-icon">?</div>
 
-	<div class="section_heading"</div>
+	<div class="section_heading">
 		<h3>
 			Question? Problem? Contact:
 		</h3>

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

@@ -8,17 +8,18 @@
       <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="span7 collection-str"><i class="umlaut_icons-famfamfam-book"></i> 
+<%= target[:collection_str] %></div>
 
             <% # 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 class="span5 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="span7 call-number"><%= target[:call_number]%></div>
             
-            <div class="holding-actions span6">
+            <div class="holding-actions span5">
               <%= 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") %>

data/app/views/resolve/partial_html_sections.xml.erb

@@ -16,6 +16,7 @@
        <% end %>
     </included_services>
     <service_load_complete value="<%= ! renderer.services_in_progress?  %>" />
+    <etag><%= renderer.section_etag %></etag>
     <response_count value="<%= renderer.responses_list.length %>" />
     <html_content>
       <%=  with_format("html") do 

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.1.0.pre1"
+  VERSION = "3.1.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre1
+  version: 3.1.0.pre2
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails