From 820e594fecac9249a7c4c6b65f8a8d7fe6b2b55b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 23 May 2016 10:53:49 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 30 +++++++++---------- .../_homework_repository_detail.html.erb | 10 +++---- app/views/users/show_homework_detail.js.erb | 2 +- app/views/users/user_homework_type.js.erb | 2 +- app/views/users/user_homeworks.html.erb | 2 +- app/views/users/user_homeworks.js.erb | 2 +- app/views/users/user_search_homeworks.js.erb | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 52fdad2e7..1a6bc4f1b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -727,21 +727,21 @@ class UsersController < ApplicationController end def show_homework_detail - homework = HomeworkCommon.find params[:homework].to_i - if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user - ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i) - if ah.empty? - @status = 2 - @homework = nil - elsif ah.first.status != 2 - @status = ah.first.status - @homework = nil - elsif ah.first.status == 2 - @homework = homework - end - else - @homework = homework - end + @homework = HomeworkCommon.find params[:homework].to_i + # if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user + # ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i) + # if ah.empty? + # @status = 2 + # @homework = nil + # elsif ah.first.status != 2 + # @status = ah.first.status + # @homework = nil + # elsif ah.first.status == 2 + # @homework = homework + # end + # else + # @homework = homework + # end @is_import = params[:is_import] respond_to do |format| format.js diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb index cf04e16cb..103ca515f 100644 --- a/app/views/users/_homework_repository_detail.html.erb +++ b/app/views/users/_homework_repository_detail.html.erb @@ -1,7 +1,7 @@
题目信息
- <% if homework.nil? && status == 0 %> + <% if homework.nil? %> 本题库遵循创作共用许可证
教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：

@@ -14,14 +14,14 @@ 对此许可证的支持或反对，请在网站中留言，我们不断完善，谢谢！ - <% elsif homework.nil? && status == 1 %> + <% else %>
标题：<%=homework.name %>
来源：<%=homework.course.name %>
diff --git a/app/views/users/show_homework_detail.js.erb b/app/views/users/show_homework_detail.js.erb index c005eabad..a5dd82453 100644 --- a/app/views/users/show_homework_detail.js.erb +++ b/app/views/users/show_homework_detail.js.erb @@ -1,5 +1,5 @@ <% if @is_import.to_i == 1 %> $("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>"); <% else %> - $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework,:status=>@status}) %>"); + $("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework}) %>"); <% end %> \ No newline at end of file diff --git a/app/views/users/user_homework_type.js.erb b/app/views/users/user_homework_type.js.erb index 83c1761e3..8cfb4dc04 100644 --- a/app/views/users/user_homework_type.js.erb +++ b/app/views/users/user_homework_type.js.erb @@ -6,7 +6,7 @@ $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homewor <% else %> $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>''})%>'); $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); -$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>"); +$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>"); $("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_repository_search', :locals=>{:type=>@type,:is_import=>@is_import,:property=>@property}) %>"); $("#homework_type_all").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>'); $("#homework_type_nor").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>'); diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 86939b510..6197aa9c4 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -71,7 +71,7 @@ <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
- <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil, :status => 0} %> + <%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb index 5579d8a92..ce1bb65e2 100644 --- a/app/views/users/user_homeworks.js.erb +++ b/app/views/users/user_homeworks.js.erb @@ -1,4 +1,4 @@ /*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/ $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>'); $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); -$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>"); +$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>"); diff --git a/app/views/users/user_search_homeworks.js.erb b/app/views/users/user_search_homeworks.js.erb index 807dcc7d0..29d490960 100644 --- a/app/views/users/user_search_homeworks.js.erb +++ b/app/views/users/user_search_homeworks.js.erb @@ -5,5 +5,5 @@ $("#homework_detail_information").html("<%=escape_javascript(render :partial => <% else %> $("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>@search})%>'); $("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); -$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil, :status => 0}) %>"); +$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>"); <% end %> \ No newline at end of file From 2afce9d56380706f57b889b450e5304698a0936b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 23 May 2016 14:05:28 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E7=94=B3=E8=AF=B7=E9=A2=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_show_user_homeworks.html.erb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb index 7e9df7f4d..46e075412 100644 --- a/app/views/users/_show_user_homeworks.html.erb +++ b/app/views/users/_show_user_homeworks.html.erb @@ -3,6 +3,8 @@
公共题库 我的题库 + +
<%=render :partial=>'homework_search_input', :locals=>{:type => @type,:is_import => 1} %>
@@ -43,11 +45,18 @@
From 6586dfaf916fc57cfd080080043555b82452d9df Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 23 May 2016 14:47:10 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=8D=E5=88=B6=E7=9A=84=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E6=88=96=E5=AD=A6=E5=8F=B7=E6=88=96=E9=82=AE=E7=AE=B1=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=8C=85=E5=90=AB=E7=A9=BA=E6=A0=BC=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8D=E5=88=B0=E7=9B=B8=E5=85=B3=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index f518f81da..dd178a1ce 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -374,7 +374,7 @@ class StudentWorkController < ApplicationController end end ################################################################################################################## - @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group] + @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group] @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc") @all_homework_commons = @course.homework_commons.order("created_at desc") @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? From a3abf098419e77605be9b5f152553d2fef30b6f9 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 23 May 2016 16:04:06 +0800 Subject: [PATCH 04/18] =?UTF-8?q?delayjob=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/news.rb | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/models/news.rb b/app/models/news.rb index 7131969a4..beb58799f 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -167,17 +167,7 @@ class News < ActiveRecord::Base # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒 def act_as_system_message if self.course - self.course.members.each do |m| - if m.user_id != self.author_id - self.delay.send_message(m.user_id, self.course_id) - count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count - if count == 0 - ws = WechatService.new - content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200 - ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", content, format_time(self.created_on) - end - end - end + self.delay.send_message else if !self.project.nil? self.project.members.each do |m| @@ -189,8 +179,19 @@ class News < ActiveRecord::Base end end - def send_message user_id, course_id - self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course_id, :viewed => false) + def send_message + self.course.members.each do |m| + if m.user_id != self.author_id + self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_id, :viewed => false) + # 微信相关 + count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count + if count == 0 + ws = WechatService.new + content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200 + ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", content, format_time(self.created_on) + end + end + end end # Time 2015-03-31 13:50:54 From ccf29c980a243dae60c0f16193c9c2ce4ee36bf9 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 May 2016 10:34:36 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BD=9C=E4=B8=9A=EF=BC=9A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=8C=85=E6=8B=AC=E4=B8=8D=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E5=85=B3=E9=94=AE=E5=AD=97=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=8D=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 5 +++-- app/views/homework_common/_homework_index_list.html.erb | 8 ++++++++ app/views/homework_common/_homework_search_form.html.erb | 2 +- app/views/homework_common/index.html.erb | 9 ++------- app/views/homework_common/index.js.erb | 5 ++++- 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 app/views/homework_common/_homework_index_list.html.erb diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 9da4b90b9..376f8d5c2 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -14,6 +14,7 @@ class HomeworkCommonController < ApplicationController #unless params[:page] # update_homework_time(@course.homework_commons) #end + search = "%#{params[:search].to_s.strip.downcase}%" @new_homework = HomeworkCommon.new @new_homework.homework_detail_manual = HomeworkDetailManual.new @new_homework.course = @course @@ -21,10 +22,10 @@ class HomeworkCommonController < ApplicationController @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) if @is_teacher #@homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10) - @homework_commons = @course.homework_commons.order("created_at desc") + @homework_commons = @course.homework_commons.where("name like '%#{search}%'").order("created_at desc") else #@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10) - @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc") + @homework_commons = @course.homework_commons.where("name like '%#{search}%' and publish_time <= '#{Date.today}'").order("created_at desc") end @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher)) @is_new = params[:is_new] diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb new file mode 100644 index 000000000..9b11017e8 --- /dev/null +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -0,0 +1,8 @@ +<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,: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/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb index f71cec9a5..250d72467 100644 --- a/app/views/homework_common/_homework_search_form.html.erb +++ b/app/views/homework_common/_homework_search_form.html.erb @@ -1,4 +1,4 @@ -<%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id), +<%= form_tag( homework_common_index_url_in_org(course.id), :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %> <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %> diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 29cff8933..35f4658f9 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -71,13 +71,8 @@ <% end%>
<% 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%> -
-
+
+ <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %>
diff --git a/app/views/homework_common/index.js.erb b/app/views/homework_common/index.js.erb index 7a038eb5c..4a9ec6ad3 100644 --- a/app/views/homework_common/index.js.erb +++ b/app/views/homework_common/index.js.erb @@ -1 +1,4 @@ -$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>"); \ No newline at end of file +/* +$("#user_show_more_homework").replaceWith("<%#= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");*/ + +$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id}) %>"); From 65c7719ed2d52524318e3e3c1ad6d257af9ab5f0 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 24 May 2016 15:18:11 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=A7=E7=BA=B2?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=9C=A8=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_project_info.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index 30f527595..c04c2effb 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -20,9 +20,9 @@
- +
- + <%= @course.name %> From 1c0a68e57b424c06f12397dde37c015e8ab01bad Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 24 May 2016 15:47:22 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=88=90=E5=91=98tab=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=A4=AA=E5=A4=9A=E5=AF=BC=E8=87=B4=E6=8D=A2=E9=A1=B5?= =?UTF-8?q?=E6=96=AD=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_member_list.html.erb | 2 +- public/stylesheets/org.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index fb22716ff..0059a2be5 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -1,6 +1,6 @@ <% members.each do |member|%>
    -
  • <%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
    • +
  • <%= get_org_member_role_name member %> <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s, diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index abfeaef85..f1b552687 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -18,14 +18,14 @@ .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;} a.saveBtn:hover {background-color:#297fb8;} -.orgMemberList {width:480px; float:left;} +.orgMemberList {width:420px; float:left;} .orgColumnList {width:688px; float:left;} .orgListUser {width:110px; float:left;padding-right: 10px;} .orgListRole {width:180px; float:left;} .orgOrder {width:70px; float:left; text-align:center;} .orgSubNum {width:30px; float:left; text-align:center;} .subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;} -.orgMemContainer {width:208px;} +.orgMemContainer {width:268px;} .orgMemberAdd {float:right;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} .undis {display:none;} From fc3b47e3aa556b454fc1d4c4f570dda7d79be673 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 24 May 2016 16:37:21 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84js=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_student_table.html.erb | 61 +++++++++++----------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb index 3022b83a6..cbb56025e 100644 --- a/app/views/exercise/_student_table.html.erb +++ b/app/views/exercise/_student_table.html.erb @@ -15,46 +15,23 @@ - <% @exercise_users_list.each do |exercise|%> - - + <% @exercise_users_list.each_with_index do |exercise, index|%> - 1 + <%=index + 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 %> - + - + --   - + <% if exercise.created_at%> <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>  <% if @exercise.end_time <= exercise.created_at %> @@ -67,5 +44,29 @@
    - <% end%> + + + +<% end%> \ No newline at end of file From c8467a50a023a2381dede7b6fdf359a3bf4f03ad Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 25 May 2016 16:19:41 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=BB=99=E8=87=AA=E5=B7=B1=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/praise_tread_controller.rb | 16 ++++++++-------- app/views/blog_comments/show.html.erb | 12 ++---------- app/views/messages/_course_show.html.erb | 10 +--------- app/views/messages/_project_show.html.erb | 12 ++---------- app/views/news/_course_show.html.erb | 12 ++---------- app/views/org_document_comments/show.html.erb | 12 ++---------- .../organizations/_org_course_homework.html.erb | 14 +++----------- .../organizations/_org_course_message.html.erb | 12 ++---------- .../organizations/_org_course_news.html.erb | 14 +++----------- .../organizations/_org_project_issue.html.erb | 12 ++---------- .../organizations/_org_subfield_message.html.erb | 12 ++---------- .../organizations/_org_subfield_news.html.erb | 12 ++---------- .../organizations/_project_message.html.erb | 12 ++---------- .../organizations/_show_org_document.html.erb | 12 ++---------- app/views/projects/_project_news.html.erb | 12 ++---------- app/views/users/_course_homework.html.erb | 12 ++---------- .../users/_course_journalsformessage.html.erb | 13 +++++++++---- app/views/users/_course_message.html.erb | 12 ++---------- app/views/users/_course_news.html.erb | 12 ++---------- app/views/users/_project_issue_reply.html.erb | 14 +++----------- app/views/users/_project_message.html.erb | 12 ++---------- app/views/users/_user_activities.html.erb | 12 ++++++------ app/views/users/_user_blog.html.erb | 12 ++---------- app/views/users/_user_homework_detail.html.erb | 12 ++---------- .../users/_user_journalsformessage.html.erb | 12 ++---------- 25 files changed, 69 insertions(+), 240 deletions(-) diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb index 96eeab884..0c665341a 100644 --- a/app/controllers/praise_tread_controller.rb +++ b/app/controllers/praise_tread_controller.rb @@ -25,14 +25,14 @@ class PraiseTreadController < ApplicationController return end @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal] - if @obj.respond_to?("author_id") - author_id = @obj.author_id - elsif @obj.respond_to?("user_id") - author_id = @obj.user_id - end - unless author_id == User.current.id - praise_tread_plus(@obj_type,@obj_id,1) - end + # if @obj.respond_to?("author_id") + # author_id = @obj.author_id + # elsif @obj.respond_to?("user_id") + # author_id = @obj.user_id + # end + # unless author_id == User.current.id + praise_tread_plus(@obj_type,@obj_id,1) + # end respond_to do |format| format.js end diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index d3763abf3..288a02d56 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -122,11 +122,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if @article.author == User.current %> - - <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%> - <% end %>
    @@ -162,12 +158,8 @@
    <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> - + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> + @@ -131,11 +127,7 @@ <%= format_time(reply.created_on) %> @@ -187,11 +183,7 @@ <%= format_time(reply.created_on) %> @@ -137,11 +133,7 @@ <%= format_time(reply.created_on) %> @@ -100,11 +96,7 @@
    <%= format_time(reply.created_at) %> - <% if reply.creator_id.to_i == User.current.id.to_i %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    <%if count>3 %> @@ -359,11 +355,7 @@
    - <% if comment.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <%= link_to( diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb index e68745f7a..03e986716 100644 --- a/app/views/organizations/_org_course_message.html.erb +++ b/app/views/organizations/_org_course_message.html.erb @@ -74,11 +74,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#=format_date(activity.updated_on)%>
    @@ -117,11 +113,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb index acf0f0377..8c260c21c 100644 --- a/app/views/organizations/_org_course_news.html.erb +++ b/app/views/organizations/_org_course_news.html.erb @@ -44,12 +44,8 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> - + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> +
    <%#= format_date(activity.updated_on) %>
    <%if count>3 %> @@ -86,11 +82,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index 9ca10c91d..94eb2820a 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -55,11 +55,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -97,11 +93,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index 61bc5bc7f..bcc43610e 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -84,11 +84,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%if count>3 %> @@ -122,11 +118,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb index 5d6c38542..662a965e9 100644 --- a/app/views/organizations/_org_subfield_news.html.erb +++ b/app/views/organizations/_org_subfield_news.html.erb @@ -64,11 +64,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -106,11 +102,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index e1b000c70..4407d86bd 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -57,11 +57,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#=format_date(activity.updated_on)%>
    @@ -96,11 +92,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index e8f531206..3042ca9ae 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -69,11 +69,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if document.creator_id.to_i == User.current.id.to_i %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
    <% if count > 3 %> @@ -102,11 +98,7 @@ <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %> <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %> - <% if comment.creator_id.to_i == User.current.id.to_i %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    <% unless comment.content.blank? %> diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb index 6d97b252d..7baf93e4f 100644 --- a/app/views/projects/_project_news.html.erb +++ b/app/views/projects/_project_news.html.erb @@ -44,11 +44,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -86,11 +82,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 3721244ed..e694f471e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -296,11 +296,7 @@ ︿ <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    @@ -365,11 +361,7 @@
    - <% if comment.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <%= link_to( diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index aeb7f5e5d..a76081859 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -33,10 +33,12 @@
    <% count = fetch_user_leaveWord_reply(activity).count %>
    -
    -
    -
    - 回复（<%= count %>） +
    +
    回复 + <%= count>0 ? "（#{count}）" : "" %>▪ + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> +
    <%if count>3 %> @@ -72,6 +74,9 @@ <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_time(comment.created_on) %> + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> +
    <%= comment.notes.html_safe %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 8b6056309..c0e667396 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -91,11 +91,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#=format_date(activity.updated_on)%>
    @@ -134,11 +130,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 19d62b14e..b89873b43 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -69,11 +69,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -111,11 +107,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb index 5323b76b6..2b43d8acf 100644 --- a/app/views/users/_project_issue_reply.html.erb +++ b/app/views/users/_project_issue_reply.html.erb @@ -4,11 +4,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -46,12 +42,8 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> - + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> +
    <% if reply.details.any? %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index b6e3f9a94..b3c2fea59 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -90,11 +90,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#=format_date(activity.updated_on)%>
    @@ -129,11 +125,7 @@ <% end %> <%= format_time(reply.created_on) %> - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
    diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2fe7315d5..432074191 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -5,24 +5,24 @@ $(document).ready(function(){ $("#relateProject,.relatePInfo").mouseover(function(){ $(".relatePInfo").css("display","block"); - }) + }); $("#relateProject,.relatePInfo").mouseout(function(){ $(".relatePInfo").css("display","none"); - }) + }); $(".coursesLineGrey").mouseover(function(){ $(this).css("color","#ffffff"); - }) + }); $(".coursesLineGrey").mouseout(function(){ $(this).css("color","#808080"); - }) + }); $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){ $(this).prev().css("color","#ffffff"); $(this).css("z-index", "9999"); - }) + }); $(".homepagePostSetting").mouseout(function(){ $(this).prev().css("color","#808080"); $(this).css("z-index", "1"); - }) + }); }) diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index de5ffc31f..522bdc835 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -50,11 +50,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    <%#= format_date(activity.updated_on) %>
    @@ -92,11 +88,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index f81fbabf5..650ced5dc 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -306,11 +306,7 @@ ︿ <%= count>0 ? "（#{count}）" : "" %>▪ - <% if homework_common.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%>
    @@ -379,11 +375,7 @@
    - <% if comment.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <%= link_to( diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index 47d5145ac..6967bb398 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -64,11 +64,7 @@
    回复 <%= count>0 ? "（#{count}）" : "" %>▪ - <% if activity.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
    @@ -106,11 +102,7 @@ <% end %> <%= format_time(comment.created_on) %> - <% if comment.user == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
    @@ -58,11 +58,11 @@
    {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} -
    -
    {{act.praise_count}}
    -
    {{act.praise_count}}
    + 回复 + {{act.reply_count}} +
    赞
    +
    {{act.praise_count}}
    +
    {{act.praise_count}}
    @@ -87,11 +87,11 @@
{{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
+ 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -134,11 +134,11 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
+ 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -164,11 +164,11 @@ {{act.activity_type_name}} {{act.latest_update}} - - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
+ 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -207,11 +207,11 @@
{{act.latest_update}} - - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
+ 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
@@ -236,11 +236,11 @@
{{act.latest_update}} - - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
+ 回复 + {{act.reply_count}} +
赞
+
{{act.praise_count}}
+
{{act.praise_count}}
diff --git a/public/images/wechat/w_praise.png b/public/images/wechat/w_praise.png new file mode 100755 index 0000000000000000000000000000000000000000..6c0a5f7eb3ac7891fcd612118fa36711ea6d2f16 GIT binary patch literal 4563 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 literal 0 HcmV?d00001 From 3b33732e6f68e8436e766fc4da2c07b0363804fc Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 May 2016 14:15:26 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=88=86=E7=8F=AD=E5=92=8C=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=81=9A=E6=88=90=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_new_member_list.html.erb | 8 ++++---- public/stylesheets/public.css | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index ef8a43d5c..bff16e053 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -22,9 +22,9 @@
    -
  • 姓名
    • -
  • 学号
    • -
  • 分班
    • +
  • 姓名
    • +
  • 学号
    • +
  • 分班
  • <%= link_to '作业积分', member_score_sort_course_path(:sort_type => 'score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml25'%> <% if @sort_type == "score" && @score_sort_by == 'desc' %> @@ -41,7 +41,7 @@ <% end %>
    • -
  • 加入时间
    • +
  • 加入时间
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 2ca221d5c..4ffc33776 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -243,6 +243,7 @@ a.c_green{ color:#28be6c;} .fontGrey3 {color:#484848;} .fontGrey4{color:#999999;} .fontGrey5 {color:#a1a1a1;} +.fontGrey6 {color:#7a7a7a;} .fontBlue {color:#3498db;} .fontBlue2 {color:#269ac9 !important;} a.underline {text-decoration:underline;} @@ -1139,4 +1140,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(.. .likeNum{color: #7f7f7f} /*弹框*/ -.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;} +.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;} From 03d70e8c9ac5043cac33069b52c2c2cdebed4c5e Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 May 2016 14:27:54 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E5=BD=93=E5=85=88=E8=BF=9B=E8=A1=8C=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=88=96=E9=80=89=E6=8B=A9=E5=88=86=E7=8F=AD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=8E=EF=BC=8C=E7=84=B6=E5=90=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E2=80=9C=E9=9A=90=E8=97=8F=E4=BD=9C=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB=E2=80=9C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E4=BF=A1=E6=81=AF=E2=80=9D?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=20=EF=BC=88=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B9=9F=E4=B8=80=E8=B5=B7=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_student_exercise.html.erb | 2 +- .../exercise/_student_exercise_archive.html.erb | 2 +- app/views/exercise/student_exercise_list.html.erb | 12 +++++++++--- app/views/student_work/_student_work_list.html.erb | 2 +- app/views/student_work/index.html.erb | 12 +++++++++--- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index f9fd114dd..2f567796a 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -17,7 +17,7 @@
--> <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> <%# end%> - +
diff --git a/app/views/exercise/_student_exercise_archive.html.erb b/app/views/exercise/_student_exercise_archive.html.erb index abc604b73..3afac2dc2 100644 --- a/app/views/exercise/_student_exercise_archive.html.erb +++ b/app/views/exercise/_student_exercise_archive.html.erb @@ -17,7 +17,7 @@ --> <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> <%# end%> - +
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb index c96f8156a..02f161589 100644 --- a/app/views/exercise/student_exercise_list.html.erb +++ b/app/views/exercise/student_exercise_list.html.erb @@ -5,8 +5,14 @@ $("#Container").css("width","1000px"); }); + function show_or_hide_info(){ + $("#homeworkInformation").toggle(); + $("#homework_info_hidden").toggle(); + $("#homework_info_show").toggle(); + } + $(function(){ - $("#homework_info_hidden").click(function(){ + /*$("#homework_info_hidden").click(function(){ $("#homeworkInformation").hide(); $("#homework_info_hidden").hide(); $("#homework_info_show").show(); @@ -15,7 +21,7 @@ $("#homework_info_show").hide(); $("#homeworkInformation").show(); $("#homework_info_hidden").show(); - }); + });*/ if($("#homework_description").height() > 54) { $("#homeworkDetailShow").show(); @@ -88,7 +94,7 @@ <% elsif @exercise.exercise_status == 3 %> 已截止 <% end%> - [ 隐藏测验信息 ] + [ 隐藏测验信息 ]
发布者：<%= @exercise.user.show_name %>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 1c699d331..bc7ab947f 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -24,7 +24,7 @@ <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %> <% end %> <% end%> - +
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 96e43af46..d0aa0d329 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -33,8 +33,14 @@ $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed").css("border","3px solid #269ac9"); } + function show_or_hide_info(){ + $("#homeworkInformation").toggle(); + $("#homework_info_hidden").toggle(); + $("#homework_info_show").toggle(); + } + $(function(){ - $("#homework_info_hidden").click(function(){ + /*$("#homework_info_hidden").click(function(){ $("#homeworkInformation").hide(); $("#homework_info_hidden").hide(); $("#homework_info_show").show(); @@ -43,7 +49,7 @@ $("#homework_info_show").hide(); $("#homeworkInformation").show(); $("#homework_info_hidden").show(); - }); + });*/ if($("#homework_description").height() > 54) { $("#homeworkDetailShow").show(); @@ -161,7 +167,7 @@ 教师评阅中 <% end%> <% end%> - [ 隐藏作业信息 ] + [ 隐藏作业信息 ]
发布者：<%= @homework.user.show_name %>
From 400a470a2b80b22f05b40c5143a2244346eeb00e Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 May 2016 14:42:12 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_title.html.erb | 5 ++- .../_evaluation_un_title.html.erb | 7 +++-- .../student_work/_evaluation_un_work.html.erb | 31 +++++++++++++------ .../student_work/_evaluation_work.html.erb | 19 ++++++++++++ public/stylesheets/courses.css | 3 ++ public/stylesheets/public.css | 1 + 6 files changed, 54 insertions(+), 12 deletions(-) diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb index 064444f04..b2bf0bd59 100644 --- a/app/views/student_work/_evaluation_title.html.erb +++ b/app/views/student_work/_evaluation_title.html.erb @@ -2,8 +2,8 @@ 序号   - 作品名称 <% if @homework.homework_type != 3 %> + 作品名称 姓名 @@ -11,9 +11,12 @@ 学号 <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + 作品名称 关联项目 + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + 作品名称 <% end %> 时间 diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index 98e9f1f64..b52f34580 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -2,9 +2,9 @@ 序号   - 作品名称 <% 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%> @@ -17,9 +17,12 @@ <% end%> <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + 作品名称 关联项目 + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + 作品名称 <% 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%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index ecdde77d8..a184d4140 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -5,20 +5,26 @@ <%= 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%> -
- <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> -
- - <% if @homework.homework_type != 3 %> + <% if @homework.homework_type != 3 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= 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;"> - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
+ <% 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))%> @@ -28,7 +34,14 @@ <%= student_work.project.name %> <% end %> - <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
+ <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
+ + <% end %> <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 0259fddf7..5007b7e47 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -20,6 +20,12 @@
<% if @homework.homework_type != 3 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <%= student_work.user.show_name%> @@ -27,6 +33,12 @@ <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <% 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))%> @@ -36,6 +48,13 @@ <%= student_work.project.name %> <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> + +
+ <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
+ <% end %> <% else%> <%=index + 1 %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 55f2a0ffc..101a54efc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -61,6 +61,8 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .hworkList160 {width:160px; text-align:center;} .hworkList220 {width:220px; text-align:center;} .hworkList260 {width:260px; text-align:left;} +.hworkList290 {width:290px; text-align:left;} +.hworkList420 {width:420px; text-align:left;} .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px; width:714px; margin-bottom:10px; } .hworkName {width:80px; float:left; line-height:18px;} .hworkName div{max-height: 36px;overflow: hidden;} @@ -91,6 +93,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .width130{width: 130px;} .width165{width: 165px;} .width180{width: 180px;} +.width290{width: 290px;} .width525{width: 525px;} .width285{width: 285px;} .width255{width: 255px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4ffc33776..9e1d97608 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -159,6 +159,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w230{width:230px !important;} .w235{ width:235px !important;} .w250{ width:250px !important;} +.w410{ width:410px !important;} .w280{ width:280px;} .w265{ width: 265px;} .w270{ width: 270px;} From 9e17db376a1fb704dd186f669e3ae6e9b28e81d5 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 May 2016 14:44:28 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=BA=8C=E7=BA=A7=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=8C=BF=E5=90=8D=E7=94=A8=E6=88=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 8 ++++++++ app/controllers/sub_document_comments_controller.rb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 82062d3dd..d7e38f370 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -1,5 +1,6 @@ class OrgDocumentCommentsController < ApplicationController before_filter :find_organization, :only => [:new, :create, :show, :index] + before_filter :authorize_allowed, :only => [:create, :add_reply] helper :attachments,:organizations layout 'base_org' @@ -101,6 +102,13 @@ class OrgDocumentCommentsController < ApplicationController @organization = Organization.find(params[:organization_id]) end + def authorize_allowed + unless User.current.logged? + redirect_to signin_url + return + end + end + def destroy @org_document_comment = OrgDocumentComment.find(params[:id]) @org_sub_id = @org_document_comment.org_subfield_id diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb index cdf153a20..80c14f004 100644 --- a/app/controllers/sub_document_comments_controller.rb +++ b/app/controllers/sub_document_comments_controller.rb @@ -1,6 +1,7 @@ class SubDocumentCommentsController < ApplicationController before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit] before_filter :find_subfield_content, :only => [:show, :index] + before_filter :authorize_allowed, :only => [:create, :add_reply] helper :attachments,:organizations layout 'base_sub_domain' @@ -207,4 +208,11 @@ class SubDocumentCommentsController < ApplicationController def find_subfield_content @subfield_content = @organization.org_subfields.order("priority") end + + def authorize_allowed + unless User.current.logged? + redirect_to signin_url + return + end + end end From 7599bf75a3c20f191ba9bdefcd36de349d75b5ac Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 May 2016 15:04:56 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8D=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_title.html.erb | 2 +- app/views/student_work/_evaluation_un_work.html.erb | 2 +- app/views/users/_user_homework_detail.html.erb | 2 +- public/stylesheets/courses.css | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index b52f34580..1a3220df6 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -22,7 +22,7 @@ 关联项目 <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> - 作品名称 + 作品名称 <% 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%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index a184d4140..688e31451 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -35,7 +35,7 @@ <% end %> <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %> - + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
<%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 650ced5dc..a01418d2f 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -201,7 +201,7 @@ <% end %> <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %> - <% projects = homework_common.student_work_projects.where("is_leader = 1") %> + <% projects = homework_common.student_work_projects.where("is_leader = 1 and project_id != -1") %> <% unless projects.empty? %> <% sort_projects = project_sort_update projects %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 101a54efc..63abab281 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -62,6 +62,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .hworkList220 {width:220px; text-align:center;} .hworkList260 {width:260px; text-align:left;} .hworkList290 {width:290px; text-align:left;} +.hworkList340 {width:340px; text-align:left;} .hworkList420 {width:420px; text-align:left;} .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px; width:714px; margin-bottom:10px; } .hworkName {width:80px; float:left; line-height:18px;} @@ -94,6 +95,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .width165{width: 165px;} .width180{width: 180px;} .width290{width: 290px;} +.width340{width: 340px;} .width525{width: 525px;} .width285{width: 285px;} .width255{width: 255px;} From 227a66841394f61644fefda5dffec6215ba5d139 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 27 May 2016 15:15:14 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_work.html.erb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 5007b7e47..ba017af5f 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -12,12 +12,6 @@ <%=index + 1 %> <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %> - - -
- <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> - <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> -
<% if @homework.homework_type != 3 %> From 649b3918c43f5035fa147c4bc59e5446f056b8df Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 May 2016 15:25:27 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=88=9B=E5=BB=BA=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 18 +++++++++++++++++- app/models/news.rb | 29 +++++++++++++++++++---------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/app/models/message.rb b/app/models/message.rb index fdc3c6bdc..cf9adab4e 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -83,7 +83,7 @@ class Message < ActiveRecord::Base # after_create :add_author_as_watcher, :reset_counters!, :add_boards_count after_update :update_messages_board, :update_activity after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score - after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count, :act_as_system_message + after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count, :act_as_system_message, :delay_message_send #before_save :be_user_score scope :visible, lambda {|*args| @@ -308,6 +308,22 @@ class Message < ActiveRecord::Base end end + def delay_message_send + if self.course + if self.parent_id.nil? # 发帖 + self.delay.contain_messages_message + end + end + end + + def contain_messages_message + self.course.members.includes(:user).each do |m| + if self.author.allowed_to?(:as_teacher, self.course) && m.user_id != self.author_id # 老师 自己的帖子不给自己发送消息 + self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false) + end + end + end + #更新用户分数 -by zjc def be_user_score #新建message且无parent的为发帖 diff --git a/app/models/news.rb b/app/models/news.rb index beb58799f..0b03dcc48 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -62,7 +62,7 @@ class News < ActiveRecord::Base :author_key => :author_id acts_as_watchable - after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message + after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send after_update :update_activity after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score @@ -167,7 +167,17 @@ class News < ActiveRecord::Base # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒 def act_as_system_message if self.course - self.delay.send_message + self.course.members.each do |m| + if m.user_id != self.author_id + #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false) + count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count + if count == 0 + ws = WechatService.new + content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200 + ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", content, format_time(self.created_on) + end + end + end else if !self.project.nil? self.project.members.each do |m| @@ -179,17 +189,16 @@ class News < ActiveRecord::Base end end - def send_message + def delay_news_send + if self.course + self.delay.contain_news_message + end + end + + def contain_news_message self.course.members.each do |m| if m.user_id != self.author_id self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_id, :viewed => false) - # 微信相关 - count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count - if count == 0 - ws = WechatService.new - content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200 - ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", content, format_time(self.created_on) - end end end end