_cover_image.html.erb in umlaut-3.0.0alpha12

- old
+ new

@@ -3,15 +3,26 @@
   size ||= "medium"
   fix_size ||= true
 
   # small med and x-large correspond roughly to amazon sm, med and lg. 
   # large corresponds roughly to google medium. Just one dimension to
-  # prevent disproportionate scaling. 
-  dimensions = { "small" => { "height" => 80 },
-                 "medium" => { "height" => 160},
-                 "large" => { "height" => 200 },
-                 "extra-large" => { "height" => 475}}
+  # prevent disproportionate scaling. We use CSS so we can set maximums
+  # in BOTH dimensions but let aspect ratio remain the same. We put it
+  # inline so HTML Snippet API clients get images constrained to reasonable
+  # sizes without extra CSS. IE6 won't do max-height/max-width, sorry IE6, no
+  # way to accomodate you (trying to put a width and a max-width triggers
+  # weird IE8 bugs!). Best we can do.
+  #
+  # generally the 'max-height' is our operative maximum for ordinary ratios,
+  # but we let the width be more than the height for weird ratio'd covers
+  # that are wider than square. 
+  dimensions_style = { 
+            "small"       => "max-height: 80px; max-width: 100px;",
+            "medium"      => "max-height: 160px; max-width: 200px;",
+            "large"       => "max-height: 200px; max-width: 240px;",
+            "extra-large" => "max-height: 475px; max-width: 570px;"
+  }
 
 
 
   img_st = cover_image_response(size)
   if img_st 
@@ -25,10 +36,10 @@
       # Umlaut proxy to avoid browser security warning. 
       if (request.protocol != img_params['src'][0..6])
         img_params['src'] = url_for(:controller => "resource", :action => "proxy", :id => img_st.id )
       end
       
-      img_params.merge!( dimensions[size]) if fix_size
+      img_params.merge!( "style" => dimensions_style[size]) if fix_size
       
       tag('img', img_params )
       
  end %>
       