Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
huang 2017-06-02 19:40:33 +08:00
parent 160efa12c3 c597fc3f39
commit 63200a2c3f
10 changed files with 89 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/courses_controller.rb
View File

@ -52,7 +52,7 @@ class CoursesController < ApplicationController
# 我参与的课程
join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{@user.id} and title like '%#{search}%'").order("created_at desc")
# 我的所有课程
all_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and title like '%#{search}%'").order("created_at desc")
all_syllabuses = Syllabus.where("title like '%#{search}%'").order("created_at desc")
@syllabus_count = Syllabus.all.count
@join_syllabuses_count = join_syllabuses.count
@ -65,6 +65,13 @@ class CoursesController < ApplicationController
else
@syllabuses = all_syllabuses
end
@syllabuses_count = @syllabuses.count
@limit = 16
@is_remote = true
@syllabuses_pages = Paginator.new @syllabuses_count, @limit, params['page'] || 1
@offset ||= @syllabuses_pages.offset
@syllabuses = paginateHelper @syllabuses, @limit
respond_to do |format|
format.js
format.html { render :layout => "base_edu" }

15
app/views/account/_change_user_email.html.erb
View File

@ -55,18 +55,5 @@
}
});
function submit_user_emails(){
if($mail_correct == false){
return
}else{
$.get('<%= account_change_email_path(:user_id => @user.id) %>',
{ valid: "mail",
value: document.getElementById("user_mail").value },
function (data){
$("#user_email_show").html(data.email);
hideModal();
return;
});
}
}
</script>

64
app/views/account/email_activation.html.erb
View File

@ -30,7 +30,7 @@
</li>
<li class="mt20 none" id="change_user_email_block">
<input type="text" class="new_loggin_users fl" name="user[mail]" id="user_new_email" placeholder="请输入有效的邮箱地址" style="width:325px; padding-left:5px;">
<a href="javascript:void(0);" class="fr task-btn-ver" onclick="submit_user_emails('<%= @user.id %>')"><span class="ml5"></span>确定<span class="mr5"></span></a>
<a href="javascript:void(0);" class="fr task-btn-ver" onclick="submit_user_emails('<%= @user.id %>');"><span class="ml5"></span>确定<span class="mr5"></span></a>
<p class="color-red fl" id="mail_req" style="display: none;">请输入正确的邮箱</p>
<div class="cl"></div>
</li>
@ -60,68 +60,10 @@
}
}
}
//跳转到指定的邮箱登录页面
$("#user_email_link").click(function () {
console.log('<%= email %>');
$(function(){
var uurl = '<%= email %>';
uurl = gotoEmail(uurl);
if (uurl != "") {
$("#user_email_link").attr("href", "http://"+uurl);
$("#user_email_link").click();
} else {
alert("抱歉!未找到对应的邮箱登录地址，请自己登录邮箱查看邮件！");
}
$("#user_email_link").attr("href", "http://"+uurl);
});
//功能：根据用户输入的Email跳转到相应的电子邮箱首页
function gotoEmail($mail) {
$t = $mail;
$t = $t.toLowerCase();
if ($t == '163.com') {
return 'mail.163.com';
} else if ($t == 'vip.163.com') {
return 'vip.163.com';
} else if ($t == '126.com') {
return 'mail.126.com';
} else if ($t == 'qq.com' || $t == 'vip.qq.com' || $t == 'foxmail.com') {
return 'mail.qq.com';
} else if ($t == 'gmail.com') {
return 'mail.google.com';
} else if ($t == 'sohu.com') {
return 'mail.sohu.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'vip.sina.com') {
return 'vip.sina.com';
} else if ($t == 'sina.com.cn' || $t == 'sina.com') {
return 'mail.sina.com.cn';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yahoo.com.cn' || $t == 'yahoo.cn') {
return 'mail.cn.yahoo.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yeah.net') {
return 'www.yeah.net';
} else if ($t == '21cn.com') {
return 'mail.21cn.com';
} else if ($t == 'hotmail.com') {
return 'www.hotmail.com';
} else if ($t == 'sogou.com') {
return 'mail.sogou.com';
} else if ($t == '188.com') {
return 'www.188.com';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else if ($t == '189.cn') {
return 'webmail15.189.cn/webmail';
} else if ($t == 'wo.com.cn') {
return 'mail.wo.com.cn/smsmail';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else {
return '';
}
};
</script>

69
app/views/account/email_valid.html.erb
View File

@ -28,7 +28,7 @@
</li>
<li class="mt20 none" id="change_user_email_block">
<input type="text" class="new_loggin_users fl" name="user[mail]" id="user_new_email" placeholder="请输入有效的邮箱地址" style="width:325px; padding-left:5px;">
<a href="javascript:void(0);" class="fr task-btn-ver" onclick="submit_user_emails('<%= @user.id %>')"><span class="ml5"></span>确定<span class="mr5"></span></a>
<a href="javascript:void(0);" class="fr task-btn-ver" onclick="submit_user_emails('<%= @user.id %>');"><span class="ml5"></span>确定<span class="mr5"></span></a>
<p class="color-red fl" id="mail_req" style="display: none;">请输入正确的邮箱</p>
<div class="cl"></div>
</li>
@ -58,66 +58,11 @@
}
}
}
//跳转到指定的邮箱登录页面
$("#user_email_link").click(function () {
var uurl = '<%= email %>';
uurl = gotoEmail(uurl);
if (uurl != "") {
$("#user_email_link").attr("href", "http://"+uurl);
$("#user_email_link").click();
} else {
alert("抱歉!未找到对应的邮箱登录地址，请自己登录邮箱查看邮件！");
}
});
//功能：根据用户输入的Email跳转到相应的电子邮箱首页
function gotoEmail($mail) {
$t = $mail;
$t = $t.toLowerCase();
if ($t == '163.com') {
return 'mail.163.com';
} else if ($t == 'vip.163.com') {
return 'vip.163.com';
} else if ($t == '126.com') {
return 'mail.126.com';
} else if ($t == 'qq.com' || $t == 'vip.qq.com' || $t == 'foxmail.com') {
return 'mail.qq.com';
} else if ($t == 'gmail.com') {
return 'mail.google.com';
} else if ($t == 'sohu.com') {
return 'mail.sohu.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'vip.sina.com') {
return 'vip.sina.com';
} else if ($t == 'sina.com.cn' || $t == 'sina.com') {
return 'mail.sina.com.cn';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yahoo.com.cn' || $t == 'yahoo.cn') {
return 'mail.cn.yahoo.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yeah.net') {
return 'www.yeah.net';
} else if ($t == '21cn.com') {
return 'mail.21cn.com';
} else if ($t == 'hotmail.com') {
return 'www.hotmail.com';
} else if ($t == 'sogou.com') {
return 'mail.sogou.com';
} else if ($t == '188.com') {
return 'www.188.com';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else if ($t == '189.cn') {
return 'webmail15.189.cn/webmail';
} else if ($t == 'wo.com.cn') {
return 'mail.wo.com.cn/smsmail';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else {
return '';
}
};
$(function(){
var uurl = '<%= email %>';
console.log(uurl);
uurl = gotoEmail(uurl);
$("#user_email_link").attr("href", "http://"+uurl);
});
</script>

11
app/views/courses/_courseList.html.erb
View File

@ -34,4 +34,13 @@
</p>
</div>
</div>
<% end %>
<% end %>
<div class="cl"></div>
<div style="text-align:center;">
<div class="pages_right_min" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @syllabuses_pages, @syllabus_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
</ul>
<div class="cl"></div>
</div>
</div>

6
app/views/courses/_join_private_course.html.erb
View File

@ -15,15 +15,15 @@
<label class="panel-form-label fl">身份：</label>
<span class="fl mr20">
<input type="checkbox" name="role[]" value="9" id="join_course_role_9" class="ml-3 mr5 magic-checkbox" />
<label>教师</label>
<label for="join_course_role_9">教师</label>
</span>
<span class="fl mr20">
<input type="checkbox" name="role[]" value="7" id="join_course_role_7" class="ml5 mr5 magic-checkbox" />
<label>助教</label>
<label for="join_course_role_7">助教</label>
</span>
<span class="fl mr20">
<input type="checkbox" name="role[]" value="10" id="join_course_role_10" class="ml5 mr5 magic-checkbox"/>
<label>学生</label>
<label for="join_course_role_10">学生</label>
</span>
</li>
<p id="none_checked_notice" class="color-red none f12" style="margin-left: 54px;">请至少选择一个身份</p>

2
app/views/layouts/base_edu_user.html.erb
View File

@ -6,7 +6,7 @@
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/font-awesome', 'css/edu-common', "css/edu-public", "css/edu-user", 'css/edu-popup', 'css/ketang',:media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/font-awesome', 'css/edu-common', "css/edu-public", "css/edu-user", 'css/edu-popup', 'css/ketang', 'css/magic-check', :media => 'all' %>
<%= javascript_heads %>
<%= javascript_include_tag "edu/application","edu/user"%>
<%= yield :header_tags -%>

2
app/views/shixuns/_shixun_list.html.erb
View File

@ -1,5 +1,7 @@
<% if @shixuns.blank? %>
<div style="background: #fff;padding-bottom: 15px;">
<%= render :partial => "welcome/no_data" %>
</div>
<% else %>
<% @shixuns.each do |shixun| %>
<div class="task-index-list-box fl ">

3
public/javascripts/bigdata.js
View File

@ -193,8 +193,9 @@ function submit_user_emails(id){
user_id: id
},
function (change_data){
var uurl = gotoEmail(change_data.email_link);
$("#user_email_show").html(change_data.email);
$("#user_email_link").attr('href', 'http://mail.' + change_data.email_link);
$("#user_email_link").attr('href', 'http://' + uurl);
$("#user_new_email").val("");
$("#change_user_email_block").toggle();
return;

52
public/javascripts/edu/application.js
View File

@ -39,6 +39,58 @@ $(function(){
});
// 邮箱验证
//功能：根据用户输入的Email跳转到相应的电子邮箱首页
function gotoEmail($mail) {
$t = $mail;
$t = $t.toLowerCase();
if ($t == '163.com') {
return 'mail.163.com';
} else if ($t == 'vip.163.com') {
return 'vip.163.com';
} else if ($t == '126.com') {
return 'mail.126.com';
} else if ($t == 'qq.com' || $t == 'vip.qq.com' || $t == 'foxmail.com') {
return 'mail.qq.com';
} else if ($t == 'gmail.com') {
return 'mail.google.com';
} else if ($t == 'sohu.com') {
return 'mail.sohu.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'vip.sina.com') {
return 'vip.sina.com';
} else if ($t == 'sina.com.cn' || $t == 'sina.com') {
return 'mail.sina.com.cn';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yahoo.com.cn' || $t == 'yahoo.cn') {
return 'mail.cn.yahoo.com';
} else if ($t == 'tom.com') {
return 'mail.tom.com';
} else if ($t == 'yeah.net') {
return 'www.yeah.net';
} else if ($t == '21cn.com') {
return 'mail.21cn.com';
} else if ($t == 'hotmail.com') {
return 'www.hotmail.com';
} else if ($t == 'sogou.com') {
return 'mail.sogou.com';
} else if ($t == '188.com') {
return 'www.188.com';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else if ($t == '189.cn') {
return 'webmail15.189.cn/webmail';
} else if ($t == 'wo.com.cn') {
return 'mail.wo.com.cn/smsmail';
} else if ($t == '139.com') {
return 'mail.10086.cn';
} else {
return '';
}
};
//------------------弹框相关--------------------//
function hideModal(el) {
if($("#popupWrap").length > 0){