{{#if showFollowButton}}
diff --git a/app/assets/templates/wallpaper-form.jst.hbs b/app/assets/templates/wallpaper-form.jst.hbs
new file mode 100644
index 000000000..8af11ab1e
--- /dev/null
+++ b/app/assets/templates/wallpaper-form.jst.hbs
@@ -0,0 +1,13 @@
+
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 390a99a4a..fef64ad29 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -16,14 +16,14 @@ class ProfilesController < ApplicationController
respond_to do |format|
format.json {
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))
- extra_json = {
+ extra_json = extra_json.merge({
:location => @person.profile.location,
:birthday => @person.profile.formatted_birthday,
:bio => @person.profile.bio
- }
+ })
end
render :json => public_json.merge(extra_json)
@@ -77,6 +77,19 @@ class ProfilesController < ApplicationController
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
def munge_tag_string
diff --git a/app/models/profile.rb b/app/models/profile.rb
index bf41aa31b..8dc6b120a 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -5,6 +5,8 @@
class Profile < ActiveRecord::Base
self.include_root_in_json = false
+ mount_uploader :wallpaper, WallpaperUploader
+
include Diaspora::Federated::Base
include Diaspora::Taggable
diff --git a/app/uploaders/wallpaper_uploader.rb b/app/uploaders/wallpaper_uploader.rb
new file mode 100644
index 000000000..a097fee04
--- /dev/null
+++ b/app/uploaders/wallpaper_uploader.rb
@@ -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
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 26a500e58..7911f699c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,6 +54,8 @@ Diaspora::Application.routes.draw do
put :make_profile_photo
end
+ post "upload_wallpaper" => 'profiles#upload_wallpaper_image'
+
# ActivityStreams routes
scope "/activity_streams", :module => "activity_streams", :as => "activity_streams" do
resources :photos, :controller => "photos", :only => [:create]
diff --git a/db/migrate/20120506053156_add_wallpaper_to_profile.rb b/db/migrate/20120506053156_add_wallpaper_to_profile.rb
new file mode 100644
index 000000000..b190cb8b6
--- /dev/null
+++ b/db/migrate/20120506053156_add_wallpaper_to_profile.rb
@@ -0,0 +1,5 @@
+class AddWallpaperToProfile < ActiveRecord::Migration
+ def change
+ add_column :profiles, :wallpaper, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1df52e628..c3d5a727e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# 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|
t.string "diaspora_handle"
@@ -369,6 +369,7 @@ ActiveRecord::Schema.define(:version => 20120427152648) do
t.string "location"
t.string "full_name", :limit => 70
t.boolean "nsfw", :default => false
+ t.string "wallpaper"
end
add_index "profiles", ["full_name", "searchable"], :name => "index_profiles_on_full_name_and_searchable"