- 杩熶氦鎵ｅ垎锛歿{act.homework_common_detail.late_penalty}}鍒 鍖胯瘎寮鍚椂闂达細{{act.homework_common_detail.evaluation_start}}
- 缂鸿瘎鎵ｅ垎锛歿{act.homework_common_detail.absence_penalty}}鍒/浣滃搧 鍖胯瘎鍏抽棴鏃堕棿锛歿{act.homework_common_detail.evaluation_end}}
+ 杩熶氦鎵ｅ垎锛歿{act.homework_common_detail.late_penalty}}鍒 鍖胯瘎寮鍚椂闂达細{{act.homework_common_detail.evaluation_start}}
+ 缂鸿瘎鎵ｅ垎锛歿{act.homework_common_detail.absence_penalty}}鍒/浣滃搧 鍖胯瘎鍏抽棴鏃堕棿锛歿{act.homework_common_detail.evaluation_end}}
@@ -215,5 +216,6 @@
var postContent = $("#message_description_<%= @article.id %>").html();
postContent = postContent.replace(/ /g," ");
$("#message_description_<%= @article.id %>").html(postContent);
+ autoUrl('message_description_<%= @article.id %>');
});
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index f0b082860..dd818fe72 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -43,8 +43,8 @@
<% count=activity.children.count%>
<% end %>
- 鍙戝笘鏃堕棿锛<%= format_time(activity.created_on) %>
- 鏇存柊鏃堕棿锛<%= format_time(activity.updated_on) %>
+ 鍙戝竷锛<%= format_time(activity.created_on) %>
+ 鏇存柊锛<%= format_time(activity.updated_on) %>
<% end %>
@@ -55,9 +55,6 @@
<%= count>0 ? "#{count}" :"0" %> 鍥炲 diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index c7e4a7428..1050a59b9 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -36,7 +36,7 @@
鍙栨秷 - 鐣欒█ + 鐣欒█ <% end %>
@@ -214,5 +215,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @article.id %>');
});
\ No newline at end of file
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index d7a1b85bb..f9fd114dd 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -22,60 +22,6 @@
- <%= render :partial => "student_table"%>
+ <%= render :partial => "student_table" %>
-
-
-<% @exercise_users_list.each do |exercise|%>
-
- -
-
- 1 -
- - <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %> - -
- - <%=exercise.user.show_name %> -
- - <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> - -
- - -- - -
- - <% if exercise.created_at%> - <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> - <% if @exercise.end_time <= exercise.created_at %> - [鏈瓟] - <% end %> - <% end %> - - -
- - <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> - - -
+
+ 娴嬮獙
+
+ (<%= @exercise_count%>浜哄凡浜)
+
+ <% if !@is_teacher && @exercise_users_list.empty?%>
+ 鎮ㄥ皻鏈彁浜
+ <% elsif !@is_teacher && !@exercise_users_list.empty?%>
+ 鎮ㄥ凡鎻愪氦
+ <% end %>
+
+ <%#if @is_teacher || @exercise.exercise_status == 3%>
+
+ <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %>
+ <%# end%>
+
+
+
+
+
+ <%= render :partial => "student_table"%>
+
+
+
+<% @exercise_users_list.each do |exercise|%>
+
+ -
+
- 1 +
- + <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %> + +
- + <%=exercise.user.show_name %> +
- + <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> + +
- + -- + +
- + <% if exercise.created_at%> + <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> + <% if @exercise.end_time <= exercise.created_at %> + [鏈瓟] + <% end %> + <% end %> + + +
- + <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> + + +
-
-
- - 搴忓彿 - - 濮撳悕 - 瀛﹀彿 - 鐝骇 - +
- - <%= link_to "鏃堕棿",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> - <%# if @show_all && @order == "created_at"%> - <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <%# end%> - + <% @exercise_users_list.each do |exercise|%> + -
- - <%= link_to "鎴愮哗",'',:class => "c_dark f14 fb fl ml10",:remote => true%> - <%# if @show_all && @order == "score"%> - <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <%# end%> - - \ No newline at end of file +
- + 搴忓彿 + + 濮撳悕 + 瀛﹀彿 + 鐝骇 + + +
- + <%= link_to "鏃堕棿",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <%# if @show_all && @order == "created_at"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> + + +
- + <%= link_to "鎴愮哗",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + <%# if @show_all && @order == "score"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> + +
| + 搴忓彿 + + 濮撳悕 + 瀛﹀彿 + 鐝骇 + | ++ <%= link_to "鏃堕棿",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + | ++ <%= link_to "鎴愮哗",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + | +||||||
|---|---|---|---|---|---|---|---|---|
| 1 | ++ <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %> + | ++ <%=exercise.user.show_name %> + | ++ <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> + | ++ -- + | ++ | + <% if exercise.created_at%> + <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> + <% if @exercise.end_time <= exercise.created_at %> + [鏈瓟] + <% end %> + <% end %> + | ++ <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> + | +|
-
+
-
+
<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %>
<% if file.attachment_histories.count == 0 %>
<%= link_to file.is_public? ? truncate(file.filename, length: 45) : truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 2ee726d77..831dc0e68 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -7,7 +7,7 @@
<%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
-
+
<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %>
<% if file.attachment_histories.count == 0 %>
<%= link_to truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 20ffb1e50..2a03723ca 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -5,7 +5,7 @@
<%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
-
+
<%# 濡傛灉鏈夊巻鍙茬増鏈垯鎻愪緵鍘嗗彶鐗堟湰涓嬭浇 %>
<% if file.attachment_histories.count == 0 %>
<%= link_to truncate(file.filename,length: 35, omission: '...'),
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 08c030f90..ed90453ac 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -1,6 +1,12 @@
<% if memos.any? %>
<% memos.each do |topic| %>
+
@@ -16,7 +22,7 @@
<%= get_praise_num(topic)%>
- <%= topic.content.html_safe%>
+
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index 92021f728..03c420c99 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -28,7 +28,7 @@
<%= render :partial => 'action_menu' %>
<% if @issue.description? || @issue.attachments.any? -%>
- <%= topic.content.html_safe%>
<% author = topic.last_reply.try(:author)%>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index e34cf0736..29cff8933 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -73,6 +73,12 @@
<% end%>
<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
+
+
-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
+
+
+
\ No newline at end of file
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 4c8dfa1d9..197cd9c02 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -3,6 +3,7 @@
<% replies_all_i=replies_all_i + 1 %>
@@ -11,7 +12,7 @@
<%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %>
<% if @issue.description? %>
<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
<%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
@@ -43,4 +43,11 @@
<%= render :partial => 'issues/attributes_show' %>
-
\ No newline at end of file
+
-
+
<% if reply.try(:user).try(:realname) == ' ' %>
<%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 83b90dc93..3524de0c8 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -94,12 +94,12 @@
<%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-
@@ -147,6 +148,7 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('activity_description_<%= @memo.id %>');
description_show_hide(<%= @memo.id %>);
});
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 33c9d7f8d..443440455 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -109,6 +109,7 @@
<%= reply.author.name%><%= format_date(reply.created_at) %>
+ <%= reply.author.name%><%= format_date(reply.created_at) %>
<%= reply.content.html_safe%>
@@ -188,5 +189,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @topic.id %>');
});
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 4d5af61dd..145afcfd7 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -138,6 +138,7 @@
@@ -210,5 +211,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @topic.id %>');
});
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 10046bce2..35b3f8a3c 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -165,6 +165,7 @@
@@ -245,5 +246,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @topic.id %>');
});
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 46346eb71..5908c7593 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -115,6 +115,7 @@
@@ -210,5 +211,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @news.id %>');
});
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 640854164..7eecf43ab 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -97,6 +97,7 @@
@@ -185,5 +186,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @news.id %>');
});
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 6b91c98ed..6b3824222 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -107,6 +107,7 @@
<% end %>
- <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
+ <% if act.org_act_type == 'OrgDocumentComment' %>
<%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
<% end %>
<% end %>
@@ -56,7 +56,7 @@
<%= render :partial => 'organizations/org_project_issue', :locals => {:activity => Issue.find(act.org_act_id),:user_activity_id =>act.id} %>
<% when 'Message' %>
<%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
- <% when 'ProjectCreateInfo'%>
+ <% when 'Project'%>
<%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
<% end %>
<% end %>
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index a09246dc7..97bc0e353 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
@@ -195,5 +196,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @news.id %>');
});
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index 787bd3185..394078db1 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1,6 +1,6 @@
//location.reload();
<% if params[:detail_page] %>
- window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>';
+ window.location.href = '<%= organization_path(params[:organization_id],:org_subfield_id => @org_sub_id )%>';
<% else %>
window.location.reload();
<% end %>
\ No newline at end of file
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index f5b186197..e2967a9ae 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -84,6 +84,7 @@
<% user = User.find(reply.creator_id) %>
@@ -158,6 +159,7 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('intro_content_<%= @document.id %>');
});
function expand_reply(container, btnid) {
var target = $(container);
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index a3e62fd16..2c135cd2e 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -46,7 +46,7 @@
-
+
<% if activity.try(:teacher).try(:realname) == ' ' %>
<%= link_to activity.try(:teacher), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
<% else %>
@@ -39,4 +39,4 @@
$(function(){
user_card_show_hide();
});
-
\ No newline at end of file
+
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index b4ca46959..d3fe36fe3 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -6,7 +6,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %>
<%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
<% else %>
@@ -210,9 +210,9 @@
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
- <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %>
+ <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %>
<% else %>
- <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %>
+ <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %>
<% end %>
<% com_time = project.project_score.commit_time %>
<% time=project.updated_on %>
@@ -315,6 +315,7 @@
<% replies_all_i = replies_all_i + 1 %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 56dafed08..e68745f7a 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -100,6 +100,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -108,7 +109,7 @@
<%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if reply.try(:author).try(:realname) == ' ' %>
<%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index a6183e891..acf0f0377 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if @ctivity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -69,6 +69,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -77,7 +78,7 @@
<%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if comment.try(:author).try(:realname) == ' ' %>
<%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index cb390f7f5..2958df0ca 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -9,7 +9,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %>
<%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
<% else %>
diff --git a/app/views/organizations/_org_project_activities.html.erb b/app/views/organizations/_org_project_activities.html.erb
index b46996661..d27e690c6 100644
--- a/app/views/organizations/_org_project_activities.html.erb
+++ b/app/views/organizations/_org_project_activities.html.erb
@@ -6,7 +6,7 @@
<%= render :partial => 'organizations/org_project_issue', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
<% when 'Message' %>
<%= render :partial => 'organizations/project_message', :locals => {:activity => act.forge_act,:user_activity_id =>act.id} %>
- <% when 'ProjectCreateInfo'%>
+ <% when 'Project'%>
<%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
<% end %>
<% end %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 98c1e2df3..9ca10c91d 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -80,6 +80,7 @@
<% replies_all_i=replies_all_i + 1 %>
@@ -88,7 +89,7 @@
<%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if reply.try(:user).try(:realname) == ' ' %>
<%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index fc6cc6ee0..61bc5bc7f 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -105,6 +105,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -113,7 +114,7 @@
<%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if reply.try(:author).try(:realname) == ' ' %>
<%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index daa81e96c..5d6c38542 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -89,6 +89,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -97,7 +98,7 @@
<%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if comment.try(:author).try(:realname) == ' ' %>
<%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb
index ef59d154e..9a4f00a9a 100644
--- a/app/views/organizations/_project_create.html.erb
+++ b/app/views/organizations/_project_create.html.erb
@@ -7,7 +7,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
-
+
<% if user.try(:realname) == ' ' %>
<%= link_to user, user_url_in_org(user.id), :class => "newsBlue mr15" %>
<% else %>
@@ -41,4 +41,4 @@
$(function(){
user_card_show_hide();
});
-
\ No newline at end of file
+
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 26cf3b318..e1b000c70 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -79,6 +79,7 @@
<% replies_all_i=replies_all_i+1 %>
@@ -87,7 +88,7 @@
<%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
diff --git a/app/views/projects/_attachment_acts.html.erb b/app/views/projects/_attachment_acts.html.erb
index de0820bff..0ecfa9be7 100644
--- a/app/views/projects/_attachment_acts.html.erb
+++ b/app/views/projects/_attachment_acts.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
<% if reply.try(:author).try(:realname) == ' ' %>
<%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 63eb1808b..ecb5ebb25 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -59,6 +59,7 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('intro_content_<%= document.id %>');
function expand_reply(container, btnid) {
var target = $(container);
var btn = $(btnid);
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 6012dd0d4..e8f531206 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -88,6 +88,12 @@
<% unless comment.content.blank? %>
- -
<% reply_id = 0 %>
<% comments_for_doc.each do |comment| %>
+
<% reply_id += 1 %>
-
<%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "鐢ㄦ埛澶村儚"), user_url_in_org(comment.creator_id) %>@@ -104,7 +110,7 @@
<%= comment.content.html_safe %>
+ <%= comment.content.html_safe %>
<% end %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
diff --git a/app/views/projects/_project_create.html.erb b/app/views/projects/_project_create.html.erb
index bd118418d..2e7a919d1 100644
--- a/app/views/projects/_project_create.html.erb
+++ b/app/views/projects/_project_create.html.erb
@@ -7,7 +7,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
-
+
<% if user.try(:realname) == ' ' %>
<%= link_to user, user_path(user), :class => "newsBlue mr15" %>
<% else %>
@@ -41,4 +41,4 @@
$(function(){
user_card_show_hide();
});
-
\ No newline at end of file
+
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 6095bac96..eacc2a152 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -80,6 +80,9 @@
if(params.content.isEmpty()){
params.contentmsg.html('鍐呭涓嶈兘涓虹┖');
params.contentmsg.css({color:'#ff0000'});
+ params.submit_btn.one('click', function(){
+ params.form.submit();
+ });
}else{
params.contentmsg.html('濉啓姝ｇ‘');
params.contentmsg.css({color:'#008000'});
@@ -124,7 +127,9 @@
issubmit:true,
content:params.editor,
contentmsg:params.contentmsg,
- textarea:params.textarea
+ textarea:params.textarea,
+ submit_btn:params.submit_btn,
+ form:params.form
});
if(is_checked){
if(flag){
@@ -161,13 +166,15 @@
params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
- if(params.textarea.data('init') == undefined){
- params.editor = init_editor(params);
- init_form(params);
- params.cancel_btn.click(function(){
- nh_reset_form(params);
- });
- }
+ params.submit_btn = $("input[nhname='submit_btn']",params.div_form);
+ params.editor = init_editor(params);
+ init_form(params);
+ params.submit_btn.one('click', function () {
+ params.form.submit();
+ });
+ params.cancel_btn.click(function(){
+ nh_reset_form(params);
+ });
params.cancel_btn.click();
toggleAndSettingWordsVal(params.div_form, params.textarea);
setTimeout(function(){
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 8756ff26f..6d97b252d 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -5,7 +5,7 @@
<%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-
+
<% if activity.try(:author).try(:realname) == ' ' %>
<%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
<% else %>
@@ -69,6 +69,7 @@
<% replies_all_i = replies_all_i + 1 %>
@@ -77,7 +78,7 @@
<%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>
-
+
<% if comment.try(:author).try(:realname) == ' ' %>
<%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
<% else %>
@@ -125,4 +126,4 @@
$(function(){
user_card_show_hide();
});
-
\ No newline at end of file
+
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 257fcb94a..064444f04 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,27 +1,39 @@
-
-
-
- 搴忓彿 -
- -
- - 浣滃搧鍚嶇О - +
- 濮撳悕 -
- 瀛﹀彿 +
- 鍏宠仈椤圭洰 +
- - 鏃堕棿 - - - <% if @homework.homework_type == 2%> -
- - 绯荤粺 - +
- - 鎴戠殑璇勫垎 - - \ No newline at end of file +
- 搴忓彿 +
- +
- + 浣滃搧鍚嶇О + + <% if @homework.homework_type != 3 %> +
- 濮撳悕 +
- 瀛﹀彿 + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> +
- 鍏宠仈椤圭洰 + <% end %> + +
- + 鏃堕棿 + + + <% if @homework.homework_type == 2%> +
- + 绯荤粺 + + <% end%> + +
- + 鎴戠殑璇勫垎 + +
- 搴忓彿 -
- -
- - 浣滃搧鍚嶇О - +
- - <%= link_to "濮撳悕",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> - <% if @show_all && @order == "lastname"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> - <% end%> - -
- - - <%= link_to "瀛﹀彿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%> - <% if @show_all && @order == "student_id"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> - <% end%> - +
- - 鍏宠仈椤圭洰 - +
-
- <%= link_to "鏃堕棿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
- <% if @show_all && @order == "created_at"%>
- <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+
+ <%= link_to "鏃堕棿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <% if @show_all && @order == "created_at"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + ++ <%= link_to "鏁欏笀",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%> + <% if @show_all && @order == "teacher_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + ++ <%= link_to "鏁欒緟",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "teaching_asistant_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + + <% if @homework.homework_type == 2%> ++ <%= link_to "绯荤粺",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "system_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + <% end%> -
-
- - - <%= link_to "鏁欏笀",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%> - <% if @show_all && @order == "teacher_score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> - <% end%> - - -
- - <%= link_to "鏁欒緟",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> - <% if @show_all && @order == "teaching_asistant_score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <% end%> - - - <% if @homework.homework_type == 2%> -
- - <%= link_to "绯荤粺",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> - <% if @show_all && @order == "system_score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <% end%> - + <% if @homework.anonymous_comment == 0%> +
- - <%= link_to "鍖胯瘎",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> - <% if @show_all && @order == "student_score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <% end%> - - <% end %> - -
- - <%= link_to "鎴愮哗",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> - <% if @show_all && @order == "score"%> - <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <% end%> - - \ No newline at end of file +
- 搴忓彿 +
- +
- + 浣滃搧鍚嶇О + + <% if @homework.homework_type != 3 %> + +
- + <%= link_to "濮撳悕",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> + <% if @show_all && @order == "lastname"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + +
- + + <%= link_to "瀛﹀彿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%> + <% if @show_all && @order == "student_id"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> +
- + 鍏宠仈椤圭洰 + + <% end %> + +
- + <%= link_to "鏃堕棿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <% if @show_all && @order == "created_at"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + + +
- + <%= link_to "鏁欏笀",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%> + <% if @show_all && @order == "teacher_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + + +
- + <%= link_to "鏁欒緟",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "teaching_asistant_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + + + <% if @homework.homework_type == 2%> +
- + <%= link_to "绯荤粺",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "system_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + + <% end%> + + <% if @homework.anonymous_comment == 0%> +
- + <%= link_to "鍖胯瘎",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "student_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + + <% end %> + +
- + <%= link_to "鎴愮哗",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + +
- <%=index + 1 %> -
-
+
+ <% user = User.find(reply.creator_id) %> @@ -164,6 +165,7 @@ postContent=postContent.replace(/ /g," "); $(this).html(postContent); }); + autoUrl('intro_content_<%= @document.id %>'); var replyCount = $(".homepagePostReplyContainer").size(); if (replyCount >3){ for(var i= 3; i < replyCount+1; i++){ diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb index cf048bcd6..12bf0f2a4 100644 --- a/app/views/users/_apply_homework_course_message.html.erb +++ b/app/views/users/_apply_homework_course_message.html.erb @@ -1,12 +1,12 @@ -+ <%=index + 1 %> +<%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %> - - +-- +
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '鐨勪綔鍝' : student_work.name%> <% if @homework.homework_type != 3 %> -<%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>- +- +
<%= student_work.user.show_name%> - - +- " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
+" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> -- +
<%= link_to( student_work.project.name, project_path(student_work.project.id))%> - + <% else %> -- +
<%= student_work.project.name %> - + <% end %> <% end %> - -- +
<% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%> <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [杩熶氦] <% end %> <% end %> - - +- +
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%> - - +- +
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%> - + <% if @homework.homework_type == 2%> -- +
<%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%> - + <% end%> <% if @homework.anonymous_comment == 0%> -- +
<% if student_work.student_score.nil? %> 鏈弬涓 <% else %> @@ -71,7 +69,7 @@ <%= format("%.1f",student_work.student_score)%> 鍒嗐 <% end%> - + <% end %> <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %> @@ -79,7 +77,7 @@ <% else %> <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%> <% end %> -- +
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> +@@ -97,9 +95,9 @@ <%= format("%.1f",score<0 ? 0 : score)%> 鍒嗐<% end%> - - - + - +
- <%= link_to User.find(ma.apply_user_id).show_name, - user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %> + user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> ">鐢宠寮曠敤浣滀笟锛
- <% content = ma.content.nil? ? '' : '锛'+ ma.content.to_s %> - <%= link_to User.find(ma.apply_user_id).show_name+"鐢宠寮曠敤浣滀笟\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"鐢宠寮曠敤浣滀笟\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + <%= link_to User.find(ma.apply_user_id).show_name+"鐢宠寮曠敤浣滀笟\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"鐢宠寮曠敤浣滀笟\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %> diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb index 617ee53c3..2aff99c17 100644 --- a/app/views/users/_apply_resource_course_message_reply.html.erb +++ b/app/views/users/_apply_resource_course_message_reply.html.erb @@ -7,10 +7,10 @@
- <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %> - "><%= ma.apply_result == 1 ? '鍚屾剰' : '鎷掔粷'%>寮曠敤璧勬簮锛 + "><%= ma.apply_result == 2 ? '鍚屾剰' : '鎷掔粷'%>寮曠敤璧勬簮锛
-
- <% link_str = ma.apply_result == 1 ?
+ <% link_str = ma.apply_result == 2 ?
'鎮ㄧ敵璇峰紩鐢ㄨ祫婧"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"鐨勭敵璇峰凡閫氳繃'
:
'鎮ㄧ敵璇峰紩鐢ㄨ祫婧"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"鐨勭敵璇疯濠夋嫆' %>
diff --git a/app/views/users/_comment_reply.html.erb b/app/views/users/_comment_reply.html.erb
index ddc654463..895eda8a9 100644
--- a/app/views/users/_comment_reply.html.erb
+++ b/app/views/users/_comment_reply.html.erb
@@ -1,6 +1,6 @@
<% unless comment.parent.nil? %> -+<%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %><% end %> diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb index 63c57f708..4c0856b14 100644 --- a/app/views/users/_course_attachment.html.erb +++ b/app/views/users/_course_attachment.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -43,4 +43,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index c92d117ee..bf23d9a97 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_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(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_create.html.erb b/app/views/users/_course_create.html.erb index 6b2234337..83c703905 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>-+<% if activity.try(:teacher).try(:realname) == ' ' %> <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %> <% else %> @@ -39,4 +39,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 28f0f99db..3721244ed 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -6,7 +6,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -216,9 +216,9 @@<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"椤圭洰澶村儚") %> <% end %> <% com_time = project.project_score.commit_time %> <% time=project.updated_on %> @@ -321,6 +321,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index 1d0c4cba5..aeb7f5e5d 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -56,6 +56,7 @@ <% replies_all_i = replies_all_i + 1 %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 2f790b19b..8b6056309 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> @@ -117,6 +117,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -125,7 +126,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% else %> @@ -179,4 +180,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 403a922ed..19d62b14e 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -94,6 +94,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -102,7 +103,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> 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/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index dab970cdf..4fbb55321 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -9,7 +9,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>-+<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb index c18e520ba..04babe100 100644 --- a/app/views/users/_intro_content.html.erb +++ b/app/views/users/_intro_content.html.erb @@ -1,6 +1,6 @@ -+\ No newline at end of file diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb index 28675b7eb..01ebb5cf9 100644 --- a/app/views/users/_join_course_course_message.html.erb +++ b/app/views/users/_join_course_course_message.html.erb @@ -6,7 +6,7 @@- <%= content.to_s.html_safe%> + <%= content.to_s.html_safe %>- <%= link_to User.find(ma.course_message_id).name+"鐢宠鎴愪负璇剧▼\""+"#{Course.find(ma.course_id).name}"+"\"鐨"+"#{ma.content == '9' ? "鏁欏笀" : "鏁欒緟"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 795432008..ed4f8cfb8 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -43,4 +43,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 55f576db1..25fd675fb 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/_project_create.html.erb b/app/views/users/_project_create.html.erb index 83bfe3f04..644918ccc 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -7,7 +7,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>-+<% if user.try(:realname) == ' ' %> <%= link_to user, user_path(user), :class => "newsBlue mr15" %> <% else %> @@ -41,4 +41,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index eb3ff2122..5427bd112 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -3,7 +3,7 @@
-灏规暀鎺 TO + diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index daa7c71c2..4b13850de 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -100,4 +100,4 @@ $(function(){ user_card_show_hide(); }); - \ No newline at end of file + diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb index 5020f67d3..5323b76b6 100644 --- a/app/views/users/_project_issue_reply.html.erb +++ b/app/views/users/_project_issue_reply.html.erb @@ -29,6 +29,7 @@ <% replies_all_i=replies_all_i + 1 %> @@ -37,7 +38,7 @@ <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:user).try(:realname) == ' ' %> <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 7cf487211..1efbf1c7d 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -3,7 +3,7 @@-灏规暀鎺 TO + diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 0a41dbbf5..b6e3f9a94 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -112,6 +112,7 @@ <% replies_all_i=replies_all_i+1 %> @@ -120,7 +121,7 @@ <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if reply.try(:author).try(:realname) == ' ' %> <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index 7f5d185e5..55e2182b5 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -5,7 +5,7 @@ <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -91,6 +91,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -99,7 +100,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %>-+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index 3397d5929..3aaed7594 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -6,7 +6,7 @@ <% attachments.each do |attach| %>- - <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %> + <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %> <% else %> @@ -14,15 +14,19 @@
-
- <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
- <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+ <% if private_attachment_allow(attach.id) %>
+
+ <% else %>
+ <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
+ <% end %>
+ <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
<% end %>
- - <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %> + <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %> <% ah = attach.get_status_by_attach(User.current.id) %> - <% if ah.nil? %> + <% if ah.nil? %> <%= link_to("璇锋眰鍒嗕韩", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %> <% elsif ah == 1 %> 绛夊緟鍥炲 @@ -32,7 +36,12 @@ 宸叉嫆缁 <% end %> <% else %> - -- + <% ah = attach.get_status_by_attach(User.current.id) %> + <% if ah == 2 %> + 鍙紩鐢 + <% else %> + -- + <% end %> <% end %>
- <%= format_date(attach.created_on) %> @@ -43,8 +52,9 @@
- <%= get_resource_type(attach.container_type)%> - - + + +
-+<% if @ctivity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> @@ -16,13 +16,13 @@@@ -75,6 +75,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -83,7 +84,7 @@ <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "鐢ㄦ埛澶村儚" %><%= link_to activity.title.to_s, user_blog_blog_comment_path(:user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:in_act => true), :class => "postGrey" %> + <% if activity.locked%> + + <% end%> + <% if activity.sticky == 1%> + 缃《 + <% end%>- <% if activity.sticky == 1%> - 缃《 - <% end%> - <% if activity.locked%> - - <% end%>-diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png index cbc3eb565..7aa0a4351 100755 Binary files a/public/images/wechat/wechat_icon.png and b/public/images/wechat/wechat_icon.png differ diff --git a/public/images/wechat/wechat_icon2.png b/public/images/wechat/wechat_icon2.png new file mode 100755 index 000000000..cbc3eb565 Binary files /dev/null and b/public/images/wechat/wechat_icon2.png differ diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 112492a7e..aec0af070 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1287,3 +1287,75 @@ function description_showwords_ellipsis(id,num){ $("#intro_content_"+id).show(); } + +//by yk 寮规 value锛歨tml浠ｇ爜鎴栬烦杞叾浠栭〉闈唬鐮 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(); + } +} + +//yk 鑷姩璇嗗埆URL 骞跺姞涓婇摼鎺 +function autoUrl(id){ + if ($("#"+id).children().length > 0 ){ + $("#"+id+" p,#"+ id +" span,#"+id+" em,#"+id+" h1,#"+id+" h2,#"+id+" h3,#"+id+" h4,#"+id+" strong,#"+id+" b,#"+id+" font,#"+id+" i").each(function(){ + if ($(this).children().length == 0){ + var html = $(this).text(); + html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.銆俔)+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { + //娌℃湁://鐨勯兘鍔犱笂http:// + var reStr = full; + if (full.length > 0){ + if (full.indexOf("://") >= 0){ + reStr = ""+full+""; + } + else{ + reStr = ""+full+""; + } + } + return reStr ; + }); + $(this).html(html); + } + }); + } + else{ + var html = $("#"+id).text(); + html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.銆俔)+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { + //娌℃湁://鐨勯兘鍔犱笂http:// + var reStr = full; + if (full.length > 0){ + if (full.indexOf("://") >= 0){ + reStr = ""+full+""; + } + else{ + reStr = ""+full+""; + } + } + return reStr ; + }); + $("#"+id).html(html); + } +} + + diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index 391774f0b..45d8de48b 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -11,11 +11,14 @@ $(function(){ var title = $('#program-title').val(); if (!src) { - alert('璇疯緭鍏ユ纭殑浠ｇ爜'); + var htmlvalue = "+<% if comment.try(:author).try(:realname) == ' ' %> <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% else %> 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_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index b8c5c2017..f81fbabf5 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -5,13 +5,18 @@ <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
-diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 24ed8c9fc..7968ba5d7 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -44,7 +44,7 @@+<%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%> TO <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%><% if homework_common.homework_detail_manual%> @@ -219,9 +224,9 @@<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚" %> <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚") %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius relatePImage",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"椤圭洰澶村儚") %> <% end %> <% com_time = project.project_score.commit_time %> <% time=project.updated_on %> @@ -326,6 +331,7 @@ <% replies_all_i = replies_all_i + 1 %> @@ -352,12 +358,16 @@ <% else %>diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 0bc87214b..29660e4fd 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -36,7 +36,7 @@-<% end %> diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index e42c5d8b2..f7669047c 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -31,7 +31,7 @@ <% if homework_commons.count == 10%> <% if is_in_course == 1%> - <%= link_to "鐐瑰嚮灞曞紑鏇村",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> + <%#= link_to "鐐瑰嚮灞曞紑鏇村",homework_common_index_path(:course => course_id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> <% else%> <%= link_to "鐐瑰嚮灞曞紑鏇村",student_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb index 38770421d..e8ed684c6 100644 --- a/app/views/users/_user_import_resource_list.html.erb +++ b/app/views/users/_user_import_resource_list.html.erb @@ -6,8 +6,22 @@+-<%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %><%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>↓ <%= link_to '鐐瑰嚮灞曞紑闅愯棌妤煎眰', show_all_replies_users_path(:comment => comment),:remote=>true %>++ ↓ + + <%= link_to '鐐瑰嚮灞曞紑闅愯棌妤煎眰', show_all_replies_users_path(:comment => comment),:remote=>true %> +<%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>- <%= get_resource_type(attach.container_type)%> diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index 944477e88..47d5145ac 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -86,6 +86,12 @@
-
@@ -115,7 +121,7 @@ <% end %>
- <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %> -
- <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">鍙戝竷浜嗛氱煡锛 +
- <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %> +
- <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">鍙戝竷浜嗛氱煡锛
- <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id }, - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -21,11 +21,11 @@ <% end %> <% if ma.course_message_type == "Comment" %>
- <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %> -
- <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>">璇勮浜嗛氱煡锛 +
- <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %> +
- <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">璇勮浜嗛氱煡锛
- <%= link_to ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" , :target => '_blank'%> @@ -41,19 +41,19 @@ <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil?%>
- <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> -
- <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "鑰佸笀", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> +
- <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %> +
- <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "鑰佸笀", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> ">鍙戝竷浜嗚绋嬩綔涓氾細
-
<% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
<%= link_to "浣滀笟鏍囬锛" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
- :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+ :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<% else %>
<%= link_to "浣滀笟鏍囬锛" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
- :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+ :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
<% end %>
@@ -100,13 +100,13 @@
<% end %>
<% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 %>
-
-
- <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> +
- <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
- <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '鑰佸笀', - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}鑰佸笀" %> + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}鑰佸笀", :target => '_blank' %> ">鍙戝竷鐨勪綔涓氾細
- <%= link_to "浣滀笟鏍囬锛" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), - :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> @@ -136,17 +136,17 @@ <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
- - <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> + <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
- <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "鑰佸笀", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> ">鍚姩浜嗕綔涓氬尶璇勶細
- <%= link_to "浣滀笟鏍囬锛" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover => "message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> + :onmouseout => "message_titile_hide($(this))", :target => '_blank' %> + + 鍒犻櫎
--
<% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
+
<% replies_all_i = replies_all_i + 1 %>
+diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 8e3aa4873..60d5b6ed8 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -1,11 +1,11 @@ <% if ma.class == CourseMessage %> <% if ma.course_message_type == "News" %><%= comment.notes.html_safe %>-
-
-
-
-
-
-diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index 6405ba496..4a7e5cee3 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -92,6 +92,15 @@- 鍙戦佽嚦 -+ + +閫夋嫨 0 涓祫婧璇蜂娇鐢 <%= @homework.language_name %> 璇█缂栧啓 + <% if @homework.language.to_i == 1 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 2 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 3 %> + 缂栬瘧鍣ㄤ俊鎭細Python version "2.6.6" + <% elsif @homework.language.to_i == 4 %> + 缂栬瘧鍣ㄤ俊鎭細java version "1.7.0_85" OpenJDK Runtime Environment + <% end %> style="display-hidden" id="data-language">diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index 6df6f2115..1d1d0ef14 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -75,6 +75,15 @@diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index f61d803dd..950cbe18e 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -10,7 +10,7 @@璇蜂娇鐢 <%= @homework.language_name %> 璇█缂栧啓 + <% if @homework.language.to_i == 1 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 2 %> + 缂栬瘧鍣ㄤ俊鎭細gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + <% elsif @homework.language.to_i == 3 %> + 缂栬瘧鍣ㄤ俊鎭細Python version "2.6.6" + <% elsif @homework.language.to_i == 4 %> + 缂栬瘧鍣ㄤ俊鎭細java version "1.7.0_85" OpenJDK Runtime Environment + <% end %><%= f.text_area :name, id: 'program-title', class:"InputBox W700", placeholder:"璇锋鎷綘鐨勪唬鐮佺殑鍔熻兘" %> diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 0bd5724c1..483dceaed 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -56,7 +56,7 @@ 鎴戠殑璧勬簮- - 绉佹湁璧勬簮 + 鐢宠璧勬簮
-+diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index fec0c4cff..1af5e185d 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -16,10 +16,10 @@Trustie骞冲彴 鍙戝竷浜嗙郴缁熸秷鎭細diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb index 3be435b15..88581b3bf 100644 --- a/app/views/words/_new_respond_course.html.erb +++ b/app/views/words/_new_respond_course.html.erb @@ -12,8 +12,8 @@ <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %> - - <%= submit_tag l(:button_feedback_respond), :name => nil , + + <%#= submit_tag l(:button_feedback_respond), :name => nil , :class => "reply_btn"%> <% end %> \ No newline at end of file diff --git a/app/views/words/_new_respond_project.html.erb b/app/views/words/_new_respond_project.html.erb index c3ff241b3..4430735a2 100644 --- a/app/views/words/_new_respond_project.html.erb +++ b/app/views/words/_new_respond_project.html.erb @@ -11,7 +11,8 @@ <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %> - <%= submit_tag l(:button_feedback_respond), :name => nil , + + <%#= submit_tag l(:button_feedback_respond), :name => nil , :class => "reply_btn"%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 18f027dce..a347359bb 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2137,6 +2137,7 @@ zh: label_notice_comment_template: 鎮ㄧ殑璇剧▼閫氱煡鏈夋柊鍥炲浜 label_news_comment_template: 鎮ㄧ殑椤圭洰鏂伴椈鏈夋柊鍥炲浜 label_homework_comment_template: 鎮ㄧ殑浣滀笟鏈夋柊鍥炲浜 + label_new_second_comment_template: 鎮ㄦ湁鏂板洖澶嶄簡 label_new_journals_template: 鎮ㄦ湁鏂扮暀瑷浜 label_journals_comment_template: 鎮ㄧ殑鐣欒█鏈夋柊鍥炲浜 label_blog_comment_template: 鎮ㄧ殑鍗氬鏈夋柊鍥炲浜 diff --git a/config/menu.yml b/config/menu.yml index d129f7aff..3951f836b 100644 --- a/config/menu.yml +++ b/config/menu.yml @@ -5,7 +5,7 @@ button: url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect" - type: "click" - name: "鎰忚杩旈" + name: "鎰忚鍙嶉" key: "FEEDBACK" - name: "鏇村" diff --git a/config/routes.rb b/config/routes.rb index 98d90c753..2863d49a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1071,6 +1071,7 @@ RedmineApp::Application.routes.draw do match "addgroups", :via => [:post, :get] match 'deletegroup', :via => [:delete] match 'show_member_score', :via => [:get] + match 'show_member_act_score', :via => [:get] match 'valid_ajax', :to => 'courses#valid_ajax', :via => :get post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group' delete 'join_in/join_group', :to => 'courses#unjoin_group' diff --git a/db/migrate/20160517013659_alter_course_contributor_score_default.rb b/db/migrate/20160517013659_alter_course_contributor_score_default.rb new file mode 100644 index 000000000..488dab848 --- /dev/null +++ b/db/migrate/20160517013659_alter_course_contributor_score_default.rb @@ -0,0 +1,52 @@ +class AlterCourseContributorScoreDefault < ActiveRecord::Migration + def up + change_column :course_contributor_scores, :message_num, :integer, :default => 0 + change_column :course_contributor_scores, :message_reply_num, :integer, :default => 0 + change_column :course_contributor_scores, :news_reply_num, :integer, :default => 0 + change_column :course_contributor_scores, :news_num, :integer, :default => 0 + change_column :course_contributor_scores, :resource_num, :integer, :default => 0 + change_column :course_contributor_scores, :journal_num, :integer, :default => 0 + change_column :course_contributor_scores, :journal_reply_num, :integer, :default => 0 + change_column :course_contributor_scores, :homework_journal_num, :integer, :default => 0 + change_column :course_contributor_scores, :total_score, :integer, :default => 0 + + count = CourseContributorScore.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + CourseContributorScore.page(i).per(30).each do |cs| + if cs.message_num.nil? + cs.message_num = 0 + end + if cs.message_reply_num.nil? + cs.message_reply_num = 0 + end + if cs.news_reply_num.nil? + cs.news_reply_num = 0 + end + if cs.news_num.nil? + cs.news_num = 0 + end + if cs.resource_num.nil? + cs.resource_num = 0 + end + if cs.journal_num.nil? + cs.journal_num = 0 + end + if cs.journal_reply_num.nil? + cs.journal_reply_num = 0 + end + if cs.homework_journal_num.nil? + cs.homework_journal_num = 0 + end + if cs.total_score.nil? + cs.total_score = 0 + end + cs.save + end + end + end + end + + def down + end +end diff --git a/db/migrate/20160519070718_change_user_activities_data.rb b/db/migrate/20160519070718_change_user_activities_data.rb new file mode 100644 index 000000000..1a1bfb827 --- /dev/null +++ b/db/migrate/20160519070718_change_user_activities_data.rb @@ -0,0 +1,9 @@ +class ChangeUserActivitiesData < ActiveRecord::Migration + def up + execute("update user_activities set act_type = 'Project' where act_type = 'ProjectCreateInfo'") + execute("update org_activities set org_act_type = 'Project' where org_act_type = 'ProjectCreateInfo'") + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 58cb9b8ae..9c4b4b333 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160518060243) do +ActiveRecord::Schema.define(:version => 20160519070718) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - create_table "application_settings", :force => true do |t| - t.integer "default_projects_limit" - t.boolean "signup_enabled" - t.boolean "signin_enabled" - t.boolean "gravatar_enabled" - t.text "sign_in_text" - t.datetime "created_at" - t.datetime "updated_at" - t.string "home_page_url" - t.integer "default_branch_protection", :default => 2 - t.boolean "twitter_sharing_enabled", :default => true - t.text "restricted_visibility_levels" - t.boolean "version_check_enabled", :default => true - t.integer "max_attachment_size", :default => 10, :null => false - t.integer "default_project_visibility" - t.integer "default_snippet_visibility" - t.text "restricted_signup_domains" - t.boolean "user_oauth_applications", :default => true - t.string "after_sign_out_path" - t.integer "session_expire_delay", :default => 10080, :null => false - end - create_table "applied_projects", :force => true do |t| t.integer "project_id", :null => false t.integer "user_id", :null => false @@ -99,18 +77,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "apply_resources", :force => true do |t| - t.integer "status" - t.integer "user_id" - t.integer "attachment_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.integer "container_id" - t.string "container_type" - t.text "content" - t.integer "apply_user_id" - end - create_table "at_messages", :force => true do |t| t.integer "user_id" t.integer "at_message_id" @@ -178,20 +144,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.string "typeName", :limit => 50 end - create_table "audit_events", :force => true do |t| - t.integer "author_id", :null => false - t.string "type", :null => false - t.integer "entity_id", :null => false - t.string "entity_type", :null => false - t.text "details" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id" - add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type" - add_index "audit_events", ["type"], :name => "index_audit_events_on_type" - create_table "auth_sources", :force => true do |t| t.string "type", :limit => 30, :default => "", :null => false t.string "name", :limit => 60, :default => "", :null => false @@ -289,17 +241,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" add_index "boards", ["project_id"], :name => "boards_project_id" - create_table "broadcast_messages", :force => true do |t| - t.text "message", :null => false - t.datetime "starts_at" - t.datetime "ends_at" - t.integer "alert_type" - t.datetime "created_at" - t.datetime "updated_at" - t.string "color" - t.string "font" - end - create_table "bug_to_osps", :force => true do |t| t.integer "osp_id" t.integer "relative_memo_id" @@ -509,15 +450,15 @@ ActiveRecord::Schema.define(:version => 20160518060243) do create_table "course_contributor_scores", :force => true do |t| t.integer "course_id" t.integer "user_id" - t.integer "message_num" - t.integer "message_reply_num" - t.integer "news_reply_num" - t.integer "resource_num" - t.integer "journal_num" - t.integer "journal_reply_num" + t.integer "message_num", :default => 0 + t.integer "message_reply_num", :default => 0 + t.integer "news_reply_num", :default => 0 + t.integer "resource_num", :default => 0 + t.integer "journal_num", :default => 0 + t.integer "journal_reply_num", :default => 0 t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.integer "total_score" + t.integer "total_score", :default => 0 t.integer "homework_journal_num", :default => 0 t.integer "news_num", :default => 0 end @@ -599,10 +540,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "visits", :default => 0 end - add_index "courses", ["id"], :name => "id", :unique => true - add_index "courses", ["tea_id"], :name => "tea_id" - add_index "courses", ["visits"], :name => "visits" - create_table "custom_fields", :force => true do |t| t.string "type", :limit => 30, :default => "", :null => false t.string "name", :limit => 30, :default => "", :null => false @@ -664,15 +601,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "deploy_keys_projects", :force => true do |t| - t.integer "deploy_key_id", :null => false - t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id" - create_table "discuss_demos", :force => true do |t| t.string "title" t.text "body" @@ -722,16 +650,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "created_at" end - create_table "emails", :force => true do |t| - t.integer "user_id", :null => false - t.string "email", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true - add_index "emails", ["user_id"], :name => "index_emails_on_user_id" - create_table "enabled_modules", :force => true do |t| t.integer "project_id" t.string "name", :null => false @@ -754,25 +672,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "events", :force => true do |t| - t.string "target_type" - t.integer "target_id" - t.string "title" - t.text "data" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "action" - t.integer "author_id" - end - - add_index "events", ["action"], :name => "index_events_on_action" - add_index "events", ["author_id"], :name => "index_events_on_author_id" - add_index "events", ["created_at"], :name => "index_events_on_created_at" - add_index "events", ["project_id"], :name => "index_events_on_project_id" - add_index "events", ["target_id"], :name => "index_events_on_target_id" - add_index "events", ["target_type"], :name => "index_events_on_target_type" - create_table "exercise_answers", :force => true do |t| t.integer "user_id" t.integer "exercise_question_id" @@ -875,15 +774,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type" add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at" - create_table "forked_project_links", :force => true do |t| - t.integer "forked_to_project_id", :null => false - t.integer "forked_from_project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true - create_table "forums", :force => true do |t| t.string "name", :null => false t.text "description" @@ -1013,17 +903,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "identities", :force => true do |t| - t.string "extern_uid" - t.string "provider" - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id" - add_index "identities", ["user_id"], :name => "index_identities_on_user_id" - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1167,20 +1046,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "private", :default => 0 end - create_table "keys", :force => true do |t| - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - t.text "key" - t.string "title" - t.string "type" - t.string "fingerprint" - t.boolean "public", :default => false, :null => false - end - - add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id" - add_index "keys", ["user_id"], :name => "index_keys_on_user_id" - create_table "kindeditor_assets", :force => true do |t| t.string "asset" t.integer "file_size" @@ -1192,27 +1057,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "owner_type", :default => 0 end - create_table "label_links", :force => true do |t| - t.integer "label_id" - t.integer "target_id" - t.string "target_type" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id" - add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type" - - create_table "labels", :force => true do |t| - t.string "title" - t.string "color" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "labels", ["project_id"], :name => "index_labels_on_project_id" - create_table "member_roles", :force => true do |t| t.integer "member_id", :null => false t.integer "role_id", :null => false @@ -1263,47 +1107,23 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "viewed_count", :default => 0 end - create_table "merge_request_diffs", :force => true do |t| - t.string "state" - t.text "st_commits", :limit => 2147483647 - t.text "st_diffs", :limit => 2147483647 - t.integer "merge_request_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + create_table "mess", :id => false, :force => true do |t| + t.string "璇剧▼鍚" + t.integer "璇剧▼ID", :default => 0, :null => false + t.string "鏁欏笀濮", :default => "", :null => false + t.string "鏁欏笀鍚", :limit => 30, :default => "", :null => false + t.string "涓昏创鍚", :default => "", :null => false + t.integer "涓昏创鎴栧洖甯朓D", :default => 0, :null => false + t.integer "鍥炲笘瀵瑰簲涓昏创ID" + t.integer "甯栧瓙鐐硅禐鏁" + t.integer "涓昏创鍥炲鏁", :default => 0, :null => false + t.text "涓昏创鎴栧洖甯栧唴瀹" + t.datetime "鍙戝笘鏃堕棿", :null => false + t.integer "鍙戝笘鎴栧洖甯栫敤鎴稩D", :default => 0, :null => false + t.string "鍙戝笘鎴栧洖甯栫敤鎴峰", :default => "", :null => false + t.string "鍙戝笘鎴栧洖甯栫敤鎴峰悕", :limit => 30, :default => "", :null => false end - add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true - - create_table "merge_requests", :force => true do |t| - t.string "target_branch", :null => false - t.string "source_branch", :null => false - t.integer "source_project_id", :null => false - t.integer "author_id" - t.integer "assignee_id" - t.string "title" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "milestone_id" - t.string "state" - t.string "merge_status" - t.integer "target_project_id", :null => false - t.integer "iid" - t.text "description" - t.integer "position", :default => 0 - t.datetime "locked_at" - end - - add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" - add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id" - add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id" - add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at" - add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id" - add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch" - add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id" - add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch" - add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true - add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title" - create_table "message_alls", :force => true do |t| t.integer "user_id" t.integer "message_id" @@ -1338,39 +1158,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" - create_table "milestones", :force => true do |t| - t.string "title", :null => false - t.integer "project_id", :null => false - t.text "description" - t.date "due_date" - t.datetime "created_at" - t.datetime "updated_at" - t.string "state" - t.integer "iid" - end - - add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id" - add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date" - add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true - add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" - - create_table "namespaces", :force => true do |t| - t.string "name", :null => false - t.string "path", :null => false - t.integer "owner_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type" - t.string "description", :default => "", :null => false - t.string "avatar" - end - - add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id" - add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true - add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id" - add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true - add_index "namespaces", ["type"], :name => "index_namespaces_on_type" - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1396,31 +1183,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "notes", :force => true do |t| - t.text "note" - t.string "noteable_type" - t.integer "author_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "project_id" - t.string "attachment" - t.string "line_code" - t.string "commit_id" - t.integer "noteable_id" - t.boolean "system", :default => false, :null => false - t.text "st_diff", :limit => 2147483647 - end - - add_index "notes", ["author_id"], :name => "index_notes_on_author_id" - add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id" - add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id" - add_index "notes", ["created_at"], :name => "index_notes_on_created_at" - add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type" - add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" - add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type" - add_index "notes", ["project_id"], :name => "index_notes_on_project_id" - add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at" - create_table "notificationcomments", :force => true do |t| t.string "notificationcommented_type" t.integer "notificationcommented_id" @@ -1430,49 +1192,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "oauth_access_grants", :force => true do |t| - t.integer "resource_owner_id", :null => false - t.integer "application_id", :null => false - t.string "token", :null => false - t.integer "expires_in", :null => false - t.text "redirect_uri", :null => false - t.datetime "created_at", :null => false - t.datetime "revoked_at" - t.string "scopes" - end - - add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true - - create_table "oauth_access_tokens", :force => true do |t| - t.integer "resource_owner_id" - t.integer "application_id" - t.string "token", :null => false - t.string "refresh_token" - t.integer "expires_in" - t.datetime "revoked_at" - t.datetime "created_at", :null => false - t.string "scopes" - end - - add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true - add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id" - add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true - - create_table "oauth_applications", :force => true do |t| - t.string "name", :null => false - t.string "uid", :null => false - t.string "secret", :null => false - t.text "redirect_uri", :null => false - t.string "scopes", :default => "", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.integer "owner_id" - t.string "owner_type" - end - - add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type" - add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true - create_table "onclick_times", :force => true do |t| t.integer "user_id" t.datetime "onclick_time" @@ -1629,23 +1348,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "allow_teacher", :default => 0 end - create_table "permissions", :force => true do |t| - t.string "controller", :limit => 30, :default => "", :null => false - t.string "action", :limit => 30, :default => "", :null => false - t.string "description", :limit => 60, :default => "", :null => false - t.boolean "is_public", :default => false, :null => false - t.integer "sort", :default => 0, :null => false - t.boolean "mail_option", :default => false, :null => false - t.boolean "mail_enabled", :default => false, :null => false - end - - create_table "permissions_roles", :id => false, :force => true do |t| - t.integer "permission_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - end - - add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id" - create_table "phone_app_versions", :force => true do |t| t.string "version" t.text "description" @@ -1728,11 +1430,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "project_import_data", :force => true do |t| - t.integer "project_id" - t.text "data" - end - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1822,16 +1519,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "protected_branches", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "developers_can_push", :default => false, :null => false - end - - add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1966,25 +1653,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "is_teacher_score", :default => 0 end - create_table "services", :force => true do |t| - t.string "type" - t.string "title" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "active", :default => false, :null => false - t.text "properties" - t.boolean "template", :default => false - t.boolean "push_events", :default => true - t.boolean "issues_events", :default => true - t.boolean "merge_requests_events", :default => true - t.boolean "tag_push_events", :default => true - t.boolean "note_events", :default => true, :null => false - end - - add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id" - add_index "services", ["project_id"], :name => "index_services_on_project_id" - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -2023,26 +1691,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "snippets", :force => true do |t| - t.string "title" - t.text "content", :limit => 2147483647 - t.integer "author_id", :null => false - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "file_name" - t.datetime "expires_at" - t.string "type" - t.integer "visibility_level", :default => 0, :null => false - end - - add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id" - add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id" - add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at" - add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at" - add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id" - add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level" - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -2115,9 +1763,9 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.integer "absence_penalty", :default => 0 t.float "system_score", :default => 0.0 t.boolean "is_test", :default => false - t.float "work_score" t.integer "simi_id" t.integer "simi_value" + t.float "work_score" end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" @@ -2165,13 +1813,13 @@ ActiveRecord::Schema.define(:version => 20160518060243) do create_table "sub_domains", :force => true do |t| t.integer "org_subfield_id" - t.integer "priority" + t.integer "priority", :default => 0 t.string "name" t.string "field_type" - t.integer "hide" - t.integer "status" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.integer "hide", :default => 0 + t.integer "status", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "subfield_subdomain_dirs", :force => true do |t| @@ -2181,17 +1829,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "subscriptions", :force => true do |t| - t.integer "user_id" - t.integer "subscribable_id" - t.string "subscribable_type" - t.boolean "subscribed" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true - create_table "system_messages", :force => true do |t| t.integer "user_id" t.string "content" @@ -2431,17 +2068,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" add_index "users", ["type"], :name => "index_users_on_type" - create_table "users_star_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id" - add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true - add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id" - create_table "versions", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.string "name", :default => "", :null => false @@ -2493,23 +2119,6 @@ ActiveRecord::Schema.define(:version => 20160518060243) do t.datetime "updated_at", :null => false end - create_table "web_hooks", :force => true do |t| - t.string "url" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type", :default => "ProjectHook" - t.integer "service_id" - t.boolean "push_events", :default => true, :null => false - t.boolean "issues_events", :default => false, :null => false - t.boolean "merge_requests_events", :default => false, :null => false - t.boolean "tag_push_events", :default => false - t.boolean "note_events", :default => false, :null => false - end - - add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id" - add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id" - create_table "wechat_logs", :force => true do |t| t.string "openid", :null => false t.text "request_raw" 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/lib/wechat/bin/wechat b/lib/wechat/bin/wechat old mode 100644 new mode 100755 diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 9ae1300e7..a8c17345b 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -2539,7 +2539,7 @@ function _nativeCommand(doc, key, val) { function _nativeCommandValue(doc, key) { var val = ''; try { - val = doc.queryCommandValue(key); + val = doc.query_nativeCommand(self.doc, name, val);Value(key); } catch (e) {} if (typeof val !== 'string') { val = ''; @@ -5694,7 +5694,9 @@ _plugin('core', function(K) { } } else { //alert(data.message); - alert("浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF"); +// alert("浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF"); + var htmlvalue = "浠呮敮鎸佸涓嬪浘鐗囨牸寮:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF!"; + pop_up_box(htmlvalue,580,30,50); } }, afterError : function(str) { 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"); //鍒犻櫎鎵鏈夌埗鑺傜偣鐨刪ref + } } }); 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/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index b9c8252e8..65c75d6ea 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -51,5 +51,6 @@ span.at {color:#269ac9;} span.at a{color:#269ac9;text-decoration: none;} /*yk*/ -.ke-content ol li{list-style-type: decimal;margin-left: 20px;} -.ke-content ul li{list-style-type: disc;margin-left: 20px;} \ No newline at end of file +.ke-content ol li{list-style-type: decimal;} +.ke-content ul li{list-style-type: disc;} +.ke-content ol,.ke-content ul{margin-top:0;margin-bottom: 0;} \ No newline at end of file diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index f0f8e9c92..b4e582336 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -17,18 +17,18 @@ - + 鐐瑰嚮灞曞紑 {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -46,7 +46,7 @@ - +@@ -54,8 +54,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -73,7 +73,7 @@ - +@@ -81,8 +81,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -98,8 +98,8 @@@@ -116,7 +116,7 @@ - +- - + +鐘舵侊細{{act.issue_detail.issue_status}} 浼樺厛绾э細{{act.issue_detail.issue_priority}}
@@ -126,8 +126,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -146,7 +146,7 @@ - +@@ -154,8 +154,8 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}@@ -170,8 +170,8 @@@@ -195,8 +195,8 @@ 鐐瑰嚮灞曞紑 {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}- - + +{{act.praise_count}}{{act.praise_count}}@@ -215,15 +215,15 @@ - +鐐瑰嚮灞曞紑 {{act.latest_update}} - - {{act.reply_count}} + + {{act.reply_count}}{{act.praise_count}}{{act.praise_count}}diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index c1133f955..514a2c94e 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -3,7 +3,7 @@diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 3b7965733..c426f2794 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -44,7 +44,7 @@-+diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index e36fb3e27..d8c50364d 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -44,7 +44,7 @@- +- +- 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒{{homework.publish_time}} @@ -50,7 +50,7 @@
- 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
- 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
- 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}} + 杩熶氦鎵ｅ垎锛歿{homework.late_penalty}}鍒
+ 缂鸿瘎鎵ｅ垎锛歿{homework.absence_penalty}}鍒/浣滃搧
+ 鍖胯瘎寮鍚椂闂达細{{homework.evaluation_start}}
+ 鍖胯瘎鍏抽棴鏃堕棿锛歿{homework.evaluation_end}}- +鏉 婧愶細 -{{issue.project_name}} | 椤圭洰缂洪櫡 +{{issue.project_name}} | 椤圭洰闂 @@ -48,7 +48,7 @@- +- +- +璇疯緭鍏ユ纭殑浠ｇ爜!"; + pop_up_box(htmlvalue,580,30,50); + return false; } if (!title) { - alert('璇疯緭鍏ユ爣棰'); + var htmlvalue = "璇疯緭鍏ユ爣棰!"; + pop_up_box(htmlvalue,580,30,50); return false; } return true; @@ -33,31 +36,6 @@ $(function(){ $('#test-program-btn').show(); return; } - /* - $.post( - '/student_work/program_test_ex', - {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test}, - function(data,status){ - tested = true; - console.log(data); - if(data.index <=0){ - data.index = $('.ProResultTop').length+1; - } - - if (typeof cb == 'function') {cb(data); return;} - - var html=bt('t:result-list',data); - $('.ProResult').prepend(html); - - if (data.status==0 && is_test != 'true') { - var r=confirm("绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"); - if (r) { - $(".HomeWorkCon form").submit(); - } - } - } - ); - */ //鍏堟祴璇曚竴娆″苟杩斿洖娴嬭瘯闆嗕釜鏁板強缁撴灉鍐嶅垽鏂槸鍚﹂渶瑕佺户缁繘琛屾祴璇 var test_post = function(i, testid){ $.post( @@ -66,6 +44,22 @@ $(function(){ src: src, title: title, is_test: is_test,tIndex:i, testid: testid}, function(data,status){ + if (data.status==-4 || data.status==-5 ){ + //寮规 + 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){ + 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); @@ -81,10 +75,8 @@ $(function(){ if (data.status==0 && is_test != 'true') { if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;} - var r=confirm("绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"); - if (r) { - $(".HomeWorkCon form").submit(); - } + var htmlvalue = "绛旈姝ｇ‘锛屾槸鍚︾珛鍒绘彁浜?"; + pop_up_box(htmlvalue,580,30,50); $('#test-program-btn').show(); return; } @@ -100,9 +92,11 @@ $(function(){ } ).fail(function(xhr, status){ if(status == 'timeout'){ - alert("鎮ㄧ殑绛旀瓒呮椂浜, 璇锋鏌ヤ唬鐮佹槸鍚﹀瓨鍦ㄦ寰幆鐨勯敊璇."); + var htmlvalue = "鎮ㄧ殑绛旀瓒呮椂浜, 璇锋鏌ヤ唬鐮佹槸鍚﹀瓨鍦ㄦ寰幆鐨勯敊璇!"; + pop_up_box(htmlvalue,580,30,50); } else { - alert("瀵逛笉璧,鏈嶅姟鍣ㄧ箒蹇欒绋嶅悗鍐嶈瘯!"); + var htmlvalue = "瀵逛笉璧,鏈嶅姟鍣ㄧ箒蹇欒绋嶅悗鍐嶈瘯!"; + pop_up_box(htmlvalue,580,30,50); } $('#test-program-btn').show(); return; @@ -120,20 +114,21 @@ $(function(){ return; } if($('.ProResult .ProResultTop').length<=0){ - var r=confirm("娴嬭瘯鍚庢墠鑳芥彁浜わ紝鏄惁绔嬪埢娴嬭瘯?"); - if (r) { + var htmlvalue = "娴嬭瘯鍚庢墠鑳芥彁浜わ紝鏄惁绔嬪埢娴嬭瘯?"; + pop_up_box(htmlvalue,580,30,50); + $("#code-test-button").on('click',function(){ test_program(); - } + hideModal(); + }); return; } - if (!tested) { test_program(function(data){ if (data.status!=0) { - var r=confirm("娴嬭瘯涓嶉氳繃锛屾槸鍚﹀己鍒舵彁浜?"); - if (!r) { - return; - } + var htmlvalue = "娴嬭瘯涓嶉氳繃锛屾槸鍚﹀己鍒舵彁浜?"; + pop_up_box(htmlvalue,580,30,50); + return; + }; $(".HomeWorkCon form").submit(); }); diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js index f9b94e2d3..0f934e88e 100644 --- a/public/javascripts/init_KindEditor.js +++ b/public/javascripts/init_KindEditor.js @@ -1,5 +1,5 @@ function init_editor(params){ - // var minHeight; //鏈灏忛珮搴 + // var minHeight; //鏈灏忛珮搴 var paramsHeight = params.height; //璁惧畾鐨勯珮搴 var paramsWidth = params.width == undefined ? "100%" : params.width; @@ -7,7 +7,7 @@ function init_editor(params){ resizeType : 1,minWidth:"1px",width:paramsWidth, height:"30px",// == undefined ? "30px":paramsHeight+"px", minHeight:"30px",// == undefined ? "30px":paramsHeight+"px", - items:['emoticons'], + items:['emoticons'], afterChange:function(){//鎸夐敭浜嬩欢 nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); var edit = this.edit; @@ -49,6 +49,9 @@ function nh_check_field(params){ if(params.content.isEmpty()){ params.contentmsg.html('鍐呭涓嶈兘涓虹┖'); params.contentmsg.css({color:'#ff0000'}); + params.submit_btn.one('click', function(){ + params.form.submit(); + }); }else{ params.contentmsg.html('濉啓姝ｇ‘'); params.contentmsg.css({color:'#008000'}); @@ -68,7 +71,9 @@ function init_form(params){ issubmit:true, content:params.editor, contentmsg:params.contentmsg, - textarea:params.textarea + textarea:params.textarea, + submit_btn:params.submit_btn, + form:params.form }); if(is_checked){ if(flag){ @@ -115,7 +120,7 @@ function init_KindEditor_data(id){ params.cancel_btn.click(function () { nh_reset_form(params); }); - params.submit_btn.click(function () { + params.submit_btn.one('click', function () { params.form.submit(); }); params.textarea.data('init', 1); diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index 16fa8cf03..da314c5f5 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -128,12 +128,15 @@ app.factory('common', function($http, auth, $routeParams){ openid: auth.openid() }; + data.disabled = true; + $http({ method: 'POST', url: apiUrl+ "new_comment/"+id, data: userInfo }).then(function successCallback(response) { alert("鎻愪氦鎴愬姛"); + data.disabled = false; if(typeof cb === 'function'){ cb(); } @@ -416,7 +419,6 @@ app.directive('textAutoHeight', function($timeout){ $timeout(function(){ var e = element.parent().children().eq(5); var height = e[0].scrollHeight; - var offsetHeight = e[0].offsetHeight; if(height>90){ element.css('display', 'block'); element.on('click', function(){ diff --git a/public/plugin_assets/redmine_code_review/javascripts/code_review.js b/public/plugin_assets/redmine_code_review/javascripts/code_review.js index 4f4d81691..625f376c9 100644 --- a/public/plugin_assets/redmine_code_review/javascripts/code_review.js +++ b/public/plugin_assets/redmine_code_review/javascripts/code_review.js @@ -1,354 +1,354 @@ -/* -# Code Review plugin for Redmine -# Copyright (C) 2009-2013 Haruyuki Iida -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -var topZindex = 1000; -var action_type = ''; -var rev = ''; -var rev_to = ''; -var path = ''; -var urlprefix = ''; -var review_form_dialog = null; -var add_form_title = null; -var review_dialog_title = null; -var repository_id = null; -var filenames = []; - -var ReviewCount = function(total, open, progress){ - this.total = total; - this.open = open; - this.closed = total - open; - this.progress = progress -}; - -var CodeReview = function(id) { - this.id = id; - this.path = ''; - this.line = 0; - this.url = ''; - this.is_closed = false; -}; - -var review_counts = new Array(); -var code_reviews_map = new Array(); -var code_reviews_dialog_map = new Array(); - -function UpdateRepositoryView(title) { - var header = $("table.changesets thead tr:first"); - var th = $(''); - th.html(title); - header.append(th); - $('tr.changeset td.id a').each(function(i){ - var revision = this.getAttribute("href"); - revision = revision.substr(revision.lastIndexOf("/") + 1); - var review = review_counts['revision_' + revision]; - var td = $(' ',{ - 'class':'progress' - }); - td.html(review.progress); - $(this.parentNode.parentNode).append(td); - }); - } -//add function $.down -if(! $.fn.down) -(function($) { - $.fn.down = function() { - var el = this[0] && this[0].firstChild; - while (el && el.nodeType != 1) - el = el.nextSibling; - return $(el); - }; -})(jQuery); - -function UpdateRevisionView() { - $('li.change').each(function(){ - var li = $(this); - if (li.hasClass('folder')) return; - - var a = li.down('a'); - if (a.size() == 0) return; - var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, ''); - - var reviewlist = code_reviews_map[path]; - if (reviewlist == null) return; - - var ul = $(' '); + th.html(title); + header.append(th); + $('tr.changeset td.id a').each(function(i){ + var revision = this.getAttribute("href"); + revision = revision.substr(revision.lastIndexOf("/") + 1); + var review = review_counts['revision_' + revision]; + var td = $(' ',{ + 'class':'progress' + }); + td.html(review.progress); + $(this.parentNode.parentNode).append(td); + }); + } +//add function $.down +if(! $.fn.down) +(function($) { + $.fn.down = function() { + var el = this[0] && this[0].firstChild; + while (el && el.nodeType != 1) + el = el.nextSibling; + return $(el); + }; +})(jQuery); + +function UpdateRevisionView() { + $('li.change').each(function(){ + var li = $(this); + if (li.hasClass('folder')) return; + + var a = li.down('a'); + if (a.size() == 0) return; + var path = a.attr('href').replace(urlprefix, '').replace(/\?.*$/, ''); + + var reviewlist = code_reviews_map[path]; + if (reviewlist == null) return; + + var ul = $('
| 搴忓彿 | ++ | 浣滃搧鍚嶇О | <% if @homework.homework_type != 3 %> -+ 濮撳悕 + | ++ 瀛﹀彿 + | <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -+ 鍏宠仈椤圭洰 + | <% end %> - -+ 鏃堕棿 + | + <% if @homework.homework_type == 2%> ++ 绯荤粺 + | + <% end%> ++ 鎴戠殑璇勫垎 + | +|||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
+
+
+ |
+ |||||||||||
-
+
-
-
| 搴忓彿 | ++ | 浣滃搧鍚嶇О | <% if @homework.homework_type != 3 %> - -+ <%= link_to "濮撳悕",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> + <% if @show_all && @order == "lastname"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + | ++ <%= link_to "瀛﹀彿",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%> + <% if @show_all && @order == "student_id"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> + <% end%> + | <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -+ 鍏宠仈椤圭洰 + | <% end %> - -+ <%= link_to "鍖胯瘎",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "student_score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + | + <% end %> ++ <%= link_to "鎴愮哗",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%> + <% if @show_all && @order == "score"%> + <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <% end%> + | +||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
+
+
+ |
+ |||||||||||
-
+
-
-