instedd_application.html.erb in instedd-rails-0.0.15

- old
+ new

@@ -1,18 +1,21 @@
 <!DOCTYPE html>
 <html>
 <head>
   <title><%= application_name.titleize %></title>
-  <%= stylesheet_link_tag 'http://theme.instedd.org/theme/stylesheets/theme.css' %>
-  <%= javascript_include_tag 'http://theme.instedd.org/theme/javascripts/theme.js' %>
   <% if Rails::version < '3.1' %>
-    <%= stylesheet_link_tag "/stylesheets/#{application_name.underscore}.css" %>
     <%= javascript_include_tag :defaults, "rails.validations" %>
     <%= csrf_meta_tag %>
   <% else %>
-    <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
+  <% end %>
+  <%= stylesheet_link_tag 'http://theme.instedd.org/theme/stylesheets/theme.css' %>
+  <%= javascript_include_tag 'http://theme.instedd.org/theme/javascripts/theme.js' %>
+  <% if Rails::version < '3.1' %>
+    <%= stylesheet_link_tag "/stylesheets/#{application_name.underscore}.css" %>
+  <% else %>
+    <%= stylesheet_link_tag    "application" %>
   <% end %>
   <%= yield(:head) %>
   <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon" />
   <%= render :partial =>"shared/analytics" %>
 </head>