hushasha
/
trustieforge
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

Browse Source
sw_new_course
cxt 10 years ago
parent 4915f7977e 725143b894
commit 097d52c07a
4 changed files with 270 additions and 217 deletions
Show Stats Download Patch File Download Diff File

9
app/controllers/account_controller.rb
Unescape View File

@ -27,8 +27,9 @@ class AccountController < ApplicationController
if request.get?
if User.current.logged?
redirect_to home_url
else
render :layout => 'login'
end
# render :layout => 'login'
else
authenticate_user
end
@ -129,10 +130,12 @@ class AccountController < ApplicationController
end
when '3'
#register_automatically(@user)
unless @user.new_record?
if !@user.new_record?
self.logged_user = @user
flash[:notice] = l(:notice_account_activated)
redirect_to my_account_url
else
redirect_to signin_path
end
else
#register_manually_by_administrator(@user)
@ -355,11 +358,13 @@ class AccountController < ApplicationController
def invalid_credentials
logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
flash.now[:error] = l(:notice_account_invalid_creditentials)
render :layout => 'login'
end
def invalid_credentials_new
logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
flash.now[:error] = l(:notice_account_invalid_creditentials_new)
render :layout => 'login'
end
# Register a user for email activation.

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

File diff suppressed because it is too large Load Diff

151
app/views/layouts/login.html.erb
Unescape View File

@ -1,131 +1,28 @@
<%= stylesheet_link_tag 'new_public'%>
<%= stylesheet_link_tag 'leftside'%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title><%= h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_public', 'user_leftside', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag 'javascripts/jquery-1.3.2' %>
<%= javascript_include_tag 'bootstrap' %>
<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(){
$(".homepageSearchIcon").click(function(){
var val=$('input:radio[name="navSearchType"]:checked').val();
if(val==null){
$("#navSearchAlert").css({display:"block"});
}
else {
$("#navSearchAlert").css({display:"none"});
}
});
$("#loginInButton").click(function(){
$("#signUpBox").css({display:"none"});
$("#loginInBox").css({display:"block"});
});
});
$(document).ready(function(){
$(".navHomepageSearchBoxcontainer").mouseover(function(){
$(".navSearchTypeBox").css({display:"block"});
});
$(".navHomepageSearchBoxcontainer").mouseout(function(){
$(".navSearchTypeBox").css({display:"none"});
});
})
</script>
<%= javascript_include_tag "bootstrap","avatars","new_user"%>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
</head>
<div class="navContainer">
<div class="navHomepage">
<div class="navHomepageLogo fl"><a href="javascript:void(0);"><img src="images/nav_logo.png" width="51" height="45" alt="确实Trustie" class="mt3" /></a></div>
<div class="fl">
<ul>
<li class="navHomepageMenu fl"><a href="javascript:void(0);" class="c_white f16">帮助中心</a></li>
</ul>
</div>
<div class="navHomepageSearchBoxcontainer fl">
<form class="navHomepageSearchBox">
<input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
<a href="javascript:void(0);" class="homepageSearchIcon"></a>
</form>
<div class="navSearchTypeBox">
<form class="mt8">
<div class="fl mr15"><div class="fl mt5"><input type="radio" value="课程" name="navSearchType" /></div>
课程</div>
<div class="fl mr15"><div class="fl mt5"><input type="radio" value="项目" name="navSearchType" /></div>
项目</div>
<div class="fl mr15"><div class="fl mt5"><input type="radio" value="用户" name="navSearchType" /></div>
用户</div>
<div id="navSearchAlert" class="fr mr10"><span class="c_red">请选择搜索类型</span></div>
</form>
</div>
</div>
<div id="loginInButton" class="fr ml20"><a href="javascript:void(0);" class="c_white db">登录</a></div>
<div id="loginSignButton" class="fr"><a href="javascript:void(0);" class="c_white db">注册</a></div>
</div>
</div>
<div class="loginContentContainer">
<div class="loginContent">
<div class="loginLeft">
<div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
<div class="loginInro">欢迎加入Trustie高校创新实践社区，老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
</div>
<div class="loginRight">
<div id="loginInBox">
<div class="loginChooseBox">
<ul class="loginChooseList">
<li class="loginChoose fl"><span class="loginChooseTab">登陆</span></li>
<li class="loginChooseBorder fl"></li>
</ul>
</div>
<div class="loginIn">
<div class="mb20">
<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />
</div>
<div>
<input type="text" placeholder="请输密码" class="loginSignBox" />
</div>
<div class="loginSignOption">
<div class="fl mt3 mr5">
<input type="checkbox" />
</div>
<a href="javascript:void(0);">自动登录</a><a href="javascript:void(0);" class="newsBlue mr40 fr"><u>忘记密码?</u></a></div>
<div class="loginInButton"><a href="javascript:void(0);" class="c_white db">登陆</a></div>
</div>
</div>
<div id="signUpBox">
<div class="loginChooseBox">
<ul class="loginChooseList">
<li class="loginChoose fl"><span class="loginChooseTab">注册</a></span>
<li class="loginChooseBorder fl"></li>
</ul>
</div>
<div class="loginIn">
<div>
<input type="text" placeholder="请输入邮箱地址" class="loginSignBox" />
<div class="loginSignAlert mb8">请输入有效邮箱地址</div>
</div>
<div>
<input type="text" placeholder="请输入密码" class="loginSignBox" />
<div class="loginSignAlert mb8">至少需要 6 个字符</div>
</div>
<div class="mb20">
<input type="text" placeholder="请再次输入密码" class="loginSignBox" />
</div>
<div>
<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />
<div class="loginSignAlert mb8">用户昵称为2-18个中英文，数字或下划线</div>
</div>
<div class="loginUpButton"><a href="javascript:void(0);" class="c_white db">注册</a></div>
</div>
</div>
</div>
<div class="cl"></div>
</div>
<% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %>
<% else%>
<%= render :partial => 'layouts/unlogin_header' %>
<% end%>
</div>
<%= yield %>

5
public/stylesheets/new_public.css
Unescape View File

@ -124,6 +124,7 @@ a.c_blue{ color:#15bccf;}
a.c_dblue{ color:#09658c;}
a:hover.c_dblue{ color:#15bccf;}
a.c_white{ color:#fff;}
input.c_white { color:#fff}
a.c_dorange{ color:#fd6e2a;}
a.c_dark{color: #3e4040;}
a:hover.c_dark{color: #3ca5c6;}
@ -612,7 +613,9 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
.loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;}
.loginSignOption {margin-left:46px; margin-top:15px;}
.loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;}
.loginSignAlert {font-size:12px; color:#fc0000; margin-left:60px;}
.loginSignAlert {font-size:12px; margin-left:60px;}
.loginSignRow {height:60px; min-height:60px;}
/*底部*/

Write Preview
Loading…
Cancel
Save