Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

2016-09-19 13:23:22 +08:00 · 2016-09-19 13:23:22 +08:00 · 0c0e865a20
parent 7a5f21456d 3624d9d4ca
commit 0c0e865a20
168 changed files with 4371 additions and 3551 deletions
--- a/4
+++ b/4
@ -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'
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@ -118,6 +118,8 @@ module Mobile
            roles_ids << "10"
          end

+          go_course_group = 0
+
          if roles_ids.length <= 0
            {status:-1,message:"请至少选择一个角色"}
          else
@ -125,7 +127,9 @@ module Mobile
            status = cs.join_course_roles({role: roles_ids, openid: params[:openid], invite_code: params[:invite_code]}, current_user)
            {
                status: status[:state],
-                message:CoursesService::JoinCourseError.message(status[:state])
+                message:CoursesService::JoinCourseError.message(status[:state]),
+                go_coursegroup_flag:status[:go_coursegroup_flag],
+                course_id:status[:course_id]
            }
          end
        end
@ -750,6 +754,47 @@ module Mobile
                    end
          out.merge(message: message)
        end
+
+        desc '获取分班列表'
+        params do
+          requires :id, type: Integer
+          requires :token, type:String
+        end
+        get 'course_groups/:id' do
+          begin
+            authenticate!
+            course = Course.find(params[:id])
+            groups = []
+            groups = course.course_groups if course.course_groups
+            present :data,groups
+            present :status,0
+          rescue
+            present :status,-1
+          end
+        end
+
+        desc "加入分班"
+        params do
+          requires :id, type: Integer
+          requires :token, type: String
+          requires :course_group_id, type: Integer
+        end
+        post 'join_coursegroup' do
+          begin
+            authenticate!
+            member = Member.where(:course_id => params[:id], :user_id => current_user.id).first
+
+            raise "你还不是该班级的学生!" unless member
+
+            member.course_group_id = params[:course_group_id].to_i
+            member.save
+            present :status,0
+          rescue  Exception=>e
+            present :message,e.message
+            present :status,-1
+          end
+        end
+
      end
    end
  end
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@ -19,6 +19,8 @@ module Mobile
            (format_time(c[field]) if (c.is_a?(Hash) && c.key?(field))) || (format_time(c.send(field)) if c.respond_to?(field))
          elsif field == :member_count
            ::Course===c ? c.members.count : 0
+          elsif field == :syllabus_title
+            c.syllabus.nil? ? "":c.syllabus.title
          else
            (c[field] if (c.is_a?(Hash) && c.key?(field))) || (c.send(field) if c.respond_to?(field))
          end
@ -38,6 +40,7 @@ module Mobile
      course_expose :lft
      course_expose :location
      course_expose :name
+      course_expose :syllabus_title
      course_expose :open_student
      # course_expose :password
      course_expose :rgt
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@ -36,6 +36,8 @@ module Mobile
                  u.lastname
                when :mail
                  u.mail
+                when :is_me
+                  defined? u.is_me ? u.is_me : 0
              end
            end
          end
@ -77,6 +79,8 @@ module Mobile

      user_expose :name

+      user_expose :is_me
+
    end
  end

--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -894,12 +894,15 @@ class CoursesController < ApplicationController
    #   return
    # end
    #更新创建课程消息状态
-    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)
+    course_request_messages = CourseMessage.where(:user_id => User.current.id, :course_id => @course.id, :course_message_type => ["CourseRequestDealResult", "Course"], :viewed => false)
+    course_request_messages.update_all(:viewed => true)
+
+    # 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)

    #更新申请结果反馈消息的状态
-    course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
-    course_request_messages.update_all(:viewed => true)
+    # course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
+    # course_request_messages.update_all(:viewed => true)

    course_activities = @course.course_activities
    @canShowRealName = User.current.member_of_course? @course
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -85,7 +85,16 @@ class HomeworkCommonController < ApplicationController
      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
      @homework.end_time = params[:homework_common][:end_time] || Time.now
      @homework.course_id = params[:course_id]
-      anonymous = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 0
+      if params[:homework_type] && params[:homework_type].to_i != @homework.homework_type
+        if @homework.homework_type == 2
+          @homework.homework_detail_programing.destroy if @homework.homework_detail_programing
+          @homework.homework_tests.destroy_all
+        elsif @homework.homework_type == 3
+          @homework.homework_detail_group.destroy if @homework.homework_detail_group
+        end
+      end
+      @homework.homework_type = params[:homework_type].to_i || @homework.homework_type
+      anonymous = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 1
      if anonymous != @homework.anonymous_comment
        if  anonymous == 1
          homework_detail_manual.ta_proportion = @homework.homework_type == 1 ? 1.0 : 0.4
@ -111,7 +120,7 @@ class HomeworkCommonController < ApplicationController
      if @homework.homework_type == 2
          @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
          @homework_detail_programing = @homework.homework_detail_programing
-          @homework_detail_programing.language = params[:language_type].to_i
+          @homework_detail_programing.language = params[:language_type].to_i if params[:language_type]
          if anonymous != @homework.anonymous_comment
            if anonymous == 1
              @homework_detail_programing.ta_proportion = 0.6
@ -120,8 +129,8 @@ class HomeworkCommonController < ApplicationController
            end
          end

-          @homework.homework_tests.delete_all
-          inputs = params[:program][:input]
+          @homework.homework_tests.delete_all if params[:program]
+          inputs = params[:program][:input] if params[:program]
          if Array === inputs
            inputs.each_with_index do |val, i|
              @homework.homework_tests << HomeworkTest.new(
@ -136,12 +145,12 @@ class HomeworkCommonController < ApplicationController
      if @homework.homework_type == 3
        @homework.homework_detail_group ||= HomeworkDetailGroup.new
        @homework_detail_group = @homework.homework_detail_group
-        @homework_detail_group.min_num = params[:min_num].to_i
-        @homework_detail_group.max_num = params[:max_num].to_i
-        @homework_detail_group.base_on_project = params[:base_on_project].to_i
+        @homework_detail_group.min_num = params[:min_num].to_i if params[:min_num]
+        @homework_detail_group.max_num = params[:max_num].to_i if params[:max_num]
+        @homework_detail_group.base_on_project = params[:base_on_project].to_i if params[:base_on_project]
      end

-      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 0
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 1
      if @homework.save
        homework_detail_manual.save if homework_detail_manual
        @homework_detail_programing.save if @homework_detail_programing
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -132,16 +132,13 @@ class IssuesController < ApplicationController
      User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
    end

-    # 缺陷状态更新
-    query_journals = @issue.journals
-      query_journals.each do |query_journal|
-        query_journal.forge_messages.each do |f|
-          if User.current.id == f.user_id
-            f.update_attributes(:viewed => true)
-          end
-        end
-      end
-    # end
+    # 缺陷状态消息更新
+    query_journals_ids = @issue.journals.map{|journal| journal.id}
+    if query_journals_ids.length > 0
+      query_journals = ForgeMessage.where("user_id =? and forge_message_type =? and forge_message_id in (#{query_journals_ids.join(",")})", User.current.id, "Journal")
+      query_journals.update_all(:viewed => true)
+    end
+
    @jour_reply = Journal.new
    @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
    @journals.each_with_index {|j,i| j.indice = i+1}
@ -183,6 +180,7 @@ class IssuesController < ApplicationController
    end
  end

+  # 用户发布新issue
  def create
    call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
@ -225,6 +223,7 @@ class IssuesController < ApplicationController
  end

  def edit
+    # 修改实例变量的值
    return unless update_issue_from_params

    respond_to do |format|
@ -233,6 +232,7 @@ class IssuesController < ApplicationController
    end
  end

+  # 用户编辑更改issue
  def update
    if params[:issue_detail]
      issue = Issue.find(params[:id])
@ -240,6 +240,7 @@ class IssuesController < ApplicationController
      @saved = update_user_issue_detail(issue, params)
      return
    else
+      # 修改实例变量的值
      return unless update_issue_from_params
      @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
      saved = false
@ -575,6 +576,7 @@ class IssuesController < ApplicationController
    @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
    @time_entry.attributes = params[:time_entry]

+    # 更新issue状态时，journal表产生记录，返回@current_journal
    @issue.init_journal(User.current)

    issue_attributes = params[:issue]
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@ -8,18 +8,33 @@ class OrgMemberController < ApplicationController
    end
  end

+  # 组织子成员，及其分页
+  def org_member_paging
+    @organization = Organization.find(params[:org])
+
+    if User.current.admin? || User.current.admin_of_org?(@organization)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
+      @members = paginateHelper @members, 20
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
  def create
-    @org = Organization.find(params[:org])
+    @organization = Organization.find(params[:org])
    if params[:membership].nil?
      @fail_hint = l(:label_blank_user_lists_for_org)
    else
      member_ids = params[:membership][:user_ids]
      role_id = params[:orgRole]
      member_ids.each do |user_id|
-        member =  OrgMember.create(:user_id=>user_id, :created_at => Time.now)
-        @org.org_members << member
+        member =  OrgMember.create(:user_id => user_id, :created_at => Time.now)
+        @organization.org_members << member
        OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id)
      end
+      @members = (@organization.org_members).sort
+      @members = paginateHelper @members, 20
    end
    respond_to do |format|
      format.js
@ -32,7 +47,11 @@ class OrgMemberController < ApplicationController
   @member_role = @member.org_member_roles[0]
   @member_role.role_id =  params[:org_member][:role_ids][0]
   @member_role.save
-   @org = @member.organization
+   @organization = @member.organization
+   # 成员编辑角色后分页
+   @members = (@organization.org_members).sort
+   @members = paginateHelper @members, 20
+
    respond_to do |format|
      format.js
    end
@ -44,8 +63,10 @@ class OrgMemberController < ApplicationController

  def destroy
    member = OrgMember.find(params[:id])
-    @org = member.organization
+    @organization = member.organization
    member.destroy
+    @members = (@organization.org_members).sort
+    @members = paginateHelper @members, 20
    respond_to do |format|
      format.js
    end
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@ -88,7 +88,7 @@ class OrganizationsController < ApplicationController
        shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
        shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
        project_ids = (@organization.projects.map(&:id) - shield_project_ids) << 0
-        course_ids = (@organization.courses.map(&:id) - shield_course_ids) << 0
+        course_ids = (@organization.courses.not_deleted.map(&:id) - shield_course_ids) << 0
        course_types = "('Message','News','HomeworkCommon','Poll','Course')"
        @project_acts = get_project_activities_org @organization, project_ids
        @course_acts = get_course_activities_org @organization, course_ids
@ -140,7 +140,7 @@ class OrganizationsController < ApplicationController
          shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
          shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
          project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
-          course_ids = (@organization.courses.map(&:id)-shield_course_ids) << 0
+          course_ids = (@organization.courses.not_deleted.map(&:id)-shield_course_ids) << 0
          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
          case params[:type]
            when nil
@ -421,6 +421,8 @@ class OrganizationsController < ApplicationController
    @organization = Organization.find(params[:id])

    if User.current.admin? || User.current.admin_of_org?(@organization)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
+      @members = paginateHelper @members, 20
    else
      render_403
    end
@ -451,10 +453,11 @@ class OrganizationsController < ApplicationController

  def members
    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
-      @members = OrgMember.where("organization_id =?", @organization.id)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
    else
      render_403
    end
+    @members = paginateHelper @members, 20
  end

  def  more_org_projects
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -580,6 +580,7 @@ class ProjectsController < ApplicationController
      end
    end
    @members = paginateHelper @members
+
  end

  def update_message_status(user, project)
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@ -252,7 +252,7 @@ class QualityAnalysisController < ApplicationController
          unresolved_issue_count = JSON.parse(unresolved_issues)["total"].to_i
          all_issues = open(@sonar_address + "/api/issues/search?projectKeys=#{@resource_id}&authors=#{email}").read
          all_issue_count = JSON.parse(all_issues)["total"].to_i
-          ratio = (changes == 0 ? 0 : format("%0.4f",unresolved_issue_count.to_f/changes.to_f))
+          ratio = ((changes == 0 || all_issue_count == 0) ? 0 : format("%0.4f",all_issue_count.to_f/changes.to_f))
          @user_quality_infos << {:email => email, :changes => changes, :unresolved_issue_count => unresolved_issue_count, :ratio => ratio, :all_issue_count => all_issue_count}
        end

--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -338,41 +338,17 @@ class StudentWorkController < ApplicationController
  end

  def index
-    # 作业消息状态更新
-    @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id && homework_message.viewed == 0
-        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
-      end
-    end
-
-    #修改作品提示消息更新
-    student_work_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, StudentWork.name, 0)
-    student_work_messages.each do |message|
-      message.update_attribute(:viewed, true)
-    end
-
+    # 作业消息状态更新?
+    homeworkcommon_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_message_id => @homework.id, :course_message_type => "HomeWorkCommon")
+    homeworkcommon_messages.update_all(:viewed => true)
+    studentwork_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_id => @homework.course, :course_message_type => "StudentWork")
+    studentwork_messages.update_all(:viewed => true)
    # 作品打分消息状态更新
    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
-    studentworks_scores.each do |studentworks_score|
-      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
-    end
+    studentworks_scores.update_all(:viewed => true)
    # 作品评论消息状态更新
    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
-    journals_for_teacher.each do |journal_for_teacher|
-      journal_for_teacher.update_attributes(:viewed => true)
-    end
-    #不能参与作业匿评消息状态更新
-    no_evaluation = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =? and status =?", User.current.id, @homework.course, "StudentWork", 0, 0)
-    no_evaluation.update_all(:viewed => true)
-    # 作品留言
-    # 消息end
-    #设置作业对应的forge_messages表的viewed字段
-    query_student_work = @homework.course_messages
-    query_student_work.each do |query|
-      if User.current.id == query.user_id
-        query.update_attributes(:viewed => true)
-      end
-    end
+    journals_for_teacher.update_all(:viewed => true)
    ##################################################################################################################
    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group]
    @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
@ -410,11 +386,11 @@ class StudentWorkController < ApplicationController
      #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @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.has_committed.where(:user_id => User.current.id).empty?)
        if @order == 'lastname'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score 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
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score 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.*,student_works.work_score 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
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score 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.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
        end
        @show_all = true
      elsif User.current.member_of_course?(@course)
@ -476,11 +452,11 @@ class StudentWorkController < ApplicationController
    else
      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @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.has_committed.where(:user_id => User.current.id).empty?)
        if @order == 'lastname'
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score 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.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score 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.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").includes(:user => {:user_extensions => []}, :project => {}, :student_works_scores => {}).order("#{@order} #{@b_sort}"),@name
        end
        @show_all = true
      elsif User.current.member_of_course?(@course)
@ -571,7 +547,7 @@ class StudentWorkController < ApplicationController
      @student_work = StudentWork.new
    #end
    respond_to do |format|
-      format.html{ render :layout => "new_base_user"}
+      format.html{ render :layout => "base_courses"}
    end
  end

@ -613,33 +589,21 @@ class StudentWorkController < ApplicationController
        student_work.work_status = 1
      end
      if student_work.save
-        if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
-          @student_work_project.student_work_id = student_work.id
-          @student_work_project.save
-          members = params[:group_member_ids].split(',')
-          for i in 1 .. members.count-1
-            stu_project = StudentWorkProject.new
-            stu_project.homework_common_id = @homework.id
-            stu_project.student_work_id = student_work.id
-            stu_project.project_id = @student_work_project.project_id
-            stu_project.user_id = members[i].to_i
-            stu_project.is_leader = 0
+        if @homework.homework_type == 3
+          if @homework.homework_detail_group.base_on_project == 1
+            @student_work_project.student_work_id = student_work.id
+            @student_work_project.save
+          elsif @homework.homework_detail_group.base_on_project == 0
+            stu_project = StudentWorkProject.new(:homework_common_id => @homework.id, :student_work_id => student_work.id, :project_id => student_work.project_id, :user_id => student_work.user_id, :is_leader => 1)
            stu_project.save
          end
-        elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0
          members = params[:group_member_ids].split(',')
-          for i in 0 .. members.count-1
-            stu_project = StudentWorkProject.new
-            stu_project.homework_common_id = @homework.id
-            stu_project.student_work_id = student_work.id
-            stu_project.project_id = -1
-            stu_project.user_id = members[i].to_i
-            if i == 0
-              stu_project.is_leader = 1
-            else
-              stu_project.is_leader = 0
+          for i in 1 .. members.count-1
+            stu_work = StudentWork.new(:name => student_work.name, :description => student_work.description,:user_id =>members[i].to_i, :homework_common_id => @homework.id,:project_id => student_work.project_id, :late_penalty => student_work.late_penalty,:work_status => 3, :commit_time => student_work.commit_time)
+            if stu_work.save
+              stu_project = StudentWorkProject.new(:homework_common_id => @homework.id, :student_work_id => student_work.id, :project_id => stu_work.project_id == 0 ? -1 : stu_work.project_id, :user_id => members[i].to_i, :is_leader => 0)
+              stu_project.save
            end
-            stu_project.save
          end
        end
        @homework.update_column(:updated_at, Time.now)
@ -669,7 +633,7 @@ class StudentWorkController < ApplicationController
      render_403
    else
      respond_to do |format|
-        format.html{ render :layout => "new_base_user"}
+        format.html{ render :layout => "base_courses"}
      end
    end
  end
@ -687,20 +651,17 @@ class StudentWorkController < ApplicationController
        if @homework.homework_type == 3
          @student_work_project = @homework.student_work_projects.where("user_id=?",User.current.id).first
          student_work_projects = @homework.student_work_projects.where("student_work_id=? and is_leader =?",@work.id,0)
+          user_ids = student_work_projects.empty? ? "(-1)" : "(" + student_work_projects.map{|stu|stu.user_id}.join(",") + ")"
+          student_works = @homework.student_works.where("user_id in #{user_ids}")
+          student_works.delete_all
          student_work_projects.delete_all
          members = params[:group_member_ids].split(',')
          for i in 1 .. members.count-1
-            stu_project = StudentWorkProject.new
-            stu_project.homework_common_id = @homework.id
-            stu_project.student_work_id = @work.id
-            if @homework.homework_detail_group.base_on_project == 1
-              stu_project.project_id = @student_work_project.project_id
-            else @homework.homework_detail_group.base_on_project == 0
-            stu_project.project_id = -1
+            stu_work = StudentWork.new(:name => @work.name, :description => @work.description,:user_id=> members[i].to_i, :homework_common_id => @homework.id, :project_id => @work.project_id, :late_penalty => @work.late_penalty,:work_status => 3, :commit_time => @work.commit_time)
+            if stu_work.save
+              stu_project = StudentWorkProject.new(:homework_common_id => @homework.id, :student_work_id => @work.id, :project_id => stu_work.project_id == 0 ? -1 : stu_work.project_id, :user_id => members[i].to_i, :is_leader => 0)
+              stu_project.save
            end
-            stu_project.user_id = members[i].to_i
-            stu_project.is_leader = 0
-            stu_project.save
          end
        end

@ -735,26 +696,25 @@ class StudentWorkController < ApplicationController

  def destroy
    if @homework.homework_type == 3
-      if @work.destroy
-        if @homework.homework_detail_group.base_on_project == 1
-          pros = @work.student_work_projects.where("is_leader = 0")
-          pros.each do |pro|
-            pro.destroy
-          end
-          project = @work.student_work_projects.where("is_leader = 1").first
-          project.update_attributes(:student_work_id => nil)
-        elsif @homework.homework_detail_group.base_on_project == 0
-          @work.student_work_projects.each do |pro2|
-            pro2.destroy
-          end
-        end
+      pros = @work.student_work_projects.where("is_leader = 0")
+      user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+      student_works = @homework.student_works.where("user_id in #{user_ids}")
+      student_works.delete_all
+      pros.delete_all
+
+      project = @work.student_work_projects.where("is_leader = 1").first
+      if @homework.homework_detail_group.base_on_project == 1
+        project.update_attributes(:student_work_id => nil)
+      else
+        project.destroy
      end
+      @work.destroy
    else
      @work.attachments.destroy_all
      @work.student_works_scores.destroy_all
      @work.course_messages.destroy_all
      @work.student_work_tests.destroy_all
-      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0, :commit_time => nil,:final_score => nil,:teacher_score => nil,:student_score => nil,:teaching_asistant_score => nil,:system_score => 0,:work_score => nil)
+      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0, :commit_time => nil,:final_score => nil,:teacher_score => nil,:student_score => nil,:teaching_asistant_score => nil,:system_score => 0,:work_score => nil, :project_id => 0)
      @work.update_column("work_score",nil)
    end
    respond_to do |format|
@ -786,22 +746,21 @@ class StudentWorkController < ApplicationController

  def retry_work
    if @homework.homework_type == 3
-      if @work.destroy
-        if @homework.homework_detail_group.base_on_project == 1
-          pros = @work.student_work_projects.where("is_leader = 0")
-          pros.each do |pro|
-            pro.destroy
-          end
-          project = @work.student_work_projects.where("is_leader = 1").first
-          project.update_attributes(:student_work_id => nil)
-        elsif @homework.homework_detail_group.base_on_project == 0
-          @work.student_work_projects.each do |pro2|
-            pro2.destroy
-          end
-        end
+      pros = @work.student_work_projects.where("is_leader = 0")
+      user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+      student_works = @homework.student_works.where("user_id in #{user_ids}")
+      student_works.delete_all
+      pros.delete_all
+
+      project = @work.student_work_projects.where("is_leader = 1").first
+      if @homework.homework_detail_group.base_on_project == 1
+        project.update_attributes(:student_work_id => nil)
+      else
+        project.destroy
      end
-    elsif @homework.homework_type == 1
-      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0, :commit_time => nil)
+      @work.destroy
+    else
+      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0, :commit_time => nil, :project_id => 0)
      @work.attachments.destroy_all
      @work.course_messages.destroy_all
    end
@ -861,17 +820,29 @@ class StudentWorkController < ApplicationController
    render_attachment_warning_if_needed(@new_score)

    if @new_score.save
+      if @homework.homework_type == 3
+        @is_group_leader = !@work.student_work_projects.empty?
+      end
      case @new_score.reviewer_role
        when 1 #教师评分：最后一个教师评分为最终评分
          @work.teacher_score = @new_score.score
+          if @is_group_leader
+            add_score_to_member @work, @homework, 1, 'teacher_score', @new_score.score
+          end
        when 2 #教辅评分 教辅评分显示平均分
          #@work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
          ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
          @work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f
+          if @is_group_leader
+            add_score_to_member @work, @homework, 2, 'teaching_asistant_score', @work.teaching_asistant_score
+          end
        when 3 #学生评分 学生评分显示平均分
          #@work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
          stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
          @work.student_score = stu_score.first.score.try(:round, 2).to_f
+          if @is_group_leader
+            add_score_to_member @work, @homework, 3, 'student_score', @work.student_score
+          end
      end
      @homework.update_column('updated_at', Time.now)
      update_course_activity(@homework.class,@homework.id)
@ -1096,9 +1067,13 @@ class StudentWorkController < ApplicationController

  #创建作业的关联项目
  def student_work_project
+    @work = @homework.student_works.where("user_id = #{User.current.id} and work_status = 0").first
+    if @work
+      @work.update_column('project_id', params[:projectName].to_i)
+    end
    @project = StudentWorkProject.new
    @project.homework_common_id = @homework.id
-    @project.project_id = (Project.find params[:projectName].to_i).id
+    @project.project_id = params[:projectName].to_i
    @project.user_id = User.current.id
    @project.is_leader = 1
    if @project.save
@ -1139,7 +1114,7 @@ class StudentWorkController < ApplicationController
    end
    all_students = User.where("id in #{all_student_ids}")
    student_work_id = @homework.student_work_projects.where("user_id=? and student_work_id is not null",User.current.id).first.nil? ? -1 : @homework.student_work_projects.where("user_id=?",User.current.id).first.student_work_id
-    @commit_student_ids = @homework.student_work_projects.where("student_work_id != #{student_work_id}").map{|student| student.user_id}
+    @commit_student_ids = @homework.student_works.where("id != #{student_work_id}").map{|student| student.user_id}
    @users = searchstudent_by_name all_students,name
    respond_to do |format|
      format.js
@ -1147,6 +1122,10 @@ class StudentWorkController < ApplicationController
  end

  def cancel_relate_project
+    @work = @homework.student_works.where("user_id = #{User.current.id} and work_status = 0").first
+    if @work
+      @work.update_column('project_id', 0)
+    end
    relate_pro = StudentWorkProject.where("user_id = #{User.current.id} and homework_common_id = #{@homework.id}").first
    if relate_pro.destroy
      @user_activity_id = params[:user_activity_id].to_i
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1052,7 +1052,7 @@ class UsersController < ApplicationController
        else
          homework.publish_time = params[:homework_common][:publish_time]
        end
-        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
+        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 1
        homework.homework_type = params[:homework_type].to_i || 1
        homework.late_penalty = 10
        homework.teacher_priority = 1
@ -1691,9 +1691,12 @@ class UsersController < ApplicationController
        when "current_user"
          container_type = 'Principal'
          act_type = 'Principal'
+        when "all"
+          container_type = 'all'
+          act_type = 'all'
      end
    end
-    if container_type != '' && act_type != ''
+    if container_type != '' && container_type != 'all'
      if container_type == 'Course'
        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
      elsif container_type == 'Project'
@ -1704,74 +1707,24 @@ class UsersController < ApplicationController
        sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
      end
      if User.current != @user
-        sql += "and user_id = #{@user.id}"
+        sql += " and user_id = #{@user.id}"
      end
    else
      if User.current != @user
        blog_ids = "("+@user.blog.id.to_s+")"
-        sql = "user_id = #{@user.id} and((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-            "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-            "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-            "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids}))"
      else
        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
-        sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-            "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-            "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-            "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+      end
+      sql = "(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+          "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+          "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+          "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+      if container_type != 'all' && User.current != @user
+        sql = "user_id = #{@user.id} and(" + sql + ")"
      end
    end
+    
    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
-    # if params[:type].present?
-    #   case params[:type]
-    #     when "course_homework"
-    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "course_news"
-    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "course_message"
-    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "course_poll"
-    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "course_journals"
-    #       @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "project_issue"
-    #       @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "project_message"
-    #       @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "user_journals"
-    #       @user_activities = UserActivity.where("container_type = 'Principal' and act_type= 'JournalsForMessage' and container_id = #{@user.id}").order('updated_at desc').limit(10).offset(@page * 10)
-    #     when "current_user"
-    #       @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
-    #     else
-    #       if @user == User.current
-    #         blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
-    #       else
-    #         blog_ids = "("+@user.blog.id.to_s+")"
-    #       end
-    #       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-    #                                                 "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-    #                                                 "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-    #                                                 "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
-    #   end
-    # else
-    #   #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
-    #   # blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
-    #   # 减少数据库交互
-    #   if @user == User.current
-    #     watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
-    #     user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
-    #   else
-    #     user_ids = "(" + @user.id.to_s + ")"
-    #   end
-    #   watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}")
-    #   blog_ids = watched_user_blog_ids.empty? ? "(-1)" : "(" + watched_user_blog_ids.map { |blog| blog.id}.join(",") + ")"
-    #
-    #   @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-    #                                             "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-    #                                             "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
-    #                                             "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
-    # end
-    # @user_activities = paginateHelper @user_activities,500
    @type = params[:type]
    respond_to do |format|
      format.js
@ -2677,7 +2630,8 @@ class UsersController < ApplicationController
    project_ids.each do |project_id|
      project = Project.find(project_id)
      if project.news.map(&:id).exclude?(news.id)
-        message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
+      #  message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
+        message = News.create(:project_id => project.id, :title => news.title, :summary => news.summary, :description => news.description, :author_id => User.current.id, :created_on => Time.now )
        # record forward to table forwards if new record is valid
        if message.valid?
          news.forwards << Forward.new(:to_type => message.class.name, :to_id => message.id)
@ -3515,11 +3469,15 @@ class UsersController < ApplicationController
    @order, @c_sort, @type, @list_type = 1, 2, 1, 1
    #limit = 5

-    @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    # 用户的所有项目
+   # @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_projects = @user.projects.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
    @my_projects_count = @my_projects.count

-    @my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    #@my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_joined_projects = @user.projects.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
    @my_joined_projects_count = @my_joined_projects.count
+
    respond_to do |format|
      format.html {render :layout => 'new_base_user'}
    end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -345,7 +345,11 @@ module ApplicationHelper

  def link_to_isuue_user(user, options={})
    if user.is_a?(User)
-      name = h(user.name(options[:format]))
+      if options[:format]
+        name = h(user.name(options[:format]))
+      else
+        name = h(user.show_name)
+    end
      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
    else
      h(user.to_s)
@ -417,13 +421,13 @@ module ApplicationHelper
    end
    # status_id：3、已解决 5、已关闭
    if issue.status_id == 3
-      s = link_to text, issue_path(issue), :class => "text_line_s", :title => title
+      s = link_to text, issue_path(issue), :class => "text_line_s fl", :title => title
    elsif issue.status_id == 5
-      s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title
+      s = link_to text, issue_path(issue), :class => "text_line_s del_line fl", :title => title
    else
-      s = link_to text, issue_path(issue), :class => "c_blue", :title => title
+      s = link_to text, issue_path(issue), :class => "c_blue fl", :title => title
    end
-    s << h(": #{subject}") if subject
+    s << h("<span style='width:450px;display:inline-block;' class='hidden'>: #{subject}</span>".html_safe) if subject
    s = h("#{issue.project} - ") + s if options[:project]
    s
  end
@ -652,7 +656,7 @@ module ApplicationHelper
            s << watcher_link(@project, User.current)#, ['whiteButton'])
            s << "</span>"
          end
-          s << (render :partial => 'projects/project', :locals => {:project => project}).to_s
+          s << (render :partial => 'projects/tracker_project', :locals => {:project => project}).to_s
        else
          s <<  (render :partial => 'projects/course', :locals => {:project => project}).to_s
        end
@ -832,9 +836,15 @@ module ApplicationHelper
    atts.count > 0 ? true :false
  end

-  # 必须是项目成，项目必须提交过代码
+  # 如果Pull Request数量为0就显示在更多中
+  def allow_show_pull_request project
+    g = Gitlab.client
+    count = g.merge_requests(project.gpid).count
+  end
+
+  # 必须是项目成员，项目必须提交过代码
  def allow_pull_request project
-    return false if project.gpid.nil?
+    return 0 if project.gpid.nil?
    g = Gitlab.client
    count = g.user_static(project.gpid, :rev => "master").count
    count
@ -915,6 +925,12 @@ module ApplicationHelper
    s.html_safe
  end

+  # 计算Pull Request的请求数目
+  def pull_request_count project
+    g = Gitlab.client
+    g.merge_requests(project.gpid).count
+  end
+
  #项目成员列表复选框生成
  def project_member_check_box_tags_ex name, principals
    s = ''
@ -972,7 +988,7 @@ module ApplicationHelper
    groups = ''
    collection.sort.each do |element|
      selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
-      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
+      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.show_name}</option>)
    end
    unless groups.empty?
      s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
@ -3420,6 +3436,43 @@ def get_hw_index(hw,is_teacher)
  return index
 end

+def get_hw_status homework_common
+  str = ""
+  if homework_common.homework_detail_manual
+    if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil?
+      str += '<span class="grey_homework_btn_cir ml5">挂起</span>'
+    elsif homework_common.homework_detail_manual.comment_status == 0
+      str += '<span class="grey_homework_btn_cir ml5">未发布</span>'
+    elsif homework_common.homework_detail_manual.comment_status == 1
+      if homework_common.anonymous_comment == 0
+        str += '<span class="grey_homework_btn_cir ml5">未开启匿评</span>'
+      else
+        str += '<span class="grey_homework_btn_cir ml5">匿评已禁用</span>'
+      end
+      if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+        str += '<span class="green_homework_btn_cir ml5">作品提交中</span>'
+      elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
+        str += '<span class="red_homework_btn_cir ml5">作品补交中</span>'
+      end
+    elsif homework_common.homework_detail_manual.comment_status == 2
+      if homework_common.anonymous_comment == 0
+        str += '<span class="green_homework_btn_cir ml5">匿评中</span>'
+      else
+        str += '<span class="grey_homework_btn_cir ml5">匿评已禁用</span>'
+      end
+      str += '<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>'
+    elsif homework_common.homework_detail_manual.comment_status == 3
+      if homework_common.anonymous_comment == 0
+        str += '<span class="grey_homework_btn_cir ml5">匿评已结束</span>'
+      else
+        str += '<span class="grey_homework_btn_cir ml5">匿评已禁用</span>'
+      end
+      str += '<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>'
+    end
+  end
+  str
+end
+
 def get_group_member_names work
  result = ""
  unless work.nil?
@ -3478,3 +3531,21 @@ def get_forge_act_message(act, type)
  format_time(forge_act.nil? ? act.created_on : forge_act.try(:updated_at))
 end

+#作业类型
+def homework_type_option
+  type = []
+  option1 = []
+  option1 << "普通作业"
+  option1 << 1
+  option2 = []
+  option2 << "编程作业"
+  option2 << 2
+  option3 = []
+  option3 << "分组作业"
+  option3 << 3
+  type << option1
+  type << option2
+  type << option3
+  type
+end
+
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -63,6 +63,7 @@ module CoursesHelper
    # searchTeacherAndAssistant(project).count
  end

+  # 统计数目
  def show_nav?(count)
    count == 0 ? true : false
  end
@ -192,18 +193,6 @@ module CoursesHelper
  #   garble count
  # end

-  def homework_type_option
-    type = []
-    option1 = []
-    option2 = []
-    option1 << l(:label_task_submit_form_accessory)
-    option1 << 1
-    option2 << l(:label_task_submit_form_project)
-    option2 << 2
-    type << option1
-    type << option2
-  end
-
  def proportion_option
    type = []
    i = 0
@ -807,11 +796,12 @@ module CoursesHelper
    link.html_safe
  end

+  # 可以查看到资源库的资源
  def visable_attachemnts_incourse course
    return[] unless course
    result = []
    course.attachments.each do |attachment|
-      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?
+      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
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@ -111,9 +111,9 @@ module IssuesHelper

  def principals_options_for_isuue_list(project)
    if User.current.member_of?(project)
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c|  [User.find(c.user_id).show_name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
    else
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["指派给", 0])
    end
  end

--- a/app/helpers/org_member_helper.rb
+++ b/app/helpers/org_member_helper.rb
@ -1,5 +1,6 @@
 module OrgMemberHelper
  include ApplicationHelper
+
  def find_user_not_in_current_org_by_name org
    if params[:q] && params[:q].lstrip.rstrip != ""
      scope = Principal.active.sorted.not_member_of_org(org).like(params[:q])
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -224,19 +224,6 @@ module ProjectsHelper
  def get_projects_by_tag(tag_name)
    Project.tagged_with(tag_name).order('updated_on desc')
  end
-  
-  # added by fq
-  def homework_type_option
-    type = []
-    option1 = []
-    option2 = []
-    option1 << l(:label_task_submit_form_accessory)
-    option1 << 1
-    option2 << l(:label_task_submit_form_project)
-    option2 << 2
-    type << option1
-    type << option2
-  end

  #是否启动互评下拉框
  def is_evaluation_option
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@ -158,4 +158,20 @@ module StudentWorkHelper
    end
    return status
  end
+
+  def group_student_works student_work, homework
+    pros = student_work.student_work_projects.where("is_leader = 0")
+    user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")"
+    student_works = homework.student_works.where("user_id in #{user_ids}")
+    return student_works
+  end
+
+  def add_score_to_member student_work, homework, role, score_type, score
+    student_works = group_student_works student_work, homework
+    student_works.each do |st_work|
+      if st_work.student_works_scores.where("reviewer_role = #{role} and score is not null").empty?
+        st_work.update_attribute("#{score_type}", score)
+      end
+    end
+  end
 end
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -162,17 +162,17 @@ module UsersHelper
  end

  def current_time_and_term_resource course
-    str = ""
+    str = course.syllabus.title + "<span class='fb'> · </span>"
    term = cur_course_term_resource
    name = course.name
    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
-      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+      str = str + name + "(" + course.time.to_s + course.term.to_s + ")"
    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
-      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+      str = str + name + "(" + course.time.to_s + course.term.to_s + ")"
    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
-      str = name + "(" + course.end_time.to_s + course.end_term.to_s + ")"
+      str = str + name + "(" + course.end_time.to_s + course.end_term.to_s + ")"
    else
-      str = name + "(" + Time.now.year.to_s + cur_course_term_resource.to_s + ")"
+      str = str + name + "(" + Time.now.year.to_s + cur_course_term_resource.to_s + ")"
    end
    str
  end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -757,6 +757,7 @@ class Issue < ActiveRecord::Base
    end
  end

+# 更新issue时，判断更新之前当前是否有自动更新的评论
  def init_journal(user, notes = "")
    @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
    if new_record?
@ -1454,8 +1455,18 @@ class Issue < ActiveRecord::Base
  end

  # Callback on file attachment
+  # 在执行issue模块前 执行：当附件被添加时，产生评论
+  # 第一次创建issue时，@current_journal为nil，评论不产生
+  # 当附件名称重名时，也不产生评论
+  # 当更新isuue时，第一次上传的附件的已经存在，则不更新次附件评论
  def attachment_added(obj)
-    if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
+
+      # 找出该issue评论表中，附件重名的个数
+      jor = Journal.where(:journalized_id => self.id)
+      jor_ids = jor.empty? ? "(-1)" : "(" + jor.map{|detail| detail.id}.join(",") + ")"
+      jor_details_count = JournalDetail.where("journal_id in #{jor_ids} and value = '#{obj.filename}'").count
+
+    if @current_journal && @current_journal.user_id == obj.author_id && jor_details_count == 0 && self.attachments.find_all_by_filename(obj.filename).count == 0
      @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)

    end
--- a/app/models/news.rb
+++ b/app/models/news.rb
@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                            :author_key => :author_id
  acts_as_watchable

-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
+  after_create :act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
  after_update :update_activity
  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score

@ -140,19 +140,13 @@ class News < ActiveRecord::Base
    Watcher.create(:watchable => self, :user => author)
  end

-  ## fq
-  def act_as_activity
-    self.acts << Activity.new(:user_id => self.author_id)
-  end
-
  # Time 2015-02-27 15:48:17
  # Author lizanle
  # Description 公用表中也要记录
  def act_as_forge_activity
    # 如果是project为空，那么是课程相关的，不需要保存
    if self.project
-      self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
-                                             :project_id => self.project.id)
+      self.forge_acts << ForgeActivity.new(:user_id => self.author_id, :project_id => self.project.id)
    end
  end

@ -198,7 +192,7 @@ class News < ActiveRecord::Base
  def contain_news_message
    self.course.members.each do |m|
      if m.user_id != self.author_id
-        self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_id, :viewed => false)
+        self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
      end
    end
  end
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@ -1,4 +1,4 @@
-#学生提交作品表
+#学生提交作品表 #work_status :0 未提交  1 已提交  2 迟交  3 分组作品复制的组员作品
 class StudentWork < ActiveRecord::Base
  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time

@ -13,7 +13,8 @@ class StudentWork < ActiveRecord::Base
  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
  has_many :attachments, :dependent => :destroy

-  scope :has_committed, lambda{where("work_status != 0")}
+  scope :has_committed, lambda{where("work_status != 0 and work_status != 3")}
+  scope :no_copy, lambda{where("work_status != 3")}

  before_destroy :delete_praise
  before_save :set_program_score, :set_src
@ -31,7 +32,7 @@ class StudentWork < ActiveRecord::Base

  private 
  def set_program_score
-    if homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
+    if self.homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
        #根据最后一次测试计算得分
        unless last_test
          self.system_score = 0
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@ -115,7 +115,7 @@ class CoursesService
                  role_name: m.roles.first.name,
                  name: m.user.show_name,
                  roles_id: role_ids.include?(7) ? 7 : (role_ids.include?(9) ? 9 : 10 ),
-                  :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
+                  :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname,:is_me => current_user.id == m.user.id ? 1:0 }
      # end

    end
@ -565,6 +565,8 @@ class CoursesService
  #多个角色加入课程
  def join_course_roles params,current_user
    course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
+    go_coursegroup_flag = 0
+    course_id = 0

    @state = 10
    if course
@ -621,6 +623,8 @@ class CoursesService
              course.members << members
              StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
              @state = 0
+              go_coursegroup_flag = 1 if course.course_groups
+              course_id = course.id
              send_wechat_join_class_notice current_user,course,10,0
            else
              is_stu = false
@ -630,6 +634,8 @@ class CoursesService
                course.members << members
                StudentsForCourse.create(:student_id => current_user.id, :course_id =>course.id)
                is_stu = true
+                go_coursegroup_flag = 1 if course.course_groups
+                course_id = course.id
                send_wechat_join_class_notice current_user,course,10,0
              end
              #如果已经发送过消息了，那么就要给个提示
@ -674,7 +680,7 @@ class CoursesService
    else
      @state = 4
    end
-    {:state => @state,:course => course}
+    {:state => @state,:course => course,:go_coursegroup_flag => go_coursegroup_flag,:course_id=>course_id}
  end


--- a/app/views/admin/leave_messages.html.erb
+++ b/app/views/admin/leave_messages.html.erb
@ -62,9 +62,9 @@
          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=strip_html(journal.notes) %>'>
            <%case journal.jour_type %>
            <% when 'Principal' %>
-                <%= link_to(strip_html(journal.notes), feedback_path(journal.jour_id)) %>
+                <%= link_to(journal.m_parent_id.nil? ? strip_html(journal.notes) : 'RE: ' + strip_html(journal.notes), feedback_path(journal.jour_id)) %>
            <% when 'Course' %>
-                <%= link_to(strip_html(journal.notes), course_feedback_path(journal.jour_id)) %>
+                <%= link_to(journal.m_parent_id.nil? ? strip_html(journal.notes) : 'RE: ' + strip_html(journal.notes), course_feedback_path(journal.jour_id)) %>
            <% end %>
          </td>
          <td class="center">
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@ -64,7 +64,6 @@
          <td class="buttons">
            <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
            <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
-            <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %>
          </td>
        </tr>
--- a/app/views/admin/syllabuses.html.erb
+++ b/app/views/admin/syllabuses.html.erb
@ -58,7 +58,7 @@
            <%= format_date(syllabus.created_at) %>
          </td>
        </tr>
-        <% courses = syllabus.courses %>
+        <% courses = syllabus.courses.not_deleted %>
        <% courses.each do |course| %>
            <tr class="even">
              <td style="text-align: center;">
--- a/app/views/attachments/_activity_attach.html.erb
+++ b/app/views/attachments/_activity_attach.html.erb
@ -9,8 +9,9 @@
          <span class="postAttSize">(
            <%= number_to_human_size attachment.filesize %>)
          </span>
-          <span class="author" title="<%= attachment.author%>">
-            <%= link_to h(truncate(attachment.author.name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+          <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %>
+          <span class="author" title="<%= user_name %>">
+            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "linkBlue2" %>,
            <%= format_time(attachment.created_on) %>
          </span>
        </div>
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@ -91,8 +91,8 @@
          &nbsp;
      <% end %>
      <% if options[:author] %>
-    <span class="author" title="<%= attachment.author%>">
-      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
+    <span class="author" title="<%= attachment.author.show_name%>">
+      <%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
      <%= format_time(attachment.created_on) %>
    </span>
      <% end %>
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@ -1,193 +1,192 @@
-<style type="text/css">
-    div.talk_new .ke-container{margin-left:2px;}
-    .break_word {width:100%;}
-</style>
-<script type="text/javascript">
-    //头部导航
-    var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
-    function buildsubmenus(){
-        for (var i=0; i<menuids.length; i++){
-            var div = document.getElementById(menuids[i]);
-            if(div == undefined)continue;
-            var ultags=div.getElementsByTagName("ul");
-            for (var t=0; t<ultags.length; t++){
-                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle";
-                ultags[t].parentNode.onmouseover=function(){
-                    this.getElementsByTagName("ul")[0].style.display="block";
-                }
-                ultags[t].parentNode.onmouseout=function(){
-                    this.getElementsByTagName("ul")[0].style.display="none";
-                }
-            }
-        }
-    }
-
-    if (window.addEventListener)
-        window.addEventListener("load", buildsubmenus, false)
-    else if (window.attachEvent)
-        window.attachEvent("onload", buildsubmenus)
-</script>
-<%= import_ke(enable_at: false, prettify: false) %>
-
-
-<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @topics, :page => 0, :user => @user} %>
-
-
-<script type="text/javascript">//侧导航
-
-function nh_check_field(params){
-    var result=true;
-    if(params.subject!=undefined){
-        if($.trim(params.subject.val()) == ""){
-            params.subjectmsg.html('主题不能为空');
-            params.subjectmsg.css({color:'#ff0000'});
-            result=false;
-        }else{
-            params.subjectmsg.html('填写正确');
-            params.subjectmsg.css({color:'#008000'});
-        }
-        params.subjectmsg.show();
-    }
-
-    if(params.content!=undefined){
-        if(params.content.isEmpty()){
-            result=false;
-        }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();                           //用上面那句ie11提交到服务器居然木有值
-            if(params.content.isEmpty()){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
-    }
-
-    return result;
-}
-function nh_init_board(params){
-    //发帖/编辑/回复按钮的click
-    params.showbtn.click(function(){
-        params.textarea.removeAttr('placeholder');
-        if(params.textarea.data('init') == undefined){
-            //初始化编辑器
-            var editor = params.kindutil.create(params.textarea, {
-//                allowPreviewEmoticons : false,
-//                allowImageUpload : false,
-                autoHeightMode : true,
-                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
-                allowFileManager:true,uploadJson:"/kindeditor/upload",
-                fileManagerJson:"/kindeditor/filemanager",
-                afterChange:function(){//按键事件
-                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-//                    var edit = this.edit;
-//                    var body = edit.doc.body;
-//                    edit.iframe.height(minHeight);
-//                    this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + 30, minHeight));
-                },
-                afterCreate:function(){
-                    this.loadPlugin("autoheight");
-                    var userAgent = navigator.userAgent.toLowerCase();
-                    if(/trident/.test(userAgent)){
-                        $("div.talk_new .ke-container").css({'margin-left':'0px'});
-                    }
-//                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
-//                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
-//                    params.toolbar_container.append(toolbar);
-                }
-            }).loadPlugin('paste');
-
-            //主题输入框按键事件
-            params.inputsubject.keyup(function(){
-                nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
-            })
-            //表单提交
-            params.form.submit(function(){
-                var is_checked = nh_check_field({
-                    issubmit:true,
-                    subject:params.inputsubject,
-                    subjectmsg:params.subjectmsg,
-                    content:editor,
-                    contentmsg:params.contentmsg,
-                    textarea:params.textarea
-                });
-                if(is_checked){
-                    //return true 居然不提交 fuck your sister
-                    $(this)[0].submit();
-//                    return true;
-                }
-                return false;
-            });
-            //提交按钮click
-            params.submitbtn.click(function(){
-                params.form.submit();
-            });
-            //取消按钮click
-            params.cancelbtn.click(function(){
-                params.about_talk.toggle();//显示/隐藏编辑区
-                if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
-                    params.form[0].reset();
-                    if(params.type=='reply'){
-                        params.textarea.empty();
-                    }else{
-                        params.textarea.html(params.init_content_val.val());
-                    }
-                    var str = params.textarea.html();
-                    str=str.replace(new RegExp(/&lt;/g),'<');
-                    str=str.replace(new RegExp(/&gt;/g),'>');
-                    editor.html(str);
-                    params.subjectmsg.hide();
-                    params.contentmsg.hide();
-                    if(params.quote_show!=undefined)params.quote_show.empty();
-                    if(params.quote_input!=undefined)params.quote_input.empty();
-                }else{
-                    if(params.type=='reply'){
-                        params.textarea.show();
-                        params.textarea.focus();
-                        params.textarea.hide();
-                        //params.jumphref.attr('href','#'+params.form.attr('id'));
-                        //params.jumphref[0].click();
-                    }else{
-                        params.textarea.show();
-                        params.textarea.focus();
-                        params.textarea.hide();
-//                      params.inputsubject.focus();
-                    }
-                }
-            });
-            params.textarea.data('init','1');//标记为已经初始化
-        }
-        params.cancelbtn.click();//显示/隐藏编辑区
-    });
-    if(params.type == 'reply'){
-        params.showbtn_child.click(function(){
-            if(params.textarea.data('init') == undefined){
-                params.showbtn.click();
-            }else{
-                params.cancelbtn.click();
-                if(params.about_talk.is(':hidden')){
-                    params.cancelbtn.click();
-                }
-            }
-            var parent_topic_id =  $(this).data('topic-id');
-            if(parent_topic_id!=undefined)$("input[name='parent_topic']",params.form).val(parent_topic_id);
-            var ref_str = params.get_ref_str_call($(this));
-            params.quote_show.html(ref_str);
-            params.quote_input.html(ref_str);
-        });
-    }
-}
-
-
-</script>
-<script type="text/javascript">
-    $(function(){
-        setTimeout(function(){
-            elocalStorage(message_content_editor,'blog_<%=User.current.id %>');
-        }, 10000);
-    });
-</script>
+<style type="text/css">
+    div.talk_new .ke-container{margin-left:2px;}
+</style>
+<script type="text/javascript">
+    //头部导航
+    var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
+    function buildsubmenus(){
+        for (var i=0; i<menuids.length; i++){
+            var div = document.getElementById(menuids[i]);
+            if(div == undefined)continue;
+            var ultags=div.getElementsByTagName("ul");
+            for (var t=0; t<ultags.length; t++){
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle";
+                ultags[t].parentNode.onmouseover=function(){
+                    this.getElementsByTagName("ul")[0].style.display="block";
+                }
+                ultags[t].parentNode.onmouseout=function(){
+                    this.getElementsByTagName("ul")[0].style.display="none";
+                }
+            }
+        }
+    }
+
+    if (window.addEventListener)
+        window.addEventListener("load", buildsubmenus, false)
+    else if (window.attachEvent)
+        window.attachEvent("onload", buildsubmenus)
+</script>
+<%= import_ke(enable_at: false, prettify: false) %>
+
+
+<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @topics, :page => 0, :user => @user} %>
+
+
+<script type="text/javascript">//侧导航
+
+function nh_check_field(params){
+    var result=true;
+    if(params.subject!=undefined){
+        if($.trim(params.subject.val()) == ""){
+            params.subjectmsg.html('主题不能为空');
+            params.subjectmsg.css({color:'#ff0000'});
+            result=false;
+        }else{
+            params.subjectmsg.html('填写正确');
+            params.subjectmsg.css({color:'#008000'});
+        }
+        params.subjectmsg.show();
+    }
+
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();                           //用上面那句ie11提交到服务器居然木有值
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
+
+    return result;
+}
+function nh_init_board(params){
+    //发帖/编辑/回复按钮的click
+    params.showbtn.click(function(){
+        params.textarea.removeAttr('placeholder');
+        if(params.textarea.data('init') == undefined){
+            //初始化编辑器
+            var editor = params.kindutil.create(params.textarea, {
+//                allowPreviewEmoticons : false,
+//                allowImageUpload : false,
+                autoHeightMode : true,
+                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
+                allowFileManager:true,uploadJson:"/kindeditor/upload",
+                fileManagerJson:"/kindeditor/filemanager",
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+//                    var edit = this.edit;
+//                    var body = edit.doc.body;
+//                    edit.iframe.height(minHeight);
+//                    this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + 30, minHeight));
+                },
+                afterCreate:function(){
+                    this.loadPlugin("autoheight");
+                    var userAgent = navigator.userAgent.toLowerCase();
+                    if(/trident/.test(userAgent)){
+                        $("div.talk_new .ke-container").css({'margin-left':'0px'});
+                    }
+//                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+//                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+//                    params.toolbar_container.append(toolbar);
+                }
+            }).loadPlugin('paste');
+
+            //主题输入框按键事件
+            params.inputsubject.keyup(function(){
+                nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
+            })
+            //表单提交
+            params.form.submit(function(){
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    subject:params.inputsubject,
+                    subjectmsg:params.subjectmsg,
+                    content:editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    //return true 居然不提交 fuck your sister
+                    $(this)[0].submit();
+//                    return true;
+                }
+                return false;
+            });
+            //提交按钮click
+            params.submitbtn.click(function(){
+                params.form.submit();
+            });
+            //取消按钮click
+            params.cancelbtn.click(function(){
+                params.about_talk.toggle();//显示/隐藏编辑区
+                if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
+                    params.form[0].reset();
+                    if(params.type=='reply'){
+                        params.textarea.empty();
+                    }else{
+                        params.textarea.html(params.init_content_val.val());
+                    }
+                    var str = params.textarea.html();
+                    str=str.replace(new RegExp(/&lt;/g),'<');
+                    str=str.replace(new RegExp(/&gt;/g),'>');
+                    editor.html(str);
+                    params.subjectmsg.hide();
+                    params.contentmsg.hide();
+                    if(params.quote_show!=undefined)params.quote_show.empty();
+                    if(params.quote_input!=undefined)params.quote_input.empty();
+                }else{
+                    if(params.type=='reply'){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                        //params.jumphref.attr('href','#'+params.form.attr('id'));
+                        //params.jumphref[0].click();
+                    }else{
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+//                      params.inputsubject.focus();
+                    }
+                }
+            });
+            params.textarea.data('init','1');//标记为已经初始化
+        }
+        params.cancelbtn.click();//显示/隐藏编辑区
+    });
+    if(params.type == 'reply'){
+        params.showbtn_child.click(function(){
+            if(params.textarea.data('init') == undefined){
+                params.showbtn.click();
+            }else{
+                params.cancelbtn.click();
+                if(params.about_talk.is(':hidden')){
+                    params.cancelbtn.click();
+                }
+            }
+            var parent_topic_id =  $(this).data('topic-id');
+            if(parent_topic_id!=undefined)$("input[name='parent_topic']",params.form).val(parent_topic_id);
+            var ref_str = params.get_ref_str_call($(this));
+            params.quote_show.html(ref_str);
+            params.quote_input.html(ref_str);
+        });
+    }
+}
+
+
+</script>
+<script type="text/javascript">
+    $(function(){
+        setTimeout(function(){
+            elocalStorage(message_content_editor,'blog_<%=User.current.id %>');
+        }, 10000);
+    });
+</script>
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@ -1,7 +1,6 @@

 <style type="text/css">
    div.talk_new .ke-container{margin-left:2px;}
-    .break_word {width:100%;}
 </style>
 <script type="text/javascript">
    //头部导航
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@ -54,7 +54,7 @@
    <li class="ml45 mb10">
      <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
      <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
-      <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
+      <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】</span>
    </li>
    <li class="ml45">
      <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@ -4,7 +4,12 @@
      <% exc_course.each_with_index do |e_course, i| %>
          <li>
            <span class="sy_sq_orange fl mr5 mt5"><%= i+1 %></span>
-            <%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle fl mb10" %>
+            <div class="fl" style="width:185px;">
+              <%= link_to e_course.syllabus.title, syllabus_path(e_course.syllabus_id), :target => '_blank', :class => "sy_class_ltitle"%>
+              &nbsp;<font class="fb c_grey">·</font>&nbsp;
+              <%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle mb10" %>
+            </div>
+            <div class="cl"></div>
            <p class="sy_cgrey ml20">
              <% homework_count = e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
              <% if homework_count > 0 %>
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@ -45,9 +45,13 @@
      <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
    </li>
 <% end %>
+<% if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin? %>
+    <li>
+      <%=link_to "分班", course_member_path(@course, :role => 2) %>
+    </li>
+<% end %>
 <% if show_nav?(0) %>
    <li>
      <a href="<%=statistics_course_course_path(@course) %>">统计</a>
-      <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
    </li>
 <% end %>
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@ -8,7 +8,7 @@
          <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
          <% if @syllabus.nil? %>
              <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"}  %>
-              <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
+              <span class="c_red" id="new_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】</span>
          <% else %>
              <span><%=@syllabus.title %></span>
              <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
@ -21,6 +21,8 @@
          <span class="c_red" id="new_course_name_notice" style="display: none;">班级名称不能为空且至少有两个字符</span>
        </li>
        <div class="cl"></div>
+        <li class="ml125 mb5 fontGrey3"><span class="success-icon mr25">正确示例：计算机系2016秋季A班</span></li>
+        <li class="ml125 mb10 fontGrey3"><span class="error-icon">错误示例：软件工程 - 计算机系2016秋季A班</span></li>
        <li  class="ml45">
          <label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
          <input  type="text" name="class_period" id="new_class_period" class="hwork_input02" onkeyup="regex_course_class_period('new');" placeholder="例如：54" maxlength="6">
@ -73,7 +75,7 @@
          <span class="c_grey">（选中后允许学生上传班级资源，否则不允许）</span>
          <div class="cl"></div>
        </li>
-        <li class=" ml90" >
+        <li class=" ml30" >
          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
          <div class="cl"></div>
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@ -32,8 +32,8 @@
          </li>
          <li class="ml45 mb10">
            <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:280px'}  %>
-            <span class="c_red" id="edit_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%></span>
+            <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:210px'}  %>
+            <span class="c_red" id="edit_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】</span>
          </li>
          <li class="ml45">
            <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@ -2,10 +2,10 @@
  <tr class="b_grey hworkH30">
    <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
    <th class="hworkList50">&nbsp;&nbsp;</th>
-    <th class="hworkList60"><span class="c_dark f14 fb">姓名</span></th>
-    <th class="hworkList80"><span class="c_dark f14 fb">学号</span></th>
-    <th class="hworkList80"><span class="c_dark f14 fb">班级</span></th>
-    <th width="230">&nbsp;&nbsp;</th>
+    <th class="hworkList130"><span class="c_dark f14 fb">姓名</span></th>
+    <th class="hworkList130"><span class="c_dark f14 fb">学号</span></th>
+    <th class="hworkList130"><span class="c_dark f14 fb">班级</span></th>
+    <th width="60">&nbsp;&nbsp;</th>
    <th class="hworkList130">
      <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%>
    </th>
@ -17,19 +17,19 @@
  <% @exercise_users_list.each_with_index do |exercise, index|%>
      <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
        <td class="pl5 pr5" style="text-align:center;"><%=index + 1 %></td>
-        <td class="hworkPortrait pr10 float-none">
+        <td class="hworkPortrait float-none">
          <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %>
        </td>
-        <td class="hworkStName student_work_<%= exercise.id%>" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
+        <td class="hworkStName130 pr10 student_work_<%= exercise.id%>" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
          <%=exercise.user.show_name %>
        </td>
-        <td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
-          <span class="hidden fl" style="width:80px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
-        </td>
-        <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
+        <td class="hworkStID130 pr10 student_work_<%= exercise.id%> float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
+          <span class="hidden fl" style="width:130px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
+        </td>
+        <td class="hworkStID130 student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
          --
        </td>
-        <td width="230">&nbsp;</td>
+        <td width="60">&nbsp;</td>
        <td class="hworkList130 c_grey">
          <% if exercise.created_at%>
              <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
@ -45,13 +45,13 @@
      </tr>

      <script type="text/javascript">
-          $(".student_work_<%= exercise.id%>").mouseenter(function(){
-              $("#work_click_<%= exercise.id%>").show();
-          }).mouseleave(function(){
-              $("#work_click_<%= exercise.id%>").hide();
-          }).mouse;
          $(function(){
              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+              $(".student_work_<%= exercise.id%>").mouseenter(function(){
+                  $("#work_click_<%= exercise.id%>").show();
+              }).mouseleave(function(){
+                  $("#work_click_<%= exercise.id%>").hide();
+              }).mouse;
              $("#student_name_<%= exercise.id%>,#student_id_<%= exercise.id%>,#student_class_<%= exercise.id%>").on('click',function() {
                  window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
              });
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@ -124,12 +124,14 @@
      </div>
    </div>
    <div class="cl"></div>
-    <div class="resource_tip_box fontGrey2">
-      <em></em>
-      <span></span>
-      <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
-      <p>公共资源：<br/>对所有用户可见</p>
-    </div>
+    <% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
+        <div class="resource_tip_box fontGrey2">
+          <em></em>
+          <span></span>
+          <p class="mb5">私有资源：<br/>仅对本班级成员可见</p>
+          <p>公共资源：<br/>对所有用户可见</p>
+        </div>
+    <% end %>
  </div>
  <div  id="course_list">
    <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
--- a/app/views/files/_tip_attachment_count.html.erb
+++ b/app/views/files/_tip_attachment_count.html.erb
@ -1,15 +1,18 @@
 共有&nbsp;<span id="attachment_count"><%= @tip_all_attachments %></span>&nbsp;个资源
-<span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span>
-<% if @project  %>
-    <% if !User.current.member_of?(@project) && params[:tag_name] %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
-    <% else %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
-    <% end %>
-<% elsif @course %>
-    <% if !User.current.member_of_course?(@course) && params[:tag_name] %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
-    <% else %>
-        <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+<% if @tip_all_private_attachments != 0 %>
+    <span id="attachment_count_public" class="fontGrey2 ml10" style="font-weight: normal;">公共资源：<%= @tip_all_public_attachments %>个</span>
+    <% if @project  %>
+        <% if !User.current.member_of?(@project) && params[:tag_name] %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
+        <% else %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+        <% end %>
+    <% elsif @course %>
+        <% if !User.current.member_of_course?(@course) && params[:tag_name] %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：0个</span>
+        <% else %>
+            <span id="attachment_count_private" class="fontGrey2 ml10" style="font-weight: normal;">私有资源：<%= @tip_all_private_attachments %>个</span>
+        <% end %>
    <% end %>
+
 <% end %>
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@ -11,7 +11,8 @@
                <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
              </div>
              <div class="postDes"><%= textAreailizable forum.description%></div>
-              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
+              <% user_name = forum.creator.show_name.empty? ? forum.creator.name : forum.creator.show_name %>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= user_name %></a></div>
              <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
            </div>
            <div class="postStatics">
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@ -27,7 +27,7 @@
              </div>
              <% author = topic.last_reply.try(:author)%>
              <% if author%>
-                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.show_name%></a></div>
                  <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
              <% end%>
              <span class=" fr " style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@ -74,7 +74,6 @@
  });
  function check_and_submit(doc){
      $("#error").html('').hide();
-      check_forum_name();
    if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
        $("#error").html("名称不能为空").show();
        return;
@ -98,7 +97,6 @@
              '<%= check_forum_name_forums_path %>',
              {"forum_name":encodeURIComponent(name)},
             function(data){
-
                 if( data == 'true'){
                     $("#error").html("贴吧名称已经存在").show();
                     check_pass = false;
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@ -41,6 +41,20 @@

 <!-- 老师身份才可以发布作业 -->
 <div class="HomeWork mb10 ml10" nhname='homework_common_form'>
+  <% committed_work_count = @homework.student_works.has_committed.count %>
+  <% stu_pro_count = @homework.student_work_projects.count %>
+  <% if committed_work_count != 0 %>
+      <% if @homework.homework_type == 1 %>
+          <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型。</p>
+      <% elsif @homework.homework_type == 2 %>
+          <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和测试集。</p>
+      <% elsif @homework.homework_type == 3 %>
+          <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置。</p>
+      <% end %>
+  <% elsif stu_pro_count != 0 && @homework.homework_type == 3 %>
+      <p class="c_red mb5">已有<%=stu_pro_count %>个学生关联项目，不允许再修改作业类型。</p>
+  <% end %>
+
  <%= form_for @homework do |f| %>
      <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
      <input type="text" name="course_activity" class="none" value="<%= @course_activity%>"/>
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@ -3,13 +3,13 @@
        $("#homework_name").val("");
        $("#homework_publish_time").val("");
        $("#homework_end_time").val("");
-        document.getElementById("anonymous_comment").checked = true;
        $("#course_id").val($("#option_select").val());
+        $("#homeworkSetting").addClass("undis");
+        $("#homeworkSetting").html("");
        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
        //homework_description_editor.html("");
        $("#homework_name_span").text("");
        $("#homework_end_time_span").text("");
-        $("#homework_end_time_span").text("");
        $("#homework_course_id_span").text("");
        $("#homework_editor").toggle();
    }
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@ -20,7 +20,7 @@
      <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
    <br>
    <div class="cl"></div>
-    由<%=link_to @issue.author, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
+    由<%=link_to @issue.author.show_name, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
  </div>

  <!--talk_txt end-->
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@ -3,7 +3,7 @@
    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>

-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true, :remote => true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
    <%= error_messages_for 'issue', 'time_entry' %>
    <%= render :partial => 'conflict' if @conflict %>
    <!--编辑的整个属性-->
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@ -78,5 +78,12 @@
    <div class="cl"></div>
    <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
-<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
-<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>
+<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80" id="issue_confirm"> 确定</a>
+<% if params[:action] == "new" %>
+    <% if @copy_from %>
+        <%= link_to "取消", issue_path(@copy_from), :class => "grey_btn fl mr50 ml10" %>
+    <% end %>
+<% else %>
+    <a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>
+<% end %>
+
--- a/app/views/issues/_jounal_refresh.js.erb
+++ b/app/views/issues/_jounal_refresh.js.erb
@ -1,8 +1,10 @@
-$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
-$("#issue_detail_show").html('<%= escape_javascript(render :partial => 'issues/detail') %>')
-$("#issue_edit_show").html('<%= escape_javascript(render :partial => 'issues/edit') %>')
-$("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => @issue}) %>");
-sd_create_editor_from_data(<%= @issue.id %>, null, "100%", "<%= @issue.class.name %>");
+/* $("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
+$("#issue_detail_show").html('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit_show").html('<%#= escape_javascript(render :partial => 'issues/edit') %>');
+$("#div_issue_attachment_<%#=@issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => @issue}) %>");
+sd_create_editor_from_data(<%#= @issue.id %>, null, "100%", "<%#= @issue.class.name %>");*/
+
+location.reload();
 issue_desc_editor = KindEditor.create('#issue_description',
        {"width":"85%",
            "resizeType":0,
@ -17,5 +19,5 @@ issue_desc_editor = KindEditor.create('#issue_description',
            "uploadJson":"/kindeditor/upload",
            "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
-$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%= @issue.class.name %>");
+// $(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
+// sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#= @issue.class.name %>");
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@ -1,12 +1,14 @@
 <% if @saved %>
-$("#issue_detail").replaceWith('<%= escape_javascript(render :partial => 'issues/detail') %>')
-$("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
+/*$("#issue_detail").replaceWith('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit").replaceWith('<%#= escape_javascript(render :partial => 'issues/edit') %>');

 $("#issue_detail").show();
 $("#issue_edit").hide();
-$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
-$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
+
+$("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#=@issue.class.name%>");
+$(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');*/
+location.reload();
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',
        {"width":"85%",
@ -31,6 +33,7 @@ issue_desc_editor = KindEditor.create('#issue_description',
 //            "allowFileManager":true,
 //            "uploadJson":"/kindeditor/upload",
 //            "fileManagerJson":"/kindeditor/filemanager"});
+
 <%else%>
    alert('<%=  @issue.errors.full_messages[0].to_s%>')
 <%end %>
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@ -18,7 +18,7 @@
        <li class="sy_class_setting_icon">
          <ul class="sy_class_setting_text">
            <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "sy_class_option" %></li>
-            <li><%= link_to "复制班级", copy_course_course_path(@course.id),:remote=>true, :class => "sy_class_option" %></li>
+            <!--<li><%#= link_to "复制班级", copy_course_course_path(@course.id),:remote=>true, :class => "sy_class_option" %></li>-->
            <% if @course.syllabus %>
                <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
            <% end %>
@ -54,7 +54,11 @@
 </div>
 <div class="sy_class_info fl ml15">
  <div  class="sy_class_titbox">
-    <h3 class="fl sy_class_title"><%=@course.name %></h3>
+    <h3 class="fl sy_class_title">
+      <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class =>'c_dark', :target => '_blank'%>
+      &nbsp;<font class="fb">·</font>&nbsp;
+      <%=@course.name %>
+    </h3>
    <span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
    <p class="sy_cgrey fl mt3">
      <span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>
@ -84,4 +88,12 @@
      <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
  <% end %>
 </div>
-<div class="cl"></div>
+<div class="cl"></div>
+<% if is_teacher %>
+    <div class="invite_code_tip_box fontGrey2">
+      <em></em>
+      <span></span>
+      <p class="mt10 mb5">请将邀请码告诉学生和教辅</p>
+      <p class="mb10">他们可以主动加入班级</p>
+    </div>
+<% end %>
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@ -14,8 +14,11 @@
          <li class="navHomepageMenu fl">
            <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
          </li>
-          <li class="navHomepageMenu fl mr30">
-            <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
+          <!--<li class="navHomepageMenu fl mr30">-->
+            <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
+          <!--</li>-->
+          <li class="navHomepageMenu fl mr40">
+            <a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="c_white f16 db p10" > 贴吧交流</a>
          </li>
      <% end %>
    </ul>
--- a/app/views/layouts/_logined_header_show.html.erb
+++ b/app/views/layouts/_logined_header_show.html.erb
@ -38,7 +38,7 @@
        <a href ="javascript:void(0);" disabled="true"><%= image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像", :id => "nh_user_logo", :class => "portraitRadius") %></a>
        <ul class="topnav_login_list none" id="topnav_login_list">
          <li>
-            <a href ="javascript:void(0);" class="menuGrey" disabled="true">修改资料</a>
+            <%= link_to "修改资料", my_account_path(:tip => 1), :class => "menuGrey"%>
          </li>
          <li>
            <a href ="javascript:void(0);" class="menuGrey" disabled="true">我的组织</a>
@ -48,7 +48,7 @@
          </li>
          <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
          <li>
-            <%= link_to "退出",logout_url_without_domain,:class => "menuGrey",:method => "post"%>
+            <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
          </li>
        </ul>
      </li>
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@ -1,41 +1,51 @@
 <%= javascript_include_tag "feedback" %>

-<div class="scrollsidebar" id="scrollsidebar">
+<div class="scrollsidebar pr" id="scrollsidebar">
  <div class="side_content">
    <div class="side_list">
-      <div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
-      <div class="side_title">
-        <a title="<%= l(:button_hide) %>" class="close_btn">
-          <span>
-          </span>
-        </a>
+      <div style="background-color:#fff; padding:10px 0; border:1px solid #aaa; border-bottom:none;">
+        <span class="fontGrey3 f14 ml40" style="vertical-align:top;">问题和建议</span>
+        <span class="hide-side-bar side-bar-circle fr mt3 mr10" title="关闭"><span class="side-bar-content">×</span></span>
+        <span class="close_btn side-bar-circle fr mt3 mr10" title="隐藏"><span class="side-bar-content" style="left:4px;">›</span></span>
      </div>
-      <div class="side_center">
-        <div class="custom_service">
+      <div style="background-color:#fff; border-left:1px solid #aaa; border-right:1px solid #aaa;">
+        <div class="custom_service tac">
          <% get_memo %>
          <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-              <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %>
              <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-              <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="f_submit();">
+              <span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
+              <a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();">
                <%= l(:label_submit)%>
              </a>
+              <div class="cl"></div>
          <% end %>
        </div>
-        <div class="mt5" style="color: #269ac9;cursor: default">
-          <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
-            <%#= l(:label_technical_support) %>
-          <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
-           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
-           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
-          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
-        </div>
      </div>
-      <div class="side_bottom"></div>
+      <div style="background-color:#fff; border:1px solid #aaa; border-top:none; padding-top:5px;">
+        <div class="fl mt5 ml10 tac">
+          <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
+          <%#= l(:label_technical_support) %>
+          <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
+          <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
+          <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
+          <p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
+        </div>
+        <div class="fr mr10 tac">
+          <img src="/images/wechat/trustie_QR.jpg" width="80" style="display:inline-block; margin-right:-5px;" /><p class="fontGrey3" style="padding-bottom:10px;">关注官方微信</p>
+        </div>
+        <div class="cl"></div>
+      </div>
    </div>
  </div>
-  <div class="show_btn">
-    <span><%= l(:label_submit)%></span>
-    <a href="javascript:void(0)" class="closeSidebar"></a>
+  <div class="show_btn tac">
+    <div style=" border:1px solid #aaa;">
+      <div style="height:79px;">
+        <img src="/images/dialog.png" width="18" class="mt10 mb5" />
+        <span class="f14 fontBlue">提<br />问</span>
+      </div>
+      <span  class="closeSidebar f16">×</span>
+    </div>
  </div>
 </div>
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@ -138,7 +138,7 @@
          <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
      <% end %>
    <% elsif ma.class == MemoMessage %>
-      <% if ma.memo_type == "Memo" %>
+      <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
          <li><a href="<%=forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id) %>" target="_blank" title="<%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : message_content(ma.memo.content)%>"><span class="shadowbox_news_user"><%=ma.memo.author.show_name %> </span><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : message_content(ma.memo.content)%></a></li>
      <% end %>
    <% elsif ma.class == UserFeedbackMessage %>
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@ -4,8 +4,11 @@
  </div>
  <div class="fl">
    <ul>
+      <!--<li class="navHomepageMenu fl mr40">-->
+        <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
+      <!--</li>-->
      <li class="navHomepageMenu fl mr40">
-        <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
+        <a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="c_white f16 db p10" > 贴吧交流</a>
      </li>
    </ul>
  </div>
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@ -2,7 +2,19 @@
    <li>
      <span class="user_icons_class"></span>
      <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
+      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu pr" >
+        <% title = "<span class='course-name'>#{course.syllabus.title}</span>".html_safe %>
+        <%= link_to title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
+        <font class="fb c_grey" style="height:39px; line-height:39px; vertical-align:top;">·</font>
+        <% classes = "<span class='course-name'>#{course.name}</span>".html_safe %>
+        <%= link_to classes, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
+        <span class="sub-menu-title c_dark">
+          课程名称：<%= course.syllabus.title %><br />
+          班级名称：<%= course.name+'（'+current_time_and_term(course)+'）' %><br />
+          班级属性：<%= course.is_public? ? '公开' : '私有' %>
+        </span>
+      </p>
+      <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                  :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
      <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
      <% wechat_count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
@ -99,4 +111,27 @@
        $("#user_show_more_course").hide();
        $('#user_hide_course').show();
    }
+
+    $(".course_list_menu").each(function(){
+       var courseWidth = $(this).children().eq(0).children().width();
+       var classWidth = $(this).children().eq(2).children().width();
+       var newClassWidth = 182 - courseWidth;
+       var newCourseWidth = 182 - classWidth;
+        console.log(courseWidth, classWidth);
+       if(courseWidth < 91 && classWidth > 91){
+           $(this).children().eq(2).css("max-width",newClassWidth + "px");
+       }
+       if(classWidth < 91 && courseWidth > 91){
+           $(this).children().eq(0).css("max-width",newCourseWidth + "px");
+       }
+    })
+
+        $(".course-name").each(function(){
+            $(this).mouseenter(function(){
+                $(this).parent().parent().children().eq(3).show();
+            });
+            $(this).mouseleave(function(){
+                $(this).parent().parent().children().eq(3).hide();
+            });
+        })
 </script>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -1,6 +1,7 @@
 <%# course_model %>
-<%# course_file_num = visable_attachemnts_incourse(@course).count%>
-<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+<%# course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% homework_num = visable_course_homework @course %>

@ -50,7 +51,7 @@
 </div>
 <div class="cl"></div>
 <div class="">
-  <div class="sy_class_infobox" id="project_info_<%=@course.id %>">
+  <div class="sy_class_infobox pr" id="project_info_<%=@course.id %>">
    <%=render :partial => 'layouts/course_base_info' %>
  </div>

--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@ -187,7 +187,8 @@
            </div>
            <div class="fl">
              <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
-              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
+              <% user_name =  @forum.creator.show_name.empty? ? @forum.creator.name : @forum.creator.show_name %>
+              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= user_name %></a></div>
              <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
            </div>
            <div class="cl"></div>
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@ -41,9 +41,9 @@
 <div style="width:1000px; margin: 5px auto;">
  <p class="sy_cgrey">
    位置：&nbsp;&nbsp;
-    <%= link_to User.current, user_path(User.current.id), :class => 'sy_cgrey', :target => '_blank' %>
+    <%= link_to @syllabus.user.show_name, user_path(@syllabus.user), :class => 'sy_cgrey', :target => '_blank' %>
    &nbsp;&gt;&nbsp;
-    <%= link_to '课程', user_courselist_user_path(User.current.id), :class => "sy_cgrey", :target => '_blank' %>
+    <%= link_to '课程', user_courselist_user_path(@syllabus.user), :class => "sy_cgrey", :target => '_blank' %>
    &nbsp;&gt;&nbsp;
    <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_cgrey" %>
  </p>
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -163,6 +163,7 @@
        <ul class="users_accordion mb10">
          <li id="user_01" class="user_icons_course">
            <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
+            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "linkGrey2" %></font>
            <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
            <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
              <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
@ -190,6 +191,7 @@
        <ul class="users_accordion mb10">
          <li id="user_06" class="user_icons_project">
            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%>
+            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => 'linkGrey2'%></font>
            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
--- a/app/views/layouts/new_base_user_show.html.erb
+++ b/app/views/layouts/new_base_user_show.html.erb
@ -103,7 +103,7 @@
    <div class="homepageLeft mt10" id="LSide">
      <div class="user_leftinfo mb10">
        <% if User.current.logged?%>
-            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_user_tx')%></a>
+            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user), width:"74", height: "74", :id=>'nh_user_tx')%></a>
        <% else %>
            <img src="images/user/male.jpg" width="74" height="74" />
        <% end %>
@ -112,7 +112,7 @@
        <% end %>
        <div class="user_info_inner">
          <div class=" user_leftinfo_namebox" >
-            <a href="javascript:void(0);" class="user_leftinfo_name"><%=@user.show_name %></a>
+            <a href="javascript:void(0);" class="user_leftinfo_name"><%= @user.show_name %></a>
            <% if @user.user_extensions && @user.user_extensions.identity %>
                <span class="user_cirbtn_yellow" ><%= get_user_roll @user %></span>
            <% end%>
@ -123,7 +123,7 @@
                <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
              </div>
            </div>
-            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
+            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id) %>');"><%= @user.user_extensions.brief_introduction %></textarea>
          </div>
          <ul class="user_atten clear">
            <li>
@ -147,7 +147,7 @@
          </ul>
        </div>
        <div id="watch_user_btn_div">
-          <a href="javascript:void(0);" class="user_editinfo" disabled="true">编辑个人资料</a>
+          <%= link_to "编辑个人资料", my_account_path(:tip => 1), :class => "user_editinfo"%>
        </div>
      </div>

--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@ -58,7 +58,7 @@
      <div class="cl"></div>

      <div class="postDetailCreater">
-        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
+        <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
      <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
      <div class="cl"></div>
      <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
@ -90,7 +90,7 @@
      </div>
      <div class="homepagePostReplyDes">
        <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content%></div>
+        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%=  reply.content.gsub(/script/, "script&nbsp").html_safe %></div>
      </div>
      <script type="text/javascript">
          $(function(){
@ -100,6 +100,8 @@
                  postContent= postContent.replace(/ {2}/g,"&nbsp; ");
                  postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
                  postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                  postContent = postContent.gsub(/<script>*/, "<script>");
+                  postContent = postContent.gsub(/<html>*/, "<html>");
                  $(this).html(postContent);
              });
              autoUrl('activity_description_<%= reply.id %>');
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@ -70,15 +70,15 @@
            </select>
            <span nhname="tag" nh_tag_1="true" style='display:none;'>
              <% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %>
-                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style=>"width:127px;" %>
+                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style => "width:127px;" %>
              <% else %>
-                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
+                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID), :style => "60px" %></span>
              <% end %>
            </span>
            <span id="identity_hint" style="display: none"></span>
          </li>

-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname, @user.lastname+@user.firstname, :no_label => true, :required => true, :nh_required => "1",:class => "w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>

          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
            <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
@ -90,6 +90,7 @@
          </li>

          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
+            <!-- 基本资料页面单位审核显示 -->
            <% if User.current.user_extensions.nil? %>
                <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
@ -98,13 +99,14 @@
                  <span id="hint" style="color: #7f7f7f;display: none"><a id="school_num" href="javascript:void(0)" style="color: red" ></a><a id="search_condition" href="javascript:void(0)"></a></span>
                </p>
                <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <!-- 从业者选择单位名称 -->
            <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
                <% if User.current.user_extensions.school_id.nil? %>
                    <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
                <% else %>
                    <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text"value="<%= User.current.user_extensions.school %>" >
-                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.school.id %>" /> <!-- 单位名称的test框选中下拉列表框的id -->
                <% end %>
                <p class="fl ml10">
                  <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
@ -605,12 +607,15 @@
    });
  });

+// 基本资料页面提交表单时，判断身份与单位是否合法
 function my_account_form_submit(){
    if($("#userIdentity").val() == -1 ) {
        $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
-        e.stopImmediatePropagation();
+        e.stopImmediatePropagation(); // 阻止事件冒泡
        return;
    }
+
+    // 单位或高校必须从下拉列表中选择
    if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
        $("#hint").html('<span style="color:red">单位名称必须是从下拉列表中选择的,不能手动修改</span>').show();
        e.stopImmediatePropagation();
--- a/app/views/my/clear_user_avatar_temp.js.erb
+++ b/app/views/my/clear_user_avatar_temp.js.erb
@ -2,7 +2,7 @@
    $('#ajax-modal').html($("#nh_tx_dialog_html").html());
    showModal('ajax-modal','460px');
    $('#ajax-modal').siblings().hide();
-    $('#ajax-modal').parent().removeClass("alert_praise");
-    //$('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().removeClass("alert_praise").removeClass("copyCoursePopup");
+    $('#ajax-modal').parent().css("top","30%").css("left","40%");
    $('#ajax-modal').parent().addClass("alert_box");
    $('#ajax-modal').parent().css("border", "3px solid #269ac9").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");
--- a/app/views/org_member/create.js.erb
+++ b/app/views/org_member/create.js.erb
@ -1,8 +1,9 @@
 <% if @fail_hint %>
    alert("<%= @fail_hint %>");
 <% else %>
-    $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+    // 组织添加成员后，同步刷新成员列表，左侧成员数
+    $("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals => {:members => @members}) %>');
    $("#principals_for_new_member").html('');
-    $("#org_members_count_id").html("<%= @org.org_members.count %>");
+    $("#org_members_count_id").html("<%= @organization.org_members.count %>");
    $("#not_org_member_search").val("");
 <% end %>
--- a/app/views/org_member/deleteOrgMember.js.erb
+++ b/app/views/org_member/deleteOrgMember.js.erb
@ -1,3 +1,4 @@
+// 删除成员后，同步刷新成员列表与左侧成员显示数
 $("#org_members_count_id").html("");
-$("#org_members_count_id").html("<%= @org.org_members.count %>")
-$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+$("#org_members_count_id").html("<%= @organization.org_members.count %>");
+$("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals=> {:members => @members}) %>');
--- a/app/views/org_member/destroy.js.erb
+++ b/app/views/org_member/destroy.js.erb
@ -1,3 +1,4 @@
+// 组织成员删除后，同步刷新成员数和成员列表
 $("#org_members_count_id").html("");
-$("#org_members_count_id").html("<%= @org.org_members.count %>")
-$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+$("#org_members_count_id").html("<%= @organization.org_members.count %>");
+$("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals => {:members => @members}) %>');
--- a/app/views/org_member/org_member_autocomplete.js.erb
+++ b/app/views/org_member/org_member_autocomplete.js.erb
@ -1,23 +1,23 @@
-<% if @org%>
+<% if @org %>
    var checked = $("#principals_for_new_member input:checked").size();
    if(checked > 0)
    {
        alert('翻页或搜索后将丢失当前选择的用户数据!');
    }
-    <% if @flag == "true"%>
+    <%# if @flag == "true"%>
+//    $('#principals_for_new_member').html('<%#= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
+    <%# else%>
    $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-    <% else%>
-    $('#principals_for_new_member').html('<%= escape_javascript(find_user_not_in_current_org_by_name(@org)) %>');
-    <% end%>
+    <%# end%>

-<%end%>
-var collection=$("#principals_for_new_member").children("#principals").children("label");
-collection.css("text-overflow","ellipsis");
-collection.css("white-space","nowrap");
-collection.css("width","200px");
-collection.css("overflow","hidden");
-for(i=0;i<collection.length;i++){    //增加悬浮显示
-    var label=collection[i];
-    var text=$(label).text();
-    $(label).attr("title",text);
+<% end %>
+var collection = $("#principals_for_new_member").children("#principals").children("label");
+    collection.css("text-overflow", "ellipsis");
+    collection.css("white-space", "nowrap");
+    collection.css("width", "200px");
+    collection.css("overflow", "hidden");
+for(i = 0; i < collection.length; i++){    //增加悬浮显示
+    var label = collection[i];
+    var text = $(label).text();
+    $(label).attr("title", text);
 }
--- a/app/views/org_member/org_member_paging.js.erb
+++ b/app/views/org_member/org_member_paging.js.erb
@ -0,0 +1,4 @@
+<% if @organization %>
+    // 局部更新组织页面子模块 id = org_member_list
+    $('#org_member_list').html("<%= escape_javascript(render :partial => 'organizations/org_member_list', :locals => {:members => @members}) %>");
+<% end %>
--- a/app/views/org_member/update.js.erb
+++ b/app/views/org_member/update.js.erb
@ -1 +1,2 @@
-$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+// 编辑成员列表角色后，刷新成员列表
+$("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list",:locals => {:members => @members}) %>');
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@ -103,22 +103,20 @@
                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                    <% end %>
                <% else %>
-                    <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <!-- link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" -->
+                    <a href = "javascript:void(0);" class = "homepageMenuText" onclick = "$('#PostDomain_<%= field.id %>').slideToggle();"><%= field.name %></a>
                <% end %>
                <% if User.current.logged? and User.current.admin_of_org?(organization) %>
                    <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                <% end %>
              </div>
-              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:none;">
+              <div class="homepageLeftMenuCourses" id="PostDomain_<%= field.id %>" style="display:<%= field.sub_domains.count == 0 ? 'none' : '' %>">
+
                <ul>
-                  <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
+                  <%= render :partial => 'organizations/org_subdomain',:locals => {:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
                </ul>
              </div>
-              <% unless (field.sub_domains.count == 0 || !if_hidden_subdomain(field)) %>
-                  <li class="homepageLeftMenuMore" id="sub_domain_jiantou_<%= field %>">
-                    <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#PostDomain_<%= field.id %>').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
-                  </li>
-              <% end %>
+
          <% elsif field.field_type == "Comptec" %>
              <div class="homepageLeftMenuBlock">
                <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id, :type => "#{User.current.admin? ? "" : "famous"}"), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@ -22,10 +22,10 @@
            <% end %>
            <%= hidden_field_tag 'membership[role_ids][]', '' %>
            <div class="pt5">
-              <a href="javascript:void(0)" class="org_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
+              <a href="javascript:void(0)" class="org_member_btn" onclick = "$('#org-member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                <%= l(:button_change)%>
              </a>
-              <a href="javascript:void(0)" class="org_member_btn" onclick="$('#org-member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(18)">
+              <a href="javascript:void(0)" class="org_member_btn" onclick = "$('#org-member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(18)">
                <%= l(:button_cancel)%>
              </a>
            </div>
@ -34,8 +34,15 @@
        <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
        <a href="javascript:void(0);" style="color: #0781B4;margin-left: 10px;float: left"  onclick="$(this).parent().height();$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
          <a href="javascript:void(0)" style = "color: #0781B4;margin-left: 10px;float: left" onclick = "ifDeleteOrgMember('<%= member.id %>','<%= username %>')" >删除</a>
-          <%#= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
+          <%#= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %>
+        <% end %>
      <div class="cl"></div>
    </ul>
    <div class="cl"></div>
-<% end %>
+<% end %>
+<ul class="wlist">
+  <!-- 组织配置页面，成员子页面单独分页 -->
+ <%= pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){ |text, parameters, options|
+        link_to text, org_member_paging_org_member_index_path( parameters.merge(:flag => true, :org => @organization.id, :format => 'js')), :remote => true
+ } %>
+</ul>
--- a/app/views/organizations/_org_members.html.erb
+++ b/app/views/organizations/_org_members.html.erb
@ -24,7 +24,7 @@
        <% end%>

        <ul class="wlist">
-          <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true %>
        </ul>
        <div class="cl"></div>
      </div>
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@ -4,7 +4,7 @@
      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
    </div>
-    <div class="homepagePostDes">
+    <div class="homepagePostDes" >
      <div class="homepagePostTo break_word">
        <% if activity.try(:author).try(:realname) == ' ' %>
            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
--- a/app/views/organizations/check_uniq.js.erb
+++ b/app/views/organizations/check_uniq.js.erb
@ -1,7 +1,7 @@
 <% if !@org_name.blank? %>
    <%if @check == false %>
-        $checkName = false
-         <% if @config_page%>
+        $checkName = false;
+         <% if @config_page %>
             $("#check_name_hint").html('<span class="c_red">名字不能重复<span>').show();
        <% else%>
            $("#organization_name_notice").html('<span class="c_red">名字不能重复<span>').show();
@ -10,7 +10,7 @@

    <% else %>
        $checkName = true;
-        <% if @config_page%>
+        <% if @config_page %>
            $("#check_name_hint").html('<span class="c_green">名字可以使用</span>').show();
        <% else%>

--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@ -1,12 +1,14 @@
 <script>
    function g(o){return document.getElementById(o);}
    function HoverLi(n){
-//如果有N个标签,就将i<=N;
+    //如果有N个标签,就将i<=N;
        for(var i=1;i<=3;i++){
            g('orgSetting_'+i).className='orgSettingOp';
-            g('orgContent_'+i).className='undis';}
+            g('orgContent_'+i).className='undis';
+        }
            g('orgContent_'+n).className='dis ml15 mr15';
-          g('orgSetting_'+n).className='orgSettingOp orgOpActive';}
+            g('orgSetting_'+n).className='orgSettingOp orgOpActive';
+    }
    //如果要做成点击后再转到请将<li>中的onmouseover 改成 onclick;
    //]]>
    $checkName = true;
@ -16,7 +18,7 @@
            return false ;
        }
        $.get(
-                '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()+"&config_page=Y" + "&org_id="+id
+                '<%= check_uniq_organizations_path %>'+'?org_name='+$("#organization_name").val().trim()+"&config_page=Y" + "&org_id="+id
        )
    }
        function update_org(id, old_value, input_value){
@ -94,7 +96,7 @@
            <!--<input id="allow_set_excellent_teachers" type="checkbox" style="margin-top:5px;" name="organization[allow_teacher]" <%#= @organization.allow_teacher==1 ? 'checked': ''%> class="ml3" />-->
            <!--</div>-->
            <!--<%# end %>-->
-            <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
+            <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick = "update_org('<%=@organization.id %>', '<%= @organization.name %>', $('#organization_name'));">保存</a>
        <% end %>
      </div>
      <div class="undis ml15 mr15" id="orgContent_2">
@ -105,16 +107,16 @@
            <div class="cl"></div>
          </ul>
          <div id="org_member_list">
-          <%= render :partial=>"org_member_list",:locals=> {:members=>@organization.org_members} %>
+          <%= render :partial => "org_member_list", :locals => {:members => @members} %>
          </div>
        </div>
        <div class="fl ml10 orgMemContainer">
          <div class="orgMemberAdd">
            <p class="fontBlue fb mb5">添加成员</p>
-            <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
+            <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id => 'org_member_add_form', :remote => true do |f|%>
                <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                <%# if @organization.secdomain_name.nil? %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org => @organization.id}.to_query }')" %>
                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %>
                <%# else %>
                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
@ -143,7 +145,7 @@
      <div class="undis ml15 mr15" id="orgContent_3">
 <!--新增二级栏目-->
      <div>
-        <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %>
+        <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id => 'add_subfield_form',:remote => true do %>
            <span class="fontGrey3 fb mb5 mr10" >新增一级栏目</span>
            <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
            <div class="mb10">
@ -178,6 +180,7 @@
          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => subfield_to_addmin?(@organization)} %>
        </div>
    </div>
+
 </div>
 <script>
  function add_org_subfield(){
@ -245,4 +248,5 @@
          $this.bind('blur', reset);
      });
  }
-</script>
+</script>
+
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@ -41,9 +41,10 @@
 </div>
 <% end %>

-<% if allow_pull_request(@project) %>
+<% if allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0 %>
    <div class="subNav">
      <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+      <%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
      <% if User.current.member_of?(@project) %>
        <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
      <% end %>
--- a/app/views/projects/_project_create.html.erb
+++ b/app/views/projects/_project_create.html.erb
@ -7,7 +7,7 @@
      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
    </div>
    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word">
+      <div class="homepagePostTo break_word" style="width:620px">
        <% if user.try(:realname) == ' ' %>
            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
        <% else %>
--- a/app/views/projects/_project_member_list.html.erb
+++ b/app/views/projects/_project_member_list.html.erb
@ -24,4 +24,7 @@
    </ul>
    <div class="cl"></div>
  </div>
-</div>
+</div>
+
+
+
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@ -5,7 +5,7 @@
      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
    </div>
    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word">
+      <div class="homepagePostTo break_word" style="width:620px">
        <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
         TO
        <%= link_to activity.project.name.to_s+" | 项目新闻", project_news_index_path(activity.project), :class => "newsBlue ml15" %>
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@ -1,3 +1,8 @@
+<li>
+  <% if allow_pull_request(@project) > 0 && allow_show_pull_request(@project) == 0 %>
+    <%= link_to "Pull Requests", project_pull_requests_path(@project) %>
+  <% end %>
+</li>
 <li>
  <% unless @project.enabled_modules.where("name = 'news'").empty? %>
    <%= link_to l(:project_module_news), project_news_index_path(@project) %>
--- a/app/views/projects/_tracker_project.html.erb
+++ b/app/views/projects/_tracker_project.html.erb
@ -0,0 +1,6 @@
+<div class="project-block">
+  <div class="wiki-description">
+    <p><%= textilizable(project.short_description.strip, :project => project) %></p>
+  </div>
+</div>
+
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@ -1,5 +1,5 @@
 <div class="project_r_h">
-  <h2 class="project_h2 fl"><%= @subPage_title%></h2>
+  <h2 class="project_h2 fl"><%= @subPage_title %></h2>
  <% if is_project_manager?(User.current, @project) %>
    <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
      <%=link_to "成员管理", :controller => 'projects', :action => 'settings', :id => @project.id, :tab => 'members' %>
--- a/app/views/student_work/_evaluation_un_group.html.erb
+++ b/app/views/student_work/_evaluation_un_group.html.erb
@ -0,0 +1,26 @@
+<div class="syllabus_courses_box">
+  <% @stundet_works.each_with_index do |student_work, i| %>
+      <div class="syllabus_courses_list" id="student_work_<%= student_work.id%>" style="cursor: default;">
+        <%= render :partial => 'evaluation_un_group_work', :locals => {:student_work => student_work} %>
+      </div>
+      <div id="about_hwork_<%= student_work.id %>"></div>
+
+      <div id="group_member_work_<%= student_work.id%>" class="undis">
+        <%= render :partial => 'group_member_work', :locals => {:student_work => student_work} %>
+      </div>
+  <% end %>
+</div>
+<div class="cl"></div>
+
+<script>
+  $(".icons_sy_close").live('click',function(){
+      $(this).parent().parent().next().next().show();
+      $(this).removeClass("icons_sy_close");
+      $(this).addClass("icons_sy_open");
+  });
+  $(".icons_sy_open").live('click',function(){
+      $(this).parent().parent().next().next().hide();
+      $(this).addClass("icons_sy_close");
+      $(this).removeClass("icons_sy_open");
+  });
+</script>
--- a/app/views/student_work/_evaluation_un_group_member_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb
@ -0,0 +1,82 @@
+<ul id="syllabus_course_ul">
+  <li class="syllabus_class_list" style="line-height:44px; vertical-align:middle;">
+    <div class="syllabus_class_w fontGrey3">
+      <%= 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? %>
+          <span class="fl student_work_<%= st.id%>" style="width:135px;">
+            <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
+            <span class="fl">(组长)</span>
+          </span>
+          <span class="fl mr15 hidden student_work_<%= st.id%>" style="width:90px;">
+            <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
+          </span>
+      <% else %>
+          <span class="fl student_work_<%= st.id%>" style="width:135px; cursor: pointer;" onclick="show_student_work('<%= student_work_path(st)%>');">
+            <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
+          </span>
+          <span class="fl student_work_<%= st.id%> mr15 hidden" style="width:90px; cursor: pointer;" onclick="show_student_work('<%= student_work_path(st)%>');">
+            <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
+          </span>
+      <% end %>
+      <div class="flex-container fl" style="width:365px;">
+        <div class="flex-cell"><span class="<%= score_color st.teacher_score%> ml35"><%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%></span></div>
+        <div class="flex-cell"><span class="<%= score_color st.teaching_asistant_score%> ml35"><%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%></span></div>
+        <% if @homework.anonymous_comment == 0 %>
+            <div class="flex-cell">
+              <div class="<%= score_color st.student_score%> student_score_info ml35 pr">
+                <% if st.student_score.nil? %>
+                    <span title="该作品未被匿评">未参与</span>
+                <% else %>
+                    <%= format("%.1f", st.student_score) %>
+                <% end %>
+                <% unless st.student_score.nil? %>
+                        <span class="linkBlue">
+                            (<%= anon_count %>)
+                        </span>
+                    <div class="g_infoNi none">
+                      现共有
+                      <span class="c_red">&nbsp;<%= anon_count %>&nbsp;</span>
+                      名学生进行了匿评，平均分为
+                      <span class="c_red">&nbsp;<%= format("%.1f", st.student_score) %>&nbsp;</span>分。
+                    </div>
+                <% end %>
+              </div>
+            </div>
+        <% end %>
+        <div class="flex-cell">
+          <% score = st.work_score %>
+          <div class="<%= score_color score%> student_final_scor_info ml35 pr" style="display: inline">
+            <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+            <% unless score.nil?%>
+                <div class="g_infoNi none width180">
+                  作品最终评分为
+                  <span class="c_red">&nbsp;<%= st.final_score%>&nbsp;</span>分。
+                  迟交扣分
+                      <span class="c_red">&nbsp;
+                        <%= st.homework_common && st.homework_common.teacher_priority == 1 && st.teacher_score ? 0 : st.late_penalty %>
+                        &nbsp;</span>分，
+                  缺评扣分
+                      <span class="c_red">&nbsp;
+                        <%= st.homework_common && st.homework_common.teacher_priority == 1 && st.teacher_score ? 0 : st.absence_penalty%>
+                        &nbsp;</span>分，
+                  最终成绩为
+                  <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
+                </div>
+            <% end%>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="hworkTip" style="display: none; left:700px; top:20px; white-space:nowrap; right:auto;" id="work_click_<%= st.id%>"><em></em><span></span><font class="fontGrey2"><%= !st.student_work_projects.empty? ? '大作品评分即组长的评分' : '点击查看详情' %></font></div>
+  </li>
+</ul>
+
+<script type="text/javascript">
+    $(".student_work_<%= st.id%>").mouseenter(function(){
+        if($("#about_hwork_<%= st.id%>").html().trim() == "") {
+            $("#work_click_<%= st.id%>").show();
+        }
+    }).mouseleave(function(){
+        $("#work_click_<%= st.id%>").hide();
+    }).mouse;
+</script>
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@ -1,89 +1,73 @@
-<tr class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <td class="none"><a name="<%= student_work.id%>"></a></td>
-  <td class="hworkList40 pl5 pr5" id="work_num_<%=student_work.id %>"><%=index + 1 %></td>
-  <td class="hworkPortrait pr10 float-none">
-    <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %>
-  </td>
-  <% if @homework.homework_detail_group.base_on_project == 1 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width130" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-        <div>
-          <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-        </div>
-      </td>
-      <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-          <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
-            <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
-          </td>
-      <% else %>
-          <td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="该项目是私有的">
-            <%= student_work.project.name %>
-          </td>
-      <% end %>
-  <% elsif @homework.homework_detail_group.base_on_project == 0 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width280' : 'width210' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
-        <div>
-          <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
-        </div>
-      </td>
-  <% end %>
-  <td class="hworkList130 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
-    <% if student_work.created_at && @homework.end_time%>
-        <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
-            <span class="c_red">[迟交]</span>
-        <% end %>
-    <% end %>
-  </td>
-  <td class="hworkList70 <%= score_color student_work.teacher_score%>">
-    <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
-  </td>
-  <td class="hworkList70 <%= score_color student_work.teaching_asistant_score%>">
-    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
-  </td>
-  <% if @homework.anonymous_comment == 0%>
-      <td class="hworkList70 <%= score_color student_work.student_score%> student_score_info">
-        <% if student_work.student_score.nil? %>
-            <span title="该作品未被匿评">未参与</span>
-        <% else %>
-            <%=format("%.1f",student_work.student_score) %>
-        <% end %>
-        <% unless student_work.student_score.nil?%>
-        <span class="linkBlue">
-          (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
+<div class="sy_courses_open f14 fontGrey3">
+  <span class="icons_sy_close fl mr5" title="点击展开/收起详情" style="cursor: pointer;"></span>
+        <span class="fl" style="width:280px;">
+        <span class="hidden fl" style="max-width:240px;"><%=student_work.name %></span>
+        <span class="fontGrey2 ml5 fl">
+          <% if student_work.work_status%>
+            <%=get_status student_work.work_status %>
+            <% end %>
        </span>
-            <div class="infoNi none">
-              现共有
-              <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>&nbsp;</span>
-              名学生进行了匿评，平均分为
-              <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
+        </span>
+  <% if @homework.homework_detail_group.base_on_project == 1 %>
+      <span class="ml15 fl">关联项目：</span>
+      <% 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 => "项目名称"%>
+      <% else %>
+          <span class="fontBlue fl hidden" style="width:200px;" title="该项目是私有的"><%= student_work.project.name %></span>
+      <% end %>
+  <% end %>
+  <a href="javascript:void(0)" onclick="show_student_work('<%= student_work_path(student_work)%>');" class="link-blue fr">评分</a>
+  <div class="cl"></div>
+</div>
+<div class="fl sy_p_grey">
+  <span class="fl" style="width:296px;">提交时间：<%=format_date(student_work.commit_time) %></span>
+  <div class="flex-container fl" style="width:368px;">
+    <div class="flex-cell">教师：<span class="<%= score_color student_work.teacher_score%>"><%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%></span></div>
+    <div class="flex-cell">助教：<span class="<%= score_color student_work.teaching_asistant_score%>"><%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%></span></div>
+    <% if @homework.anonymous_comment == 0 %>
+        <div class="flex-cell">匿评：
+          <div class="<%= score_color student_work.student_score%> student_score_info pr" style="display: inline">
+            <% if student_work.student_score.nil? %>
+                <span title="该作品未被匿评">未参与</span>
+            <% else %>
+                <%= format("%.1f", student_work.student_score) %>
+            <% end %>
+            <% unless student_work.student_score.nil? %>
+                    <span class="linkBlue">
+                        (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>)
+                    </span>
+                <div class="g_infoNi none">
+                  现共有
+                  <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>&nbsp;</span>
+                  名学生进行了匿评，平均分为
+                  <span class="c_red">&nbsp;<%= format("%.1f", student_work.student_score) %>&nbsp;</span>分。
+                </div>
+            <% end %>
+          </div>
+        </div>
+    <% end %>
+    <div class="flex-cell">成绩：
+      <% score = student_work.work_score %>
+      <div class="<%= score_color score%> student_final_scor_info pr" style="display: inline">
+        <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
+        <% unless score.nil?%>
+            <div class="g_infoNi none width180">
+              作品最终评分为
+              <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+              迟交扣分
+                      <span class="c_red">&nbsp;
+                        <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+                        &nbsp;</span>分，
+              缺评扣分
+                      <span class="c_red">&nbsp;
+                        <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
+                        &nbsp;</span>分，
+              最终成绩为
+              <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
            </div>
        <% end%>
-      </td>
-  <% end %>
-  <!-- 成绩 -->
-  <% if student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score %>
-      <% score = student_work.respond_to?("score") ? student_work.score : student_work.teacher_score %>
-  <% else %>
-      <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
-  <% end %>
-  <td class="hworkList70 <%= score_color score%> student_final_scor_info">
-    <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
-    <% unless score.nil?%>
-        <div class="infoNi none width180">
-          作品最终评分为
-          <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
-          迟交扣分
-          <span class="c_red">&nbsp;
-            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
-            &nbsp;</span>分，
-          缺评扣分
-          <span class="c_red">&nbsp;
-            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
-            &nbsp;</span>分，
-          最终成绩为
-          <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
-        </div>
-    <% end%>
-  </td>
-  <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
-</tr>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="cl"></div>
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@ -26,7 +26,11 @@
              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word"%>
            </div>
          </td>
-          <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+          <% if student_work.project_id == 0 || student_work.project_id.nil?%>
+              <td class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="该项目是私有的">
+                --
+              </td>
+          <% elsif student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
              <td  class="<%=@homework.anonymous_comment == 1 ? 'hworkPrName2' : 'hworkPrName'%> student_work_<%= student_work.id%>" title="项目名称">
                <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
              </td>
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -26,7 +26,11 @@
              <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "linkGrey f14 StudentName break_word"%>
            </div>
          </td>
-            <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+            <% if student_work.project_id == 0 || student_work.project_id.nil?%>
+              <td  class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="项目名称">
+                --
+              </td>
+            <% elsif student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
              <td  class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="项目名称">
                <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
              </td>
--- a/app/views/student_work/_group_member_work.html.erb
+++ b/app/views/student_work/_group_member_work.html.erb
@ -0,0 +1,11 @@
+<% user_ids = student_work.student_work_projects.empty? ? "(-1)" : "(" + student_work.student_work_projects.map{|st| st.user_id}.join(",") + ")" %>
+<% 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| %>
+    <div class="syllabus_class_box" id="student_work_<%= st.id%>">
+      <%= render :partial => 'evaluation_un_group_member_work', :locals => {:st => st, :anon_count => anon_count} %>
+    </div>
+    <% if j != 0 %>
+        <div id="about_hwork_<%= st.id %>"></div>
+    <% end %>
+<% end %>
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@ -14,7 +14,7 @@
        </div>
        <div class="cl"></div>
    <% end %>
-    <% if work.user == User.current %>
+    <% if work.user == User.current && !User.current.allowed_to?(:as_teacher, @homework.course) %>
        <div class="resubAtt mb15">
          <span class="resubTitle">追加修订附件</span>
        </div>
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@ -7,6 +7,8 @@
        <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
        <% is_my_work = pro && pro.student_work_id == work.id%>
    <% end %>
+    <% is_member_work = @homework.homework_type == 3 && work.student_work_projects.empty? %>
+    <% if !is_member_work %>
    <ul>
      <li class="fl" >
        <span class="tit_fb">上交时间：</span>
@ -31,8 +33,7 @@
      <div class="cl"></div>

      <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
-
-      <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
+        <% if @homework.homework_type == 3 && work.student_work_projects && (@homework.homework_detail_manual.comment_status != 2 || is_my_work || is_teacher ) %>
          <div class="cl"></div>
          <li>
            <span class="tit_fb"> 参与人员：</span>
@ -46,51 +47,67 @@
          <% if @homework.homework_detail_group.base_on_project == 1 %>
              <li>
                <span class="tit_fb"> 关联项目：</span>
-                <% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
+                <% if work.project_id == 0 || work.project_id.nil? %>
+                    <span>暂无</span>
+                <% elsif work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
                    <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+                    <span class="ml5">(综合评分：<font class="c_red"><%=static_project_score(work.project.project_score).to_i %></font>)</span>
                <% else %>
                    <span title ="该项目是私有的"><%=work.project.name %></span>
+                    <span class="ml5">(综合评分：<font class="c_red"><%=static_project_score(work.project.project_score).to_i %></font>)</span>
                <% end %>
                <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
-                <span class="ml5">(综合评分：<font class="c_red"><%=static_project_score(work.project.project_score).to_i %></font>)</span>
              </li>
          <% end %>
-      <% end%>
+        <% end%>

-      <li >
-        <span class="tit_fb ">内容：</span>
-        <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
-          <%= work.description.html_safe if work.description%>
-        </div>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <span class="tit_fb"> 附件：</span>
-        <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
-        <% if com_attachments.empty?%>
+        <li>
+          <span class="tit_fb ">内容：</span>
+          <div class="showHworkP break_word upload_img" id="student_work_img_<%=work.id %>">
+            <%= work.description.html_safe if work.description%>
+          </div>
+          <div class="cl"></div>
+        </li>
+        <li>
+          <span class="tit_fb"> 附件：</span>
+          <% com_attachments = work.attachments.where("attachtype IS NULL OR attachtype <> 7") %>
+          <% if com_attachments.empty?%>
            <span style="color: #999999">尚未提交附件</span>
-        <% else%>
+          <% else%>
            <div class="fl" style="width: 90%;">
              <%= render :partial => 'work_attachments_status', :locals => {:attachments => com_attachments, :status => @homework.homework_detail_manual.comment_status} %>
            </div>
-        <% end%>
-        <div class="cl"></div>
-      </li>
-      <li >
-        <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
+          <% end%>
+          <div class="cl"></div>
+        </li>
+        <li >
+          <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && !is_my_work)%>
            <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
            <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
              <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
            </div>
-        <% end%>
-        <div class="cl"></div>
-      </li>
+          <% end%>
+          <div class="cl"></div>
+        </li>
    </ul>

    <div id="revise_attachment">
      <%= render :partial => 'student_work/revise_attachment', :locals => {:work => work} %>
    </div>
    <div class="cl"></div>
+    <% else %>
+      <ul>
+        <li >
+          <% if @is_teacher %>
+              <!-- 老师 -->
+              <div id="add_student_score_<%= work.id%>" class="mt10 evaluation">
+                <%= render :partial => 'add_score',:locals => {:work => work,:score => score}%>
+              </div>
+          <% end%>
+          <div class="cl"></div>
+        </li>
+      </ul>
+    <% end %>

    <div class="ping_box fl" id="score_list_<%= work.id%>" style="<%= work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
      <%student_work_scores.each do |student_score|%>
@ -98,6 +115,9 @@
            <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
          </div>
      <% end%>
+      <% if is_member_work && student_work_scores.empty? && !@is_teacher %>
+        <p class="c_red" style="text-align: center">暂无评分</p>
+      <% end %>
    </div>
    <div class="cl"></div>
    <!---ping_box end--->
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@ -36,11 +36,19 @@
 <div class="cl"></div>

 <div class="fl">
-  <% if @is_evaluation && !@stundet_works.empty?%>
-      <%= render :partial => "evaluation_title"%>
-  <% else%>
-      <%= render :partial => "evaluation_un_title"%>
-  <% end%>
+  <% if @homework.homework_type != 3%>
+      <% if @is_evaluation && !@stundet_works.empty? %>
+          <%= render :partial => "evaluation_title"%>
+      <% else%>
+          <%= render :partial => "evaluation_un_title"%>
+      <% end%>
+  <% else %>
+      <% if !@is_teacher && @is_evaluation && !@stundet_works.empty? %>
+          <%= render :partial => "evaluation_title"%>
+      <% else %>
+          <%= render :partial => "evaluation_un_group"%>
+      <% end%>
+  <% end %>
 </div>
 <div class="cl"></div>

@ -50,7 +58,7 @@
      {
          $("#homework_info_show").show();
      }
-      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
+      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id || (@is_evaluation && @is_focus == 1) %>
          <% if @message_student_work_id %>
            <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>
          <% else %>
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@ -11,8 +11,18 @@ var num = $("#work_num_<%= @work.id%>").html();
 $("#score_list_<%= @work.id%>").removeAttr("style");

 <% if @is_teacher %>
-    $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
-    $("#work_num_<%= @work.id%>").html(num);
+    <% if @homework.homework_type == 3 %>
+        <% if @is_group_leader %>
+            $("#student_work_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'evaluation_un_group_work', :locals => {:student_work => @work}) %>");
+            $("#group_member_work_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'group_member_work', :locals => {:student_work => @work}) %>");
+        <% else %>
+            <% anon_count = @work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %>
+            $("#student_work_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'evaluation_un_group_member_work', :locals => {:st => @work, :anon_count => anon_count}) %>");
+        <% end %>
+    <% else %>
+        $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_work',:locals => {:student_work => @work, :index => 1}) %>");
+        $("#work_num_<%= @work.id%>").html(num);
+    <% end %>
 <% else %>
    $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
    $("#work_num_<%= @work.id%>").html(num);
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@ -2,6 +2,7 @@
    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
    <%= javascript_include_tag 'homework','baiduTemplate' %>
 <% end %>
+<div class="homepageRight mt0 ml10">
 <div class="homepageRightBanner mb10">
  <div class="NewsBannerName">编辑作品</div>
 </div>
@ -83,6 +84,7 @@
    <% end%>
  </div><!----HomeWorkCon end-->
 </div>
+</div>
 <script type="text/javascript">
    <% if @homework.homework_detail_group %>
    $(function(){
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@ -197,7 +197,8 @@
  });
 </script>

-<div class="homepageRightBanner mb10">
+<div class="homepageRight mt0 ml10">
+<div class="homepageRightBanner mb10 ml10">
  <div class="NewsBannerName">提交作品</div>
 </div>
 <div class="cl"></div>
@ -297,4 +298,5 @@
        <div class="cl"></div>
    <% end%>
  </div><!----HomeWorkCon end-->
-</div>
+</div>
+</div>
--- a/app/views/syllabuses/_syllabus_course_list.html.erb
+++ b/app/views/syllabuses/_syllabus_course_list.html.erb
@ -18,11 +18,19 @@
      <% @courses.each do |course| %>
          <ul class="sy_classlist">
            <div class="fl">
-              <% if !course.is_public && !User.current.member_of_course?(course) %>
-                  <h3 class="sy_classlist_title fl"><%=course.name %>（<%=current_time_and_term_short(course) %>）</h3>
+              <% if course.is_public == 0 && !User.current.member_of_course?(course) && !User.current.admin? %>
+                  <h3 class="sy_classlist_title fl">
+                    <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :style => 'color:#000', :target => '_blank' %>
+                    &nbsp;<font class="fb">·</font>&nbsp;
+                    <%=course.name %>（<%=current_time_and_term_short(course) %>）
+                  </h3>
              <% else %>
-                  <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "sy_classlist_title fl",
+                <h3 class="sy_classlist_title fl">
+                  <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :style => 'color:#000', :target => '_blank' %>
+                  &nbsp;<font class="fb">·</font>&nbsp;
+                  <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                              :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                </h3>
              <% end %>
              <span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
              <div class="cl"></div>
--- a/app/views/syllabuses/new.html.erb
+++ b/app/views/syllabuses/new.html.erb
@ -1,27 +1,29 @@
-<div class="project_r_h02">
-  <h2 class="project_h2">新建课程</h2>
-</div>
-<div class="hwork_new">
-  <ul>
-    <%= labelled_form_for @syllabus do |f| %>
-        <li class="ml45">
-          <label><span class="c_red">*</span>&nbsp;课程名称&nbsp;&nbsp;：</label>
-          <input  type="text" name="title" id="new_syllabus_name" class="name_input" placeholder="例如：软件工程" maxlength="100" onkeyup="regex_syllabus_name();">
-          <span class="c_red" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
-        </li>
-        <div class="cl"></div>
-        <li class="ml45">
-          <label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Software Engineering" class="name_input" maxlength="100">
-          <!--<span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>-->
-        </li>
-        <div class="cl"></div>
-        <li class=" ml90" >
-          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_syllabus();" >提交</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
-          <div class="cl"></div>
-        </li>
-    <% end%>
-  </ul>
-</div><!--talknew end-->
+<div class="project_r_h02">
+  <h2 class="project_h2">新建课程</h2>
+</div>
+<div class="hwork_new">
+  <ul>
+    <%= labelled_form_for @syllabus do |f| %>
+        <li class="ml45">
+          <label><span class="c_red">*</span>&nbsp;课程名称&nbsp;&nbsp;：</label>
+          <input  type="text" name="title" id="new_syllabus_name" class="name_input" placeholder="例如：软件工程" maxlength="100" onkeyup="regex_syllabus_name();">
+          <span class="c_red" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
+        </li>
+        <div class="cl"></div>
+        <li class="ml125 fontGrey3"><span class="success-icon mr25">正确示例：软件工程</span><span class="error-icon">错误示例：2016软件工程</span></li>
+        <li class="ml125 mt10 mb10 fontGrey2">课程是针对一个具体的学科方向开展的教学内容与进程安排。<br/>本质上，一门课程就是一个教学计划。</li>
+        <li class="ml45">
+          <label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
+          <input  type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Software Engineering" class="name_input" maxlength="100">
+          <!--<span class="c_red" id="new_course_class_period_notice" style="display: none;"></span>-->
+        </li>
+        <div class="cl"></div>
+        <li class=" ml55" >
+          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_syllabus();" >提交</a>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
+          <div class="cl"></div>
+        </li>
+    <% end%>
+  </ul>
+</div><!--talknew end-->
 <div class="cl"></div>
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@ -4,6 +4,7 @@
 <script type="text/javascript">
    $(function() {
        sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>");
+        showNormalImage('syllabus_description_<%= @syllabus.id %>');
    });
 </script>
 <ul id="sy_tab_nav">
@ -23,7 +24,7 @@
      <p class="sy_tab_con_p">该课程尚未填写课程大纲，敬请期待！</p>
  <% else %>
      <div class="sy_tab_con">
-        <div class="syllabuscon">
+        <div class="syllabuscon upload_img" id="syllabus_description_<%= @syllabus.id %>">
          <%=@syllabus.description.html_safe %>
          <div class="mt10" style="font-weight:normal;">
            <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @syllabus} %>
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@ -12,7 +12,9 @@
            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
        <% end %>
        TO
-        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
+        <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue" %>
      </div>
      <div class="homepagePostTitle break_word" >
        <%= link_to activity.filename, course_files_path(activity.course), :class => "postGrey" %>
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@ -12,7 +12,9 @@
            <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
        <% end %>
        TO
-        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%=link_to activity.syllabus.title, syllabus_path(activity.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue" %>
      </div>
      <div class="homepagePostTitle break_word" >
        <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>
--- a/Show More
+++ b/Show More