jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新邮件激活页面500问题

This commit is contained in:
huang 2016-12-28 16:44:09 +08:00
parent 67139f84e0
commit 10af2b14d1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/mailer.rb
View File

@ -848,6 +848,7 @@ class Mailer < ActionMailer::Base
def register(token)
set_language_if_valid(token.user.language)
@token = token
@login = token.user.try(:login)
@url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
mail :to => token.user.mail,
:subject => "#{Setting.mail_subject}"

4
app/views/mailer/register.html.erb
View File

@ -23,13 +23,13 @@
<div class="new_content">
<div style="width: 598px; background:#fff; margin:20px auto;">
<div style="height:50px; width: 578px; background:#3b94d6; padding:9px 10px 6px;border:1px solid #ddd; border-bottom:none;">
<a href="www.trustie.net" ><img src="http://www.trustie.net/images/nav_logo.png" width="51" height="45" ></a>
<a href="https://www.trustie.net/"><img src="http://www.trustie.net/images/nav_logo.png" width="51" height="45" ></a>
<p style="color:#fff; float:right; margin-top:15px;">确实让创新更美好</p>
<div style="clear:both; overflow:hidden;"></div>
</div>
<div style="width: 558px; border-left:1px solid #ddd;border-right:1px solid #ddd; background:#fff; padding:20px; color:#333; line-height: 1.9;">
<p style="font-size: 14px; color:#333;">
<span style="font-weight:bold;color:#3b94d6;"><%= @user.show_name %></span>,您好！<br/>
<span style="font-weight:bold;color:#3b94d6;"><%= @login %></span>,您好！<br/>
您已经成功注册为Trustie用户！<br/>
请点击以下链接激活您的帐号：<br/>
<%= link_to h(@url), @url, :style => "font-weight: normal; color:#3b94d6;" %><br/>