diff --git a/app/views/invitations/_new.haml b/app/views/invitations/_new.haml index c53b8451316776e2a060e1bc068f8b3f8a4900d6..77b07faa283c07ef7ecb1e0105879fc0dd79fc63 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 b82cca1041d87a73dbb17f4b7229fd77943f50d7..40476eae732831854737e41501736c2343a95760 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"