mirrors/retrospring
1
0
Fork 1
mirror of https://github.com/Retrospring/retrospring.git synced 2025-03-31 03:52:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix emails

Browse source
This commit is contained in:
Yuki 2015-07-23 12:12:36 +05:30
parent 38d1c21118
commit 5c86833601
6 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/devise/mailer/confirmation_instructions.html.haml
View file

@ -4,5 +4,6 @@
= APP_CONFIG['site_name'] = APP_CONFIG['site_name']
= succeed '!' do = succeed '!' do
= @resource.screen_name = @resource.screen_name
%p  
%p{style: "margin:0px;padding:0px"} You can confirm your account email through the link below: %p{style: "margin:0px;padding:0px"} You can confirm your account email through the link below:
%p{style: "margin:0px;padding:0px"}= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %p{style: "margin:0px;padding:0px"}= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))

6
app/views/devise/mailer/reset_password_instructions.html.haml
View file

@ -1,8 +1,10 @@
%p{style: "margin:0px;padding:0px"} %p{style: "margin:0px;padding:0px"}
Hello Hello
= succeed '!' = succeed '!' do
= @resource.screen_name = @resource.screen_name
%p  
%p{style: "margin:0px;padding:0px"} Someone (hopefully you) has requested a link to change your password. You can do this through the link below. %p{style: "margin:0px;padding:0px"} Someone (hopefully you) has requested a link to change your password. You can do this through the link below.
%p{style: "margin:0px;padding:0px"}= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %p{style: "margin:0px;padding:0px"}= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
%p  
%p{style: "margin:0px;padding:0px"} If you didn't request this, please ignore this email. %p{style: "margin:0px;padding:0px"} If you didn't request this, please ignore this email.
%p{style: "margin:0px;padding:0px"} Your password won't change until you access the link above and create a new one. %p{style: "margin:0px;padding:0px"} Your password won't change until you access the link above and create a new one.

4
app/views/devise/mailer/reset_password_instructions.text.erb
View file

@ -1,9 +1,9 @@
Hello <%= @resource.screen_name %> Hello <%= @resource.screen_name %>!
Someone (hopefully you) has requested a link to change your password. 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. 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) %> <%= edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %>
If you didn't request this, please ignore this email. 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. Your password won't change until you access the link above and create a new one.

5
app/views/devise/mailer/unlock_instructions.html.haml
View file

@ -1,7 +1,8 @@
%p{style: "margin:0px;padding:0px"} %p{style: "margin:0px;padding:0px"}
Hello Hello
= succeed '!' = succeed '!' do
= @resource.screen_name = @resource.screen_name
%p &nbsp;
%p{style: "margin:0px;padding:0px"} Your account has been locked due to an excessive number of unsuccessful sign in attempts. %p{style: "margin:0px;padding:0px"} Your account has been locked due to an excessive number of unsuccessful sign in attempts.
%p{style: "margin:0px;padding:0px"} Click the link below to unlock your account: %p{style: "margin:0px;padding:0px"} Click the link below to unlock your account:
%p{style: "margin:0px;padding:0px"}= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %p{style: "margin:0px;padding:0px"}= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))

2
app/views/devise/mailer/unlock_instructions.text.erb
View file

@ -1,4 +1,4 @@
Hello <%= @resource.screen_name %> Hello <%= @resource.screen_name %>!
Your account has been locked due to an excessive number of unsuccessful 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 sign in attempts. You can unlock your account by copying the link below

23
app/views/layouts/mail.html.haml
View file

@ -1,17 +1,16 @@
%html %html
%head %head
%style{type: "text/css"} :css
:css body {
body { font-size: 16px;
font-size: 16px; margin-top: 0px;
margin-top: 0px; margin-bottom: 0px;
margin-bottom: 0px; font-family: Arial, sans-serif;
font-family: Arial, sans-serif; }
} p {
p { margin: 0px;
margin: 0px; padding: 0px;
padding: 0px; }
}
%body %body
%table{cellpadding: 0, cellspacing: 0, border: 5, bordercolor: "#5e35b1", bgcolor: "#5e35b1", style: "font-size:0px;", align: "center", width: "630"} %table{cellpadding: 0, cellspacing: 0, border: 5, bordercolor: "#5e35b1", bgcolor: "#5e35b1", style: "font-size:0px;", align: "center", width: "630"}
%tbody %tbody