* VRFS-3664 - dont say dear anonymous in emails

admin/app/admin/affiliates.rb

@@ -6,6 +6,8 @@ ActiveAdmin.register JamRuby::AffiliatePartner, :as => 'Affiliates' do
   config.batch_actions = false
   # config.clear_action_items!
   config.filters = false
+  config.per_page = 50
+  config.paginate = true
 
   form :partial => 'form'
 

admin/app/views/email/dump_emailables.csv.erb

@@ -1,2 +1,2 @@
 <%- headers = ['email', 'name', 'unsubscribe_token'] -%>
-<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.first_name, user.unsubscribe_token]) %><%- end -%>
+<%= CSV.generate_line headers %><%- @users.each do |user| -%><%= CSV.generate_line([user.email, user.anonymous? ? '-' : user.first_name, user.unsubscribe_token]) %><%- end -%>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb

@@ -1,5 +1,5 @@
 <% provide(:title, 'Confirm Email') %>
 
-<p>Welcome to JamKazam, <%= @user.first_name %>!</p>
+<p>Welcome to JamKazam<%= @user.anonymous? ? '!' : ", #{@user.first_name}!" %></p>
 
 <p>To confirm this email address, please go to the <a style="color: #ffcc00;" href="<%= @signup_confirm_url %>">signup confirmation page</a>.</p>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.text.erb

@@ -1,3 +1,3 @@
-Welcome to JamKazam, <%= @user.first_name %>!
+Welcome to JamKazam<%= @user.anonymous? ? '!' : ", #{@user.first_name}!" %>
 
 To confirm this email address, please go to the signup confirmation page at: <%= @signup_confirm_url %>.

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb

@@ -1,5 +1,7 @@
 <% provide(:title, 'New Musicians You Should Check Out') %>
-Hi <%= @user.first_name %>,
+<% if !@user.anonymous? %>
+<p>Hi <%= @user.first_name %>,</p>
+<% end %>
 
 <p>The following new musicians have joined JamKazam within the last week, and have Internet connections with low enough latency to you that you can have a good online session together. We'd suggest that you look through the new musicians listed below to see if any match your musical interests, and if so, click through to their profile page on the JamKazam website to send them a message or a request to connect as a JamKazam friend:
 </p>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb

@@ -1,7 +1,8 @@
 New Musicians You Should Check Out
 
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
-
+<% end %>
 The following new musicians have joined JamKazam within the last week, and have Internet connections with low enough latency to you that you can have a good online session together. We'd suggest that you look through the new musicians listed below to see if any match your musical interests, and if so, click through to their profile page on the JamKazam website to send them a message or a request to connect as a JamKazam friend:
 
 <% @new_musicians.each do |user| %>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb

@@ -1,7 +1,8 @@
 <% provide(:title, @title) %>
 
-<p>Hello <%= @user.first_name %> --
-</p>
+<% if !@user.anonymous? %>
+<p>Hi <%= @user.first_name %>,</p>
+<% end %>
 
 <p>The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.</p>
 

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb

@@ -1,7 +1,8 @@
 <% provide(:title, @title) %>
 
-Hello <%= @user.first_name %> --
-
+<% if !@user.anonymous? %>
+Hi <%= @user.first_name %>,
+<% end %>
 The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.
 
 GENRE | NAME | DESCRIPTION | LATENCY

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.html.erb

@@ -1,18 +1,20 @@
 <% provide(:title, 'JamKazam Session Reminder') %>
 
 
-<div>
+<% if !@user.anonymous? %>
+<p>
 Hi <%= @user.first_name %>,
-</div>
+</p>
+<% end %>
 <br/>
-<div>
+<p>
   <span>This is a reminder that your JamKazam session</span>
   <a href='<%=@session_url%>'><%= @session_name %></a>
   <span>is scheduled for tomorrow. We hope you have fun!</span>
-</div>
+</p>
 <br/>
-<div>
+<p>
 Best Regards,
 <br/>
 Team JamKazam
-</div>
+</p>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_day.text.erb

@@ -1,5 +1,6 @@
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
-
+<% end %>
 This is a reminder that your JamKazam session <%=@session_name%> is scheduled for tomorrow. We hope you have fun!
 
 Best Regards,

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.html.erb

@@ -1,17 +1,20 @@
 <% provide(:title, 'Your JamKazam session starts in 1 hour!') %>
 
-<div>
+<% if !@user.anonymous? %>
+<p>
 Hi <%= @user.first_name %>,
-</div>
+</p>
+<% end %>
+
 <br/>
-<div>
+<p>
   <span>This is a reminder that your JamKazam session</span>
   <a href='<%=@session_url%>'><%= @session_name %></a>
   <span>starts in 1 hour. We hope you have fun!</span>
-</div>
+</p>
 <br/>
-<div>
+<p>
 Best Regards,
 <br/>
 Team JamKazam
-</div>
+</p>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_reminder_upcoming.text.erb

@@ -1,4 +1,6 @@
+<% if !@user.anonymous? %>
 Hi <%= @user.first_name %>,
+<% end %>
 
 This is a reminder that your JamKazam session 
 <%=@session_name%>

ruby/lib/jam_ruby/models/user.rb

@@ -297,8 +297,12 @@ module JamRuby
       online?
     end
 
+    def anonymous?
+      first_name == 'Anonymous' && last_name == 'Anonymous'
+    end
+
     def name
-      if first_name == 'Anonymous' && last_name == 'Anonymous'
+      if anonymous?
         'Anonymous'
       else
         "#{first_name} #{last_name}"
@@ -1684,8 +1688,6 @@ module JamRuby
       else
         false
       end
-
-
     end
     private
       def create_remember_token