forked from diaspora/diaspora
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add markerb to the Gemfile * Update mailer classes to send multipart text+html emails * Simplify all email templates and convert to Markdown+ERB This required stripping the CSS and images from the emails. All Markdown templates are based on the original HTML version except for the inviter, where it was much easier to work with the text version (and the i18n contains the whole message anyway).
- Loading branch information
1 parent
4c7e82f
commit 56db268
Showing
41 changed files
with
98 additions
and
450 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<%= t('devise.mailer.welcome', :email => @resource.email) %> | ||
|
||
<%= t('.you_can_confirm') %> | ||
|
||
[<%= t('.confirm') %>][1] | ||
|
||
[1]: <%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %> |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
app/views/devise/mailer/reset_password_instructions.markerb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<%= t('devise.mailer.hello', :email => @resource.email) %> | ||
|
||
<%= t('.someone_requested') %> | ||
|
||
[<%= t('.change') %>][1] | ||
|
||
[1]: <%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %> | ||
|
||
<%= t('.wont_change') %> | ||
|
||
<%= t('.ignore') %> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<%= t('devise.mailer.hello', :email => @resource.email) %> | ||
|
||
<%= t('.account_locked') %> | ||
|
||
<%= t('.click_to_unlock') %> | ||
|
||
[<%= t('.unlock') %>][1] | ||
|
||
[1]: <%= unlock_url(@resource, :unlock_token => @resource.unlock_token) %> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<%= comment_message(@notification.comment, :process_newlines => true) %> | ||
|
||
[<%= t('notifier.comment_on_post.reply', :name => @notification.comment.post.author.first_name) %>][1] | ||
|
||
[1]: <%= post_url(@notification.comment.post) %> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<%= comment_message(@notification.comment, :process_newlines => true) %> | ||
|
||
[<%= t('notifier.comment_on_post.reply', :name => @notification.comment.post.author.name) %>][1] | ||
|
||
[1]: <%= post_url(@notification.comment.post) %> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<%= t('notifier.hello', :name => @notification.recipient.profile.first_name) %> | ||
|
||
<%= t('notifier.confirm_email.click_link', :unconfirmed_email => @notification.recipient.unconfirmed_email) %> | ||
|
||
<<%= confirm_email_url(:token => @notification.recipient.confirm_email_token) %>> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.