upload a photo button next to publisher

This commit is contained in:
danielvincent 2010-10-29 10:34:32 -07:00
parent 4776f4810e
commit 51dd6d32b3
3 changed files with 17 additions and 7 deletions

View file

@ -20,7 +20,7 @@
}); });
#publisher #publisher
= owner_image_tag = owner_image_link
- if( !defined?(type) || type == :status_message ) - if( !defined?(type) || type == :status_message )
= form_for StatusMessage.new, :remote => true do |status| = form_for StatusMessage.new, :remote => true do |status|
@ -32,7 +32,6 @@
= status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id) = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
.options_and_submit .options_and_submit
- if aspect == :all - if aspect == :all
.public_toggle .public_toggle
= status.check_box( :public, {}, true, false ) = status.check_box( :public, {}, true, false )
@ -48,6 +47,11 @@
- else - else
= status.submit t('.share'), :title => "Share with #{aspect}" = 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 - else
= form_for Album.new do |album| = form_for Album.new do |album|
= album.error_messages = album.error_messages

View file

@ -35,8 +35,8 @@ qq.FileUploader = function(o){
// UI customizations // UI customizations
template: '<div class="qq-uploader">' + template: '<div class="qq-uploader">' +
'<div class="qq-upload-drop-area"><span>Drop files here to upload</span></div>' + '<div class="qq-upload-drop-area"><span>Drop photos here to upload</span></div>' +
'<div class="qq-upload-button">Upload a file</div>' + '<div class="qq-upload-button">Upload a photo</div>' +
'<ul class="qq-upload-list"></ul>' + '<ul class="qq-upload-list"></ul>' +
'</div>', '</div>',

View file

@ -260,7 +260,7 @@ header
img img
:position absolute :position absolute
:top 8px :top 7px
:left 0 :left 0
h2 h2
@ -291,7 +291,7 @@ li.message
.content .content
:margin :margin
:top -4px :top 0
:padding :padding
:left 65px :left 65px
@ -682,8 +682,8 @@ label
.options_and_submit .options_and_submit
:min-height 21px :min-height 21px
:display none
:position relative :position relative
:display none
:padding :padding
:top 8px :top 8px
:margin :margin
@ -1371,3 +1371,9 @@ ul.aspects
:border-radius 5px :border-radius 5px
:height 100px :height 100px
:width 100px :width 100px
#publisher_photo_upload
:position absolute
:display inline
:left 600px
:top 0