From 65b5b467d440bd99793a9c6726c8575c41e6a8b2 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 26 Aug 2015 16:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb    |  3 +-
 app/views/account/lost_password.html.erb | 50 +++++++++++++++++-------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index bc5c15873..60f12fb38 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -36,8 +36,9 @@ class AccountController < ApplicationController
     end
   end
 
+  # 服务协议
   def agreement
-    render :layout => 'users_base'
+    render :layout => 'static_base'
   end
 
   # Log out current user and redirect to welcome page
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index 3c6c57f52..46d3b2d7b 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -1,16 +1,36 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
-<h3><%=l(:label_password_forget)%></h3>
+<%= stylesheet_link_tag 'new_user'%>
 
-<%= form_tag(lost_password_path) do %>
-  <div class="box tabular">
-    <p>
-      <label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-      <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱'%>
-      <%= submit_tag l(:button_submit) %>
-    </p>
-  </div>
-<% end %>
+<div class="homepageContentContainer " style="margin-top:20px;">
+  <div class="homepageContent BgBox">
+  	<h2 class="BgBox_h2">忘记密码</h2>
+    <div class="BgBoxCon">
+    	<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>
+    	
+    </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>