- <% if @canShowCode %>
-
- <% if member.user.show_name == ''%>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe,user_path(member.user)) %>
- <% else%>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.show_name} ".html_safe,user_path(member.user)) %>
- <%end%>
-
- <% else %>
- <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.name} ".html_safe, user_path(member.user)) %>
- <% end %>
+
+ <%= link_to("#{l(:label_bidding_user_studentname)}：#{member.user.show_name} ".html_safe,user_path(member.user)) %>
+
<%= link_to("#{l(:label_bidding_user_studentcode)}：#{member.user.user_extensions.student_id} ".html_safe,user_path(member.user)) %>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index dc2509c77..ef1a0fc58 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -8,36 +8,36 @@
* <%= l(:label_tags_course_name)%> ：课程名称不能为空且至少有两个字符
+ 课程名称不能为空且至少有两个字符
* <%= l(:label_class_period)%> ：
* <%= l(:label_course_term)%> ：
* 结束学期 ：仅针对跨越多个学期的班级，否则不用修改。
* <%= l(:label_new_course_password)%> ：显示明码
-
学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。
@@ -75,11 +75,11 @@
\ No newline at end of file
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index b0c4a067f..82123a767 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -33,35 +33,35 @@
* <%= l(:label_tags_course_name)%> ：课程名称不能为空
+ 课程名称不能为空
* <%= l(:label_class_period)%> ：
* <%= l(:label_course_term)%> ：
* 结束学期 ：
* <%= l(:label_new_course_password)%> ：显示明码
-
学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。
diff --git a/app/views/homework_common/_alert_open_student_works.html.erb b/app/views/homework_common/_alert_open_student_works.html.erb
index ef8fe3d08..73c7f0b47 100644
--- a/app/views/homework_common/_alert_open_student_works.html.erb
+++ b/app/views/homework_common/_alert_open_student_works.html.erb
@@ -1,10 +1,20 @@
- <% if @homework.is_open == 0 %>
+ <% if @homework.is_open == 0 && @homework.course.is_public == 1 %>
公开作品
本次作业的所有作品将对Trustie平台所有注册用户开放，请问是否确定公开作品？
+ <% elsif @homework.is_open == 0 && @homework.course.is_public == 0 %>
+
公开作品
+
+ 该作业是私有课程的作业，公开作品后本次作业的所有作品将对课程内的所有学生开放，请问是否确定公开作品？
+
+ <% elsif @homework.is_open == 1 && @homework.course.is_public == 0 %>
+
取消公开作品
+
+ 您将取消“公开作品”的功能，该私有作业的作品将只在作业截止后对已提交作品的学生开放，请问是否确定？
+
<% else %>
取消公开作品
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index 03c420c99..ec9a0bc54 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -6,15 +6,15 @@
<% case @issue.tracker_id %>
<% when 1%>
- 【缺陷】
<% when 2%>
- 【功能】
<% when 3%>
- 【支持】
<% when 4%>
- 【任务】
<% when 5%>
- 【周报】
<% end %>
<%= @issue.subject %>
<%= get_issue_priority(@issue.priority_id)[1] %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index a9e859448..c3f3a4a60 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -157,9 +157,9 @@
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index 1e830d7bc..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 = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.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/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index c00cc6161..2c135cd2e 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -46,7 +46,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 %>
diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb
index d0439439a..afa7d0716 100644
--- a/app/views/organizations/_org_subfield_leftMD.html.erb
+++ b/app/views/organizations/_org_subfield_leftMD.html.erb
@@ -28,7 +28,7 @@
<%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -50,7 +50,7 @@
<% end %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -67,7 +67,7 @@
<%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -130,7 +130,7 @@
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -151,7 +151,7 @@
<% end %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
@@ -168,7 +168,7 @@
<%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -214,7 +214,7 @@
<%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+ <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank" %>
@@ -244,7 +244,7 @@
<% end %>
- <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
@@ -264,7 +264,7 @@
<% end %>
- <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
@@ -285,7 +285,7 @@
<%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
- <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
+ <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28, :maxwidth=>0} %>
<%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index 88cf8f344..4f7fb7f4a 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -10,7 +10,9 @@
<%= format_time(journal.created_on) %>
- <%=journal.notes.html_safe%>
+
+
<%=journal.notes.html_safe%>
+
+
<% end %>
<% end %>
diff --git a/app/views/sub_document_comments/destroy.js.erb b/app/views/sub_document_comments/destroy.js.erb
index 4a45e48dd..d4c7bffcd 100644
--- a/app/views/sub_document_comments/destroy.js.erb
+++ b/app/views/sub_document_comments/destroy.js.erb
@@ -1,6 +1,6 @@
//location.reload();
<% if params[:detail_page] %>
-window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id)%>';
+window.location.href = '<%= org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @sub_domain.id)%>';
<% else %>
window.location.reload();
<% end %>
\ No newline at end of file
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index fc35d00cb..7050c1c66 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -56,7 +56,7 @@
<%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 1), :class => "postOptionLink" %>
- <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :detail_page => 1), :method => 'delete',
+ <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 0, :detail_page=>1), :method => 'delete',
:data => {:confirm => l(:text_are_you_sure)},
:remote => true, :class => 'postOptionLink' %>
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index bf23d9a97..5cb2c27a7 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -31,9 +31,6 @@
锁
<% end %>
<% u = User.where("id=?",activity.author_id).first%>
-
- 发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-
@@ -42,11 +39,13 @@
<% else %>
<% content = activity.parent.content %>
<% end %>
-
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
+
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %>
-
发帖：<%= format_time(activity.created_on) %>
-
更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
+
+ 发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+
+
更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %>
<% count=0 %>
<% if activity.parent %>
<% count=activity.parent.children.count%>
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 0e5805112..87dbe6b95 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -24,16 +24,15 @@
顶
<% end%>
<% u = User.where("id=?",activity.author_id).first%>
-
- 发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-
-
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %>
+
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %>
-
发布：<%= format_time(activity.created_on) %>
+
+ 发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+
更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
<% count=0 %>
<% count=activity.comments.count %>
diff --git a/app/views/users/_intro_content_ex.html.erb b/app/views/users/_intro_content_ex.html.erb
index e3baf3fe2..082d0cb94 100644
--- a/app/views/users/_intro_content_ex.html.erb
+++ b/app/views/users/_intro_content_ex.html.erb
@@ -12,6 +12,11 @@
$("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
}
+ var maxWidth = <%= maxwidth %>
+ if (maxWidth > 0) {
+ $("#intro_content_<%= user_activity_id%>").css("max-width", maxWidth + "px");
+ }
+
description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>);
});
\ No newline at end of file
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
index 348a68c00..b4a7bc6ef 100644
--- a/app/views/users/_org_file_form.html.erb
+++ b/app/views/users/_org_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => defined?(type) ? type : "6" ),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => @type ),:remote=>true,:id=>'orgs_list_form' do %>
<%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index 25fd675fb..fe7bc03f2 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -31,9 +31,6 @@
锁
<% end %>
<% u = User.where("id=?",activity.author_id).first%>
-
- 发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-
@@ -42,11 +39,13 @@
<% else %>
<% content = activity.parent.content %>
<% end %>
-
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %>
+
<%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %>
-
发帖：<%= format_time(activity.created_on) %>
-
更新：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+
+ 发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+
+
更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %>
<% count=0 %>
<% if activity.parent %>
<% count=activity.parent.children.count%>
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 74e8fecc2..413ffa17a 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => defined?(type) ? type : "6" ), :remote => true, :id => 'projects_list_form' %>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => @type ), :remote => true, :id => 'projects_list_form' %>
<%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 4b13850de..d8714400d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -38,16 +38,16 @@
<% case activity.tracker_id %>
- <% when 1%>
-
+ <% when 1%>
+
【缺陷】
<% when 2%>
-
+
【功能】
<% when 3%>
-
+
【支持】
<% when 4%>
-
+
【任务】
<% when 5%>
-
+
【周报】
<% end %>
<%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey ml5" %>
@@ -100,4 +100,4 @@
$(function(){
user_card_show_hide();
});
-
+
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 54ff83684..6788161f0 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -1,13 +1,16 @@
发送到
-
+ <% unless send_ids.blank? %>
+ <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+ <% end %>
+
课程
项目
组织
- <%= form_tag search_user_org_user_path(user),:method => 'get',
+ <%= form_tag search_user_org_user_path(user, :type => @type),:method => 'get',
:remote=>true,:id=>'search_user_org_form' do %>
<%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %>
@@ -19,5 +22,5 @@
- <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids, :type => type} %>
+ <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids, :type => @type} %>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index c758ef492..07f4abe38 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -2,7 +2,10 @@
发送到
-
+ <% unless send_ids.blank? %>
+ <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+ <% end %>
+
课程
项目
组织
@@ -12,7 +15,7 @@
- <%= form_tag search_user_project_user_path(user),:method => 'get',
+ <%= form_tag search_user_project_user_path(user, :type => @type),:method => 'get',
:remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
<%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 3895446f1..68c059a1d 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -4,7 +4,10 @@
发送到
-
+ <% unless send_ids.blank? %>
+ <% send_ids = send_ids.class == String ? send_ids : send_ids.join(",") %>
+ <% end %>
+
课程
项目
组织
@@ -14,10 +17,9 @@
- <%= form_tag search_user_course_user_path(user),:method => 'get',
- :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
- <%= hidden_field_tag(:send_id, send_id) %>
- <%= hidden_field_tag(:send_ids, send_ids) %>
+ <%= form_tag search_user_course_user_path(user),:method => 'get', :remote=>true, :id=> 'search_user_course_form', :class=> 'resourcesSearchBox' do %>
+ <%= hidden_field_tag(:send_id, send_id) %>
+ <%= hidden_field_tag(:send_ids, send_ids) %>
\ No newline at end of file
+
+
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 2616cfd24..dc7cdc5fc 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -20,10 +20,17 @@
<% else %>
<%= l(:label_anonymous) %>
<% end %>
-
-
- <%= reply.notes.html_safe %>
-
+
+
+ <%= reply.notes.html_safe %>
+
+
+
<%= format_time reply.created_on %>
@@ -55,4 +62,4 @@
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/config/menu.yml b/config/menu.yml
index 3951f836b..de1952503 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
-
type: "view"
name: "最新动态"
- 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"
+ url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.course.trustie.net/assets/wechat/app.html#/activities?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
-
type: "click"
name: "意见反馈"
@@ -13,8 +13,8 @@ button:
-
type: "view"
name: "进入网站"
- url: "https://www.trustie.net/"
+ url: "https://test.course.trustie.net/"
-
type: "view"
name: "使用手册"
- url: "https://www.trustie.net/organizations/1/downloads"
\ No newline at end of file
+ url: "https://test.course.trustie.net/organizations/1/downloads"
\ No newline at end of file
diff --git a/db/migrate/20160526093715_delete_anonymous_reply.rb b/db/migrate/20160526093715_delete_anonymous_reply.rb
new file mode 100644
index 000000000..443a07999
--- /dev/null
+++ b/db/migrate/20160526093715_delete_anonymous_reply.rb
@@ -0,0 +1,11 @@
+class DeleteAnonymousReply < ActiveRecord::Migration
+ def up
+ anonymous_replys = OrgDocumentComment.where("organization_id = 23 AND creator_id = 2")
+ if anonymous_replys
+ anonymous_replys.destroy_all
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9c4b4b333..8911cefef 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 => 20160519070718) do
+ActiveRecord::Schema.define(:version => 20160526093715) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -77,6 +77,18 @@ ActiveRecord::Schema.define(:version => 20160519070718) 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"
@@ -1107,23 +1119,6 @@ ActiveRecord::Schema.define(:version => 20160519070718) do
t.integer "viewed_count", :default => 0
end
- 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 "主贴或回帖ID", :default => 0, :null => false
- t.integer "回帖对应主贴ID"
- t.integer "帖子点赞数"
- t.integer "主贴回复数", :default => 0, :null => false
- t.text "主贴或回帖内容"
- t.datetime "发帖时间", :null => false
- t.integer "发帖或回帖用户ID", :default => 0, :null => false
- t.string "发帖或回帖用户姓", :default => "", :null => false
- t.string "发帖或回帖用户名", :limit => 30, :default => "", :null => false
- end
-
create_table "message_alls", :force => true do |t|
t.integer "user_id"
t.integer "message_id"
diff --git a/lib/wechat/bin/wechat b/lib/wechat/bin/wechat
index 8931a2dcb..d5563802e 100755
--- a/lib/wechat/bin/wechat
+++ b/lib/wechat/bin/wechat
@@ -1,3 +1,4 @@
+#coding=utf-8
#!/usr/bin/env ruby
lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index a8c17345b..6b0f1621b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -297,7 +297,7 @@ K.options = {
'td,th': [
'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
- '.font-style', '.text-decoration', '.vertical-align', '.background', '.border', '.text-overflow','.overflow','.white-space'
+ '.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
],
a : ['id', 'class', 'href', 'target', 'name'],
embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
@@ -2539,7 +2539,8 @@ function _nativeCommand(doc, key, val) {
function _nativeCommandValue(doc, key) {
var val = '';
try {
- val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+// val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+ val = doc.queryCommandValue(key);
} catch (e) {}
if (typeof val !== 'string') {
val = '';
@@ -3310,6 +3311,7 @@ _each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull
if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
self.selection();
}
+
return self;
};
});
@@ -5751,7 +5753,7 @@ _plugin('core', function(K) {
h2 : 24,
h3 : 18,
H4 : 14,
- p : 12
+ p : 12
},
curVal = self.cmd.val('formatblock'),
menu = self.createMenu({
@@ -5769,6 +5771,14 @@ _plugin('core', function(K) {
checked : (curVal === key || curVal === val),
click : function() {
self.select().exec('formatblock', '<' + key + '>').hideMenu();
+ //by yk利用html的特性使h1 h2 h3 h4标签之间不能相互包含 并将空的标签去掉
+ if (key != "p"){
+ var val = self.select().html();
+ self.select().html(val);
+ val = self.select().html().replace(/(
\s*<\/h1>)|(\s*<\/h2>)|(\s*<\/h3>)|(\s*<\/h4>)/g,"");
+ self.select().html(val);
+ self.select();
+ }
}
});
});
diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
index 82928ff0c..cdd3f94f8 100644
--- a/public/assets/kindeditor/plugins/autoheight/autoheight.js
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -41,7 +41,7 @@ KindEditor.plugin('autoheight', function(K) {
var body = edit.doc.body;
edit.iframe.height(minHeight);
self.resize(null, Math.max(
- ((K.IE ? body.scrollHeight : body.offsetHeight) > 500 ? 500 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+ ((K.IE ? body.scrollHeight : body.offsetHeight) > 250 ? 250 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+ 33, minHeight));
}
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 65c75d6ea..cf9c219e9 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -1,7 +1,7 @@
.ke-content {
- font-size: 12px;
- font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ���ź�, ����;
- font-family:Tahoma;
+ font-size: 14px;
+ /*font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;*/
+ font-family: "微软雅黑","宋体";
}
.ke-content pre {
font-size:9pt;
@@ -53,4 +53,6 @@ span.at a{color:#269ac9;text-decoration: none;}
/*yk*/
.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
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
+.ke-content a{color: #15bccf;}
+.ke-content a:link,.ke-content a:visited{text-decoration:none;}
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index be386f7cc..74b14b118 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -257,6 +257,7 @@ KindEditor.plugin('table', function(K) {
style += 'border-color:'+borderColor+';';
}
style += 'table-layout: '+'fixed;';
+ style += 'border-collapse: collapse;';
var html = '' + (K.IE ? ' ' : ' ';
}
html += '';
}
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index b4e582336..30b4dafaa 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -8,30 +8,32 @@
-
-
-
-
-
-
-
-
迟交扣分：{{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}}
+
+
+
-
点击展开
-
-
{{act.activity_type_name}}
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.activity_type_name}}
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -42,23 +44,25 @@
-
-
-
-
-
-
-
+
-
点击展开
-
-
{{act.activity_type_name}}
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.activity_type_name}}
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -69,23 +73,25 @@
-
-
-
-
-
-
-
+
-
点击展开
-
-
{{act.activity_type_name}}
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.activity_type_name}}
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -112,25 +118,27 @@
-
-
-
-
-
-
-
-
状态：{{act.issue_detail.issue_status}} 优先级：{{act.issue_detail.issue_priority}}
-
指派给：{{act.issue_detail.issue_assigned_to}} 完成度：{{act.issue_detail.done_ratio}}%
+
+
+
+
+
+
+
+
+
状态：{{act.issue_detail.issue_status}} 优先级：{{act.issue_detail.issue_priority}}
+
指派给：{{act.issue_detail.issue_assigned_to}} 完成度：{{act.issue_detail.done_ratio}}%
+
+
+
-
点击展开
-
-
{{act.activity_type_name}}
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.activity_type_name}}
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -142,30 +150,32 @@
-
-
-
-
-
-
-
+
-
点击展开
-
-
{{act.activity_type_name}}
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.activity_type_name}}
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
-
+
@@ -184,22 +194,24 @@
-
-
-
留言
-
-
-
-
+
-
点击展开
-
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.latest_update}}
+
回复
+
{{act.reply_count}}
+
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -211,22 +223,24 @@
-
-
-
博客
-
-
-
-
+
-
点击展开
-
-
{{act.latest_update}}
-
-
-
-
-
+
{{act.latest_update}}
+
回复
+
{{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 514a2c94e..fa3a9f341 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -1,46 +1,49 @@
-
-
-
-
{{blog.title}}
-
-
-
-
+
+
+
+
+
{{blog.title}}
+
+
+
+
+
{{blog.created_at}}
+
-
-
{{blog.created_at}}
-
-
-
-
回复 ({{blog.comment_count}})
-
已赞 ({{blog.praise_count}})
-
赞 ({{blog.praise_count}})
-
-
-
-
-
-
-
{{journal.user.realname}}
-
-
{{journal.lasted_comment}}
-
回复
+
+
回复 ({{blog.comment_count}})
+
已赞 ({{blog.praise_count}})
+
赞 ({{blog.praise_count}})
+
+
+
+
+
+
+
{{journal.user.realname}}
+
+
{{journal.lasted_comment}}
+
回复
+
+
+
+
+
-
\ No newline at end of file
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index d8c50364d..d1b65e629 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -1,52 +1,56 @@
-
-
-
-
{{discussion.subject}}
-
- 发布者：
- {{discussion.user.realname}}
-
-
- 来 源：
- {{discussion.course_project_name}} | 课程问答区
-
-
-
-
{{discussion.created_on}}
-
-
-
-
回复 ({{discussion.replies_count}})
-
已赞 ({{discussion.praise_count}})
-
赞 ({{discussion.praise_count}})
-
-
-
-
-
-
-
{{journal.user.realname}}
-
-
{{journal.lasted_comment}}
-
回复
+
+
+
+
+
+
{{discussion.subject}}
+
+ 发布者：
+ {{discussion.user.realname}}
+
+
+ 来 源：
+ {{discussion.course_project_name}} | 课程问答区
+
+
-
-
-
-
-
-
-
-
-
回复
+
{{discussion.created_on}}
+
+
回复 ({{discussion.replies_count}})
+
已赞 ({{discussion.praise_count}})
+
赞 ({{discussion.praise_count}})
+
+
+
+
+
+
+
{{journal.user.realname}}
+
+
{{journal.lasted_comment}}
+
回复
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index c426f2794..c10763bf8 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -1,5 +1,6 @@
+
@@ -30,7 +31,7 @@
{{comments.author.realname}}
-
+
{{comments.created_on}}
回复
@@ -42,7 +43,8 @@
-
回复
@@ -50,3 +52,4 @@
+
\ No newline at end of file
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 1af5e185d..2783bd317 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -1,5 +1,6 @@
+
@@ -36,7 +37,7 @@
{{journal.user.realname}}
-
+
{{journal.lasted_comment}}
回复
@@ -48,11 +49,13 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 950cbe18e..035a7c98d 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -1,5 +1,6 @@
+
@@ -34,7 +35,7 @@
{{journal.user.realname}}
-
+
{{journal.created_on}}
回复
@@ -46,7 +47,8 @@
-
回复
@@ -54,3 +56,4 @@
+
\ No newline at end of file
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 29660e4fd..5ccbf6248 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -1,44 +1,47 @@
-
-
-
-
-
{{message.created_on}}
-
-
-
+
+
+
+
+
+
{{message.created_on}}
+
+
+
-
-
-
-
回复 ({{message.reply_count}})
-
已赞 ({{message.praise_count}})
-
赞 ({{message.praise_count}})
-
-
+
+
回复 ({{message.reply_count}})
+
已赞 ({{message.praise_count}})
+
赞 ({{message.praise_count}})
+
+
-
-
-
-
-
{{journal.user.realname}}
-
-
{{journal.lasted_comment}}
-
回复
+
+
+
+
+
{{journal.user.realname}}
+
+
{{journal.lasted_comment}}
+
回复
+
+
+
+
+
-
\ No newline at end of file
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 7968ba5d7..be639c1a0 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -1,9 +1,10 @@
+
-
{{discussion.subject}}
+
{{discussion.subject}}
发布者：
{{discussion.user.realname}}
@@ -30,7 +31,7 @@
{{journal.user.realname}}
-
+
{{journal.lasted_comment}}
回复
@@ -38,15 +39,17 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/public/images/nav_icon.png b/public/images/nav_icon.png
index 1b4e61aec..c9144e074 100644
Binary files a/public/images/nav_icon.png and b/public/images/nav_icon.png differ
diff --git a/public/images/wechat/icon.png b/public/images/wechat/icon.png
new file mode 100755
index 000000000..afc7aa639
Binary files /dev/null and b/public/images/wechat/icon.png differ
diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif
new file mode 100755
index 000000000..8b38366c6
Binary files /dev/null and b/public/images/wechat/icon_list.gif differ
diff --git a/public/images/wechat/icon_list2.gif b/public/images/wechat/icon_list2.gif
new file mode 100755
index 000000000..1d7dcb061
Binary files /dev/null and b/public/images/wechat/icon_list2.gif differ
diff --git a/public/images/wechat/loading.gif b/public/images/wechat/loading.gif
deleted file mode 100755
index b806bf34c..000000000
Binary files a/public/images/wechat/loading.gif and /dev/null differ
diff --git a/public/images/wechat/w_praise.png b/public/images/wechat/w_praise.png
new file mode 100755
index 000000000..6c0a5f7eb
Binary files /dev/null and b/public/images/wechat/w_praise.png differ
diff --git a/public/images/wechat/w_praised.png b/public/images/wechat/w_praised.png
new file mode 100755
index 000000000..3b80c9c0b
Binary files /dev/null and b/public/images/wechat/w_praised.png differ
diff --git a/public/images/wechat/w_reply.png b/public/images/wechat/w_reply.png
new file mode 100755
index 000000000..d18e19508
Binary files /dev/null and b/public/images/wechat/w_reply.png differ
diff --git a/public/images/wechat/wechat_icon.gif b/public/images/wechat/wechat_icon.gif
new file mode 100755
index 000000000..8d460be80
Binary files /dev/null and b/public/images/wechat/wechat_icon.gif differ
diff --git a/public/images/weixin_pic.jpg b/public/images/weixin_pic.jpg
new file mode 100644
index 000000000..b9696dfa3
Binary files /dev/null and b/public/images/weixin_pic.jpg differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aec0af070..303fc3ac9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1178,6 +1178,37 @@ function chooseSendType(res_id,res_ids, user_id, send_type){
lastSendType = sendType;
}
+
+function chooseSendType2(res_id,res_ids, user_id, send_type, type){
+ console.log(res_ids);
+ sendType = $(".resourcesSendType").val();
+ if (sendType === lastSendType) {
+ return;
+ } else if(lastSendType != null) { //不是第一次点击的时候
+ if (sendType == '1') {
+ $.ajax({
+ type: 'get',
+ url: '/users/' + user_id + '/search_user_course' + '?' + "&type=" + type,
+ data:{send_id:res_id, send_ids:res_ids ,send_type:send_type}
+ });
+ } else if(sendType == '2') {
+ console.log(res_ids);
+ $.ajax({
+ type: 'get',
+ url: '/users/' + user_id + '/search_user_project' + '?' + "&type=" + type,
+ data:{send_id:res_id, send_ids:res_ids, send_type:send_type}
+ });
+ }else if(sendType == '3'){
+ $.ajax({
+ type: 'get',
+ url: '/users/' + user_id + '/search_user_org' + '?' + "&type=" + type,
+ data:{send_id:res_id, send_ids:res_ids, send_type:send_type}
+ });
+ }
+ }
+ lastSendType = sendType;
+}
+
//组织新建和配置中，选择组织为私有后，disbled掉允许游客下载选项
function disable_down(source, des, hint){
if (source.attr("checked")){
@@ -1322,15 +1353,15 @@ function autoUrl(id){
$("#"+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) {
+ html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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+" ";
+ reStr = ""+full+" ";
}
else{
- reStr = ""+full+" ";
+ reStr = ""+full+" ";
}
}
return reStr ;
@@ -1341,15 +1372,15 @@ function autoUrl(id){
}
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) {
+ html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+(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+" ";
+ reStr = ""+full+" ";
}
else{
- reStr = ""+full+" ";
+ reStr = ""+full+" ";
}
}
return reStr ;
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 0bba3264b..73ab065ea 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -73,79 +73,79 @@ function hidden_homework_score_form()
///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////新建课程相关
//验证课程名称
-function regex_course_name()
+function regex_course_name(str)
{
- var name = $.trim($("#course_name").val());
+ var name = $.trim($("#"+str+"_course_name").val());
if(name.length < 2)
{
- $("#course_name_notice").show();
+ $("#"+str+"_course_name_notice").show();
return false;
}
else
{
- $("#course_name_notice").hide();
+ $("#"+str+"_course_name_notice").hide();
return true;
}
}
//验证课程学时
-function regex_course_class_period()
+function regex_course_class_period(str)
{
- var class_period = $.trim($("#class_period").val());
+ var class_period = $.trim($("#"+str+"_class_period").val());
var regex = /^\d*$/;
if(class_period.length == 0)
{
- $("#course_class_period_notice").html("学时总数不能为空");
- $("#course_class_period_notice").show();
+ $("#"+str+"_course_class_period_notice").html("学时总数不能为空");
+ $("#"+str+"_course_class_period_notice").show();
return false;
}
else if (regex.test(class_period)) {
if(parseInt(class_period) > 0)
{
- $("#course_class_period_notice").html("");
- $("#course_class_period_notice").hide();
+ $("#"+str+"_course_class_period_notice").html("");
+ $("#"+str+"_course_class_period_notice").hide();
return true;
}
else
{
- $("#course_class_period_notice").html("学时总数必须大于0");
- $("#course_class_period_notice").show();
+ $("#"+str+"_course_class_period_notice").html("学时总数必须大于0");
+ $("#"+str+"_course_class_period_notice").show();
return false;
}
}
else
{
- $("#course_class_period_notice").html("学时总数必须为正整数");
- $("#course_class_period_notice").show();
+ $("#"+str+"_course_class_period_notice").html("学时总数必须为正整数");
+ $("#"+str+"_course_class_period_notice").show();
return false;
}
}
//验证开始学期和结束学期
-function regex_time_term(){
- var obj_time = document.getElementById("time");
- var obj_end_time = document.getElementById("end_time");
- var obj_term = document.getElementById("term");
- var obj_end_term = document.getElementById("end_term");
+function regex_time_term(str){
+ var obj_time = document.getElementById(str+"_time");
+ var obj_end_time = document.getElementById(str+"_end_time");
+ var obj_term = document.getElementById(str+"_term");
+ var obj_end_term = document.getElementById(str+"_end_term");
var time = obj_time.options[obj_time.selectedIndex];
var end_time = obj_end_time.options[obj_end_time.selectedIndex];
var term = obj_term.options[obj_term.selectedIndex];
var end_term = obj_end_term.options[obj_end_term.selectedIndex];
if(time.value == end_time.value) {
if(set_term_val(term.value) > set_term_val(end_term.value)) {
- $("#course_time_term_notice").html("开始学期不能晚于结束学期");
- $("#course_time_term_notice").show();
+ $("#"+str+"_course_time_term_notice").html("开始学期不能晚于结束学期");
+ $("#"+str+"_course_time_term_notice").show();
return false;
} else {
- $("#course_time_term_notice").html("");
- $("#course_time_term_notice").hide();
+ $("#"+str+"_course_time_term_notice").html("");
+ $("#"+str+"_course_time_term_notice").hide();
return true;
}
} else if(time.value < end_time.value) {
- $("#course_time_term_notice").html("");
- $("#course_time_term_notice").hide();
+ $("#"+str+"_course_time_term_notice").html("");
+ $("#"+str+"_course_time_term_notice").hide();
return true;
} else {
- $("#course_time_term_notice").html("开始学期不能晚于结束学期");
- $("#course_time_term_notice").show();
+ $("#"+str+"_course_time_term_notice").html("开始学期不能晚于结束学期");
+ $("#"+str+"_course_time_term_notice").show();
return false;
}
}
@@ -160,32 +160,32 @@ function set_term_val(val) {
}
}
//验证密码
-function regex_course_password()
+function regex_course_password(str)
{
- var class_period = $.trim($("#course_course_password").val());
+ var class_period = $.trim($("#"+str+"_course_course_password").val());
var regex = /^\w+$/;
if(class_period.length == 0)
{
- $("#course_course_password_notice").html("课程密码不能为空");
- $("#course_course_password_notice").show();
+ $("#"+str+"_course_course_password_notice").html("课程密码不能为空");
+ $("#"+str+"_course_course_password_notice").show();
return false;
}
else if (regex.test(class_period)) {
- $("#course_course_password_notice").html("");
- $("#course_course_password_notice").hide();
+ $("#"+str+"_course_course_password_notice").html("");
+ $("#"+str+"_course_course_password_notice").hide();
return true;
}
else
{
- $("#course_course_password_notice").html("课程密码有非法字符");
- $("#course_course_password_notice").show();
+ $("#"+str+"_course_course_password_notice").html("课程密码有非法字符");
+ $("#"+str+"_course_course_password_notice").show();
return false;
}
}
//提交新建课程
function submit_new_course()
{
- if(regex_course_name()&®ex_course_class_period()&®ex_time_term()&®ex_course_password())
+ if(regex_course_name('new')&®ex_course_class_period('new')&®ex_time_term('new')&®ex_course_password('new'))
{
$("#new_course").submit();
}
@@ -193,7 +193,7 @@ function submit_new_course()
function submit_edit_course(id)
{
- if(regex_course_name()&®ex_course_class_period()&®ex_time_term()&®ex_course_password())
+ if(regex_course_name('edit')&®ex_course_class_period('edit')&®ex_time_term('edit')&®ex_course_password('edit'))
{
$("#edit_course_"+id).submit();
}
@@ -475,6 +475,19 @@ function submitMemberSerch(content)
function show_more_msg()
{
$("#course_description").toggleClass("course_description_none");
+ var information = $("#expend_more_information");
+ var arrow = $("#arrow");
+ var val = information.attr("value");
+ if (val == "show_more") {
+ $("#expend_more_information").text("收起描述信息");
+ information.attr("value", "hide_more");
+ arrow.attr("src", "/images/jiantouup.jpg")
+ }
+ else {
+ $("#expend_more_information").text("展开更多信息");
+ information.attr("value", "show_more");
+ arrow.attr("src", "/images/jiantou.jpg")
+ }
}
//作业描述显示更多信息
function news_show_more_des(id)
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index 2ff5336e1..d6fc52a8d 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -25,7 +25,7 @@ function sd_create_editor(params){
var edit = this.edit;
var body = edit.doc.body;
edit.iframe.height(paramsHeight);
- this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight)) , paramsHeight));
+ this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7)) , paramsHeight));
},
afterBlur:function(){
//params.toolbar_container.hide();
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 45d8de48b..e9ef7ad6c 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -487,6 +487,7 @@ int main()\n\
';
} else if(language==3){
src = '\
+#-*-coding:utf-8-*-\n\
#注意\n\
#1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
#2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index da314c5f5..1149ea131 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,10 +1,10 @@
var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = '/api/v1/';
-var debug = false; //调试标志,如果在本地请置为true
+var debug = true; //调试标志,如果在本地请置为true
if(debug===true){
- //apiUrl = 'http://localhost:3000/api/v1/';
- apiUrl = 'https://www.trustie.net/api/v1/';
+ apiUrl = 'http://localhost:3000/api/v1/';
+ //apiUrl = 'https://www.trustie.net/api/v1/';
}
app.factory('auth', function($http,$routeParams, $cookies, $q){
@@ -78,6 +78,9 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
url: apiUrl+ "activities",
data: {openid: auth.openid(), page: page}
}).then(function successCallback(response) {
+ if(response.data.message == "undefined method `user' for nil:NilClass"){
+ alert("请先绑定确实的用户账号");
+ }
$scope.current_page = 0;
console.log($scope.current_page);
console.log(response.data.page);
@@ -128,6 +131,7 @@ app.factory('common', function($http, auth, $routeParams){
openid: auth.openid()
};
+ //回复按钮禁用
data.disabled = true;
$http({
@@ -135,7 +139,8 @@ app.factory('common', function($http, auth, $routeParams){
url: apiUrl+ "new_comment/"+id,
data: userInfo
}).then(function successCallback(response) {
- alert("提交成功");
+ //alert("提交成功");
+ //数据提交完成,回复按钮启用
data.disabled = false;
if(typeof cb === 'function'){
cb();
@@ -410,31 +415,51 @@ app.filter('safeHtml', function ($sce) {
}
});
-app.directive('textAutoHeight', function($timeout){
- return {
+//app.directive('textAutoHeight', function($timeout){
+// return {
+// restrict: 'A',
+// scope: {},
+// link: function(scope, element, attr){
+// scope.text = '点击展开';
+// $timeout(function(){
+// var e = element.parent().children().eq(5);
+// var height = e[0].scrollHeight;
+// if(height>90){
+// element.css('display', 'block');
+// element.on('click', function(){
+// if(element.text() == "点击展开"){
+// e.css("height", height+'px');
+// element.text("点击隐藏");
+// } else {
+// e.css("height", '90px');
+// element.text("点击展开");
+// }
+//
+// });
+// }
+// }, false);
+//
+// }
+// }
+//});
+
+app.directive('inputAuto',function(){
+ return{
restrict: 'A',
scope: {},
- link: function(scope, element, attr){
- scope.text = '点击展开';
- $timeout(function(){
- var e = element.parent().children().eq(5);
- var height = e[0].scrollHeight;
- if(height>90){
- element.css('display', 'block');
- element.on('click', function(){
- if(element.text() == "点击展开"){
- e.css("height", height+'px');
- element.text("点击隐藏");
- } else {
- e.css("height", '90px');
- element.text("点击展开");
- }
-
- });
- }
- }, false);
-
- }
+ link: function(scope, element){
+ var copyContainer = element.parent().children().eq(0);
+ var sendButton = element.parent().next();
+ element.on('input',function(){
+ console.log(sendButton);
+ copyContainer.html(element[0].value);
+ var textHeight = copyContainer[0].scrollHeight;
+ element.css('height', textHeight + 'px');
+ });
+ sendButton.on('click',function(){
+ element.css('height','28px');
+ });
+ }
}
});
@@ -442,7 +467,7 @@ app.directive('loadingSpinner', function ($http) {
return {
restrict: 'A',
replace: true,
- template: '加载中... 加载中...
+ 
回复
+ 
赞
{{act.praise_count}}
