From: John Dong Date: Fri, 31 Aug 2007 22:07:03 +0000 (-0400) Subject: merge jdong X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/d2fadf2d1f345fab0956a05599b50a483d939c9a?hp=3ebaed889614cc7bdf66dd2456c48d69b3fb2507 merge jdong --- diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index 1542b84..bdb206a 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -5,9 +5,11 @@ <%= stylesheet_link_tag "common", :media => "all" %> <%= stylesheet_link_tag "main", :media => "all" %> <%= stylesheet_link_tag *(@stylesheets) %> - <%= stylesheet_link_tag "ie6hacks", :media => "all" if \ - request.methods.include?(:user_agent) and \ + <%begin%> + <%= stylesheet_link_tag "ie6hacks", :media => "all" if request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %> + <%rescue NoMethodError%> + <%end%> <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>