Fix text, add more templates

app/mailers/retromail.rb

@@ -7,7 +7,7 @@ class Retromail < Devise::Mailer
   def devise_mail(record, action, opts={})
     initialize_from_record(record)
     mail(headers_for(action, opts)) do |format|
-      format.txt
+      format.text
       format.html
     end
   end

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

@@ -1,5 +1,8 @@
-%p Hello #{@resource.screen_name}!
+%p
+  Hello
+  = succeed '!'
+   = @resource.screen_name
 %p Someone (hopefully you) 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, protocol: (APP_CONFIG['https'] ? :https : :http))
 %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 Your password won't change until you access the link above and create a new one.

app/views/devise/mailer/reset_password_instructions.text.erb

@@ -0,0 +1,9 @@
+Hello <% @resource.screen_name %>
+
+Someone (hopefully you) has requested a link to change your password.
+You can do this by copying the link below and entering it into your browser.
+
+<%= edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.

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

@@ -1,4 +1,7 @@
-%p Hello #{@resource.screen_name}!
+%p
+  Hello
+  = succeed '!'
+   = @resource.screen_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= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
+%p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))

app/views/devise/mailer/unlock_instructions.text.erb

@@ -0,0 +1,7 @@
+Hello <% @resource.screen_name %>
+
+Your account has been locked due to an excessive number of unsuccessful
+sign in attempts. You can unlock your account by copying the link below
+and entering it into your browser.
+
+<%= unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %>

app/views/layouts/mail.html.haml

@@ -2,4 +2,7 @@
 %div{style: 'background: #5e35b1; padding: 5px; padding-left: 10px; font-size: 25px; color: white; font-family: Arial; width: 800px; margin: 0;'}= APP_CONFIG['site_name']
 %div{style: 'border: #5e35b1 5px solid; padding: 5px; border-top: none; background: white; color: black; font-family: Arial; width: 795px; margin: 0;'}
   = yield
-%small{style: 'color: grey; display: block; width: 800px; text-align: center;'} © 2015 Retrospring
+%small{style: 'color: grey; display: block; width: 800px; text-align: center;'}
+  ©
+  = Time.zone.now.year
+  = APP_CONFIG['site_name']

app/views/layouts/mail.text.erb

@@ -0,0 +1,3 @@
+<%= yield %>
+
+© <%= Time.zone.now.year %> <%= APP_CONFIG['site_name'] %>

app/views/layouts/mail.txt.erb

@@ -1,3 +0,0 @@
-<%= yield %>
-
-© 2015 Retrospring