diff --git a/.gitignore b/.gitignore index e59296a5..0af7cb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ public/stylesheets/cache tmp vendor/plugins/query_trace/ rerun.txt -public/javascripts/jquery-all.js -public/javascripts/tracks.js -public/stylesheets/all.css +public/javascripts/jquery-cached.js +public/javascripts/tracks-cached.js +public/stylesheets/tracks-cached.css .idea .rvmrc diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb index 64b322d3..88729618 100644 --- a/app/views/layouts/standard.html.erb +++ b/app/views/layouts/standard.html.erb @@ -2,12 +2,12 @@ - <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.9.custom', :cache => true %> + <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.9.custom', :cache => 'tracks-cached' %> <%= stylesheet_link_tag "print", :media => "print" %> <%= javascript_include_tag 'jquery-1.5.min', 'jquery-ui-1.8.9.custom.min', 'jquery.truncator', - 'jquery.jeditable.mini', 'jquery.cookie', 'jquery.blockUI', 'jquery.form', :cache => 'jquery-all' %> + 'jquery.jeditable.mini', 'jquery.cookie', 'jquery.blockUI', 'jquery.form', :cache => 'jquery-cached' %> <%= javascript_include_tag 'hoverIntent','superfish','application', - 'accesskey-hints','niftycube','swfobject', :cache => 'tracks' %> + 'accesskey-hints','niftycube','swfobject', :cache => 'tracks-cached' %> <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %> <%= javascript_tag "var TAG_NAME = '#{@tag_name}';" if @tag_name %>