From f2e406a41651315c0e167881307c430e927c88a5 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 25 Aug 2015 16:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=B3=A8=E5=86=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=94=B9=E4=B8=BA=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb      |  1 +
 app/views/account/login.html.erb           | 39 +++++++++++++---------
 app/views/layouts/_logined_header.html.erb |  2 +-
 app/views/layouts/_unlogin_header.html.erb |  4 +--
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 02736346c..913612f80 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -25,6 +25,7 @@ class AccountController < ApplicationController
   # Login request and validation
   def login
     if request.get?
+      @login = params[:login]
       if User.current.logged?
         redirect_to home_url
       else
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 4b822a616..deec186c8 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -1,18 +1,18 @@
-<%= stylesheet_link_tag 'new_public'%>
+<%= stylesheet_link_tag 'new_user'%>
 <%= stylesheet_link_tag 'leftside'%>
 
 <script>
 
-    $(document).ready(function(){
-        $("#loginSignButton").click(function(){
-            $("#signUpBox").css({display:"block"});
-            $("#loginInBox").css({display:"none"});
-        });
-        $("#loginInButton").click(function(){
-            $("#signUpBox").css({display:"none"});
-            $("#loginInBox").css({display:"block"});
-        });
-    });
+//    $(document).ready(function(){
+//        $("#loginSignButton").click(function(){
+//            $("#signUpBox").css({display:"block"});
+//            $("#loginInBox").css({display:"none"});
+//        });
+//        $("#loginInButton").click(function(){
+//            $("#signUpBox").css({display:"none"});
+//            $("#loginInBox").css({display:"block"});
+//        });
+//    });
 
     $(document).ready(function(){
         $(".homepageSearchIcon").click(function(){
@@ -24,10 +24,10 @@
                 $("#navSearchAlert").css({display:"none"});
             }
         });
-        $("#loginInButton").click(function(){
-            $("#signUpBox").css({display:"none"});
-            $("#loginInBox").css({display:"block"});
-        });
+//        $("#loginInButton").click(function(){
+//            $("#signUpBox").css({display:"none"});
+//            $("#loginInBox").css({display:"block"});
+//        });
     });
 
     $(document).ready(function(){
@@ -38,6 +38,15 @@
             $(".navSearchTypeBox").css({display:"none"});
         });
     })
+    $(document).ready(function(){
+        if(<%= @login%>){
+            $("#signUpBox").css({display:"none"});
+            $("#loginInBox").css({display:"block"});
+        }else{
+            $("#signUpBox").css({display:"block"});
+            $("#loginInBox").css({display:"none"});
+        }
+    });
     function clearInfo(id, content) {
                 var text = $('#' + id);
                 if (text.val() == content) {
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 16e5be059..252b64ad1 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -55,7 +55,7 @@
         <ul class="topnav_login_list">
           <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
           <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
-          <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+          <li><a href="<%= signout_path %>" class="menuGrey" >退出</a></li>
         </ul>
       </li>
     </ul>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index b4423a713..b484093ea 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -39,9 +39,9 @@
     </div>
   </div>
   <div id="loginInButton" class="fr ml20">
-    <a href="javascript:void(0);" class="c_white db">登录</a>
+    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
   </div>
   <div id="loginSignButton" class="fr">
-    <a href="javascript:void(0);" class="c_white db">注册</a>
+    <a href="<%= signin_path(:login=>false) %>" class="c_white db">注册</a>
   </div>
 </div>
\ No newline at end of file