diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 60f12fb38..1e4b01df0 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -79,7 +79,7 @@ class AccountController < ApplicationController return end end - render :template => "account/password_recovery" + render :layout => 'static_base', :template => "account/password_recovery" return else if request.post? @@ -87,6 +87,7 @@ class AccountController < ApplicationController # user not found or not active unless user && user.active? flash.now[:error] = l(:notice_account_unknown_email) + render :layout => 'static_base' return end # user cannot change its password @@ -99,10 +100,11 @@ class AccountController < ApplicationController if token.save Mailer.run.lost_password(token) flash[:notice] = l(:notice_account_lost_email_sent) - redirect_to signin_url + redirect_to lost_password_path return end end + render :layout => 'static_base' end end diff --git a/app/views/account/agreement.html.erb b/app/views/account/agreement.html.erb index f18731348..95befbfd4 100644 --- a/app/views/account/agreement.html.erb +++ b/app/views/account/agreement.html.erb @@ -1,5 +1,5 @@ <%= stylesheet_link_tag 'new_user'%> -
+

Trustie服务协议

@@ -28,7 +28,7 @@
-
+ diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 3dea90fba..0afeb28e5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -635,7 +635,7 @@ ul.list_watch{ /*20150826忘记密码 LB*/ -.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;} +.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto} .BgBox_h2{ font-size:16px; color:#484848; width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;} .NomalInput{width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;} .BgBoxCon{ width:310px; margin:80px auto;}