upload wallpaper for great success.
This commit is contained in:
parent
91ffe00de2
commit
56913ffb80
13 changed files with 126 additions and 29 deletions
|
|
@ -1,11 +1,24 @@
|
||||||
app.forms.Picture = app.views.Base.extend({
|
app.forms.PictureBase = app.views.Base.extend({
|
||||||
templateName : "picture-form",
|
|
||||||
|
|
||||||
events : {
|
events : {
|
||||||
'ajax:complete .new_photo' : "photoUploaded",
|
'ajax:complete .new_photo' : "photoUploaded",
|
||||||
"change input[name='photo[user_file]']" : "submitForm"
|
"change input[name='photo[user_file]']" : "submitForm"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
photoUploaded : $.noop,
|
||||||
|
|
||||||
|
postRenderTemplate : function(){
|
||||||
|
this.$("input[name=authenticity_token]").val($("meta[name=csrf-token]").attr("content"))
|
||||||
|
},
|
||||||
|
|
||||||
|
submitForm : function (){
|
||||||
|
this.$("form").submit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
/* multi photo uploader */
|
||||||
|
app.forms.Picture = app.forms.PictureBase.extend({
|
||||||
|
templateName : "picture-form",
|
||||||
|
|
||||||
initialize : function() {
|
initialize : function() {
|
||||||
this.photos = new Backbone.Collection()
|
this.photos = new Backbone.Collection()
|
||||||
this.photos.bind("add", this.render, this)
|
this.photos.bind("add", this.render, this)
|
||||||
|
|
@ -39,3 +52,17 @@ app.forms.Picture = app.views.Base.extend({
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/* wallpaper uploader */
|
||||||
|
app.forms.Wallpaper = app.forms.PictureBase.extend({
|
||||||
|
templateName : "wallpaper-form",
|
||||||
|
|
||||||
|
photoUploaded : function(evt, xhr) {
|
||||||
|
resp = JSON.parse(xhr.responseText)
|
||||||
|
if(resp.success) {
|
||||||
|
$("#profile").css("background-image", "url(" + resp.data.wallpaper + ")")
|
||||||
|
} else {
|
||||||
|
alert("Upload failed! Please try again. " + resp.error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
@ -9,7 +9,8 @@ app.pages.Profile = app.views.Base.extend({
|
||||||
|
|
||||||
subviews : {
|
subviews : {
|
||||||
"#profile-info" : "profileInfo",
|
"#profile-info" : "profileInfo",
|
||||||
"#canvas" : "canvasView"
|
"#canvas" : "canvasView",
|
||||||
|
"#wallpaper-upload" : "wallpaperForm"
|
||||||
},
|
},
|
||||||
|
|
||||||
events : {
|
events : {
|
||||||
|
|
@ -38,7 +39,7 @@ app.pages.Profile = app.views.Base.extend({
|
||||||
this.model = new app.models.Profile.findByGuid(options.personId)
|
this.model = new app.models.Profile.findByGuid(options.personId)
|
||||||
this.stream = options && options.stream || new app.models.Stream()
|
this.stream = options && options.stream || new app.models.Stream()
|
||||||
|
|
||||||
this.model.bind("change", this.setPageTitle, this)
|
this.model.bind("change", this.setPageTitleAndBackground, this)
|
||||||
|
|
||||||
/* binds for getting started pulsation */
|
/* binds for getting started pulsation */
|
||||||
this.stream.bind("fetched", this.pulsateNewPostControl, this)
|
this.stream.bind("fetched", this.pulsateNewPostControl, this)
|
||||||
|
|
@ -47,6 +48,7 @@ app.pages.Profile = app.views.Base.extend({
|
||||||
this.stream.preloadOrFetch();
|
this.stream.preloadOrFetch();
|
||||||
|
|
||||||
this.canvasView = new app.views.Canvas({ model : this.stream })
|
this.canvasView = new app.views.Canvas({ model : this.stream })
|
||||||
|
this.wallpaperForm = new app.forms.Wallpaper()
|
||||||
|
|
||||||
// send in isOwnProfile data
|
// send in isOwnProfile data
|
||||||
this.profileInfo = new app.views.ProfileInfo({ model : this.model.set({isOwnProfile : this.isOwnProfile()}) })
|
this.profileInfo = new app.views.ProfileInfo({ model : this.model.set({isOwnProfile : this.isOwnProfile()}) })
|
||||||
|
|
@ -60,9 +62,11 @@ app.pages.Profile = app.views.Base.extend({
|
||||||
]("pulse")
|
]("pulse")
|
||||||
},
|
},
|
||||||
|
|
||||||
setPageTitle : function() {
|
setPageTitleAndBackground : function() {
|
||||||
if(this.model.get("name"))
|
if(this.model.get("name")) {
|
||||||
document.title = this.model.get("name")
|
document.title = this.model.get("name")
|
||||||
|
this.$el.css("background-image", "url(" + this.model.get("wallpaper") + ")")
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
toggleEdit : function(evt) {
|
toggleEdit : function(evt) {
|
||||||
|
|
|
||||||
|
|
@ -441,19 +441,6 @@ div[data-template=flow] {
|
||||||
right : 10px;
|
right : 10px;
|
||||||
top : 10px;
|
top : 10px;
|
||||||
|
|
||||||
|
|
||||||
.label {
|
|
||||||
padding : 2px 5px;
|
|
||||||
padding-bottom : 3px;
|
|
||||||
|
|
||||||
span {
|
|
||||||
display : inline-block;
|
|
||||||
position : relative;
|
|
||||||
top : 1px;
|
|
||||||
font-family : Roboto-Bold;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
& > a {
|
& > a {
|
||||||
@include transition(opacity);
|
@include transition(opacity);
|
||||||
@include opacity(0.4);
|
@include opacity(0.4);
|
||||||
|
|
@ -466,3 +453,16 @@ div[data-template=flow] {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* bootstrap label fixes for Roboto */
|
||||||
|
.label {
|
||||||
|
padding : 2px 5px;
|
||||||
|
padding-bottom : 3px;
|
||||||
|
|
||||||
|
span {
|
||||||
|
display : inline-block;
|
||||||
|
position : relative;
|
||||||
|
top : 1px;
|
||||||
|
font-family : Roboto-Bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,7 @@
|
||||||
|
|
||||||
#photo_upload_button {
|
#photo_upload_button {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin : {
|
margin-bottom : 9px;
|
||||||
bottom : 9px;
|
|
||||||
}
|
|
||||||
|
|
||||||
input{
|
input{
|
||||||
@include opacity(0);
|
@include opacity(0);
|
||||||
|
|
@ -21,6 +19,7 @@
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
height:100%;
|
height:100%;
|
||||||
|
cursor : pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
NOTE: I noticed that just turning the brightness down had an adverse affect on contrast,
|
NOTE: I noticed that just turning the brightness down had an adverse affect on contrast,
|
||||||
thus the "washing out" at -50 contrast. For more info on this specific command, read the documentation
|
thus the "washing out" at -50 contrast. For more info on this specific command, read the documentation
|
||||||
on it here: http://www.imagemagick.org/script/command-line-options.php#brightness-contrast */
|
on it here: http://www.imagemagick.org/script/command-line-options.php#brightness-contrast */
|
||||||
image : url('/imagetest.jpg');
|
//image : url('/imagetest.jpg');
|
||||||
|
|
||||||
size : cover;
|
size : cover;
|
||||||
attachment : fixed;
|
attachment : fixed;
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
{{#if isOwnProfile}}
|
||||||
|
<div id="wallpaper-upload"></div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div id="top-right-nav">
|
<div id="top-right-nav">
|
||||||
{{#if showFollowButton}}
|
{{#if showFollowButton}}
|
||||||
|
|
|
||||||
13
app/assets/templates/wallpaper-form.jst.hbs
Normal file
13
app/assets/templates/wallpaper-form.jst.hbs
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<form accept-charset="UTF-8" action="/upload_wallpaper" class="new_photo" data-remote="true" enctype="multipart/form-data" method="post" style="position:absolute; left:10px; top: 10px; opacity:0.4;">
|
||||||
|
<input name="authenticity_token" type="hidden"/>
|
||||||
|
<div style="margin:0;padding:0;display:inline">
|
||||||
|
<input name="utf8" type="hidden" value="✓"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id='photo_upload_button'>
|
||||||
|
<a href="#" class='label label-inverse'>
|
||||||
|
<i class="icon-picture icon-white" style="margin-right:4px;"></i>CHANGE WALLPAPER
|
||||||
|
</a>
|
||||||
|
<input name="photo[user_file]" type="file"/>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
@ -16,14 +16,14 @@ class ProfilesController < ApplicationController
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.json {
|
format.json {
|
||||||
public_json = @person.as_api_response(:backbone)
|
public_json = @person.as_api_response(:backbone)
|
||||||
extra_json = {}
|
extra_json = {:wallpaper => @person.profile.wallpaper.url}
|
||||||
|
|
||||||
if(current_user && (current_user.person == @person || current_user.contacts.receiving.where(:person_id => @person.id).first))
|
if(current_user && (current_user.person == @person || current_user.contacts.receiving.where(:person_id => @person.id).first))
|
||||||
extra_json = {
|
extra_json = extra_json.merge({
|
||||||
:location => @person.profile.location,
|
:location => @person.profile.location,
|
||||||
:birthday => @person.profile.formatted_birthday,
|
:birthday => @person.profile.formatted_birthday,
|
||||||
:bio => @person.profile.bio
|
:bio => @person.profile.bio
|
||||||
}
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
render :json => public_json.merge(extra_json)
|
render :json => public_json.merge(extra_json)
|
||||||
|
|
@ -77,6 +77,19 @@ class ProfilesController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def upload_wallpaper_image
|
||||||
|
if remotipart_submitted?
|
||||||
|
profile = current_user.person.profile
|
||||||
|
|
||||||
|
profile.wallpaper.store! params[:photo][:user_file]
|
||||||
|
if profile.save
|
||||||
|
respond_to do |format|
|
||||||
|
format.json { render :json => {"success" => true, "data" => {"wallpaper" => profile.wallpaper.url}} }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def munge_tag_string
|
def munge_tag_string
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@
|
||||||
class Profile < ActiveRecord::Base
|
class Profile < ActiveRecord::Base
|
||||||
self.include_root_in_json = false
|
self.include_root_in_json = false
|
||||||
|
|
||||||
|
mount_uploader :wallpaper, WallpaperUploader
|
||||||
|
|
||||||
include Diaspora::Federated::Base
|
include Diaspora::Federated::Base
|
||||||
include Diaspora::Taggable
|
include Diaspora::Taggable
|
||||||
|
|
||||||
|
|
|
||||||
27
app/uploaders/wallpaper_uploader.rb
Normal file
27
app/uploaders/wallpaper_uploader.rb
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
class WallpaperUploader < CarrierWave::Uploader::Base
|
||||||
|
include CarrierWave::MiniMagick
|
||||||
|
|
||||||
|
storage :file
|
||||||
|
|
||||||
|
process :darken
|
||||||
|
|
||||||
|
def store_dir
|
||||||
|
"uploads/images"
|
||||||
|
end
|
||||||
|
|
||||||
|
def extension_white_list
|
||||||
|
%w(jpg jpeg png tiff)
|
||||||
|
end
|
||||||
|
|
||||||
|
#def filename
|
||||||
|
# SecureRandom.hex(10) + File.extname(@filename) if @filename
|
||||||
|
#end
|
||||||
|
|
||||||
|
def darken
|
||||||
|
manipulate! do |img|
|
||||||
|
img.brightness_contrast "-40x-50"
|
||||||
|
img = yield(img) if block_given?
|
||||||
|
img
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -54,6 +54,8 @@ Diaspora::Application.routes.draw do
|
||||||
put :make_profile_photo
|
put :make_profile_photo
|
||||||
end
|
end
|
||||||
|
|
||||||
|
post "upload_wallpaper" => 'profiles#upload_wallpaper_image'
|
||||||
|
|
||||||
# ActivityStreams routes
|
# ActivityStreams routes
|
||||||
scope "/activity_streams", :module => "activity_streams", :as => "activity_streams" do
|
scope "/activity_streams", :module => "activity_streams", :as => "activity_streams" do
|
||||||
resources :photos, :controller => "photos", :only => [:create]
|
resources :photos, :controller => "photos", :only => [:create]
|
||||||
|
|
|
||||||
5
db/migrate/20120506053156_add_wallpaper_to_profile.rb
Normal file
5
db/migrate/20120506053156_add_wallpaper_to_profile.rb
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddWallpaperToProfile < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :profiles, :wallpaper, :string
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20120427152648) do
|
ActiveRecord::Schema.define(:version => 20120506053156) do
|
||||||
|
|
||||||
create_table "account_deletions", :force => true do |t|
|
create_table "account_deletions", :force => true do |t|
|
||||||
t.string "diaspora_handle"
|
t.string "diaspora_handle"
|
||||||
|
|
@ -369,6 +369,7 @@ ActiveRecord::Schema.define(:version => 20120427152648) do
|
||||||
t.string "location"
|
t.string "location"
|
||||||
t.string "full_name", :limit => 70
|
t.string "full_name", :limit => 70
|
||||||
t.boolean "nsfw", :default => false
|
t.boolean "nsfw", :default => false
|
||||||
|
t.string "wallpaper"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "profiles", ["full_name", "searchable"], :name => "index_profiles_on_full_name_and_searchable"
|
add_index "profiles", ["full_name", "searchable"], :name => "index_profiles_on_full_name_and_searchable"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue