Merge branch 'develop' into hjq_new_course

Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb

app/controllers/admin_controller.rb

@@ -51,6 +51,37 @@ class AdminController < ApplicationController
     end
   end
 
+  #管理员界面精品课程列表
+  def excellent_courses
+    @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
+    respond_to do |format|
+      format.html
+    end
+  end
+
+ #管理员界面课程资源列表
+  def course_resource_list
+    @resource = Attachment.where(:container_type => 'Course')
+    @resource = paginateHelper @resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #管理员界面項目资源列表
+  def project_resource_list
+    @pro_resource = Attachment.where(:container_type => 'Project')
+    @pro_resource = paginateHelper @pro_resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
   def users
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)

app/controllers/courses_controller.rb

@@ -240,6 +240,18 @@ class CoursesController < ApplicationController
     # req[:message] = l(:modal_valid_passing) if req[:message].blank?
     render :json => req
   end
+
+  def teacher_assign_group
+    member = Member.where(:course_id => @course.id, :user_id => params[:user_id]).first
+    member.course_group_id = params[:course_group_id].to_i
+    member.save
+    @course_groups = @course.course_groups
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def join_group
     @subPage_title = l :label_student_list
     group = CourseGroup.find(params[:object_id])
@@ -838,6 +850,8 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
+    # 统计访问量
+    @course.update_attribute(:visits, @course.visits.to_i + 1)
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)

app/controllers/files_controller.rb

@@ -854,9 +854,7 @@ class FilesController < ApplicationController
     @result = visable_attachemnts @result
     if params[:other]
       @result = @result.select{|attachment|
-        attachment.tag_list.exclude?('软件') &&
-            attachment.tag_list.exclude?('媒体') &&
-            attachment.tag_list.exclude?('代码')
+        attachment.tag_list.index{|tag|tag != '软件' and tag != '媒体' and tag != '代码'}.present?
       }
     else
       @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?

app/controllers/news_controller.rb

@@ -107,28 +107,18 @@ class NewsController < ApplicationController
 
   def show
     # 更新news对应的forge_messages的消息viewed字段
+    ids = @news.comments.map { |comment| comment.id }.join(",") unless @news.comments.nil?
     if @project
-      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =?", @news.id, User.current.id).first
+      # 更新新闻
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      # 更新新闻的时候一并更新回复
+      ForgeMessage.where("forge_message_id in (#{ids}) and forge_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     else
-      query_message_news = CourseMessage.where("course_message_id =? and user_id =?", @news.id, User.current.id).first
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      CourseMessage.where("course_message_id in (#{ids}) and course_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     end
-    query_message_news.update_attribute(:viewed, true)
-    # 更新项目新闻的评阅的消息viewed字段
-    current_message_comments = @news.comments
-    current_message_comments.each do |current_message_comment|
-    if @project
-      query_message_comment = current_message_comment.forge_messages
-    else
-      query_message_comment = current_message_comment.course_messages
-    end
-    query_message_comment.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-      end
-    end
-    # end
-
+    query_message_news.update_attribute(:viewed, true) unless query_message_news.nil?
+    # over
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

app/controllers/organizations_controller.rb

@@ -69,6 +69,8 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      # 统计访问量
+      @organization.update_attribute(:visits, @organization.visits.to_i + 1)
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0

app/controllers/projects_controller.rb

@@ -298,6 +298,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+    # 统计访问量
+    @project.update_attribute(:visits, @project.visits.to_i + 1)
 =begin
     cond = @project.project_condition(Setting.display_subprojects_issues?)
     has = {

app/controllers/student_work_controller.rb

@@ -99,16 +99,18 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-        @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? ||
-            (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
@@ -144,8 +146,14 @@ class StudentWorkController < ApplicationController
           end
           if my_work.empty?
             @stundet_works = []
+          else
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
               @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -158,14 +166,17 @@ class StudentWorkController < ApplicationController
 
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
-        @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
@@ -201,8 +212,14 @@ class StudentWorkController < ApplicationController
           end
           if my_work.empty?
             @stundet_works = []
+          else
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
               @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else

app/helpers/application_helper.rb

@@ -2951,3 +2951,33 @@ def user_url_in_org(user_id)
     return "https://www.trustie.net/users/" + user_id.to_s
   end
 end
+
+def logout_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/logout"
+  elsif Rails.env.test?
+    return "https://test.forge.trustie.net/logout"
+  else
+    return "https://www.trustie.net/logout"
+  end
+end
+
+def signin_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/login?login=true"
+  elsif Rails.env.test?
+    return "https://test.forge.trustie.net/login?login=true"
+  else
+    return "https://www.trustie.net/login?login=true"
+  end
+end
+
+def register_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/login?login=false"
+  elsif Rails.env.test?
+    return "https://test.forge.trustie.net/login?login=false"
+  else
+    return "https://www.trustie.net/login?login=false"
+  end
+end

app/helpers/courses_helper.rb

@@ -71,6 +71,11 @@ module CoursesHelper
     project.members.count
   end
 
+  # 统计课程中作品的数量
+  def student_works_num course
+    StudentWork.find_by_sql("SELECT * FROM student_works WHERE homework_common_id IN (SELECT id FROM homework_commons WHERE course_id = '#{course.id}')").count
+  end
+
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
     project ? project.members.count - studentCount(project).to_i : 0
@@ -601,6 +606,24 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  #分班下拉框
+  def course_group_option course
+    type = []
+    option1 = []
+    option1 << "暂无"
+    option1 << 0
+    type << option1
+    unless course.course_groups.nil?
+      course.course_groups.each do |cg|
+        option = []
+        option << cg.name
+        option << cg.id
+        type << option
+      end
+    end
+    type
+  end
+
   #课程实践年份下拉框
   def course_time_option year
     type = []
@@ -762,7 +785,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end

app/helpers/files_helper.rb

@@ -121,7 +121,8 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? ||
+      if (attachment.is_public? && attachment.container_type != "Course") ||
+          (attachment.is_public? && attachment.container_type == "Course" && attachment.is_publish == 1)||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||

app/helpers/users_helper.rb

@@ -62,7 +62,7 @@ module UsersHelper
         when 'Course'
           result = current_time_and_term_resource content
         when 'Project'
-          result = content.name
+          result = content.name + "(" + content.id.to_s + ")"
         when 'Issue'
           result = content.subject
         when 'Message'

app/models/attachment.rb

@@ -499,6 +499,12 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+  def self.attach_filesex_public(obj, attachments,attachment_type, is_public)
+    result = obj.save_attachmentsex_public(attachments, User.current,attachment_type, is_public)
+    obj.attach_saved_attachments
+    result
+  end
+
   def self.latest_attach(attachments, filename)
     attachments.sort_by(&:created_on).reverse.detect {
       |att| att.filename.downcase == filename.downcase

app/models/praise_tread.rb

@@ -2,8 +2,8 @@ class PraiseTread < ActiveRecord::Base
   attr_accessible :user_id,:praise_tread_object_id,:praise_tread_object_type,:praise_or_tread
   belongs_to :user
   belongs_to :praise_tread_object, polymorphic: true
-  after_create :be_user_score
-  after_destroy :down_user_score
+  #after_create :be_user_score
+  #after_destroy :down_user_score
   include UserScoreHelper
   def self.find_object_by_type_and_id(type,id)
     @obj = nil

app/views/admin/course_resource_list.html.erb

@@ -0,0 +1,64 @@
+<h3><%=l(:label_course_resource_list)%></h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+
+      <th style="width: 60px;">
+        资源名称
+      </th>
+      <th style="width: 30px;">
+        资源大小
+      </th>
+      <th style="width: 25px;">
+        资源类型
+      </th>
+      <th style="width: 23px;">
+        上传时间
+      </th>
+      <th style="width: 15px;">
+        下载次数
+      </th>
+      <th style="width: 20px;">
+        上传者
+      </th>
+      <th style="width: 35px;">
+        所属课程
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @resource.each do |resource| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: left;">
+            <%= link_to truncate(resource.filename, :length => 18), download_named_attachment_path(resource.id, resource.filename ), :title => resource.filename,:class=>'resourcesBlack'%>
+          </td>
+          <td style=" text-align: center;">
+            <%=  number_to_human_size(resource.filesize)%>
+          </td>
+          <td style=" text-align: center;">
+            课程资源
+          </td>
+          <td style=" text-align: center;">
+            <%= format_date(resource.created_on)%>
+          </td>
+          <td style=" text-align: center;">
+            <%= resource.downloads %>
+          </td>
+          <td style=" text-align: center;">
+            <%= link_to(User.find(resource.author_id).realname, user_path(User.find(resource.author_id)) ) %>
+          </td>
+          <td style=" text-align: center;">
+            <%=link_to truncate(Course.find(resource.container_id).name, :length => 10), course_path(Course.find(resource.container_id)), :title => Course.find(resource.container_id).name, :class => "hidden fl w170" %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/admin/excellent_courses.html.erb

@@ -0,0 +1,75 @@
+<h3>
+  <%=l(:label_excellent_courses_list)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 25px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        课程名
+      </th>
+      <th style="width: 50px;">
+        主讲老师
+      </th>
+      <th style="width: 30px;">
+        学生数
+      </th>
+      <th style="width: 25px;">
+        作业数
+      </th>
+      <th style="width: 25px;">
+        作品数
+      </th>
+      <th style="width: 25px;">
+        资源数
+      </th>
+      <th style="width: 70px;">
+        帖子数
+      </th>
+      <th style="width: 70px;">
+        动态数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @courses.each do |course| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= course.id %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
+            <span>
+              <%= link_to(course.name, course_path(course.id)) %>
+            </span>
+          </td>
+          <td align="center">
+            <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+          </td>
+          <td align="center">
+            <%= studentCount(course) %>
+          </td>
+          <td class="center">
+            <%= course.homework_commons.count%>
+          </td>
+          <td class="center">
+            <%= student_works_num(course) %>
+          </td>
+          <td class="center">
+            <%= visable_attachemnts_incourse(course).count%>
+          </td>
+          <td class="center">
+            <%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %>
+
+          </td>
+          <td class="center">
+            <%= course.course_activities.count%>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>

app/views/admin/project_resource_list.html.erb

@@ -0,0 +1,64 @@
+<h3><%=l(:label_project_resource_list)%></h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+
+      <th style="width: 60px;">
+        资源名称
+      </th>
+      <th style="width: 30px;">
+        资源大小
+      </th>
+      <th style="width: 25px;">
+        资源类型
+      </th>
+      <th style="width: 23px;">
+        上传时间
+      </th>
+      <th style="width: 15px;">
+        下载次数
+      </th>
+      <th style="width: 20px;">
+        上传者
+      </th>
+      <th style="width: 35px;">
+        所属项目
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @pro_resource.each do |pro_resource| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: left;">
+            <%= link_to truncate(pro_resource.filename, :length => 18), download_named_attachment_path(pro_resource.id, pro_resource.filename ), :title => pro_resource.filename,:class=>'resourcesBlack'%>
+          </td>
+          <td style=" text-align: center;">
+            <%=  number_to_human_size(pro_resource.filesize)%>
+          </td>
+          <td style=" text-align: center;">
+            项目资源
+          </td>
+          <td style=" text-align: center;">
+            <%= format_date(pro_resource.created_on)%>
+          </td>
+          <td style=" text-align: center;">
+            <%= pro_resource.downloads %>
+          </td>
+          <td style=" text-align: center;">
+            <%= link_to(User.find(pro_resource.author_id).realname, user_path(User.find(pro_resource.author_id)) ) %>
+          </td>
+          <td style=" text-align: center;">
+            <%=link_to truncate(Project.find(pro_resource.container_id).name, :length => 10), project_path(Project.find(pro_resource.container_id)), :title => Project.find(pro_resource.container_id).name, :class => "hidden fl w170" %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/blog_comments/_simple_ke_reply_form.html.erb

@@ -10,7 +10,7 @@
           <input type="hidden" name="blog_comment[title]" id="reply_subject">
           <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
       <% end%>

app/views/blogs/_article.html.erb

@@ -200,7 +200,7 @@
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= user_activity_id%>'></p>
               <% end%>

app/views/courses/_new_member_list.html.erb

@@ -24,7 +24,8 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
         <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li class="ml358">
+        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
+        <li style="margin-left: 25px;">
           <%= link_to '作业积分', member_score_sort_course_path(: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%>
           <% if @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
@@ -58,11 +59,31 @@
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
               <% end%>
             </ul>
+            <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
+                <% if @course.course_groups.nil? || @group %>
+                    <div class="select-class-option fl" style="margin-left: 105px;">
+                      <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                    </div>
+                <% 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 %>
+                        <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                          <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a>
+                        </div>
+                        <%= 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=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
+                    <% end %>
+                <% end %>
+            <% else %>
+                <div class="select-class-option fl" style="margin-left: 105px;">
+                  <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                </div>
+            <% end %>
             <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
                     :action => 'show_member_score',
                     :member_id => member.id,
                     :remote => true},
-                        :class => 'ml258 c_red' %>
+                        :class => 'ml25 c_red' %>
             <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
             <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
           </div>
@@ -79,3 +100,40 @@
     </p>
 <% end%>
 
+<script>
+    $(document).ready(function(){
+        /*$(".select-class-option").mouseover(function(){
+         $(this).children(".pic_edit2").css("display","inline-block");
+         });
+         $(".select-class-option").mouseout(function(){
+         $(this).children(".pic_edit2").css("display","none");
+         });*/
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".class-edit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.class-edit').css('display','none');
+            $('.select-class-option').show();
+        });
+        $('.class-edit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+    function join_group_function(id){
+        $(id).submit();
+    }
+</script>
+

app/views/courses/syllabus.html.erb

@@ -192,7 +192,7 @@
                   <input type="hidden" name="blog_comment[locked]" value="0">
                   <div nhname='toolbar_container_<%= @article.id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+                  <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)"  onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= @article.id%>'></p>
               <% end%>

app/views/courses/teacher_assign_group.js.erb

@@ -0,0 +1 @@
+$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>");

app/views/issues/_issue_replies.html.erb

@@ -74,7 +74,7 @@
             <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
           </div>
           <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr mt5" style="display:none;">发送</a>
+          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
           <div class="cl"></div>
       <% end %>
     </div>

app/views/issues/_issue_reply_ke_form.html.erb

@@ -16,7 +16,7 @@
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
           <div class="cl"></div>
           <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
           <div class="cl"></div>
       <% end %>
     </div>

app/views/layouts/_logined_header.html.erb

@@ -100,7 +100,7 @@
           </li>
           <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
           <li>
-            <%= link_to "退出",signout_path,:class => "menuGrey",:method => "post"%>
+            <%= link_to "退出",logout_url_without_domain,:class => "menuGrey",:method => "post"%>
           </li>
         </ul>
       </li>