From 67b504991316834b65e44fd26d0801243c625ea7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 11 Mar 2014 02:27:52 +0000 Subject: [PATCH 1/2] * VRFS-1380 - lighter links in emails --- .../app/views/jam_ruby/corp_mailer/feedback.html.erb | 2 +- .../jam_ruby/invited_user_mailer/friend_invitation.html.erb | 2 +- .../jam_ruby/invited_user_mailer/welcome_betauser.html.erb | 2 +- .../views/jam_ruby/user_mailer/band_session_join.html.erb | 2 +- .../app/views/jam_ruby/user_mailer/confirm_email.html.erb | 2 +- .../jam_ruby/user_mailer/musician_session_join.html.erb | 2 +- .../app/views/jam_ruby/user_mailer/password_reset.html.erb | 2 +- .../app/views/jam_ruby/user_mailer/updating_email.html.erb | 2 +- .../app/views/jam_ruby/user_mailer/welcome_message.html.erb | 6 +++--- .../jam_ruby/app/views/layouts/from_user_mailer.html.erb | 2 +- ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb index 7daab2af6..611a9891b 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb @@ -8,7 +8,7 @@

-This email was received because someone left feedback at http://www.jamkazam.com/corp/contact +This email was received because someone left feedback at http://www.jamkazam.com/corp/contact

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb index 11c4bffd7..7667ae9fd 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb @@ -1,7 +1,7 @@ <% provide(:title, "You've been invited to JamKazam by #{@sender.name}!") %> <% provide(:photo_url, @sender.resolved_photo_url) %> -To signup, please go to the create account page. +To signup, please go to the create account page. <% content_for :note do %> <% if @note %> diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb index c1aafeaee..8cc412c4f 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Welcome to the JamKazam Beta!') %> -To signup, please go to the create account page. \ No newline at end of file +To signup, please go to the create account page. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb index 276ae4fcc..3106f63df 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/band_session_join.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'New Band Session') %> -

<%= @body %> Listen in.

\ No newline at end of file +

<%= @body %> Listen in.

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb index 074024223..bb943b508 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/confirm_email.html.erb @@ -2,4 +2,4 @@

Welcome to Jamkazam, <%= @user.first_name %>!

-

To confirm this email address, please go to the signup confirmation page..

+

To confirm this email address, please go to the signup confirmation page.

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb index de2b7e43c..97a709a97 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/musician_session_join.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Musician in Session') %> -

<%= @body %> Listen in.

\ No newline at end of file +

<%= @body %> Listen in.

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb index 06bd2dcb2..a69fe4da5 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Jamkazam Password Reset') %> -Visit this link so that you can change your Jamkazam password: reset password. \ No newline at end of file +Visit this link so that you can change your Jamkazam password: reset password. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb index c6ecd5a1f..3573d8ea6 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/updating_email.html.erb @@ -1,3 +1,3 @@ <% provide(:title, 'Please Confirm New Jamkazam Email') %> -Please click the following link to confirm your change in email: confirm email. \ No newline at end of file +Please click the following link to confirm your change in email: confirm email. \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb index 500176087..96fea047f 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb @@ -7,17 +7,17 @@

Tutorial videos that show you how to use the key features of the product:
-https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos +https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos

Getting Started knowledge base articles:
-https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles +https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles

Support Portal in case you run into trouble and need help:
-https://jamkazam.desk.com/ +https://jamkazam.desk.com/

diff --git a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb index 0b957eabb..3d03cec55 100644 --- a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb +++ b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb @@ -49,7 +49,7 @@

-

This email was sent to you because you have an account at JamKazam. +

This email was sent to you because you have an account at JamKazam. diff --git a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb index 5b25240d7..6fcd69d53 100644 --- a/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb +++ b/ruby/lib/jam_ruby/app/views/layouts/user_mailer.html.erb @@ -40,7 +40,7 @@

-

This email was sent to you because you have an account at JamKazam. +

This email was sent to you because you have an account at JamKazam. From cee4dd6aa44e17418a8f0e2f9e580785aecb4d0d Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 10 Mar 2014 22:41:32 -0400 Subject: [PATCH 2/2] add line break --- web/app/views/corps/features.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/views/corps/features.html.erb b/web/app/views/corps/features.html.erb index 10892e941..62e87c4b5 100644 --- a/web/app/views/corps/features.html.erb +++ b/web/app/views/corps/features.html.erb @@ -77,7 +77,7 @@ Finally, musicians can use JamKazam to find other musicians in their area, check out their skills, styles, and listen to their performances, and connect to play together online and/or offline.

-

BENEFITS:

+

BENEFITS:


Everyone who plays music knows that it’s far more fun to play with others than to play alone. But many musicians – especially amateur musicians – are not in bands and don’t have established networks of musician friends to play with, simply because of the time and logistical challenges of playing with others, as described earlier. With JamKazam, musicians can easily find other musicians in their area who want to play together online, and who have complementary instruments, skill levels, and musical interests. And they can easily try playing with others without the risk or investment of time to meet in person.

\ No newline at end of file