Merge branch 'master' of github.com:diaspora/diaspora_rails

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'

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();

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 {

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