Merge from head

[selectricity-live] / app / views / layouts / main.rhtml

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index 5ae18dc81a11db933e7b20df5b9627d299075ad6..74ad018564dbdd57ec8e894ac45d2eb54d99c84e 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -5,6 +5,8 @@
     <%= stylesheet_link_tag "common", :media => "all" %>
     <%= stylesheet_link_tag "main", :media => "all" %>
     <%= stylesheet_link_tag *(@stylesheets) %>
+    <%= stylesheet_link_tag "ie6hacks", :media => "all" if \
+          request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>