Mercurial > hg > soundsoftware-site

changeset 82:c71f2900168f luisf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Feature #53: User's name and email address also shown in email.
author luisf
date Wed, 15 Dec 2010 16:51:38 +0000
parents b5fbd125d70b
children 387ad4f40686
files app/views/mailer/account_activation_request.text.html.rhtml app/views/mailer/account_activation_request.text.plain.rhtml
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 <p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
 <p><%= link_to @url, @url %></p>
 
-<h4><%= l(:label_ssamr_details) %></h4>
-<p><%= textilizable @user.ssamr_user_detail['description'] %></p>
+<h3><%= l(:label_ssamr_details) %></h3>
+<p><%=l(:field_name)%>: <%= h @user.name %></p>
+<p><%=l(:field_mail)%>: <%= h @user.mail %></p>
 
+<h4><%= l(:label_ssamr_description ) %></h4>
+<%= textilizable @user.ssamr_user_detail['description'] %>
+
--- 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'] %>