@@ -1,7 +1,7 @@ class PostsController < ApplicationController - before_filter :protect, :except => [ :index, :show, :posts_by, :imagebrowser, :random ] - before_filter :find_and_protect_post, :except => [ :index, :new, :create, :add_image, :remove_new_image, :show, :posts_by, :imagebrowser, :random ] + before_filter :protect, :except => [ :index, :show, :posts_by, :imagebrowser, :random, :updated ] + before_filter :find_and_protect_post, :except => [ :index, :new, :create, :add_image, :remove_new_image, :show, :posts_by, :imagebrowser, :random, :updated ] def find_and_protect_post @post = Post.find(params[:id]) @@ -23,13 +23,22 @@ class PostsController < ApplicationController def index @posts = Post.paginate(:all, :page => params[:page], :per_page => 20, :order => "posts.created_on desc, comments.created_on", :include => [ :comments, :user ]) @title = "rawdod" - @hotness = Post.find(:all, :order => "commented_on desc", :limit => 8, :conditions => ["commented_on is NOT NULL"]) +# @hotness = Post.find(:all, :order => "commented_on desc", :limit => 8, :conditions => ["commented_on is NOT NULL"]) respond_to do |format| format.html # index.rhtml format.xml { render :xml => @posts.to_xml } end end + def updated + @posts = Post.paginate(:all, :page => params[:page], :per_page => 20, :order => "posts.commented_on desc, comments.created_on", :conditions => "posts.commented_on > '2005-11-07 19:22:40'", :include => [ :comments, :user ]) + @title = "rawdod" + respond_to do |format| + format.html { render :action => "index" }# index.rhtml + format.xml { render :xml => @posts.to_xml } + end + end + def posts_by if user = User.find_by_login(params[:user]) @posts = Post.paginate(:all, :page => params[:page], :per_page => 20, :conditions => ["posts.user_id = ?", user.id ], :order => "posts.created_on desc, comments.created_on", :include => [ :comments, :user ]) app/controllers/posts_controller.rb @@ -1,34 +1,8 @@ +<%= link_to "Order by Post", "/" %> | <%= link_to "Order by Comment", "/updated" %> +<br clear="both"/> <br clear="both"/> -<% unless params[:page] || params[:user] %> - -<%= render :partial => "post", :locals => { :post => @posts.shift } %> - -<div class="post"> - -<!-- <div class="post_title">Comments Such as</div> --> - -<% posts_on_page = @posts.collect { |p| p.id } %> -<% for post in @hotness %> -<% if posts_on_page.include? post.id %> -<!-- -Post: <%= link_to sanitize(truncate(post.title, 65) + " - " + truncate(post.body, 65)), "#post_" + post.id.to_s %><br/> -Comment: <%= link_to sanitize(truncate(post.comments.last.body, 65) + " " + post.comments.last.user.login), "#comment_" + post.comments.last.id.to_s %> <br/> ---> -<%= post.comments.last.user.login %> comments on: <%= link_to sanitize(truncate(post.title + " " + post.body, 60)), "#post_" + post.id.to_s %><br/> - -<br/> -<% else %> -<%= link_to sanitize(truncate post.body, 60), :action => "show", :id => post.id %><br/> -<% end %> -<% end %> -</div> -<% end %> - - -<hr width="80%" color="#333333" style="margin: 80px;"/> - -<% if params[:page] || params[:user] %><%= will_paginate(@posts, :outer_window => 0, :inner_window => 2) %><% end%> +<% if params[:page] || params[:user] %><%= will_paginate(@posts, :outer_window => 0, :inner_window => 2) %><% end %> <%= render :partial => "post", :collection => @posts %> app/views/posts/index.rhtml @@ -1,5 +1,5 @@ user rawdod; -worker_processes 2; +worker_processes 4; #error_log logs/error.log debug; #error_log logs/error.log notice; #error_log logs/error.log info; @@ -22,9 +22,11 @@ http { server 127.0.0.1:6200; server 127.0.0.1:6201; } + + server { listen 1666; - client_max_body_size 50m; + client_max_body_size 500m; server_name site.rawdod.com; root /home/rawdod/rawdod/public; index index.html index.htm; @@ -49,4 +51,8 @@ http { root html; } } + + + + } config/nginx.conf @@ -19,6 +19,7 @@ ActionController::Routing::Routes.draw do |map| map.connect '/logout', :controller => "user", :action => "logout" map.connect '/login', :controller => "user", :action => "login" map.connect '/seen', :controller => "user", :action => "seen" + map.connect '/updated', :controller => "posts", :action => "updated" map.connect '/homepages', :controller => "user", :action => "homepages" map.connect '/home/:user', :controller => "user", :action => "homepage" map.connect '/home/:user/css', :controller => "user", :action => "css" config/routes.rb ba3be5d729b99b4e85fd485605ccf6ad072a601c David Richards rawdod@gmail.com http://github.com/oneman/rawdod/commit/412bad507dc5ab73419ad6955173105f920302cf 412bad507dc5ab73419ad6955173105f920302cf 2009-11-07T21:31:10-08:00 2009-11-07T21:31:10-08:00 different updated on thingie 83a64cf737a069a8e2c4faecb1bd5624f9d1ab91 David Richards rawdod@gmail.com