Upgrade to Rails 3.2 and move some of the assets to the asset pipeline directories

2012-02-09 23:26:47 +00:00
parent 61c7d2147c
commit bfd5b29a9a
15 changed files with 169 additions and 260 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -2,10 +2,9 @@
 <html>
 <head>
  <title><%= @title.nil? ? (@menu.nil? ? t(:application_name) : @menu.capitalize + ' - ' + t(:application_name)) : @title + ' - ' + t(:application_name) %></title>
-  <%= stylesheet_link_tag :all %>
-	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-  <%= csrf_meta_tag %>
-  
+  <%= stylesheet_link_tag "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tag %>  
 </head>
 <body>
 		<div id="wrapper">