From baacf328b7d7229099cd3730ebd427aca1d230a6 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 13 Nov 2014 09:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=8A=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=82=AE=E7=AE=B1=E9=A1=B5=E9=9D=A2=E3=80=8B?= =?UTF-8?q?=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 3 +- app/views/account/email_valid.html.erb | 109 +++++++------------ app/views/my/account.html.erb | 79 ++++++++------ app/views/users/_mail_notifications.html.erb | 5 +- public/images/jingtanhao.JPG | Bin 0 -> 8119 bytes 5 files changed, 90 insertions(+), 106 deletions(-) create mode 100644 public/images/jingtanhao.JPG diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index f1525522e..4b5a8c064 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -220,6 +220,7 @@ class AccountController < ApplicationController end def email_valid + end private @@ -351,7 +352,7 @@ class AccountController < ApplicationController UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0) Mailer.register(token).deliver flash[:notice] = l(:notice_account_register_done) - render action: 'email_valid' + render action: 'email_valid', locals: {:mail => user.mail} else yield if block_given? end diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb index 0eeb923ed..ce47877bd 100644 --- a/app/views/account/email_valid.html.erb +++ b/app/views/account/email_valid.html.erb @@ -1,78 +1,53 @@ + 注册帐号 - + -<% email = params[:mail] %> -
-

邮箱激活

-
-
-

请在24小时内点击邮件中的链接继续完成注册

-
- 邮件已发送到邮箱 - alanlong9278@126.com -
- - <% mail = "mail." + mail.split('@')[1] %> - 立即查收邮件 - - - 没收到邮件？ +<% email = @user.mail.split("@")[1] %> + +
+ +

+ 邮箱激活

+ +
+
+
+

请在24小时内点击邮件中的链接继续完成注册

+
+ 邮件已发送到邮箱 + <%= @user.mail %> +
+

+ 立即查收邮件

+ + + 没收到邮件？ -
-
- 请先检查是否在垃圾邮件中 - 如果还未收到， - 重新发送邮件 - +
+ + 请先检查是否在垃圾邮件中 + +
-
-
+
+
+
+ + \ No newline at end of file diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index b95959cca..3118c10dd 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -68,6 +68,39 @@

+

+ <%= l(:label_identity) %> * + + + + <% end %> + + +