Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/application_controller.rb

@@ -3,10 +3,10 @@
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
-  has_mobile_fu
+  #has_mobile_fu
   protect_from_forgery :except => :receive
 
-  before_filter :mobile_except_ipad
+  # =>before_filter :mobile_except_ipad
   before_filter :set_contacts_and_status, :except => [:create, :update]
   before_filter :count_requests
   before_filter :set_invites

app/controllers/dev_utilities_controller.rb

@@ -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
 

app/controllers/people_controller.rb

@@ -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]

app/controllers/status_messages_controller.rb

@@ -9,7 +9,7 @@ class StatusMessagesController < ApplicationController
   respond_to :json, :only => :show
 
   def create
-    photos = Photo.all(:id.in => [*params[:photos]])
+    photos = Photo.all(:id.in => [*params[:photos]], :diaspora_handle => current_user.person.diaspora_handle)
 
     public_flag = params[:status_message][:public]
     public_flag.to_s.match(/(true)/) ? public_flag = true : public_flag = false

app/helpers/application_helper.rb

@@ -180,4 +180,8 @@ module ApplicationHelper
     @@youtube_title_cache[id] = ret;
     return ret
   end
+
+  def info_text(text)
+    "<span class='what_is_this' title='#{text}'>?</span>".html_safe
+  end
 end

app/models/photo.rb

@@ -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)
     }

app/uploaders/image_uploader.rb

@@ -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

app/views/aspects/index.html.haml

@@ -3,8 +3,12 @@
 -#   the COPYRIGHT file.
 
 .span-24.last
-  %h2
+  %h2{:style => "position:relative;"}
     Home
+    .right
+      %span.description
+        = current_user.diaspora_handle
+        = info_text("This is your diaspora handle.  Like an email address, you can give this to people to reach you.")
 
 .span-15.last
   = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
@@ -16,7 +20,6 @@
   #pagination
     = will_paginate @posts
 
-
 .span-8.prepend-1.last
   = render 'shared/aspect_contacts', :contacts => @contacts, :aspect => @aspect
 

app/views/photos/show.html.haml

@@ -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"

app/views/users/edit.html.haml

@@ -24,11 +24,24 @@
   %h2
     = t('account')
 
-  = link_to t('.invite_contacts'), new_user_invitation_path(current_user)
+  .span-8.append-1.last
+    %h3
+      Your diaspora handle
+    %p
+      %b= current_user.diaspora_handle
+  .span-8.prepend-2.last
+    %h3
+      Your email
+    %p
+      = current_user.email
 
   %br
   %br
   %br
+  %br
+  %br
+  %br
+  %br
 
   %h3 
     = t('.change_password')

public/javascripts/view.js

@@ -81,6 +81,7 @@ $(document).ready(function(){
   $(".add_aspect_button", "#aspect_nav").tipsy({gravity:'w'});
   $(".person img", ".dropzone").tipsy({live:true});
   $(".avatar", ".aspects").tipsy({live:true});
+  $(".what_is_this").tipsy({live:true,delayIn:400});
 
   $('.webfinger_form').submit(function(evt){
     form = $(evt.currentTarget);
@@ -136,6 +137,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){

public/stylesheets/sass/application.sass

@@ -1943,3 +1943,26 @@ h3,h4
     :-moz-border-radius 5px
     :border-radius 5px
 
+.what_is_this
+  :display inline-block
+  :cursor default
+  :font
+    :size 8px
+  :color #fff
+
+  :background
+    :color #ccc
+
+  :-webkit-border-radius 10px
+
+  :width 15px
+  :max-width 12px
+  :text
+    :indent 4px
+
+  :position relative
+  :top -4px
+
+  &:hover
+    :background
+      :color #107FC9

spec/models/photo_spec.rb

@@ -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

spec/models/profile_spec.rb

@@ -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