FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from Retrospring/feature-mail-template-revision 

PR: mail template revision
This commit is contained in:
Yuki 2015-07-23 12:18:51 +05:30
parent 5366c3c748 5c86833601
commit 79cf463cf2
6 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/devise/mailer/confirmation_instructions.html.haml
View File

@ -1,8 +1,9 @@
%p
%p{style: "margin:0px;padding:0px"}
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, protocol: (APP_CONFIG['https'] ? :https : :http))
%p  
%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))

16
app/views/devise/mailer/reset_password_instructions.html.haml
View File

@ -1,8 +1,10 @@
%p
%p{style: "margin:0px;padding:0px"}
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.
= succeed '!' do
= @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"}= 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"} 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.
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.
Your password won't change until you access the link above and create a new one.

13
app/views/devise/mailer/unlock_instructions.html.haml
View File

@ -1,7 +1,8 @@
%p
%p{style: "margin:0px;padding:0px"}
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))
= succeed '!' do
= @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"} 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))

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
sign in attempts. You can unlock your account by copying the link below

36
app/views/layouts/mail.html.haml
View File

@ -1,8 +1,28 @@
%style{type: "text/css"} p{margin:0;padding:0;}*,div,small,span,body{font-family:Arial;}
%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;'}
&copy;
= Time.zone.now.year
= APP_CONFIG['site_name']
%html
%head
:css
body {
font-size: 16px;
margin-top: 0px;
margin-bottom: 0px;
font-family: Arial, sans-serif;
}
p {
margin: 0px;
padding: 0px;
}
%body
%table{cellpadding: 0, cellspacing: 0, border: 5, bordercolor: "#5e35b1", bgcolor: "#5e35b1", style: "font-size:0px;", align: "center", width: "630"}
%tbody
%tr
%td{style: "padding:5px 10px;", align: "center"}
%p{style: "margin:0px;padding:0px"}
%font{color: "#ffffff", size: 6, face: "Arial, sans-serif"}= APP_CONFIG['site_name']
%tr
%td{bgcolor: "#ffffff", style: "padding:10px"}
%font{color: "#000000", size: 4, face: "Arial, sans-serif"}= yield
%p{style:"margin:0px;padding:5px;", align: "center"}
%font{size: 2, color: "#797979", face: "Arial, sans-serif"}
&copy;
= Time.zone.now.year
= APP_CONFIG['site_name']