Merge branch 'release/0.16'0.16

1 files changed, 6 insertions, 7 deletions

diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb
index 416ddb825..7a1648efd 100644
--- a/app/views/general/_stylesheet_includes.html.erb
+++ b/app/views/general/_stylesheet_includes.html.erb
@@ -1,23 +1,22 @@
 <%- if @render_to_file %>
   <style>
-  <%= raw File.read(Rails.root.join('public', 'stylesheets', 'main.css')) %>
-  <%= raw File.read(Rails.root.join('public', 'stylesheets', 'print.css')) %>
+  <%= Rails.application.assets["main.css"].to_s %>
+  <%= Rails.application.assets["print.css"].to_s %>
   </style>
 <%- else %>
-  <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %>
+  <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet", :media => "all" %>
   <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all"  %>
   <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print"  %>
   <% if !params[:print_stylesheet].nil? %>
   <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all"  %>
   <% end %>
-  <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
   <!--[if LT IE 7]>
-  <style type="text/css">@import url("/stylesheets/ie6.css");</style>
+  <%= stylesheet_link_tag 'ie6.css' %>
   <![endif]-->
   <!--[if LT IE 8]>
-  <style type="text/css">@import url("/stylesheets/ie7.css");</style>
+  <%= stylesheet_link_tag 'ie7.css' %>
   <![endif]-->
   <% if AlaveteliConfiguration::force_registration_on_new_request %>
-  <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet"  %>
+  <%= stylesheet_link_tag 'jquery.fancybox-1.3.4.css', :rel => "stylesheet"  %>
   <% end %>
 <% end %>