# HG changeset patch # User luisf # Date 1292431898 0 # Node ID c71f2900168f5a348fb0f923dc4c240a4694d3dd # Parent b5fbd125d70b7c8b857e1e60c60aec8e29492089 Feature #53: User's name and email address also shown in email. diff -r b5fbd125d70b -r c71f2900168f app/views/mailer/account_activation_request.text.html.rhtml --- a/app/views/mailer/account_activation_request.text.html.rhtml Wed Dec 15 16:17:46 2010 +0000 +++ b/app/views/mailer/account_activation_request.text.html.rhtml Wed Dec 15 16:51:38 2010 +0000 @@ -1,6 +1,10 @@

<%= l(:mail_body_account_activation_request, h(@user.login)) %>

<%= link_to @url, @url %>

-

<%= l(:label_ssamr_details) %>

-

<%= textilizable @user.ssamr_user_detail['description'] %>

+

<%= l(:label_ssamr_details) %>

+

<%=l(:field_name)%>: <%= h @user.name %>

+

<%=l(:field_mail)%>: <%= h @user.mail %>

+

<%= l(:label_ssamr_description ) %>

+<%= textilizable @user.ssamr_user_detail['description'] %> + diff -r b5fbd125d70b -r c71f2900168f app/views/mailer/account_activation_request.text.plain.rhtml --- a/app/views/mailer/account_activation_request.text.plain.rhtml Wed Dec 15 16:17:46 2010 +0000 +++ b/app/views/mailer/account_activation_request.text.plain.rhtml Wed Dec 15 16:51:38 2010 +0000 @@ -1,8 +1,11 @@ <%= l(:mail_body_account_activation_request, @user.login) %> <%= @url %> +*<%= l(:label_ssamr_details) %>* +<%=l(:field_name)%>: <%= h @user.name %> +<%=l(:field_mail)%>: <%= h @user.mail %> -*<%= l(:label_ssamr_details) %>* +*<%= l(:label_ssamr_description ) %>* <%= h @user.ssamr_user_detail['description'] %>