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

app/views/devise/mailer/invitation.html.haml

@@ -48,7 +48,7 @@
       %p
         Hello #{@resource.email}!
       %p
-        #{(@resource.inviters.count == 1)? ( @resource.inviters.first.real_name + " has") : (@resource.inviters.map{|inv| inv.real_name}.join(",") + " have")} invited you to #{root_url}, you can accept it through the link below.
+        #{(@resource.inviters.count == 1)? ( @resource.inviters.first.real_name + " has") : (@resource.inviters.map{|inv| inv.real_name + " (#{inv.diaspora_handle})"}.join(",") + " have")} invited you to join Diaspora at #{root_url}, you can accept it through the link below.
       - @resource.inviters.each do |inv|
         - if @resource.invite_messages[inv.id.to_s]
           = "#{inv.real_name}:"

app/views/invitations/_new.haml

@@ -1,7 +1,8 @@
 .span-12.last
   .modal_title_bar
-    %h4 Send invitation
+    %h4 Invite someone to join Diaspora!
 
+  %i if they accept, they will be added to the aspect you invited them
   = form_for User.new, :url => invitation_path(User) do |invite|
     %p
       = invite.label :email
@@ -11,8 +12,9 @@
       = invite.select(:aspects, @aspects_dropdown_array)
     - else 
       = invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)
+    
     Message:
-    = invite.text_area :invite_messages
+    = invite.text_area :invite_messages, :value => ""
 
     %p= invite.submit "Send an invitation"
 

app/views/people/show.html.haml

@@ -12,6 +12,8 @@
       = person_image_link(@person)
     %ul
       -unless @posts.first.nil?
+        %li
+          %b.small= @person.diaspora_handle
         %li
           %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first))
       - if @person != current_user.person && current_user.friends.include?(@person)

app/views/shared/_invitations.haml

@@ -1,8 +1,7 @@
-- unless @aspect == :all
-  %h4 Invites
-  = link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend"
-  = "(#{invites} left)"
-  %br
-  .yo{ :style => "display:none;"}
-    #invite_user_pane
-      = render "invitations/new"
+%h4 Invites
+= link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend"
+= "(#{invites} left)"
+%br
+.yo{ :style => "display:none;"}
+  #invite_user_pane
+    = render "invitations/new"

lib/hcard.rb

@@ -11,7 +11,7 @@ module HCard
     {:given_name => doc.css(".given_name").text,
     :family_name => doc.css(".family_name").text,
     :url => doc.css("#pod_location").text,
-    :photo => doc.css(".photo[src]").text}
+    :photo => doc.css(".photo[src]").attribute('src').text     }
   end
 
   def self.find url