@@ -46,9 +46,6 @@ class PostsController < BaseController end end - def popular - @posts = Post.find(:all, :conditions => "published_at > '#{1.days.ago.to_s :db}'", :order => "view_count DESC") - end # GET /posts/1 # GET /posts/1.xml @@ -207,7 +204,7 @@ class PostsController < BaseController end def featured - @pages, @posts = paginate :posts, :order => "posts.published_at DESC", :conditions => ["users.featured_writer = ?", true], :include => :user + @pages, @posts = paginate :posts, :order => "posts.published_at DESC", :conditions => ["users.featured_writer = ?", 1], :include => :user @featured_writers = User.find_featured @rss_title = "#{AppConfig.community_name} Featured Posts" app/controllers/posts_controller.rb @@ -34,6 +34,14 @@ class Post < ActiveRecord::Base attr_accessor :invalid_emails + #Named scopes + named_scope :by_featured_writers, :conditions => ["users.featured_writer = ?", 1], :include => :user + named_scope :recent, :order => 'published_at DESC' + named_scope :popular, :order => 'view_count DESC' + named_scope :since, lambda { |days| + {:conditions => "published_at > '#{days.ago.to_s :db}'" } + } + def self.find_related_to(post, options = {}) merged_options = options.merge({:limit => 8, :order => 'published_at DESC', @@ -50,16 +58,17 @@ class Post < ActiveRecord::Base end def self.find_recent(options = {:limit => 5}) - find(:all, :order => "published_at desc", :limit => options[:limit], :include => :user) + self.recent.find :all, :limit => options[:limit] end def self.find_popular(options = {} ) options.reverse_merge! :limit => 5, :since => 7.days - find(:all, :conditions => "published_at > '#{options[:since].ago.to_s :db}'", :order => "view_count desc", :limit => options[:limit]) + + self.popular.since(options[:since]).find :all, :limit => options[:limit] end def self.find_featured(options = {:limit => 10}) - find(:all, :order => "posts.published_at desc", :conditions => ["users.featured_writer = ?", true], :limit => options[:limit], :include => :user) + self.recent.by_featured_writers.find(:all, :limit => options[:limit] ) end def self.find_most_commented(limit = 10, since = 7.days.ago) app/models/post.rb @@ -132,7 +132,7 @@ class User < ActiveRecord::Base end def self.find_featured - self.find(:all, :conditions => "featured_writer = 1") + self.find(:all, :conditions => ["featured_writer = ?", 1]) end def this_months_posts app/models/user.rb @@ -3,14 +3,14 @@ .yui-b .box.alt.first_alt - %h3 Featured Writers + %h3=:staff_writers.l - @featured_writers.each do |user| = render :partial => "users/sidebar_user", :locals => {:user => user} #yui-main .yui-b .box.hfeed - %h3 Featured Posts + %h3="Featured Posts".l .pagination =pagination_links app/views/posts/featured.haml @@ -19,7 +19,7 @@ .yui-b .box.hfeed %h3 - =:recent_posts.l + =:recent_posts.l "Recent Posts" %ul.subnav %li= "(looking for {link}?)".l :looking_for_most_x, :link => link_to("popular".l, popular_path) app/views/posts/recent.html.haml @@ -9,7 +9,7 @@ var Lightbox = { /* hideAll - closes all open lightbox windows */ hideAll: function(){ lboxes = document.getElementsByClassName('lbox') - lboxes.each(function(box){ + $A(lboxes).each(function(box){ Element.hide(box) } ) assets/javascripts/lightbox.js @@ -10,6 +10,8 @@ all_clippings_tagged: All clippings tagged {tag_name} all_photos_tagged: All photos tagged {tag_name} #en: all_posts_tagged: All posts tagged {tag_name} all_posts_tagged: All posts tagged {tag_name} +#en: all_tags: All tags +all_tags: All tags #en: all_users_tagged: All users tagged {tag_name} all_users_tagged: All users tagged {tag_name} #en: comments_count: "{count} pluralize{{count}, comment}" lang/ui/en-US.yml @@ -10,6 +10,8 @@ all_clippings_tagged: All clippings tagged {tag_name} all_photos_tagged: All photos tagged {tag_name} #en: all_posts_tagged: All posts tagged {tag_name} all_posts_tagged: All posts tagged {tag_name} +#en: all_tags: All tags +all_tags: All tags #en: all_users_tagged: All users tagged {tag_name} all_users_tagged: All users tagged {tag_name} #en: comments_count: "{count} pluralize{{count}, comment}" lang/ui/en.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html how_to: id: 1 - name: How To + name: How to inspiration: id: 2 name: Inspiration test/fixtures/categories.yml @@ -16,7 +16,7 @@ class CommentTest < Test::Unit::TestCase end def test_should_generate_commetable_url - assert_equal "http://localhost:3000/quentin/posts/1-Building-communities-is-all-about-love-#comment_1", comments(:quentins_comment_on_his_own_post).generate_commentable_url + assert_equal "http://#{APP_URL}/quentin/posts/1-Building-communities-is-all-about-love-#comment_1", comments(:quentins_comment_on_his_own_post).generate_commentable_url end end test/unit/comment_test.rb a3f6244dd412a1574d8550cb1752e388a48bf30e Bruno Bornsztein bruno@otis.local http://github.com/bborn/communityengine/commit/7c513ce9fb5abe1c5e89d84842a8bb3767731156 7c513ce9fb5abe1c5e89d84842a8bb3767731156 2008-08-14T13:13:18-07:00 2008-08-14T13:13:18-07:00 javascript fix to clipping create page (lightbox wasn't working), starting to use some nice named scoped on the post model (yay named scope!) b0a929b1b2df9f51c85bc75c1ef69665ee2b30e9 Bruno Bornsztein bruno@otis.local