merged in changes from devel

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

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index a1c9173851c7cb7bb797a891111ce6bdf97ec40e..c34e797b6f60028658061777bfe2fad261e2f67e 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -4,6 +4,12 @@
     <title><%= @page_title || "Selectricity" %></title>
     <%= 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" %>
   </head>
 
@@ -11,10 +17,13 @@
   <div id="page-wrapper">
 
     <div id="left-side">
-      <%= link_to "<h1>Selectricity</h1>",
-                  :controller => 'site', :action => 'index' %>
+      <%= link_to "<h1>Selectricity</h1>", :controller => 'front' %>
 
       <div id="left-side-content">
+        <% if flash[:notice]%>
+        <div id="notice"><%= flash[:notice] %></div>
+        <% end%>
+
         <%= @sidebar_content %>
       </div>
 
@@ -30,20 +39,17 @@
           <%= 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 %> 
         </div>
 
         <div id="bar-right">
-          <%= link_to("help/about", :controller => "site", :action => "about") %>
+          <%= link_to "help/about", :controller => 'about' %>
         </div>
       </div> <!-- end of top-bar -->
       
       <div id="main-box">
-        <% if flash[:notice]%>
-        <div id="notice"><%= flash[:notice] %></div>
-        <% end%>
         <%= @content_for_layout %>
       </div>