app/views/posts/_new_image.rhtml app/views/posts/add_image.rjs app/views/posts/remove_image.rjs app/views/posts/remove_new_image.rjs @@ -2,3 +2,4 @@ log/* tmp/* db/backup/* db/backups/* +public/uploaded_images .gitignore @@ -1,7 +1,7 @@ class PostsController < ApplicationController before_filter :protect, :except => :index - before_filter :find_and_protect_post, :except => [ :index, :new, :create ] + before_filter :find_and_protect_post, :except => [ :index, :new, :create, :add_image, :remove_new_image ] def find_and_protect_post @post = Post.find(params[:id]) @@ -52,6 +52,15 @@ class PostsController < ApplicationController respond_to do |format| if @post.save flash[:notice] = 'Post was successfully created.' + + if params[:images] + for image in params[:images]["file_data"] + if image != "" + @image = Image.create(:file_data => image, :post_id => @post.id ) + end + end + end + format.html { redirect_to :controller => "posts" } format.xml { head :created, :location => post_url(:id => @post) } else @@ -68,6 +77,15 @@ class PostsController < ApplicationController respond_to do |format| if @post.update_attributes(params[:post]) flash[:notice] = 'Post was successfully updated.' + + if params[:images] + for image in params[:images]["file_data"] + if image != "" + @image = Image.create(:file_data => image, :post_id => @post.id ) + end + end + end + format.html { redirect_to posts_path } format.xml { head :ok } else @@ -89,6 +107,22 @@ class PostsController < ApplicationController end end + + # Image Stuff + + def add_image + params[:type] ||= "new_image" + @type = params[:type] + end + + def remove_image + if request.method == :delete + @image = Image.find(params[:image_id]).destroy + end + end + + def remove_new_image + end end app/controllers/posts_controller.rb @@ -1,5 +1,97 @@ class Image < ActiveRecord::Base - belongs_to :user + belongs_to :post + + DIRECTORY = 'public/uploaded_images' + THUMB_MAX_SIZE = 125 + LARGE_MAX_SIZE = 600 + + after_create :process_upload + after_destroy :remove + + + def validate + errors.add_to_base "File Must be a .jpg or .png file!" if !self.proper_ext? + end + + def proper_ext? + ["jpg", "png"].include? @extension + end + + def file_data=(file_data) + @file_data = file_data + @extension = file_data.original_filename.split('.').last.downcase + end + + def original + url("original") + end + + def url(version="large",secondtry=false) + filename = Dir[File.join(DIRECTORY, "#{self.id}-#{version}*")].first + + url = "#{filename.sub(/^public/,'')}" rescue nil + + if secondtry == false + if url != nil + return url + else + self.create_resized_versions + url(version,true) + end + else + if url != nil + return url + else + return "/images/warn.gif" + end + end + end + + def thumbnail_url + url("thumb") + end + + def path + # `ls #{DIRECTORY}/#{self.id.to_s}-original*`.chop + Dir[File.join(DIRECTORY, "#{self.id}-original*")].first + end + + def delete_resized_versions + Dir[File.join(DIRECTORY, "#{self.id}-*")].each do |filename| + unless filename.include? "#{self.id}-original" + File.unlink(filename) rescue nil + end + end + end + + def create_resized_versions + original = path + `convert #{original} -resize #{THUMB_MAX_SIZE}x #{original.sub("original","thumb")}` + `convert #{original} -resize #{LARGE_MAX_SIZE}x #{original.sub("original","large")}` + end + + private + + def process_upload + if @file_data + save_original + create_resized_versions + @file_data = nil + end + end + + def remove + Dir[File.join(DIRECTORY, "#{self.id}-*")].each do |filename| + File.unlink(filename) rescue nil + end + end + + def save_original + File.open("#{DIRECTORY}/#{self.id}-original.#{@extension}", 'wb') do |file| + file.puts @file_data.read + end + end + end app/models/image.rb @@ -1,6 +1,7 @@ class Post < ActiveRecord::Base belongs_to :user has_many :comments, :order => "created_on" + has_many :images, :dependent => :destroy def authorized?(userid) if (self.user_id == userid) && editable? app/models/post.rb @@ -1,6 +1,6 @@ <div id="comment_<%= comment.id %>" class="comment"> <p> - <%= sanitize comment.body %> + <%= auto_link sanitize comment.body %> </p> <% if logged_in? and comment.authorized?(session[:user_id]) %> app/views/comments/_comment.rhtml @@ -5,5 +5,11 @@ <li>Title: (This is optional)</li> <li><%= form.text_field :title, :class => "post_field" %></li> <li><%= form.text_area :body, :class => "post_field", :cols => 70 %></li> + <li>Images: (Jpeg or PNG)</li> + + <div id="new_images"></div> + + <%= link_to_remote "Add Image", :url => { :action => "add_image" } %> + </ol> </fieldset> app/views/posts/_form.rhtml @@ -1,5 +1,6 @@ -<div class="post_title"><%= post.title %></div> <div class="post"> +<div class="post_title"><%= post.title %></div> + <div class="datestamp"> Posted <%= post.created_on.strftime("%A") %><br/><br/> </div> @@ -9,9 +10,13 @@ <% if post.authorized?(session[:user_id]) %><i><%= link_to "Edit", edit_post_path(post) %></i><br/><% end %> -<%= post.user.login %><br/><br/> +<% if post.images.size > 0 %> +<% for image in post.images %> + <div class="thumbs" id="image_<%= image.id %>"><%= link_to image_tag(image.thumbnail_url), image.url,{ :rel => 'lightbox[' + post.id.to_s + ']'} %><br/></div> +<% end %> +<% end %> - - <div id="comments_for_post_<%= post.id %>"> + <div class="comments" id="comments_for_post_<%= post.id %>"> <%= render :partial => "comments/comment", :collection => post.comments %> </div> @@ -29,5 +34,3 @@ <% end %> </div> - -<br/><br/> <br/><br/><br/> app/views/posts/_post.rhtml @@ -2,10 +2,19 @@ <% form_for(:post, :url => post_path(:id => @post), - :html => { :method => :put }) do |form| %> + :html => { :method => :put, :multipart => true }) do |form| %> + <%= render :partial => "form", :locals => { :form => form } %> - <%= submit_tag "Update", :class => "submit" %> + <fieldset class="submit"><%= submit_tag "Update", :class => "submit" %> </fieldset> <% end %> + + +<h3>Images</h3> + +<% for image in @post.images %> + <div class="thumbs" id="image_<%= image.id %>"><%= link_to image_tag(image.thumbnail_url), image.url,{ :rel => 'lightbox[' + @property.id.to_s + ']'} %><br/> + <%= link_to_remote "Remove", :url => {:action => "remove_image", :id => @post.id, :image_id => image.id }, :confirm => "Are you sure?", :method => :delete %></div> +<% end %> \ No newline at end of file app/views/posts/edit.rhtml @@ -1,4 +1,8 @@ -<br/><br/><br/> +<br clear="both"/> +<% if params[:page] %><%= will_paginate(@posts) %><% end%> + <%= render :partial => "post", :collection => @posts %> -<br/> + + +<br clear="both"/> <%= will_paginate(@posts) %> app/views/posts/index.rhtml @@ -1,6 +1,6 @@ <h2> Post something to rawdod </h2> -<% form_for(:post, :url => posts_path) do |form| %> +<% form_for(:post, :url => posts_path, :html => { :method => :put, :multipart => true }) do |form| %> <%= render :partial => "form", :locals => { :form => form } %> <fieldset class="submit"><%= submit_tag "Post" %></fieldset> <% end %> app/views/posts/new.rhtml @@ -24,6 +24,7 @@ http { } server { listen 1666; + client_max_body_size 50m; server_name site.rawdod.com; root /home/rawdod/rawdod/public; index index.html index.htm; config/nginx.conf public/images/rawdod_mainlogo.png @@ -1,16 +1,19 @@ /* a:hover { color: #00FF00; border-bottom: 1px solid yellow; } */ a { color: #008800; text-decoration: none; } a img { border: none; } +img { max-width: 400px;} body { text-align: center; background-color: #252525; font-size: 13px; font-family: Sans-serif; color: white;} .post_form { margin-top: 25px; margin-bottom: 25px; } -#content { text-align: left; margin-left: auto; margin-right: auto; width: 600px; } +#content { text-align: left; margin-left: auto; margin-right: auto; width: 470px;} #header { margin-top: 25px; } +#header img { max-width: 450px;} .post_title { margin-bottom: 12px; font-size: 20px; } #notice { font-size: 20px; margin: 40px; } .userstamp { } .datestamp { margin: 10px; color: #888888; float: right;} -.post { background-color: #191919; padding: 12px;} -.comment { background-color: #171717; padding: 8px;} +.post { background-color: #191919; padding: 12px; margin: 12px; width: 460px; } +.comment { background-color: #191919; padding-left: 14px; border-top: 2px dashed #232323; margin-bottom: 8px; margin-top: 4px;} +.comments { border-top: 0px solid #333333; } form { margin-left: auto; public/stylesheets/rawdod.css a1b4eb8c2775ce8718ef1ca0f1abb98c6db51824 David Richards rawdod@gmail.com http://github.com/oneman/rawdod/commit/c5abaa7f00c7e1e5d706025e5229fdc3ee76b3c8 c5abaa7f00c7e1e5d706025e5229fdc3ee76b3c8 2008-02-09T19:45:01-08:00 2008-02-09T19:45:01-08:00 image uploading and processing support beta, and some other minor changes like a better logo 21bda88a27f370fb12290ca6409f4aa85a20936e David Richards rawdod@gmail.com