seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98

This commit is contained in:
Jonathan Kolyer 2014-10-01 22:10:54 +00:00
parent f58a410233
commit 5d524cd7b0
13 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/manifest
View File

@ -214,3 +214,4 @@ fix_find_session_sorting_2216a.sql
fix_find_session_sorting_2216b.sql
fix_find_session_sorting_2216c.sql
entabulate_current_network_scores.sql
emails_from_update.sql

2
db/up/emails_from_update.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE email_batches ALTER from_email SET DEFAULT 'JamKazam <support@jamkazam.com>';

2
ruby/lib/jam_ruby/app/mailers/corp_mailer.rb
View File

@ -11,7 +11,7 @@ module JamRuby
layout "user_mailer"
DEFAULT_SENDER = "noreply@jamkazam.com"
DEFAULT_SENDER = "JamKazam <noreply@jamkazam.com>"
default :from => DEFAULT_SENDER

2
ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb
View File

@ -9,7 +9,7 @@ module JamRuby
class InvitedUserMailer < ActionMailer::Base
include SendGrid
DEFAULT_SENDER = "noreply@jamkazam.com"
DEFAULT_SENDER = "JamKazam <noreply@jamkazam.com>"
default :from => DEFAULT_SENDER

2
ruby/lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -11,7 +11,7 @@
layout "user_mailer"
DEFAULT_SENDER = "noreply@jamkazam.com"
DEFAULT_SENDER = "JamKazam <noreply@jamkazam.com>"
default :from => DEFAULT_SENDER

2
ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.html.erb
View File

@ -10,7 +10,7 @@
It’s still very early in our company’s development, so we don’t have zillions of users online on our service yet. If you click Find Session, you will often not find a good session to join, both due to the number of musicians online at any given time, and also because you won’t see private sessions where groups of musicians don’t want to be interrupted in their sessions.
</p>
<p>If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
<p>If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a style="color: #588C98;" href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
</p>
<p>This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session.

2
ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.html.erb
View File

@ -7,7 +7,7 @@
</p>
<p>Find Other Musicians on JamKazam<br />
To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a style="color: #588C98;" href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
</p>
<p>This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that you read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session.

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/friend_request.html.erb
View File

@ -2,4 +2,4 @@
<p><%= @body %></p>
<p>To accept this friend request, <a href="<%= @url %>">click here</a>.</p>
<p>To accept this friend request, <a style="color: #588C98;" href="<%= @url %>">click here</a>.</p>

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
View File

@ -24,7 +24,7 @@ Hi <%= @user.first_name %>,
<% end %>
</table>
</p>
<p>There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>.
<p>There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a style="color: #588C98;" href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>.
</p>
<p>Best Regards,</p>

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.text.erb
View File

@ -1 +1 @@
Visit this link so that you can change your JamKazam password: <a href="<%= @password_reset_url %>">Reset Password</a>.
Visit this link so that you can change your JamKazam password: <%= @password_reset_url %>..

4
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
View File

@ -68,7 +68,7 @@
<td><%= sess.genre.description %></td>
<td>
<%= sess.name %><br/>
<a href="<%= "http://www.jamkazam.com/sessions/#{sess.id}/details" %>">Details</a>
<a style="color: #588C98;" href="<%= "http://www.jamkazam.com/sessions/#{sess.id}/details" %>">Details</a>
</td>
<td><%= sess.description %></td>
<td style="text-align:center">
@ -86,7 +86,7 @@
</tbody>
</table>
<p>To see ALL the scheduled sessions that you might be interested in joining, view our <a href="http://www.jamkazam.com/client#/findSession">Find Session page</a>.</p>
<p>To see ALL the scheduled sessions that you might be interested in joining, view our <a style="color: #588C98;" href="http://www.jamkazam.com/client#/findSession">Find Session page</a>.</p>
<p>Best Regards,</p>

4
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/text_message.html.erb
View File

@ -4,5 +4,5 @@
<% content_for :note do %>
<%= @note %>
<p>To reply to this message, <a href="<%= @url %>">click here</a>.</p>
<% end %>
<p>To reply to this message, <a style="color: #588C98;" href="<%= @url %>">click here</a>.</p>
<% end %>

2
ruby/lib/jam_ruby/models/email_batch.rb
View File

@ -12,7 +12,7 @@ module JamRuby
VAR_FIRST_NAME = '@FIRSTNAME'
VAR_LAST_NAME = '@LASTNAME'
DEFAULT_SENDER = "noreply@jamkazam.com"
DEFAULT_SENDER = "JamKazam <noreply@jamkazam.com>"
BATCH_SIZE = 500
BODY_TEMPLATE =<<FOO