From 9bfb749e705411b5e17ef6643a4ee8e1e9d47384 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 26 Sep 2016 10:17:45 +0800 Subject: [PATCH 01/69] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E8=AF=BE=E5=86=85=E6=90=9C=E7=B4=A2=E6=94=B9?= =?UTF-8?q?=E6=88=90=E7=8F=AD=E5=86=85=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_file.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 045eec6f7..1157961fe 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -98,7 +98,7 @@
<%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %> <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%> - <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %> + <%= submit_tag "班内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %> <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %> <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %> From 42afe33dab280adc715113d25ebc1d59faa6ee3a Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 26 Sep 2016 11:12:01 +0800 Subject: [PATCH 02/69] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=8F=8F=E8=BF=B0=E5=8F=AA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_homework_post_brief.html.erb | 2 +- .../student_work/_student_work_list.html.erb | 4 ---- app/views/student_work/index.html.erb | 23 ------------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/app/views/student_work/_homework_post_brief.html.erb b/app/views/student_work/_homework_post_brief.html.erb index 6b3c0d542..310b4118b 100644 --- a/app/views/student_work/_homework_post_brief.html.erb +++ b/app/views/student_work/_homework_post_brief.html.erb @@ -42,7 +42,7 @@
-
+
<%= homework.description.html_safe %>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 6bcb2bb5e..77517f747 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -54,10 +54,6 @@
From 0e8df56c9aee1467e647ecfd23ae615958f8d4ee Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 26 Sep 2016 14:38:07 +0800 Subject: [PATCH 03/69] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_evaluation_un_group_member_work.html.erb | 21 ++++++++++--------- .../student_work/_evaluation_un_work.html.erb | 10 ++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index 842e1c899..3ee9ec891 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -1,8 +1,9 @@ +<% is_expand = st.student_work_projects.empty? %>
  • -
    +
    > <%= link_to(image_tag(url_to_avatar(st.user),:width =>"40",:height => "40", :style => "display:block;"),user_activities_path(st.user), :class => "fl") %> - <% if !st.student_work_projects.empty? %> + <% if !is_expand %> (组长) @@ -11,10 +12,10 @@ 学号：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%> <% else %> - + -
    - +
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index bb87bfde1..2a2b7faee 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -95,19 +95,19 @@ <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> -
+
作品最终评分为 -  <%= student_work.final_score%> 分。 +  <%= student_work.final_score%> 分
迟交扣分   <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %> -  分， +  分
缺评扣分   <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%> -  分， +  分
最终成绩为 -  <%= format("%.1f",score<0 ? 0 : score)%> 分。 +  <%= format("%.1f",score<0 ? 0 : score)%> 分
<% end%> From 4db59ea0d328d2a56443fab6c2bd7366a1ab3fc1 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 26 Sep 2016 15:07:25 +0800 Subject: [PATCH 04/69] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A2=98=E5=BA=93=20?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=A4=E6=AC=A1=E5=90=8E=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 87dc127a0..792ba4690 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -625,7 +625,7 @@ class UsersController < ApplicationController visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")" @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}") end - @type = params[:type] + @type = params[:type] ? params[:type] : '1' @limit = 10 @is_remote = true @hw_count = @homeworks.count @@ -808,7 +808,7 @@ class UsersController < ApplicationController #@homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}") end end - @type = params[:type] + @type = params[:type] ? params[:type] : '1' @property = params[:property] @is_import = params[:is_import] @limit = params[:is_import].to_i == 1 ? 15 : 10 From 03fac1900e341173df707fa8464d7861c1cc6f62 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 28 Sep 2016 10:00:01 +0800 Subject: [PATCH 05/69] =?UTF-8?q?=E5=88=86=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 14 +- app/views/courses/_course_student.html.erb | 11 +- app/views/courses/_new_groups_name.html.erb | 61 +++---- app/views/courses/_new_member_list.html.erb | 172 ++++++++++++++++++-- app/views/courses/_searchmembers.html.erb | 44 +++-- app/views/courses/addgroups.js.erb | 4 +- app/views/courses/member.html.erb | 48 ++++-- public/images/sy/sy_icons02.png | Bin 0 -> 199603 bytes public/javascripts/course.js | 3 +- public/stylesheets/css/common.css | 2 +- public/stylesheets/css/courses.css | 2 +- public/stylesheets/syllabus.css | 37 +++++ 12 files changed, 308 insertions(+), 90 deletions(-) create mode 100644 public/images/sy/sy_icons02.png diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 403119e20..0c82edad7 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1233,7 +1233,12 @@ class CoursesController < ApplicationController AND student_works.user_id = members.user_id ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 + resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id - ) AS act_score + ) AS act_score,(SELECT SUM(exercise_users.score) + FROM exercise_users,exercises + WHERE exercise_users.exercise_id = exercises.id + AND exercises.course_id = #{@course.id} + AND exercise_users.user_id = members.user_id + ) AS ex_score FROM members JOIN students_for_courses ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id @@ -1247,7 +1252,12 @@ class CoursesController < ApplicationController AND student_works.user_id = members.user_id ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 + resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id - ) AS act_score + ) AS act_score,(SELECT SUM(exercise_users.score) + FROM exercise_users,exercises + WHERE exercise_users.exercise_id = exercises.id + AND exercises.course_id = #{@course.id} + AND exercise_users.user_id = members.user_id + ) AS ex_score FROM members JOIN students_for_courses ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id diff --git a/app/views/courses/_course_student.html.erb b/app/views/courses/_course_student.html.erb index 8da3987a8..db0aabc3b 100644 --- a/app/views/courses/_course_student.html.erb +++ b/app/views/courses/_course_student.html.erb @@ -1,10 +1,8 @@ -
- +
+ <%= render :partial => 'searchmembers' %>
-
+
<%= render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups} %>
@@ -12,5 +10,4 @@
<%= render :partial => 'new_member_list', :locals => {:members => members} %>
-
-
\ No newline at end of file +
\ No newline at end of file diff --git a/app/views/courses/_new_groups_name.html.erb b/app/views/courses/_new_groups_name.html.erb index 6ffbb6dd2..81799360a 100644 --- a/app/views/courses/_new_groups_name.html.erb +++ b/app/views/courses/_new_groups_name.html.erb @@ -1,56 +1,41 @@
    -
  • 分班:
    • -
  • +
  • 分班:
    • +
  • <%= link_to l(:label_all), searchgroupmembers_course_path(@course,:group_id => 0), :onclick => "checkclass('course_group_0')", method: 'get', remote: true%>
    • +
  • + <%= link_to '未分班', searchgroupmembers_course_path(@course,:group_id => 0), :onclick => "checkclass('course_group_0')", method: 'get', remote: true%> +
    • <% unless course_groups.nil? %> <% course_groups.each do |group| %> - <% group_name = " #{ group.name}( #{group.members.count.to_s}人)".html_safe %> -
  • - <%= link_to group_name, searchgroupmembers_course_path(@course,:group_id => group.id), method: 'get', remote: true,:onclick => "checkclass('group_name_#{group.id}')"%> + <%# group_name = " #{ group.name}( #{group.members.count.to_s}人)".html_safe %> +
  • + <%= link_to group.name, searchgroupmembers_course_path(@course,:group_id => group.id), class: 'fl mr5', method: 'get', remote: true,:onclick => "checkclass('group_name_#{group.id}')"%> + (<%=group.members.count.to_s %>人) <% if @canShowCode%> + <% if group.members.empty?%> <%= link_to '', deletegroup_course_path(:group_id => group.id), :method => 'delete', :remote => true, :data => {confirm: l(:label_delete_group)}, - :class => 'f_1', - :style => "width: 11px;height: 16px;margin-top:3px;margin-left:5px;background: url(/images/pic_del.gif) no-repeat 0 0;" - %> + :class => 'sy_icons_del fl' + %> <% else%> - - 删除班级 - + <% end%> - - 编辑班级 - - <% end %> -
    • - -
  • - <% if @canShowCode%> - <%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, :id => 'update_group_'+group.id.to_s) do %> - - <% end %> <% end %>
    • <% end %> - <% end %> - - <% if @canShowCode %> -
  • - +添加分班 -
    • -
  • - + + <% if @canShowCode%> +
  • + <%= form_tag(updategroupname_course_path(@course), method: 'get', remote:true, :id => 'update_group_form') do %> + + + 确定 + 取消 + <% end %>
    • + <% end %> <% end %>
\ No newline at end of file diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index 08df18175..31bc91589 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -11,15 +11,144 @@
<% if members.any? %> - <% if @result_count %> -

- <%= l(:label_search_member_count) %> - <%= @result_count %> - <%= l(:label_member_people) %> + + + + + + + + + + + + + + + <% members.each_with_index do |member, i| %> + + <% user = member.user %> + <% hw_score = member.score.nil? ? 0 : member.score %> + <% ex_score = member.ex_score.nil? ? 0 : member.ex_score %> + <% act_score = member.act_score.nil? ? 0 : member.act_score %> + <% sum = hw_score + ex_score + act_score %> + + + + + + + + + <% end %> + +
序号姓名 + <%= link_to '学号', member_score_sort_course_path(:sort_type => 'student_id', :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, :style => 'color:#000000;'%> + <% if @sort_type == "student_id" && @score_sort_by == 'desc' %> + + <% elsif @sort_type == "student_id" && @score_sort_by == 'asc' %> + + <% end %> + + <%= 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, :style => 'color:#000000;'%> + <% if @sort_type == "score" && @score_sort_by == 'desc' %> + + <% elsif @sort_type == "score" && @score_sort_by == 'asc' %> + + <% end %> +
+

积分规则
+ 班级作业的得分总和

+
+ 		测评得分 +
+

积分规则
+ 班级测验的得分总和

+
+ 		+ <%= link_to '社区得分', member_score_sort_course_path(:sort_type => 'act_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, :style => 'color:#000000;'%> + <% if @sort_type == "act_score" && @score_sort_by == 'desc' %> + + <% elsif @sort_type == "act_score" && @score_sort_by == 'asc' %> + + <% end %> +
+

积分规则
+ 资源发布：资源数 x 5
+ 问答发布：发帖数 x 2
+ 通知发布：通知数 x 1
+ 问答回复：回复数 x 1
+ 作业留言：留言数 x 1
+ 通知留言：留言数 x 1
+ 班级留言：留言数 x 1
+ 总得分为以上得分之和

-
+
+ 		总得分 +
+

积分规则
+ 作业得分+测评得分+社区得分

+
+ 		分班
<%= i + 1 %> + <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30"), user_path(member.user_id), :class => 'sy_class_users_st fl mt4 mr5' ,:alt => "用户头像" %> + <%= user.show_name %> + + <%= user.user_extensions.student_id %> + + <%= link_to format("%0.2f", hw_score), { + :action => 'show_member_score', + :member_id => member.id, + :remote => true}, + :class => "" %> + <%= ex_score %> + <%= link_to act_score, { + :action => 'show_member_act_score', + :member_id => member.id, + :remote => true}, + :class => '' %> + + <%= format("%0.2f", sum) %> +
+ +

+ <%= user.show_name %>
+ 资源    发布数：1
+ 问答    发布数：1回复数：1
+ 通知    提交数：1留言数：1
+ 作业    提交数：1留言数：1
+ 班级    留言数：1
+ 测验    提交数：1 +

+
+ 		+ <% unless @course.course_groups.empty? %> + <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? || User.current == user %> + <% if @course.course_groups.nil? || @group %> + <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %> + <% else %> + <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %> +
+ <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %> + +
+ <%= select( :name,:group_id, course_group_option(@course), + { :include_blank => false,:selected => member.course_group_id}, + {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w100 undis class-edit sy_fenban_select", :style => "margin-left: 5px;"}) %> + <% end %> + <% end %> + <% else %> + <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %> + <% end %> + <% end %> +
+<% else%> +

+ <%= l(:label_no_data) %> +

+<% end %> +<% if members.any? %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index bc21ff8d2..18d56fc72 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -8,7 +8,7 @@
  • - 贴吧交流 + 帮助中心
    • From 06ea193eb444b65734fb2d0e8dbef95b9aaf7249 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 29 Sep 2016 16:23:53 +0800 Subject: [PATCH 22/69] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=88=A0=E9=99=A4=E3=80=81=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_resources_list.html.erb | 2 +- app/views/users/_user_resource_info.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb index 0190e60dc..3c78e3a0c 100644 --- a/app/views/users/_resources_list.html.erb +++ b/app/views/users/_resources_list.html.erb @@ -249,7 +249,7 @@ } line.children().css("background-color", 'white'); id = line.children().last().html(); - user_id = line.children().eq(5).html(); + user_id = line.children().eq(4).html(); if(user_id === '<%= User.current.id%>') { if(line.children().first().children().data('hasHistory') == 'Y'){ alert('该资源存在历史版本，不能删除'); diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb index d3b169a17..d5a31bdf7 100644 --- a/app/views/users/_user_resource_info.html.erb +++ b/app/views/users/_user_resource_info.html.erb @@ -225,7 +225,7 @@ document.oncontextmenu = function() {return true;} line.children().css("background-color",'white'); id = line.children().last().html(); - user_id = line.children().eq(5).html(); + user_id = line.children().eq(4).html(); if(user_id === '<%= User.current.id %>') { res_name = line.children().eq(1).children().attr('title'); res_link = line.children().eq(1).html(); From e2be4a9e7fb28fc67e560173e53375ce52874d3a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 29 Sep 2016 16:55:32 +0800 Subject: [PATCH 23/69] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/homework.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb index 03472d0a0..aaf21999d 100644 --- a/app/views/admin/homework.html.erb +++ b/app/views/admin/homework.html.erb @@ -38,11 +38,13 @@ <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%> - <% if homework.course %> - - <%= link_to(homework.course.name, course_path(homework.course.id)) %> + + + <% if homework.course %> + <%= link_to homework.course.name, course_path(homework.course.id) %> + <% end %> - <% end %> + <%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'> <% if homework.try(:user).try(:realname) == ' '%> <%= link_to(homework.try(:user), user_path(homework.user_id)) %> From 17c82c5291c4f07b8a60dff788d4a473a4fc8954 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 29 Sep 2016 17:17:17 +0800 Subject: [PATCH 24/69] =?UTF-8?q?=E5=B7=B2=E6=8F=90=E4=BA=A4=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E7=9A=84=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E5=8F=AF?= =?UTF-8?q?=E6=89=A9=E5=A4=A7=E5=88=86=E7=BB=84=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/edit.html.erb | 2 +- app/views/users/_user_group_attr.html.erb | 32 +++++++++++++++++--- app/views/users/_user_homework_form.html.erb | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index ec5ecc31c..b2bc236ca 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -47,7 +47,7 @@ <% elsif @homework.homework_type == 2 %>

    已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和测试集。

    <% elsif @homework.homework_type == 3 %> -

    已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置。

    +

    已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置(可扩大分组范围)。

    <% end %> <% elsif stu_pro_count != 0 && @homework.homework_type == 3 %>

    已有<%=stu_pro_count %>个学生关联项目，不允许再修改作业类型。

    diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb index 4596ef411..5d1475991 100644 --- a/app/views/users/_user_group_attr.html.erb +++ b/app/views/users/_user_group_attr.html.erb @@ -1,10 +1,10 @@
    分组设置：
    每组最小人数： - />人 + />人
    每组最大人数： - />人 + />人
    @@ -21,7 +21,29 @@
    \ No newline at end of file diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index f225e4fcd..b8785dc9a 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -7,7 +7,7 @@ var first_click = true; $(function(){ $("#homework_type_option").on("change",function(){ - var type = $(this).children('option:selected').val() + var type = $(this).children('option:selected').val(); if(type == "1"){ $("#homeworkSetting").addClass("undis"); $("#homeworkSetting").html(""); From 742d5b630b4999b4cf1182fc2d0420b9078ce5d5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 29 Sep 2016 17:18:46 +0800 Subject: [PATCH 25/69] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=EF=BC=9A=E5=AF=BC=E5=85=A5=E9=97=AE=E5=8D=B7=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9C=AA=E6=9C=89=E6=96=B0=E5=BB=BA=E9=97=AE?= =?UTF-8?q?=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/other_poll.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/other_poll.js.erb b/app/views/poll/other_poll.js.erb index 26ec89046..19dc17052 100644 --- a/app/views/poll/other_poll.js.erb +++ b/app/views/poll/other_poll.js.erb @@ -1,6 +1,6 @@ <% if @polls.empty? %> - alert('您目前还没有自己新建的问卷'); + alert('您目前其他课程无问卷可导入'); <% else %> $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>'); From a9a53caa1377645db0c2c09c5687c589efc94d9c Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Sep 2016 10:29:42 +0800 Subject: [PATCH 26/69] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=90=8E=EF=BC=8C=E8=B7=B3=E8=BD=AC=E8=87=B3?= =?UTF-8?q?=E2=80=9C=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E2=80=9C=E4=BD=9C=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/student_work/_work_edit_information.html.erb | 2 +- app/views/student_work/_work_information.html.erb | 2 +- app/views/student_work/update.js.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 792ba4690..5ab85e21d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1033,7 +1033,7 @@ class UsersController < ApplicationController update_org_activity(homework.class,homework.id) flash[:notice] = l(:notice_successful_create) - redirect_to student_work_index_url(:homework => params[:homework]) + redirect_to student_work_index_url(:homework => params[:homework], :tab => 2) else render_403 end diff --git a/app/views/student_work/_work_edit_information.html.erb b/app/views/student_work/_work_edit_information.html.erb index 057d305d5..d3e430d6e 100644 --- a/app/views/student_work/_work_edit_information.html.erb +++ b/app/views/student_work/_work_edit_information.html.erb @@ -38,6 +38,6 @@ \ No newline at end of file diff --git a/app/views/student_work/_work_information.html.erb b/app/views/student_work/_work_information.html.erb index f9da89c11..eabab8ed0 100644 --- a/app/views/student_work/_work_information.html.erb +++ b/app/views/student_work/_work_information.html.erb @@ -39,6 +39,6 @@ \ No newline at end of file diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb index 9dc381e42..4f2ace330 100644 --- a/app/views/student_work/update.js.erb +++ b/app/views/student_work/update.js.erb @@ -12,5 +12,5 @@ window.location.href = '<%= edit_student_work_url(@work)%>'; function clickCanel() { hideModal('#popbox02'); - window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>'; + window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/student_work?homework=" + "<%= @homework.id%>&tab=2" } \ No newline at end of file From 6ed65abb67b10ea31b86b325feb8cb1feacedcd2 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Sep 2016 10:44:52 +0800 Subject: [PATCH 27/69] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine/scm/adapters/git_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 927018b34..76666b071 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -61,7 +61,7 @@ module Redmine end end - def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil) + def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil, project_id) super @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding end From 0ad71e0f64768fe89cfd67c2d9f69d486d090a8a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 30 Sep 2016 11:07:22 +0800 Subject: [PATCH 28/69] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E5=8F=8A=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=97=AE=E9=A2=98=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E7=9A=84issue=E7=9A=84=E6=89=80=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- app/views/projects/_development_group.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9f8accdaa..9a150bf92 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -122,7 +122,7 @@ 新 增
    diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index ad8d9a35a..57fea898b 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -8,8 +8,8 @@ <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
    <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> - <% if @project.project_score.issue_num > 0 %> - (<%= @project.project_score.issue_num %>) + <% if @issues_filter.count > 0 %> + (<%= @issues_filter.count %>) <% end %> <% if User.current.member_of?(@project) %> From acbc94af1ae585c3f2b323965413c8745a80467e Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 30 Sep 2016 11:24:04 +0800 Subject: [PATCH 29/69] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E6=95=B0=E5=AD=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_development_group.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 57fea898b..1ddd9acac 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -1,4 +1,5 @@ <% project_file_num = Attachment.where(:container_type => "Project", :container_id => @project.id).count %> +<% project_issue_count =Issue.where(:project_id => @project.id).count%>
    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> @@ -8,8 +9,8 @@ <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
    <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> - <% if @issues_filter.count > 0 %> - (<%= @issues_filter.count %>) + <% if project_issue_count > 0 %> + (<%= project_issue_count %>) <% end %> <% if User.current.member_of?(@project) %> From 7b51812ebbbeb3c448b43e6fa909541f662d7a4d Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Sep 2016 13:20:35 +0800 Subject: [PATCH 30/69] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=A4=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index cda8e8be5..57d1ceda6 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -62,6 +62,9 @@
  • <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
    • +
  • + <%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current.id}, :class => "menuGrey" %> +
  • <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
    • From 5d0e3889dfa5718abfc20dcf119abcdba7ed13dc Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Sep 2016 14:26:16 +0800 Subject: [PATCH 31/69] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E7=BB=84=E7=BB=87=E5=B8=96=E5=AD=90=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=9B=9E=E5=A4=8D=E7=9A=84=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 20 +++++-- app/helpers/application_helper.rb | 19 +++++- app/views/messages/_course_show.html.erb | 54 +---------------- .../messages/_course_show_replies.html.erb | 60 +++++++++++++++++++ app/views/messages/_org_show_replies.html.erb | 59 ++++++++++++++++++ .../messages/_org_subfield_show.html.erb | 51 +--------------- app/views/messages/_project_show.html.erb | 52 +--------------- .../messages/_project_show_replies.html.erb | 60 +++++++++++++++++++ app/views/messages/show.js.erb | 7 +++ public/stylesheets/css/public.css | 1 + 10 files changed, 224 insertions(+), 159 deletions(-) create mode 100644 app/views/messages/_course_show_replies.html.erb create mode 100644 app/views/messages/_org_show_replies.html.erb create mode 100644 app/views/messages/_project_show_replies.html.erb create mode 100644 app/views/messages/show.js.erb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 5731244c3..226d24afa 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -47,6 +47,9 @@ class MessagesController < ApplicationController all_comments = [] @replies = get_all_children(all_comments, @topic) @reply_count = @replies.count + @page = params[:page] ? params[:page].to_i + 1 : 0 + @limit = 10 + @replies = @replies[@page * @limit..@page * @limit + 9] @reply = Message.new(:subject => "RE: #{@message.subject}") if @course #@replies = @topic.children. @@ -57,7 +60,11 @@ class MessagesController < ApplicationController #all #@replies = paginateHelper messages_replies,10 @left_nav_type = 2 - render :action => "show", :layout => "base_courses"#by young + respond_to do |format| + format.js + format.html {render :layout => 'base_courses'} + end + #render :action => "show", :layout => "base_courses"#by young elsif @project #@reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page # @replies = @topic.children. @@ -66,8 +73,10 @@ class MessagesController < ApplicationController # limit(@reply_pages.per_page). # offset(@reply_pages.offset). # all - - render :action => "show", :layout => "base_projects"#by young + respond_to do |format| + format.js + format.html {render :layout => 'base_projects'} + end else # @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page # @replies = @topic.children. @@ -78,7 +87,10 @@ class MessagesController < ApplicationController # all @organization = @org_subfield.organization - render :action => "show", :layout => "base_org"#by young + respond_to do |format| + format.js + format.html {render :layout => 'base_org'} + end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c427bbea..c3e0bee54 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3244,17 +3244,32 @@ def get_reply_parents_no_root parents_rely, comment parents_rely end +def get_all_children_ex result, jour + if jour.kind_of? Message + jour.children.includes(:author, :praise_tread_cache).each do |jour_child| + result << jour_child + get_all_children_ex result, jour_child + end + elsif (jour.kind_of? JournalsForMessage) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment) + jour.children.each do |jour_child| + result << jour_child + get_all_children_ex result, jour_child + end + end + result +end + #获取所有子节点 def get_all_children result, jour if jour.kind_of? Message jour.children.includes(:author, :praise_tread_cache).each do |jour_child| result << jour_child - get_all_children result, jour_child + get_all_children_ex result, jour_child end elsif (jour.kind_of? JournalsForMessage) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment) jour.children.each do |jour_child| result << jour_child - get_all_children result, jour_child + get_all_children_ex result, jour_child end end if jour.respond_to?(:created_on) diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index abdeef255..80661078a 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -95,58 +95,8 @@
    <%# all_comments = []%> <%# comments = get_all_children(all_comments, @topic) %> -
    - <% @replies.each do |reply| %> - -
    -
    - <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
    -
    - <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%> - -
    - <%= reply.content.html_safe%> -
    -
    -
    - - - <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> - - - <%= link_to( - l(:button_reply), - {:action => 'quote', :id => reply}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> - - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :post, - :id => "delete_reply_#{reply.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if reply.course_destroyable_by?(User.current) %> - - -
    -
    -
    -

    -
    -
    -
    - <% end %> +
    + <%= render :partial => "messages/course_show_replies" %>
    diff --git a/app/views/messages/_course_show_replies.html.erb b/app/views/messages/_course_show_replies.html.erb new file mode 100644 index 000000000..ad715df20 --- /dev/null +++ b/app/views/messages/_course_show_replies.html.erb @@ -0,0 +1,60 @@ +<% @replies.each do |reply| %> + +
    +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
    +
    + <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%> + +
    + <%= reply.content.html_safe%> +
    +
    +
    + + + <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> + + + <%= link_to( + l(:button_reply), + {:action => 'quote', :id => reply}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> + + + <%= link_to( + l(:button_delete), + {:action => 'destroy', :id => reply}, + :method => :post, + :id => "delete_reply_#{reply.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if reply.course_destroyable_by?(User.current) %> + + +
    +
    +
    +

    +
    +
    +
    +<% end %> +<% if @reply_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', board_message_path(@topic.board_id, @topic, :page => @page),:remote=>true %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/messages/_org_show_replies.html.erb b/app/views/messages/_org_show_replies.html.erb new file mode 100644 index 000000000..fbde35fcf --- /dev/null +++ b/app/views/messages/_org_show_replies.html.erb @@ -0,0 +1,59 @@ +<% @replies.each_with_index do |reply, i| %> + +
    +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => 33, :height => 33), user_path(reply.author) %> +
    +
    + <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %> + +
    + <%= reply.content.html_safe %> +
    +
    +
    + + + <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> + + + <%= link_to( + l(:button_reply), + {:action => 'quote', :id => reply}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> + + + <%= link_to( + l(:button_delete), + {:action => 'destroy', :id => reply}, + :method => :post, + :class => 'fr mr20', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if reply.course_destroyable_by?(User.current) %> + + +
    +
    +
    +

    +
    +
    +
    +<% end %> +<% if @reply_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', board_message_path(@topic.board_id, @topic, :page => @page),:remote=>true %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb index 6b6983bb1..19e8b30d5 100644 --- a/app/views/messages/_org_subfield_show.html.erb +++ b/app/views/messages/_org_subfield_show.html.erb @@ -130,56 +130,7 @@ <%# all_comments = [] %> <%# comments = get_all_children(all_comments, @topic) %>
    - <% @replies.each_with_index do |reply, i| %> - -
    -
    - <%= link_to image_tag(url_to_avatar(reply.author), :width => 33, :height => 33), user_path(reply.author) %> -
    -
    - <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %> - -
    - <%= reply.content.html_safe %> -
    -
    -
    - - - <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> - - - <%= link_to( - l(:button_reply), - {:action => 'quote', :id => reply}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> - - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :post, - :class => 'fr mr20', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if reply.course_destroyable_by?(User.current) %> - - -
    -
    -
    -

    -
    -
    -
    - <% end %> + <%= render :partial => "messages/org_show_replies" %>
    <% end %> diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index f46d70ad2..e7d12c3d3 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -160,57 +160,7 @@ <%# all_comments = []%> <%# comments = get_all_children(all_comments, @topic) %>
    - <% @replies.each_with_index do |reply,i| %> - -
    -
    - <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> -
    -
    - <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%> - -
    - <%= reply.content.html_safe%> -
    -
    -
    - - - <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> - - - <%= link_to( - l(:button_reply), - {:action => 'quote', :id => reply}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> - - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :post, - :id => "delete_reply_#{reply.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if reply.destroyable_by?(User.current) %> - - -
    -
    -
    -

    -
    -
    -
    - <% end %> + <%= render :partial => "messages/project_show_replies" %>
    <% if !@topic.locked? && authorize_for('messages', 'reply') %> diff --git a/app/views/messages/_project_show_replies.html.erb b/app/views/messages/_project_show_replies.html.erb new file mode 100644 index 000000000..ea0b64069 --- /dev/null +++ b/app/views/messages/_project_show_replies.html.erb @@ -0,0 +1,60 @@ +<% @replies.each_with_index do |reply,i| %> + +
    +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
    +
    + <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%> + +
    + <%= reply.content.html_safe%> +
    +
    +
    + + + <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %> + + + <%= link_to( + l(:button_reply), + {:action => 'quote', :id => reply}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %> + + + <%= link_to( + l(:button_delete), + {:action => 'destroy', :id => reply}, + :method => :post, + :id => "delete_reply_#{reply.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if reply.destroyable_by?(User.current) %> + + +
    +
    +
    +

    +
    +
    +
    +<% end %> +<% if @reply_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', board_message_path(@topic.board_id, @topic, :page => @page),:remote=>true %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/messages/show.js.erb b/app/views/messages/show.js.erb new file mode 100644 index 000000000..fcfaa3858 --- /dev/null +++ b/app/views/messages/show.js.erb @@ -0,0 +1,7 @@ +<% if @project %> +$("#more_message_replies").replaceWith("<%= escape_javascript(render :partial => 'messages/project_show_replies')%>"); +<% elsif @course %> +$("#more_message_replies").replaceWith("<%= escape_javascript(render :partial => 'messages/course_show_replies')%>"); +<% else %> +$("#more_message_replies").replaceWith("<%= escape_javascript(render :partial => 'messages/org_show_replies')%>"); +<% end %> \ No newline at end of file diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index d4cce2679..cce278668 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1403,6 +1403,7 @@ a:hover.comment_ding_link{ color:#269ac9;} .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;} .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} +.detail_cont_hide{ text-align:center; width:690px; display:block; font-size:14px; color:#333; border-bottom:1px solid #e3e3e3; padding:8px 0; margin: 0px auto;} /* 未登录的提示信息 */ .syllabusbox_tishi{ From a63f58de5b9c156f114d45eceb5c13ecb4883fc6 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Sep 2016 14:48:42 +0800 Subject: [PATCH 32/69] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/show.html.erb | 6 +++--- app/views/blogs/_homepage.html.erb | 6 +++--- app/views/org_document_comments/show.html.erb | 6 +++--- app/views/organizations/_org_subfield_message.html.erb | 6 +++--- app/views/organizations/_show_org_document.html.erb | 6 +++--- app/views/users/_course_journalsformessage.html.erb | 6 +++--- app/views/users/_course_message.html.erb | 6 +++--- app/views/users/_project_message.html.erb | 6 +++--- app/views/users/_user_blog.html.erb | 6 +++--- app/views/users/_user_journalsformessage.html.erb | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 45a621816..7143e980b 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -106,7 +106,8 @@
    <% all_comments = []%> - <% count=get_all_children(all_comments, @article).count %> + <% all_replies = get_all_children(all_comments, @article) %> + <% count= all_replies.count %>
    回复 @@ -119,8 +120,7 @@
    - <% all_comments = []%> - <% comments = get_all_children(all_comments, @article) %> + <% comments = all_replies %> <% if count > 0 %>
    <% comments.each do |comment| %> diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb index a076ed15c..6e45fdd88 100644 --- a/app/views/blogs/_homepage.html.erb +++ b/app/views/blogs/_homepage.html.erb @@ -46,12 +46,12 @@
    <% all_comments = []%> - <% count=get_all_children(all_comments, activity).count %> + <% all_repies = get_all_children(all_comments, activity) %> + <% count = all_repies.count %>
    <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %> - <% all_comments = []%> - <% comments = get_all_children(all_comments, activity)[0..2] %> + <% comments = all_repies[0..2] %> <% if count > 0 %>
    <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%> diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 1321fc83e..0fe72ad36 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -75,7 +75,8 @@
    <% all_comments = []%> - <% count=get_all_children(all_comments, @document).count %> + <% all_replies = get_all_children(all_comments, @document) %> + <% count = all_replies.count %>
    <%# if count > 0 %> @@ -88,8 +89,7 @@
    - <% all_comments = []%> - <% comments = get_all_children(all_comments, @document) %> + <% comments = all_replies %>
    <% comments.each do |comment| %> -
  • -
    - <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> -
    -
    - <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%> - - <% if !comment.content_detail.blank? %> -
    - <%= comment.content_detail.html_safe %> -
    -
    -
    - - - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - - - <%= link_to( - l(:button_reply), - {:controller => 'comments',:action => 'quote', :id => comment}, - :remote => true, - :method => 'get', - :title => l(:button_reply))%> - - - <%= link_to( - l(:button_delete), - {:controller => 'comments', - :action => 'destroy', :id => @news, - :comment_id => comment}, - :method => :delete, - :id => "delete_reply_#{comment.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if User.current.allowed_to?(:manage_news, object) %> - -
    -
    -
    -

    - <% end %> -
    -
    -
    • - <% end %> + <%= render :partial => 'news/news_replies_detail', :locals => {:object => object} %>
    <% end %> diff --git a/app/views/news/_news_replies_detail.html.erb b/app/views/news/_news_replies_detail.html.erb new file mode 100644 index 000000000..f79bbdfc0 --- /dev/null +++ b/app/views/news/_news_replies_detail.html.erb @@ -0,0 +1,63 @@ +<% @comments.each_with_index do |comment,i| %> + +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %> +
    +
    + <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%> + + <% if !comment.content_detail.blank? %> +
    + <%= comment.content_detail.html_safe %> +
    +
    +
    + + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + + + <%= link_to( + l(:button_reply), + {:controller => 'comments',:action => 'quote', :id => comment}, + :remote => true, + :method => 'get', + :title => l(:button_reply))%> + + + <%= link_to( + l(:button_delete), + {:controller => 'comments', + :action => 'destroy', :id => @news, + :comment_id => comment}, + :method => :delete, + :id => "delete_reply_#{comment.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if ((object.kind_of? Organization) ? User.current.allowed_to?(:manage_news, object) : (User.current.admin_of_org?(object) || User.current == comment.author)) %> + +
    +
    +
    +

    + <% end %> +
    +
    +
    • +<% end %> +<% if @comments_count > @page * @limit + 10 %> +
    +
    + ↓ + + <%= link_to '点击展开更多回复', news_path(@news, :page => @page), :remote=>true %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb index 9790c1305..c86d71d63 100644 --- a/app/views/news/_organization_show.html.erb +++ b/app/views/news/_organization_show.html.erb @@ -72,7 +72,7 @@
    - <%= render :partial => 'news/news_all_replies' %> + <%= render :partial => 'news/news_all_replies', :locals => {:object => @organization} %>
      From d29fb00c306ab328ebb94c2f635e48f429af2331 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 8 Oct 2016 10:29:01 +0800 Subject: [PATCH 46/69] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8500?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 976de8235..6f70353e3 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -146,13 +146,13 @@
    <% if @center_flag %>
    - + 我的课程 (<%=@user.courses.count%>)
    - + 我的项目 (<%=@user.projects.count%>) From bee9dfa1b5e6b6a666a8ba90a1c972de491ee55b Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 10:38:12 +0800 Subject: [PATCH 47/69] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=88=97=E8=A1=A8=E5=9B=BE=E7=89=87=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/_syllabus_course_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb index 8bbbd3cf9..26eda1c3b 100644 --- a/app/views/syllabuses/_syllabus_course_list.html.erb +++ b/app/views/syllabuses/_syllabus_course_list.html.erb @@ -75,7 +75,7 @@
    <% else %> -
    +
    <% if User.current == @syllabus.user %>

    您建立的课程还未创建班级，请 <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "sy_corange", :target => '_blank'%> From 23d5d57f5caff5cb5a2c33c203208bd10efdf45d Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 8 Oct 2016 10:49:50 +0800 Subject: [PATCH 48/69] =?UTF-8?q?admin=E2=80=9C=E9=9A=90=E8=97=8F=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E2=80=9D=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA=E2=80=9C?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 ++-- app/views/layouts/_logined_header.html.erb | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 1305320cf..cbeade2a3 100644 --- a/Gemfile +++ b/Gemfile @@ -50,10 +50,10 @@ gem 'elasticsearch-model' gem 'elasticsearch-rails' #rails 3.2.22.2 bug - # gem "test-unit", "~>3.0" + gem "test-unit", "~>3.0" ### profile - # gem 'oneapm_rpm' + gem 'oneapm_rpm' group :development do gem 'grape-swagger' diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 98c06aafb..378741035 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -14,13 +14,14 @@

  • <%= link_to "题库", user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
    • - - - - <% end %> +
  • + <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %> +
    • + <% else %>
  • - 帮助中心 + 公共贴吧
    • + <% end %>
    \ No newline at end of file diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index 25b42e5f6..bd3d71a28 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -1,7 +1,7 @@
    - + <% if student_work.work_status%> <%=get_status student_work.work_status %> @@ -16,12 +16,11 @@ <% end %> <% end %> - 评分
    提交时间：<%=format_date(student_work.commit_time) %> -
    +
    教师：<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
    助教：<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
    <% if @homework.anonymous_comment == 0 %> @@ -69,5 +68,6 @@
    + 评分
    \ No newline at end of file diff --git a/app/views/student_work/_group_member_work.html.erb b/app/views/student_work/_group_member_work.html.erb index bfe25c982..a03a9fb93 100644 --- a/app/views/student_work/_group_member_work.html.erb +++ b/app/views/student_work/_group_member_work.html.erb @@ -2,7 +2,7 @@ <% student_work_groups = @homework.student_works.where("user_id in #{user_ids}").order("created_at asc") %> <% anon_count = student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %> <% student_work_groups.each_with_index do |st, j| %> -
    +
    <%= render :partial => 'evaluation_un_group_member_work', :locals => {:st => st, :anon_count => anon_count} %>
    <% if j != 0 %> From b4036ba901c0e433c3d9e7668f693afd8a56bb6b Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Oct 2016 15:28:09 +0800 Subject: [PATCH 54/69] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_evaluation_un_group_member_work.html.erb | 8 ++++---- .../student_work/_evaluation_un_group_work.html.erb | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index d373600a5..ac13c57ed 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -8,18 +8,18 @@ (组长) -
    diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index bd3d71a28..31b8fd190 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -9,18 +9,18 @@ <% if @homework.homework_detail_group.base_on_project == 1 %> - 关联项目： <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> - <%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fl hidden', :style => "width:200px;", :title => "项目名称"%> + <%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fr hidden', :style => "max-width:200px;", :title => "项目名称"%> <% else %> - + <% end %> + 关联项目： <% end %>
    - 提交时间：<%=format_date(student_work.commit_time) %> -
    + 提交时间：<%=format_date(student_work.commit_time) %> +
    教师：<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
    助教：<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
    <% if @homework.anonymous_comment == 0 %> From 053e66c4645a91d2bfdde9b5dc0ba29ed76bc2c2 Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Oct 2016 15:37:55 +0800 Subject: [PATCH 55/69] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_evaluation_un_group_member_work.html.erb | 12 ++++++------ .../student_work/_evaluation_un_group_work.html.erb | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index ac13c57ed..efd3440f7 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -4,22 +4,22 @@
    > <%= link_to(image_tag(url_to_avatar(st.user),:width =>"40",:height => "40", :style => "display:block;"),user_activities_path(st.user), :class => "fl") %> <% if !is_expand %> - - + + (组长) <% else %> - - + + <% end %> -
    +
    <%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%>
    <%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
    <% if @homework.anonymous_comment == 0 %> @@ -68,7 +68,7 @@
    <% if is_expand %> -
    评分
    +
    评分
    <% end %>
    diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index 31b8fd190..8c18d64c7 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -19,8 +19,8 @@
    - 提交时间：<%=format_date(student_work.commit_time) %> -
    + 提交时间：<%=format_date(student_work.commit_time) %> +
    教师：<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
    助教：<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
    <% if @homework.anonymous_comment == 0 %> @@ -68,6 +68,6 @@
    - 评分 + 评分
    \ No newline at end of file From 9d65d61f2a0ee70324b7c21b09e990827b88375d Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 15:56:43 +0800 Subject: [PATCH 56/69] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E4=B8=AD=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E6=95=99=E5=B8=88?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=BA=94=E6=9C=89=E4=B8=8A=E7=A7=BB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/_syllabus_member_list.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/syllabuses/_syllabus_member_list.html.erb b/app/views/syllabuses/_syllabus_member_list.html.erb index 84bbe1d01..97a500f56 100644 --- a/app/views/syllabuses/_syllabus_member_list.html.erb +++ b/app/views/syllabuses/_syllabus_member_list.html.erb @@ -42,7 +42,9 @@ <% else %> 删除 <% end %> - <% if i != 0 && i < count - 1 %> + <% if i == 0 && count == 1 %> +   + <% elsif i != 0 && i < count - 1 %> <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %> <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %> <% elsif i < count - 1 %> From 30e6bd6d0ed1931cc6751017bed3fe4cb1970a4b Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 8 Oct 2016 16:04:35 +0800 Subject: [PATCH 57/69] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9C=8B=E4=BB=96=E4=BA=BA=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 6f70353e3..2f3ef2928 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -166,13 +166,13 @@ <% else%>
    - + TA的课程 (<%=@user.courses.visible.count%>)
    - + TA的项目 (<%=@user.projects.visible.count%>) From ed05880653087eaff880de8921aa9f2c95145319 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:22:37 +0800 Subject: [PATCH 58/69] =?UTF-8?q?https=E7=9A=84=E9=93=BE=E6=8E=A5=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/show.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index d3398234a..b6c32f125 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -5,6 +5,14 @@ $(function() { sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>"); showNormalImage('syllabus_description_<%= @syllabus.id %>'); + $("#syllabus_description_<%= @syllabus.id%> p,#syllabus_description_<%= @syllabus.id%> span,#syllabus_description_<%= @syllabus.id%> em").each(function(){ + var postContent = $(this).html(); + postContent = postContent.replace(/ /g," "); + postContent= postContent.replace(/ {2}/g,"  "); + postContent=postContent.replace(/   /g,"   "); + postContent=postContent.replace(/  /g,"   "); + $(this).html(postContent); + }); autoUrl('syllabus_description_<%= @syllabus.id %>'); }); From 277c1468dd4a6c0c2e81e0cb3bae8e9fd1320b74 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:41:06 +0800 Subject: [PATCH 59/69] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index b97fa1a64..69864f226 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -418,7 +418,7 @@ class CoursesService course.send(:safe_attributes=, params[:course], current_user) #course.safe_attributes = params[:course] #course.password = params[:course][:password] - course.syllabus_id = params[:syllabus_id].to_i + #course.syllabus_id = params[:syllabus_id].to_i course.time = params[:time] course.term = params[:term] course.end_time = params[:end_time] From 4aca50e62d8c405aca9f22570d93d7c9c2a3a16e Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 8 Oct 2016 16:46:59 +0800 Subject: [PATCH 60/69] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E7=BB=99=E8=AF=BE=E7=A8=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=99=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/syllabuses/members.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/syllabuses/members.html.erb b/app/views/syllabuses/members.html.erb index 456845400..2eb560116 100644 --- a/app/views/syllabuses/members.html.erb +++ b/app/views/syllabuses/members.html.erb @@ -13,11 +13,11 @@
    <%= render :partial => 'syllabus_member_list' %> - <% if User.current == @syllabus.user %> + <% if User.current == @syllabus.user || User.current.admin? %> 添加成员 <% end %>
    - <% if User.current == @syllabus.user %> + <% if User.current == @syllabus.user || User.current.admin? %> diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 0d4a55ff9..ce12b6b76 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -16,7 +16,7 @@ <% end%> <% end%> $("div[nhname='pro_setting']").show(); - $("#RSide").css('width',"730px"); + $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"}); }); diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index 180cd22b0..a8a948a11 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -26,5 +26,5 @@ <% html_title(l(:label_followers)) -%> \ No newline at end of file diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 54c7434b0..08e723e6d 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -10,7 +10,7 @@
    diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb index 8471b503c..b7e744288 100644 --- a/app/views/repositories/changes.html.erb +++ b/app/views/repositories/changes.html.erb @@ -25,5 +25,5 @@ <% html_title(l(:label_change_plural)) -%> diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb index 69dae2629..273721bee 100644 --- a/app/views/repositories/quality_analyses.html.erb +++ b/app/views/repositories/quality_analyses.html.erb @@ -1,76 +1,80 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -
    -

    <%= l(:label_quality_analyses) %>

    -
    - -
    - <%#= render :partial => 'navigation' %> -
    -
    - -
    -
    -
    -
    - - - -

    <%= link_to l(:button_back), :action => 'show', :id => @project %>

    -<% html_title(l(:label_repository), l(:label_statistics)) -%> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +
    +

    <%= l(:label_quality_analyses) %>

    +
    + +
    + <%#= render :partial => 'navigation' %> +
    +
    + +
    +
    +
    +
    + + + +

    <%= link_to l(:button_back), :action => 'show', :id => @project %>

    +<% html_title(l(:label_repository), l(:label_statistics)) -%> + + \ No newline at end of file diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb index 4b35e64f6..f14022810 100644 --- a/app/views/repositories/stats.html.erb +++ b/app/views/repositories/stats.html.erb @@ -1,195 +1,199 @@ -<%= javascript_include_tag 'highcharts','highcharts-more' %> -
    -

    <%= l(:label_statistics) %>

    -
    -<% if false %> -
    请在版本库中提交代码，统计信息将更准确
    -<% else %> -
    - <%= render :partial => 'navigation' %> -
    -
    - -
    -
    -
    -
    - - - -

    <%= link_to l(:button_back), :action => 'show', :id => @project %>

    - <% html_title(l(:label_repository), l(:label_statistics)) -%> -<% end %> \ No newline at end of file +<%= javascript_include_tag 'highcharts','highcharts-more' %> +
    +

    <%= l(:label_statistics) %>

    +
    +<% if false %> +
    请在版本库中提交代码，统计信息将更准确
    +<% else %> +
    + <%= render :partial => 'navigation' %> +
    +
    + +
    +
    +
    +
    + + + +

    <%= link_to l(:button_back), :action => 'show', :id => @project %>

    + <% html_title(l(:label_repository), l(:label_statistics)) -%> +<% end %> + + \ No newline at end of file From f3f59c727c2a6c1612c23533eb4681cd22a37c80 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 8 Oct 2016 17:21:30 +0800 Subject: [PATCH 62/69] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/other_poll.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/other_poll.js.erb b/app/views/poll/other_poll.js.erb index 19dc17052..cbaa2bbec 100644 --- a/app/views/poll/other_poll.js.erb +++ b/app/views/poll/other_poll.js.erb @@ -1,6 +1,6 @@ <% if @polls.empty? %> - alert('您目前其他课程无问卷可导入'); + alert('您的其它班级下没有问卷可供导入'); <% else %> $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>'); From 1db5064486218ecfd6295b02312aa761b1144a6d Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 8 Oct 2016 17:37:41 +0800 Subject: [PATCH 63/69] =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=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 --- app/views/pull_requests/_new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb index 08e723e6d..8a376d995 100644 --- a/app/views/pull_requests/_new.html.erb +++ b/app/views/pull_requests/_new.html.erb @@ -10,7 +10,7 @@