diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb index c0c1b5a5d..46275db4a 100644 --- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb @@ -412,7 +412,7 @@ end end - def scheduled_session_comment(target_user, source_user, msg, comment, session) + def scheduled_session_comment(target_user, sender, msg, comment, session) return if !target_user.subscribe_email email = target_user.email @@ -422,7 +422,8 @@ @session_name = session.name @session_date = session.pretty_scheduled_start(true) @comment = comment - @source_user = source_user + @sender = sender + @suppress_user_has_account_footer = true @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details" sendgrid_category "Notification" sendgrid_unique_args :type => unique_args[:type] @@ -432,7 +433,7 @@ mail(:to => email, :subject => subject) do |format| format.text - format.html + format.html { render :layout => "from_user_mailer" } end end diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb index 3f0837c2c..a367a7444 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb @@ -1,7 +1,11 @@ -<% provide(:title, 'Scheduled Session Comment') %> +<% provide(:title, "Scheduled Session Comment from #{@sender.name}") %> +<% provide(:photo_url, @sender.resolved_photo_url) %> -
<%= @comment %>
+<% content_for :note do %> +<%= @comment %>
-- <%= @source_user.name %>
+<%= @session_name %>
+<%= @session_date %>
- \ No newline at end of file + +<% end %> \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.text.erb index 5ae68c0db..5bb7377a2 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.text.erb @@ -5,6 +5,6 @@ <%= @comment %> -- <%= @source_user.name %> +- <%= @sender.name %> See session details at <%= @session_url %>. \ No newline at end of file