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

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Jonathan Kolyer 2014-03-10 11:47:52 +00:00
parent 00c45b4612 cee4dd6aa4
commit 93a24f0ca8
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/app/views/jam_ruby/corp_mailer/feedback.html.erb
View File

@ -8,7 +8,7 @@
<br/>
<br/>
<p>
This email was received because someone left feedback at <a href="http://www.jamkazam.com/corp/contact">http://www.jamkazam.com/corp/contact</a>
This email was received because someone left feedback at <a style="color: #588C98;" href="http://www.jamkazam.com/corp/contact">http://www.jamkazam.com/corp/contact</a>
</p>
</body>
</html>

2
ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/friend_invitation.html.erb
View File

@ -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 <a href="<%= @signup_url %>">create account</a> page.
To signup, please go to the <a style="color: #588C98;" href="<%= @signup_url %>">create account</a> page.
<% content_for :note do %>
<% if @note %>

2
ruby/lib/jam_ruby/app/views/jam_ruby/invited_user_mailer/welcome_betauser.html.erb
View File

@ -1,3 +1,3 @@
<% provide(:title, 'Welcome to the JamKazam Beta!') %>
To signup, please go to the <a href="<%= @signup_url %>">create account</a> page.
To signup, please go to the <a style="color: #588C98;" href="<%= @signup_url %>">create account</a> page.

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

@ -1,3 +1,3 @@
<% provide(:title, 'New Band Session') %>
<p><%= @body %>&nbsp;<a href="<%= @session_url %>">Listen in.</a></p>
<p><%= @body %>&nbsp;<a style="color: #588C98;" href="<%= @session_url %>">Listen in.</a></p>

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

@ -2,4 +2,4 @@
<p>Welcome to Jamkazam, <%= @user.first_name %>!</p>
<p>To confirm this email address, please go to the <a href="<%= @signup_confirm_url %>">signup confirmation page.</a>.</p>
<p>To confirm this email address, please go to the <a style="color: #588C98;" href="<%= @signup_confirm_url %>">signup confirmation page</a>.</p>

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

@ -1,3 +1,3 @@
<% provide(:title, 'Musician in Session') %>
<p><%= @body %>&nbsp;<a href="<%= @session_url %>">Listen in.</a></p>
<p><%= @body %>&nbsp;<a style="color: #588C98;" href="<%= @session_url %>">Listen in.</a></p>

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

@ -1,3 +1,3 @@
<% provide(:title, 'Jamkazam Password Reset') %>
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: <a style="color: #588C98;" href="<%= @password_reset_url %>">reset password</a>.

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

@ -1,3 +1,3 @@
<% provide(:title, 'Please Confirm New Jamkazam Email') %>
Please click the following link to confirm your change in email: <a href="<%= @user.update_email_confirmation_url %>">confirm email</a>.
Please click the following link to confirm your change in email: <a style="color: #588C98;" href="<%= @user.update_email_confirmation_url %>">confirm email</a>.

6
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb
View File

@ -7,17 +7,17 @@
<p>
Tutorial videos that show you how to use the key features of the product:</br>
<a href="https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos">https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos</a>
<a style="color: #588C98;" href="https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos">https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos</a>
</p>
<p>
Getting Started knowledge base articles:</br>
<a href="https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles">https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles</a>
<a style="color: #588C98;" href="https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles">https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles</a>
</p>
<p>
Support Portal in case you run into trouble and need help:</br>
<a href="https://jamkazam.desk.com/">https://jamkazam.desk.com/</a>
<a style="color: #588C98;" href="https://jamkazam.desk.com/">https://jamkazam.desk.com/</a>
</p>
<p>

2
ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb
View File

@ -49,7 +49,7 @@
<!-- CALL OUT BOX -->
</font></p>
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a href="http://www.jamkazam.com">JamKazam</a>.
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a style="color: #588C98;" href="http://www.jamkazam.com">JamKazam</a>.
</td></tr></table>
</td>

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

@ -40,7 +40,7 @@
<!-- CALL OUT BOX -->
</font></p>
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a href="http://www.jamkazam.com">JamKazam</a>.
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a style="color: #588C98;" href="http://www.jamkazam.com">JamKazam</a>.
</td></tr></table>
</td>

2
web/app/views/corps/features.html.erb
View File

@ -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.
</p>
<h2>BENEFITS:</h2>
<h2>BENEFITS:</h2><br/>
<p>
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.
</p>