fixed caching, removed action_cache plugin and now using Rails 2.1 de…

…fault caching

app/controllers/base_controller.rb

@@ -6,16 +6,10 @@ class BaseController < ApplicationController
   include AuthenticatedSystem
   before_filter :login_from_cookie  
 
-  caches_action :site_index, :footer_content
-
-  def cache_action?(action_name)
-    !logged_in? && controller_name.eql?('base') && params[:format].blank?
-  end
-  def action_fragment_key(options)  
-    url = url_for(options).split('://').last
-    url = (url =~ /^.*\/$/) ? "#{url}index" : url
-    url
-  end    
+  caches_action :site_index, :footer_content, :if => Proc.new{|c| c.cache_action? }
+  def cache_action?
+    !logged_in? && controller_name.eql?('base') && params[:format].blank? 
+  end  
 
   if AppConfig.closed_beta_mode
     before_filter :beta_login_required, :except => [:teaser]

app/controllers/posts_controller.rb

@@ -4,8 +4,8 @@ class PostsController < BaseController
   uses_tiny_mce(:options => AppConfig.simple_mce_options, :only => [:show])
 
   cache_sweeper :post_sweeper, :only => [:create, :update, :destroy]
-  caches_action :show  
-  def cache_action?(action_name)
+  caches_action :show, :if => Proc.new{|c| c.cache_action? }
+  def cache_action?
     !logged_in? && controller_name.eql?('posts')
   end  
 

app/controllers/sitemap_controller.rb

@@ -1,9 +1,6 @@
 class SitemapController < BaseController
   layout false
-  caches_action :index  
-  def cache_action?(action_name)
-    true
-  end  
+  caches_action :index
 
   def index
     @users = User.find(:all, :select => 'id, login, updated_at, login_slug', :conditions => "activated_at IS NOT NULL")

assets/stylesheets/screen.css

@@ -916,9 +916,6 @@ div.progressBar div.background {
     margin: 0 0 0; }
 
 
-.poll_excerpt {
-  padding-left: 20px;
-  background: url(/images/icons/poll.png) no-repeat left; }
 table.poll {
   width: 100%;
   margin-bottom: 3em; }