Commit 857a4b5f authored by danielvincent's avatar danielvincent

photo large is now at 300px. a person's profile photo now references the...

photo large is now at 300px.  a person's profile photo now references the larger size instead of medium.
parent f4ff48f5
......@@ -69,7 +69,7 @@ class DevUtilitiesController < ApplicationController
current_user.raw_visible_posts << photo
current_user.save
current_user.update_profile(:image_url => photo.url(:thumb_medium))
current_user.update_profile(:image_url => photo.url(:thumb_large))
current_user.save
end
......
......@@ -76,7 +76,7 @@ class PeopleController < ApplicationController
params[:profile_image_hash] = { :user_file => raw_image, :to => "all" }
photo = current_user.post(:photo, params[:profile_image_hash])
params[:person][:profile][:image_url] = photo.url(:thumb_medium)
params[:person][:profile][:image_url] = photo.url(:thumb_large)
end
if current_user.update_profile params[:person][:profile]
......
......@@ -65,7 +65,7 @@ class Photo < Post
end
def ensure_user_picture
people = Person.all('profile.image_url' => absolute_url(:thumb_medium) )
people = Person.all('profile.image_url' => absolute_url(:thumb_large) )
people.each{ |person|
person.profile.update_attributes(:image_url => nil)
}
......
......@@ -30,7 +30,7 @@ class ImageUploader < CarrierWave::Uploader::Base
end
version :thumb_large do
process :resize_to_fill => [200,200]
process :resize_to_fill => [300,300]
end
version :scaled_full do
......
......@@ -40,7 +40,7 @@
-if @ownership
= image_tag 'ajax-loader.gif', :id => "photo_spinner", :class => "hidden"
= image_tag @photo.url(:scaled_full)
.photo_options{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
.photo_options{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_large)}"}}
= link_to t('.make_profile_photo'), '#', :class => 'make_profile_photo'
|
= link_to 'edit', '#', :id => "edit_photo_toggle"
......
......@@ -136,6 +136,8 @@ function openVideo(type, videoid, link) {
link.parentNode.insertBefore(container, this.nextSibling);
$container.slideDown('fast', function() { });
link.onclick = function() { $container.slideToggle('fast', function() { } ); }
}
$(".make_profile_photo").live("click", function(evt){
......
......@@ -82,7 +82,7 @@ describe Photo do
it 'should remove its reference in user profile if it is referred' do
@photo.save
@user.profile.image_url = @photo.image.url(:thumb_medium)
@user.profile.image_url = @photo.image.url(:thumb_large)
@user.person.save
@photo.destroy
Person.find(@user.person.id).profile.image_url.should be_nil
......
......@@ -55,12 +55,12 @@ describe Profile do
lambda {@profile.image_url = ""}.should_not change(@profile, :image_url)
end
it 'makes relative urls absolute' do
@profile.image_url = @photo.url(:thumb_medium)
@profile.image_url.should == "#{@pod_url}#{@photo.url(:thumb_medium)}"
@profile.image_url = @photo.url(:thumb_large)
@profile.image_url.should == "#{@pod_url}#{@photo.url(:thumb_large)}"
end
it 'accepts absolute urls' do
@profile.image_url = "#{@pod_url}#{@photo.url(:thumb_medium)}"
@profile.image_url.should == "#{@pod_url}#{@photo.url(:thumb_medium)}"
@profile.image_url = "#{@pod_url}#{@photo.url(:thumb_large)}"
@profile.image_url.should == "#{@pod_url}#{@photo.url(:thumb_large)}"
end
end
describe 'serialization' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment