X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/86087be54da5f8c3af8fa475fafebd0c5527da9f..1633d6c9b98f425d1ad33c1dd61a63b7365ff54c:/app/views/layouts/main.rhtml?ds=inline diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index a1c9173..3f90f7a 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -4,6 +4,12 @@ <%= @page_title || "Selectricity" %> <%= stylesheet_link_tag "common", :media => "all" %> <%= stylesheet_link_tag "main", :media => "all" %> + <%= stylesheet_link_tag *(@stylesheets) %> + <%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" %> @@ -11,10 +17,13 @@
- <%= link_to "

Selectricity

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

Selectricity

", :controller => 'front' %>
+ <% if flash[:notice]%> +
<%= flash[:notice] %>
+ <% end%> + <%= @sidebar_content %>
@@ -24,26 +33,23 @@
<% 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" + %>/<%= link_to "sign up", :controller => "account", :action => "signup" %> <% end %>
- <%= link_to("help/about", :controller => "site", :action => "about") %> + <%= link_to "help/about", :controller => 'about' %>
- <% if flash[:notice]%> -
<%= flash[:notice] %>
- <% end%> <%= @content_for_layout %>