jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

This commit is contained in:
sw 2015-08-25 16:35:36 +08:00
parent 4ca3d8be03 79bd438c87
commit 79f3a069cb
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/account_controller.rb
View File

@ -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

39
app/views/account/login.html.erb
View File

@ -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) {

4
app/views/layouts/_logined_header.html.erb
View File

@ -50,7 +50,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>
@ -71,4 +71,4 @@
}).mouseout(function(){
$("#navHomepageSearchType").hide();
});
</script>
</script>

6
app/views/layouts/_unlogin_header.html.erb
View File

@ -34,10 +34,10 @@
</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>
@ -48,4 +48,4 @@
}).mouseout(function(){
$("#navHomepageSearchType").hide();
});
</script>
</script>