From 887795bead1dae577bab4ca69bfa36572a6e8e13 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 5 Apr 2014 22:16:32 +0000 Subject: [PATCH] VRFS-1483 final cleanup --- admin/app/admin/email_batch.rb | 4 ++-- ruby/lib/jam_ruby/models/email_batch.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/app/admin/email_batch.rb b/admin/app/admin/email_batch.rb index a4d9a843c..d074fd0d4 100644 --- a/admin/app/admin/email_batch.rb +++ b/admin/app/admin/email_batch.rb @@ -48,8 +48,8 @@ ActiveAdmin.register JamRuby::EmailBatch, :as => 'Batch Emails' do batch_test_admin_batch_email_path(bb.id), :confirm => "Run test batch with #{bb.test_count} emails?") : '' end - column 'Send Live' do |bb| - bb.can_run_batch? ? link_to("Live Batch (#{User.email_opt_in.count})", + column 'Deliver Live' do |bb| + bb.can_run_batch? ? link_to("Deliver Batch (#{User.email_opt_in.count})", batch_send_admin_batch_email_path(bb.id), :confirm => "Run LIVE batch with #{User.email_opt_in.count} emails?") : '' end diff --git a/ruby/lib/jam_ruby/models/email_batch.rb b/ruby/lib/jam_ruby/models/email_batch.rb index a7bca12b0..bdd3f2e7d 100644 --- a/ruby/lib/jam_ruby/models/email_batch.rb +++ b/ruby/lib/jam_ruby/models/email_batch.rb @@ -20,7 +20,7 @@ Hello #{VAR_FIRST_NAME},

Paragraph 1 ... newline whitespace is significant for plain text conversions

-

Paragraph 2 ... #{VAR_FIRST_NAME} will be replaced by users first name

+

Paragraph 2 ... "#{VAR_FIRST_NAME}" will be replaced by users first name

Thanks for using JamKazam!

FOO