Mercurial > hg > soundsoftware-site
changeset 917:66ac47c3719b cannam_integration
Rename .text.html.erb and .text.plain.erb to .html.erb and .text.erb in line with the other mailer files
| author | Chris Cannam |
|---|---|
| date | Tue, 06 Mar 2012 14:05:16 +0000 |
| parents | e39b2060aba1 |
| children | 04114f36670d |
| files | app/views/mailer/account_activation_request.html.erb app/views/mailer/account_activation_request.text.erb app/views/mailer/account_activation_request.text.html.erb app/views/mailer/account_activation_request.text.plain.erb |
| diffstat | 4 files changed, 20 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/mailer/account_activation_request.html.erb Fri Mar 02 12:37:49 2012 +0000 +++ b/app/views/mailer/account_activation_request.html.erb Tue Mar 06 14:05:16 2012 +0000 @@ -1,2 +1,12 @@ <p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p> -<p><%= link_to h(@url), @url %></p> +<p><%= link_to @url, @url %></p> + +<h3><%= l(:label_ssamr_details) %></h3> +<p> + <%=l(:field_name)%>: <%= h @user.name %><br /> + <%=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.erb Fri Mar 02 12:37:49 2012 +0000 +++ b/app/views/mailer/account_activation_request.text.erb Tue Mar 06 14:05:16 2012 +0000 @@ -1,2 +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_description ) %>* +<%= h @user.ssamr_user_detail['description'] %> + +
--- a/app/views/mailer/account_activation_request.text.html.erb Fri Mar 02 12:37:49 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p> -<p><%= link_to @url, @url %></p> - -<h3><%= l(:label_ssamr_details) %></h3> -<p> - <%=l(:field_name)%>: <%= h @user.name %><br /> - <%=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.erb Fri Mar 02 12:37:49 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -<%= 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_description ) %>* -<%= h @user.ssamr_user_detail['description'] %> - -