Moved includes into the head where they belong

baphled · Aug 5, 2010 · 32e2158 · 32e2158
1 parent 0330c64
commit 32e2158
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 47 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,31 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
   <head>
     <title>SaladBowl</title>
-  </head>
-  <%= stylesheet_link_tag "jquery-ui" %>
-  <%= stylesheet_link_tag "formtastic" %>
-  <%= stylesheet_link_tag "formtastic_changes" %>
-  <%= stylesheet_link_tag "tipsy" %>
-  <%= yield :css_head %>
-  <link rel="stylesheet" href="/stylesheets/compiled/screen.css" type="text/css" media="screen, projection" />
-  <link rel="stylesheet" href="/stylesheets/compiled/print.css" type="text/css" media="print" />
-  <!--[if lt IE 8]>
-    <link rel="stylesheet" href="/stylesheets/compiled/ie.css" type="text/css" media="screen, projection" />
-  <![endif]-->
-
-  <%= javascript_include_tag "jquery" %>
-  <%= javascript_include_tag "jquery-ui" %>
-  <%= javascript_include_tag "jquery-icon-animation" %>
-  <%= javascript_include_tag "jquery.ajax.dialog" %>
-  <%= javascript_include_tag "jquery-include" %>
-  <!-- JS Head start -->
-  <%= yield :js_head %>
-  <!-- JS Head end -->
-  <%= javascript_include_tag "jquery-validate" %>
-  <%= javascript_include_tag "jquery.tipsy" %>
-  <%= javascript_include_tag "application" %>
-  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+    <%= stylesheet_link_tag "jquery-ui" %>
+    <%= stylesheet_link_tag "formtastic" %>
+    <%= stylesheet_link_tag "formtastic_changes" %>
+    <%= stylesheet_link_tag "tipsy" %>
+    <%= yield :css_head %>
+    <link rel="stylesheet" href="/stylesheets/compiled/screen.css" type="text/css" media="screen, projection" />
+    <link rel="stylesheet" href="/stylesheets/compiled/print.css" type="text/css" media="print" />
+    <!--[if lt IE 8]>
+      <link rel="stylesheet" href="/stylesheets/compiled/ie.css" type="text/css" media="screen, projection" />
+    <![endif]-->
 
+    <%= javascript_include_tag "jquery" %>
+    <%= javascript_include_tag "jquery-ui" %>
+    <%= javascript_include_tag "jquery-icon-animation" %>
+    <%= javascript_include_tag "jquery.ajax.dialog" %>
+    <%= javascript_include_tag "jquery-include" %>
+    <!-- JS Head start -->
+    <%= yield :js_head %>
+    <!-- JS Head end -->
+    <%= javascript_include_tag "jquery-validate" %>
+    <%= javascript_include_tag "jquery.tipsy" %>
+    <%= javascript_include_tag "application" %>
+    <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+  </head>
   <body class="salad">
     <div id="container">
       <%= render :partial => 'layouts/header' %>

diff --git a/app/views/layouts/no_sidebar.html.erb b/app/views/layouts/no_sidebar.html.erb
@@ -2,31 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
   <head>
     <title>SaladBowl</title>
-  </head>
-  <%= stylesheet_link_tag "jquery-ui" %>
-  <%= stylesheet_link_tag "formtastic" %>
-  <%= stylesheet_link_tag "formtastic_changes" %>
-  <%= stylesheet_link_tag "tipsy" %>
-  <%= yield :css_head %>
-  <link rel="stylesheet" href="/stylesheets/compiled/screen.css" type="text/css" media="screen, projection" />
-  <link rel="stylesheet" href="/stylesheets/compiled/print.css" type="text/css" media="print" />
-  <!--[if lt IE 8]>
-    <link rel="stylesheet" href="/stylesheets/compiled/ie.css" type="text/css" media="screen, projection" />
-  <![endif]-->
-
-	<%= javascript_include_tag "jquery" %>
-  <%= javascript_include_tag "jquery-ui" %>
-  <%= javascript_include_tag "jquery-icon-animation" %>
-  <%= javascript_include_tag "inflection" %>
-  <%= javascript_include_tag "jquery.render.flash.message" %>
-  <%= javascript_include_tag "jquery.tipsy" %>
-  <%= javascript_include_tag "jquery-include" %>
-  <%= javascript_include_tag "jquery.ajax.dialog" %>
-  <%= javascript_include_tag "application" %>
-  <%= yield :js_head %>
+    <%= stylesheet_link_tag "jquery-ui" %>
+    <%= stylesheet_link_tag "formtastic" %>
+    <%= stylesheet_link_tag "formtastic_changes" %>
+    <%= stylesheet_link_tag "tipsy" %>
+    <%= yield :css_head %>
+    <link rel="stylesheet" href="/stylesheets/compiled/screen.css" type="text/css" media="screen, projection" />
+    <link rel="stylesheet" href="/stylesheets/compiled/print.css" type="text/css" media="print" />
+    <!--[if lt IE 8]>
+      <link rel="stylesheet" href="/stylesheets/compiled/ie.css" type="text/css" media="screen, projection" />
+    <![endif]-->
 
-  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+      <%= javascript_include_tag "jquery" %>
+    <%= javascript_include_tag "jquery-ui" %>
+    <%= javascript_include_tag "jquery-icon-animation" %>
+    <%= javascript_include_tag "inflection" %>
+    <%= javascript_include_tag "jquery.render.flash.message" %>
+    <%= javascript_include_tag "jquery.tipsy" %>
+    <%= javascript_include_tag "jquery-include" %>
+    <%= javascript_include_tag "jquery.ajax.dialog" %>
+    <%= javascript_include_tag "application" %>
+    <%= yield :js_head %>
 
+    <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+  </head>
   <body class="salad">
 	  <div id="container">
 	    <%= render :partial => 'layouts/header' %>