Merge from devel

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

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index a1c9173851c7cb7bb797a891111ce6bdf97ec40e..bdb206a9fc8af29049a0d7e35190fb7602411df1 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" %>
     <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>
 
     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>
 


@@ -15,6 +21,10 @@
                   :controller => 'site', :action => 'index' %>
 
       <div id="left-side-content">
                   :controller => 'site', :action => 'index' %>
 
       <div id="left-side-content">

+        <% if flash[:notice]%>
+        <div id="notice"><%= flash[:notice] %></div>
+        <% end%>
+

         <%= @sidebar_content %>
       </div>
 
         <%= @sidebar_content %>
       </div>
 


@@ -41,9 +51,6 @@
       </div> <!-- end of top-bar -->
       
       <div id="main-box">
       </div> <!-- end of top-bar -->
       
       <div id="main-box">

-        <% if flash[:notice]%>
-        <div id="notice"><%= flash[:notice] %></div>
-        <% end%>

         <%= @content_for_layout %>
       </div>
 
         <%= @content_for_layout %>
       </div>