diff --git a/app/models/photo.rb b/app/models/photo.rb index 42e704273..70e65cb64 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,8 +1,5 @@ class Photo < Post require 'carrierwave/orm/mongomapper' include MongoMapper::Document - before_validation {puts "I'M GONNA VALIDATE"} - before_save {puts "I'M GONNA SAVE"} - before_create {puts "I'M GONNA CREATE"} mount_uploader :image, ImageUploader end diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 724ad3413..78f907600 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -6,6 +6,7 @@ %li{ :class => "status_message" }= link_to "status message", "#" %li{ :class => "bookmark" }= link_to "bookmark", "#" %li{ :class => "blog" }= link_to "blog", "#" + %li{ :class => "photo" }= link_to "photo", "#" #publisher_form = form_for StatusMessage.new, :remote => true do |f| @@ -37,3 +38,11 @@ = f.text_area :body %p = f.submit "Post" + + = form_for Photo.new, :html => {:multipart => true} do |f| + = f.error_messages + %p + %label{:for => "image_form"} Image + = f.file_field :image + %p + = f.submit 'post it!', :class => 'button' diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index 9ecc68a08..19dc542bd 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -3,6 +3,7 @@ $("#publisher_content_pickers .status_message").click(selectPublisherTab); $("#publisher_content_pickers .bookmark").click(selectPublisherTab); $("#publisher_content_pickers .blog").click(selectPublisherTab); + $("#publisher_content_pickers .photo").click(selectPublisherTab); function selectPublisherTab(evt){ evt.preventDefault(); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 61039aeb8..86c4fc512 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -281,7 +281,8 @@ label { #new_blog, #new_bookmark, -#new_status_message { +#new_status_message, +#new_photo { display: none; } ul#publisher_content_pickers { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0e64172c2..09bd60a8b 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -330,7 +330,8 @@ label #new_blog, #new_bookmark, -#new_status_message +#new_status_message, +#new_photo :display none ul#publisher_content_pickers