From 733876743e56dc83c7ffcfaae9efd6c9383eacf7 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 26 Aug 2015 17:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE=20?=
 =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb    |  6 +++--
 app/views/account/agreement.html.erb     |  4 +--
 app/views/account/login.html.erb         |  2 +-
 app/views/account/lost_password.html.erb | 32 ++++++++----------------
 public/stylesheets/new_user.css          |  2 +-
 5 files changed, 18 insertions(+), 28 deletions(-)

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'%>
-<div class="homepageContentContainer " style="margin-top:20px;">
+<!--<div class="homepageContentContainer mb20" >-->
   <div class="homepageContent BgBox">
   	<h2 class="BgBox_h2">Trustie服务协议</h2>
    	<div class="AgreementBox">
@@ -28,7 +28,7 @@
     
     
   </div><!---BgBox end--->
-</div><!---homepageContentContainer end--->
+<!--</div>&lt;!&ndash;-homepageContentContainer end-&ndash;&gt;-->
 <script>
 $(".resourcesList").mousedown(function(e) {  
 if (3 == e.which) {  
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 68fb4b9ba..816ef4a77 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -172,7 +172,7 @@
             <li class="loginChooseBorder fl"></li>
           </ul>
         </div>
-        <div class="loginSignAlert" style="color: red"><%= flash.empty? ? "" : flash[:error].html_safe  %></div>
+        <div class="loginSignAlert" style="color: red"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></div>
         </div>
         <div class="loginIn">
 
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index 46d3b2d7b..b028ceab6 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -4,33 +4,21 @@
   <div class="homepageContent BgBox">
   	<h2 class="BgBox_h2">忘记密码</h2>
     <div class="BgBoxCon">
+      <%= form_tag(lost_password_path) do %>
     	<p class="BgBoxConP mb5">通过注册邮箱链接重设密码</p>
-    	 <input type="text"  class="NomalInput mb20 " value="请输入登录邮箱地址"  />
-          <div class="LoginButton"><a href="javascript:void(0);" class="c_white db">提交</a></div>
-    	
+    	 <!--<input type="text"  class="NomalInput mb20 " value="请输入登录邮箱地址"  />-->
+          <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%>
+          <% if  flash[:error] %>
+              <div style="color: red" class="mb5" ><%=  flash[:error]%></div>
+          <% elsif  flash[:notice] %>
+              <div style="color: green" class="mb5" ><%=  flash[:notice]%></div>
+          <% end %>
+          <div class="LoginButton"><a href="javascript:void(0);" class="c_white db" onclick="$(this).parent().parent().submit();">提交</a></div>
+      <% end %>
     </div>
     
     
   </div><!---BgBox end--->
 </div><!---homepageContentContainer end--->
-<script>
-$(".resourcesList").mousedown(function(e) {  
-if (3 == e.which) {  
-         document.oncontextmenu = function() {return false;}  
-         $("#contextMenu").hide();  
-         $("#contextMenu").attr("style","display: block; position: fixed; top:"  
-         + e.pageY  
-         + "px; left:"  
-         + e.pageX  
-         + "px; width: 80px;");  
-         $("#contextMenu").show();  
-         }
-		 
-});
-$(".resourcesList").click(function(e) {  
-		 $("#contextMenu").hide();
-		 document.oncontextmenu = function() {return true;}
-}); 
-</script>
 </body>
 </html>
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;}