X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/b6a595a53dad49f5f29310c712e75e4a1911ca96..fab8468ffaabbf50bc64c32f03de1d37dbda7152:/app/views/layouts/main.rhtml?ds=inline diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index 5836b4f..75f196a 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -5,7 +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.user_agent =~ /MSIE 6/ %> + <%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" %> @@ -13,8 +17,7 @@
- <%= link_to "

Selectricity

", - :controller => 'site', :action => 'index' %> + <%= link_to "

Selectricity

", :controller => 'front' %>
<% if flash[:notice]%> @@ -30,19 +33,19 @@
<% if session[:user] %> - <%= link_to User.find(session[:user]).login.capitalize, + <%= link_to User.find(session[:user]).login.downcase, :controller => "account", :action => "summary", :id => session[:user][:id] %> <%= link_to "logout", :controller => "account", :action => "logout" %> <% else %> - <%= link_to("login", :controller => "account", :action => "login") - %>/<%= link_to("sign up", :controller => "account", :action => "signup")%> + <%= link_to "login", :controller => "account", :action => "login" + %> <% end %>
- <%= link_to("help/about", :controller => "site", :action => "about") %> + <%= link_to "help/about", :controller => 'about' %>
@@ -52,7 +55,7 @@
- <%= render_partial 'layouts/footer' %> + <%= render :partial => 'layouts/footer' %>