From 77b92b0b234f04c4b10cfb2f0d90529b9381d306 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 1 Jan 2015 17:50:25 +0100
Subject: [PATCH] changed a few Devise views

---
 app/views/devise/confirmations/new.html.haml               | 2 +-
 .../devise/mailer/confirmation_instructions.html.haml      | 7 ++++++-
 .../devise/mailer/reset_password_instructions.html.haml    | 4 ++--
 app/views/devise/mailer/unlock_instructions.html.haml      | 2 +-
 app/views/devise/passwords/new.html.haml                   | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index f4f0ecf3..59a3b121 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -3,7 +3,7 @@
   = bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
     = devise_error_messages!
 
-    = f.email_field :screen_name, autofocus: true, label: "User name"
+    = f.text_field :screen_name, autofocus: true, label: "User name"
     = f.submit "Resend confirmation instructions"
 
   = render "devise/shared/links"
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
index ffbe7f29..2692ab55 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.haml
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -1,3 +1,8 @@
-%p Welcome #{@screen_name}!
+%p
+  Welcome to
+  = succeed ',' do
+    = APP_CONFIG['site_name']
+  = succeed '!' do
+    = @resource.screen_name
 %p You can confirm your account email through the link below:
 %p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token)
\ No newline at end of file
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
index 0a64cbd8..9a33c013 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.haml
+++ b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -1,5 +1,5 @@
-%p Hello #{@resource.email}!
-%p Someone has requested a link to change your password. You can do this through the link below.
+%p Hello #{@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)
 %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.
\ No newline at end of file
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
index 6c5e8c74..3e78afb2 100644
--- a/app/views/devise/mailer/unlock_instructions.html.haml
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -1,4 +1,4 @@
-%p Hello #{@resource.email}!
+%p Hello #{@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)
\ No newline at end of file
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 56a4c885..aa400f65 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -3,8 +3,8 @@
   = bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
     = devise_error_messages!
 
-    = f.text_field :screen_name, autofocus: true, "User name"
-    = f.submit "Send me reset password instructions"
+    = f.text_field :screen_name, autofocus: true, label: "User name"
+    = f.submit "Send me password reset instructions"
 
   = render "devise/shared/links"
 = render "shared/links"