Merge pull request #2 from webdev-camp/email

Make some small changes to automated emails

app/views/apply_mailer/cancel.text.erb

@@ -1,14 +1,16 @@
 Hello <%=@application.user.name%>,
 
-This is to confirm that we have received your application cancellation.
+We have received your application cancellation. This is sad to see you go.
 
 <% if @reason.blank? %>
 Since you have not given a reason for the cancellation, we assume you won't apply again
 and may wish to cancel your account as well.
 <% else %>
-You may apply again if your situation changes.
+If you have any other question, please reply to this email and we're happy to help.
 <% end %>
 
-We wish you best in your career endeavours
+We wish to see you again when your situation changes and wish you best in your career endeavours.
 
-The Web Dev Team
+Sincerely,
+
+WebDev Camp

app/views/apply_mailer/submit.text.erb

@@ -1,10 +1,10 @@
-Hello <%= @application.user.name %>,
+Hello, <%= @application.user.name %>!
 
-this is to confirm that we have received your application for the web dev course: <%=@application.primary_choice_course.full_name%>
+Welcome to WebDev Camp. We have received your application for next Bootcamp: <%=@application.primary_choice_course.full_name%>
 
-We will review you application and email you within one week.
+We will review your application and contact you as soon as possible. Due to the big amount of applications we receive everyday, the waiting time might take up to one week.
 
-If your situation changes or you have additional questions or concerns, you can get in touch by replying to this email.
+If your situation changes or if you have any other question, please reply to this email and we're happy to help.
 
 Best Regards
 

app/views/devise/mailer/confirmation_instructions.html.haml

@@ -1,4 +1,10 @@
 %p
-  Welcome #{@resource.name}!
-%p You can confirm your account email through the link below:
+  Hello, #{@resource.name}!
+%p
+  Welcome to WebDev Camp, a 9 week Bootcamp that will change your life.
+  You can confirm your account email through the link below:
 %p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token)
+%p
+  Best regards,
+%p
+  WebDev Camp

app/views/devise/mailer/password_change.html.haml

@@ -1,3 +1,8 @@
 %p
-  Hello #{@resource.name}!
-%p We're contacting you to notify you that your password has been changed.
+  Hello, #{@resource.name}!
+%p
+  This email is to confirm that your password has been changed.
+%p
+  Have a great day
+%p
+  WebDev Camp

app/views/devise/mailer/reset_password_instructions.html.haml

@@ -1,6 +1,9 @@
 %p
-  Hello #{@resource.name}!
+  Hello, #{@resource.name}!
 %p Someone has requested a link to change your password. You can do this through the link below.
 %p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token)
 %p If you didn't request this, please ignore this email.
 %p Your password won't change until you access the link above and create a new one.
+
+%p Sincerely,
+%p WebDev Camp

app/views/devise/mailer/unlock_instructions.html.haml

@@ -1,5 +1,8 @@
 %p
-  Hello #{@resource.name}!
+  Hello, #{@resource.name}!
 %p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
-%p Click the link below to unlock your account:
+%p If you wish to unlock your account again, please click the link below:
 %p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token)
+
+%p Sincerely,
+%p WebDev Camp