From 6f20e11a676e96bc64a2c21025892d2cd4116760 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Thu, 18 Aug 2011 19:09:20 -0700 Subject: [PATCH] better invite emails wip --- app/controllers/invitations_controller.rb | 2 +- app/models/invitation.rb | 2 +- app/views/devise/mailer/_inviters.haml | 12 ++++---- ...nvites.erb => invitation_instructions.erb} | 28 +++++++++++++++++++ .../mailer/invitation_instructions.haml | 22 --------------- 5 files changed, 35 insertions(+), 31 deletions(-) rename app/views/devise/mailer/{_batch_invites.erb => invitation_instructions.erb} (94%) delete mode 100644 app/views/devise/mailer/invitation_instructions.haml diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index 7b070c1c8..1046e247b 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -23,7 +23,7 @@ class InvitationsController < Devise::InvitationsController #NOTE should we try and find users by email here? probs aspect = current_user.aspects.find(aspect_id) - invites = Invitation.batch_invite(emails, :sender => current_user, :aspect => aspect, :service => 'email') + invites = Invitation.batch_invite(emails, :message => message, :sender => current_user, :aspect => aspect, :service => 'email') flash[:notice] = extract_messages(invites) diff --git a/app/models/invitation.rb b/app/models/invitation.rb index c75375dab..d088458e0 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -8,7 +8,7 @@ class Invitation < ActiveRecord::Base belongs_to :recipient, :class_name => 'User' belongs_to :aspect - attr_accessible :sender, :recipient, :aspect, :service, :identifier, :admin + attr_accessible :sender, :recipient, :aspect, :service, :identifier, :admin, :message before_validation :set_email_as_default_service diff --git a/app/views/devise/mailer/_inviters.haml b/app/views/devise/mailer/_inviters.haml index 88046fe46..b4c1f12d9 100644 --- a/app/views/devise/mailer/_inviters.haml +++ b/app/views/devise/mailer/_inviters.haml @@ -1,11 +1,9 @@ -%p - - if @invs.count == 1 - = t('.has_invited_you', :name => @invs.first.sender.name + " (#{@invs.first.sender.diaspora_handle})") - - else - = t('.have_invited_you', :names => (@invs.map{|inv| inv.sender.name + " (#{inv.sender.diaspora_handle})"}.join(","))) - = t('.accept_at', :url => root_url) +- if @invs.count == 1 + = person_image_link(@invs.first.sender.person, :size => :thumb_small) + = t('.has_invited_you', :name => @invs.first.sender.name + " (#{@invs.first.sender.diaspora_handle})") +- else + = t('.have_invited_you', :names => (@invs.map{|inv| inv.sender.name + " (#{inv.sender.diaspora_handle})"}.to_sentence)) - @invs.each do |inv| - unless inv.message.blank? = "#{inv.sender.name}:" = "\"#{inv.message}\"" - %p diff --git a/app/views/devise/mailer/_batch_invites.erb b/app/views/devise/mailer/invitation_instructions.erb similarity index 94% rename from app/views/devise/mailer/_batch_invites.erb rename to app/views/devise/mailer/invitation_instructions.erb index 600fa306b..598ad585a 100644 --- a/app/views/devise/mailer/_batch_invites.erb +++ b/app/views/devise/mailer/invitation_instructions.erb @@ -1,3 +1,6 @@ + + Accept Your Diaspora* Invite! +

Email not displaying correctly? View it in your browser

+ + + + + + + + + + + + + <% if @resource.invitations_to_me.any?{|x| !x.admin?} %> + <% @invs = @resource.invitations_to_me %> + + + + <% end %> + + + +
@@ -10,14 +13,38 @@
Finally - it's here.
+ <%= render :partial => 'devise/mailer/inviters' %> +
The social network you have been waiting for has arrived. Revamped, more secure, and more fun, DIASPORA* is ready to help you share and explore the web in a whole new way.
@@ -124,3 +151,4 @@
+ diff --git a/app/views/devise/mailer/invitation_instructions.haml b/app/views/devise/mailer/invitation_instructions.haml deleted file mode 100644 index b945d898f..000000000 --- a/app/views/devise/mailer/invitation_instructions.haml +++ /dev/null @@ -1,22 +0,0 @@ -- @invs = @resource.invitations_to_me --unless @invs.first.admin? - !!! - %html - %head - %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ - = render :partial => 'notifier/notifier_css' - %body - %header - = image_tag AppConfig[:pod_url] + 'images/logo_caps.png' - #container - %p - = t('devise.mailer.welcome', :email => @resource.email) - = render :partial => 'inviters' - - %p= link_to t('.accept'), accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text" - %p.small - = t('.ignore') - %br/ - = t('.no_account_till') --else - = render :partial => 'devise/mailer/batch_invites'