nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form

Browse source
This commit is contained in:
Maxwell Salzberg 2012-03-17 17:10:08 -07:00
parent 5868ff06f1
commit aee17798c1
3 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/invitations_controller.rb
View file

@ -8,7 +8,6 @@ class InvitationsController < ApplicationController
def new def new
@invite_code = current_user.invitation_code @invite_code = current_user.invitation_code
@sent_invitations = current_user.invitations_from_me.includes(:recipient)
respond_to do |format| respond_to do |format|
format.html do format.html do
render :layout => false render :layout => false

35
app/views/invitations/new.html.haml
View file

@ -5,23 +5,27 @@
.span-12.last .span-12.last
%h2 %h2
= t('.invite_someone_to_join') = t('.invite_someone_to_join')
.description %br
= t('.if_they_accept_info')
%br
.span-7.append-1.last .span-7.append-1.last
%b= t('.paste_link')
%br
%br
= invite_link(@invite_code)
= t('.codes_left', :count => @invite_code.count)
%br
%br
#email_invitation #email_invitation
= form_tag new_user_invitation_path do = form_tag new_user_invitation_path do
%h4 %h4
= t('email') = t('email')
= text_field_tag 'email_inviter[emails]' ,nil, :title => t('.comma_seperated_plz'), :placeholder => 'foo@bar.com, max@foo.com...' = text_field_tag 'email_inviter[emails]' ,nil, :title => t('.comma_seperated_plz'), :placeholder => 'foo@bar.com, max@foo.com...'
%br %br
%br
%h4 %h4
= t('.language') = t('.language')
= select_tag('email_inviter[locale]', options_from_collection_for_select(available_language_options, "second", "first", :selected => current_user.language)) = select_tag('email_inviter[locale]', options_from_collection_for_select(available_language_options, "second", "first", :selected => current_user.language))
%br
%br %br
%h4 %h4
@ -29,23 +33,4 @@
= text_area_tag 'email_inviter[message]',nil, :rows => 3, :value => t('.check_out_diaspora') = text_area_tag 'email_inviter[message]',nil, :rows => 3, :value => t('.check_out_diaspora')
%p %p
= submit_tag t('.send_an_invitation') = submit_tag t('.send_an_invitation')
.clearfix
.span-7.prepend-3.last
= t('.paste_link')
= invite_link(@invite_code)
= t('.codes_left', :count => @invite_code.count)
%br
%br
- unless @sent_invitations.empty?
.span-6.prepend-3.last
#already_invited_pane
%h4
= t('.already_invited')
- for invitation in @sent_invitations
= invitation.recipient_identifier
= link_to t('.resend'), invitation_resend_path(invitation), :confirm => t('are_you_sure')
%br

2
config/locales/diaspora/en.yml
View file

@ -339,7 +339,7 @@ en:
personal_message: "Personal message" personal_message: "Personal message"
send_an_invitation: "Send an invitation" send_an_invitation: "Send an invitation"
send_invitation: "Send invitation" send_invitation: "Send invitation"
paste_link: "or paste them this link!" paste_link: "Share this link with your friends to invite them to Diaspora*, or email them the link directly."
codes_left: codes_left:
zero: "No invites left on this code" zero: "No invites left on this code"
one: "One invite left on this code" one: "One invite left on this code"