From d0055cee37afcfb1e996045f17f733668d658a72 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 19 Oct 2010 21:07:10 -0700
Subject: [PATCH] changed a bit of text in the invite, also made it show on all
 aspects now that we have it fixed

---
 app/views/invitations/_new.haml    |  4 +++-
 app/views/shared/_invitations.haml | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/invitations/_new.haml b/app/views/invitations/_new.haml
index c53b84513..77b07faa2 100644
--- a/app/views/invitations/_new.haml
+++ b/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,6 +12,7 @@
       = invite.select(:aspects, @aspects_dropdown_array)
     - else 
       = invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)
+    
     Message:
     = invite.text_area :invite_messages, :value => ""
 
diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml
index b82cca104..40476eae7 100644
--- a/app/views/shared/_invitations.haml
+++ b/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"