diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 4ac7c5392..6499b01f3 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -20,7 +20,7 @@ }); #publisher - = owner_image_tag + = owner_image_link - if( !defined?(type) || type == :status_message ) = form_for StatusMessage.new, :remote => true do |status| @@ -32,7 +32,6 @@ = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id) .options_and_submit - - if aspect == :all .public_toggle = status.check_box( :public, {}, true, false ) @@ -48,6 +47,11 @@ - else = status.submit t('.share'), :title => "Share with #{aspect}" + #publisher_photo_upload + or + = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id), :album_id => nil + + - else = form_for Album.new do |album| = album.error_messages diff --git a/public/javascripts/fileuploader.js b/public/javascripts/fileuploader.js index 9f5477b34..19b1c104c 100644 --- a/public/javascripts/fileuploader.js +++ b/public/javascripts/fileuploader.js @@ -35,8 +35,8 @@ qq.FileUploader = function(o){ // UI customizations template: '