<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
-
发帖时间：<%= format_time(activity.created_on) %>
-
更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+
发帖：<%= format_time(activity.created_on) %>
+
更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
<% count=0 %>
<% if activity.parent %>
<% count=activity.parent.children.count%>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index ff99e116e..0e5805112 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -33,8 +33,8 @@
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %>
-
发布时间：<%= format_time(activity.created_on) %>
-
更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+
发布：<%= format_time(activity.created_on) %>
+
更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
<% count=0 %>
<% count=activity.comments.count %>
<%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>赞
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index 5f61d26ef..928d682d8 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -45,8 +45,8 @@
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
-
发帖时间：<%= format_time(activity.created_on) %>
-
更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+
发帖：<%= format_time(activity.created_on) %>
+
更新：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
<% count=0 %>
<% if activity.parent %>
<% count=activity.parent.children.count%>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 8ef0faa9e..5e3f48963 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -28,12 +28,10 @@
+
+ 更新：<%= format_time(course.updated_on) %>
- 创建时间：<%= format_time(course.created_at) %>
-
- 更新时间：<%= format_time(course.updated_on) %>
-
- 开课学期: <%= current_time_and_term course %>
+ 学期: <%= current_time_and_term course %>
<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
<% homework_num = course.homework_commons.count %>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index 1526da58f..6124b82d8 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -27,8 +27,8 @@
- 创建时间：<%= format_time(project.created_on) %>
- 更新时间：<%= format_time(project.updated_at) %>
+
+ 更新：<%= format_time(project.updated_at) %>
<%= project.project_score.issue_num %>问题| <%= project.project_score.attach_num %>资源
diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb
index 86b888ad3..e205376d9 100644
--- a/lib/rails_kindeditor/config/routes.rb
+++ b/lib/rails_kindeditor/config/routes.rb
@@ -2,6 +2,6 @@ Rails.application.routes.draw do
namespace :kindeditor do
post "/upload" => "assets#create"
get "/filemanager" => "assets#list"
- get "/uploadpic" => "assets#uploadpic"
+ post "/uploadpic" => "assets#uploadpic"
end
end
\ No newline at end of file
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 7165b142a..97d5e33c5 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -370,6 +370,9 @@ function df(myself) {
else
sstr += that.attr("src") + "|";
}
+ else if (that.attr("src").indexOf("data:image") >= 0){
+ that.parents().removeAttr("href"); //删除所有父节点的href
+ }
}
});
uploadpic(sstr,myself);
@@ -397,7 +400,7 @@ function uploadpic(piclist,myself) {
$.ajax({
url: "/kindeditor/uploadpic",
data:{"pic":piclist},
- type: "GET",
+ type: "POST",
beforeSend: function () {
// $("#ajax-indicator span").text("图片上传中请稍等...");
keShadow(myself);
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 4cf64abb7..9820f66ff 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1261,3 +1261,33 @@ function description_showwords_ellipsis(id,num){
$("#intro_content_"+id).show();
}
+
+//by yk 弹框 tWidth = 580 tTop=30 tLeft=50
+function pop_up_box(value,tWidth,tTop,tLeft){
+
+ if(!tWidth){
+ var tWidth = 580;
+ }
+
+ if(!tTop){
+ var tTop = 30;
+ }
+
+ if(!tLeft){
+ var tLeft = 50;
+ }
+
+ $("#ajax-modal").html(value);
+ showModal('ajax-modal', tWidth + "px");
+ $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').before("
");
+ $('#ajax-modal').parent().css("top", tTop+"%").css("left", tLeft+"%").css("padding-top", "10px").css("position", "fixed");
+ $('#ajax-modal').parent().addClass("resourceUploadPopup");
+ $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px");
+
+ function hideModal(){
+ $('#ajax-modal').hide();
+ }
+}
+
+
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 391774f0b..aaf70cd3f 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -66,6 +66,24 @@ $(function(){
src: src, title: title, is_test: is_test,tIndex:i,
testid: testid},
function(data,status){
+ if (data.status==-4 || data.status==-5 ){
+// alert("非常抱歉，您的程序引起了后台问题，请在公共贴吧提交您的代码进行意见反馈，谢谢！");
+ //弹框
+ var root_path = getRootPath();
+ var forums_1_path = root_path + "/forums/1"
+ var htmlvalue = "
您的程序引发了不知名异常，请在公共贴吧提交您的代码进行意见反馈，我们处理后会立即联系您，谢谢！
";
+ pop_up_box(htmlvalue,580,30,50);
+
+ $('#test-program-btn').show();
+ return;
+ }
+ else if (data.status==-3){
+ alert("对不起,服务器繁忙请稍后再试!");
+ var htmlvalue = "
对不起,服务器繁忙请稍后再试!
";
+ pop_up_box(htmlvalue,580,30,50);
+ $('#test-program-btn').show();
+ return;
+ }
var tSeq = data.tseq;
var tCount = data.tcount;
console.log("tSeq="+tSeq);
@@ -100,9 +118,13 @@ $(function(){
}
).fail(function(xhr, status){
if(status == 'timeout'){
- alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
+// alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
+ var htmlvalue = "
您的答案超时了, 请检查代码是否存在死循环的错误!
";
+ pop_up_box(htmlvalue,580,30,50);
} else {
- alert("对不起,服务器繁忙请稍后再试!");
+// alert("对不起,服务器繁忙请稍后再试!");
+ var htmlvalue = "
对不起,服务器繁忙请稍后再试!
";
+ pop_up_box(htmlvalue,580,30,50);
}
$('#test-program-btn').show();
return;