diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index a5acc4523..caca6fb1e 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -36,7 +36,7 @@ module CoursesHelper #生成课程老师成员链接 def course_teacher_link teacher_num if User.current.member_of_course?(@course) || User.current.admin? - link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue' + link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue', :id => 'teacher_number' else content_tag 'span',teacher_num, :class => 'info_foot_num c_blue' end @@ -45,7 +45,7 @@ module CoursesHelper #生成课程学生列表连接 def course_student_link student_num if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin? - link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue' + link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue', :id => "student_number" else content_tag 'span',student_num, :class => 'info_foot_num c_blue' end diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 0ef55d278..305187b02 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -24,9 +24,9 @@
<%#= l(:label_technical_support) %> - - - 请加入：师姐答疑群 + + +

请加入师姐答疑群

173184401
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 0f622d831..b418be4ab 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -76,7 +76,7 @@
- <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>） + <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>） |  <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>） <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb index 976f5c724..8a6500572 100644 --- a/app/views/members/create.js.erb +++ b/app/views/members/create.js.erb @@ -4,6 +4,7 @@ <% else%> $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>'); hideOnLoad(); + $("#project_members_number").html("<%= @project.members.count %>"); alert("<%= @succes_message%>"); <% end%> <%elsif @course%> @@ -11,6 +12,8 @@ alert("<%= @create_member_error_messages%>"); <% else%> $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); + $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>"); + $("#student_number").html("<%= studentCount(@course) %>"); alert("添加成功"); <% end%> hideOnLoad(); diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb index b6f206e05..b331f15a4 100644 --- a/app/views/members/destroy.js.erb +++ b/app/views/members/destroy.js.erb @@ -1,7 +1,10 @@ <%if @project%> $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>'); + $("#project_members_number").html("<%= @project.members.count %>"); // $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>'); <%elsif @course%> $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>'); + $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>") + $("#student_number").html("<%= studentCount(@course) %>"); <%end%> hideOnLoad(); diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index c2a94a478..be178607f 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -174,7 +174,7 @@
  • 确认 - +
    • diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index f6bb3c8cb..5c6339e59 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -145,6 +145,7 @@ var id; //资源id var sendType; //发送到课程 1 发送到项目 2 var lastSendType; //保存上次发送的发送类型 + var last_op $("#resources_list").mousedown(function(e) { //如果是右键的话 if (3 == e.which) { @@ -179,6 +180,28 @@ last_line = line; } }); + + //鼠标经过时，背景颜色设为灰色 + $("#resources_list").mouseover(function(e){ + pageX = e.clientX; + pageY = e.clientY; + var ele = document.elementFromPoint(pageX,pageY); + line = $(ele).parent(); + if(last_op != null){ + last_op.children().css("background-color", 'white'); + restore(); + last_op == null; + } + //如果当前的tag是li，那么还要li的父级元素 + if(line.get(0).tagName === 'LI'){ + line = line.parent(); + } + //将当前的元素的所有子元素的背景色改为蓝色 + line.children().css("background-color", '#e1e1e1'); + //将当前元素赋给 上一个对象 保存起来。 + last_op = line; + }); + //元素包含关系计算 var contains = function(root, el) { if (root.compareDocumentPosition)