From da1ac64ab7939b92df9c9a5d20f2ae960bf1fd98 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 29 Apr 2014 10:59:27 -0300 Subject: [PATCH] rails3: write cached assets to a cache/ subdirectory --- app/helpers/layout_helper.rb | 2 +- app/views/layouts/_javascript.html.erb | 2 +- app/views/layouts/chat.html.erb | 2 +- app/views/layouts/slideshow.html.erb | 2 +- debian/noosfero.links | 5 ----- public/stylesheets/images | 1 + 6 files changed, 5 insertions(+), 9 deletions(-) create mode 120000 public/stylesheets/images diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 4ae851d..f9632e6 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -33,7 +33,7 @@ module LayoutHelper plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') } output = '' - output += stylesheet_link_tag standard_stylesheets, :cache => 'cache' + output += stylesheet_link_tag standard_stylesheets, :cache => 'cache/application' output += stylesheet_link_tag template_stylesheet_path output += stylesheet_link_tag icon_theme_stylesheet_path output += stylesheet_link_tag jquery_ui_theme_stylesheet_path diff --git a/app/views/layouts/_javascript.html.erb b/app/views/layouts/_javascript.html.erb index 4faeacd..15d1439 100644 --- a/app/views/layouts/_javascript.html.erb +++ b/app/views/layouts/_javascript.html.erb @@ -3,7 +3,7 @@ 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate', 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'add-and-join', 'report-abuse', 'catalog', 'manage-products', -'jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache-general' %> +'jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %> <% language = FastGettext.locale %> <% %w{messages methods}.each do |type| %> diff --git a/app/views/layouts/chat.html.erb b/app/views/layouts/chat.html.erb index 0874e01..fcae464 100644 --- a/app/views/layouts/chat.html.erb +++ b/app/views/layouts/chat.html.erb @@ -6,7 +6,7 @@ <%= noosfero_javascript %> - <%= javascript_include_tag 'prototype', 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', :cache => 'cache-chat' %> + <%= javascript_include_tag 'prototype', 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', :cache => 'cache/chat' %> <%= noosfero_stylesheets %> <%= stylesheet_link_tag icon_theme_stylesheet_path %> <%= stylesheet_link_tag theme_stylesheet_path %> diff --git a/app/views/layouts/slideshow.html.erb b/app/views/layouts/slideshow.html.erb index 05873ca..89f1f89 100644 --- a/app/views/layouts/slideshow.html.erb +++ b/app/views/layouts/slideshow.html.erb @@ -11,7 +11,7 @@ %> <%= stylesheet_import "slideshow" %> - <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose', :cache => 'cache-slideshow' %> + <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose', :cache => 'cache/slideshow' %>