diff --git a/Gemfile b/Gemfile
index deecb67e3..2b50f6e97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,13 @@ group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
+<<<<<<< HEAD
   #gem  'win32console'
+=======
+  if RUBY_PLATFORM =~ /w32/
+    gem  'win32console'
+  end
+>>>>>>> 1dae37f613838b2ada8b8f872abec71b256cb1ad
 end
 
 group :development, :test do 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6387a97a4..cbf2c30bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -418,6 +418,8 @@ class ApplicationController < ActionController::Base
       @project = Project.find(params[:project_id])
     elsif params[:course_id]
       @course = Course.find(params[:course_id])
+    elsif params[:org_subfield_id]
+      @org_subfield = OrgSubfield.find(params[:org_subfield_id])
     end
   rescue ActiveRecord::RecordNotFound
      render_404
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 37182dbcf..d371ed4cb 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -240,6 +240,8 @@ class AttachmentsController < ApplicationController
         format.html { redirect_to_referer_or respond_path(@attachment.container) }
       elsif !@attachment.container.nil? && @attachment.container.is_a?(PhoneAppVersion)
         format.html { redirect_to_referer_or mobile_version_path }
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgSubfield)
+        format.html {redirect_to_referer_or org_subfield_files_path(@attachment.container)}
       else
          if @project.nil?
            format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0c61c449e..1b0ead141 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -25,6 +25,7 @@ class CoursesController < ApplicationController
   before_filter :authorize_course, :only => [:show, :settings,  :update,  :course]
   before_filter :authorize_course_global, :only => [:new,:create]
   before_filter :toggleCourse, :only => [:finishcourse, :restartcourse]
+  before_filter :is_deleted, :only => [:show, :settings]
 
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
@@ -55,11 +56,11 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-        cs = CoursesService.new
-        @user = User.current
-        join = cs.join_course params,@user
-        @state = join[:state]
-        @course = join[:course]
+      cs = CoursesService.new
+      @user = User.current
+      join = cs.join_course params,@user
+      @state = join[:state]
+      @course = join[:course]
       # else
       #   @course = Course.find_by_id params[:object_id]
       #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
@@ -70,7 +71,7 @@ class CoursesController < ApplicationController
     end
     @object_id = params[:object_id]
     respond_to do |format|
-        format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
+      format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
 
   end
@@ -85,7 +86,7 @@ class CoursesController < ApplicationController
     end
   end
 
-  
+
   def join_private_courses
     respond_to do |format|
       format.js
@@ -98,14 +99,14 @@ class CoursesController < ApplicationController
     c = cs.edit_course params,@course,User.current
     @course = c[:course]
     if @course.errors.full_messages.count <= 0
-        respond_to do |format|
-          format.html {
-            # render :layout => 'base_courses'
-            flash[:notice] = l(:notice_successful_update)
-            redirect_to settings_course_url(@course)
-          }
-          format.api  { render_api_ok }
-        end
+      respond_to do |format|
+        format.html {
+          # render :layout => 'base_courses'
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to settings_course_url(@course)
+        }
+        format.api  { render_api_ok }
+      end
     else
       respond_to do |format|
         format.html {
@@ -134,8 +135,8 @@ class CoursesController < ApplicationController
       courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
-   @name = params[:name]
-   @type = 'courses'
+    @name = params[:name]
+    @type = 'courses'
     respond_to do |format|
       format.html {
         render :layout => 'course_base'
@@ -277,7 +278,7 @@ class CoursesController < ApplicationController
   def member
     ## 有角色参数的才是课程，没有的就是项目
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
-      
+
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
@@ -312,7 +313,7 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
-   
+
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
@@ -427,7 +428,7 @@ class CoursesController < ApplicationController
   end
 
   def course
-     @school_id = params[:school_id]
+    @school_id = params[:school_id]
     per_page_option = 10
     if @school_id == "0" or @school_id.nil?
       @courses_all = Course.active.visible.
@@ -515,8 +516,8 @@ class CoursesController < ApplicationController
 
   def index
     if !User.current.admin?
-       render_404
-       return
+      render_404
+      return
     end
     @course_type = params[:course_type]
     @school_id = params[:school_id]
@@ -565,7 +566,7 @@ class CoursesController < ApplicationController
 
     respond_to do |format|
       format.html {
-         render :layout => 'base'
+        render :layout => 'base'
       }
       format.atom {
         courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
@@ -581,6 +582,13 @@ class CoursesController < ApplicationController
     end
   end
 
+  def is_deleted
+    if @course.is_delete == 1 and !User.current.admin?
+      render_404
+      return
+    end
+  end
+
   def get_courses
     @user = User.current
     membership = @user.coursememberships.all
@@ -634,6 +642,11 @@ class CoursesController < ApplicationController
   end
 
   def show
+    # 被删除的课程只有超级管理员才能看到，is_delete为1的时候，标记课程被删除
+    # if @course.is_delete == 1 && !User.current.admin?
+    #   render_403
+    #   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)
@@ -684,10 +697,10 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-   @course.journals_for_messages.each do |messages|
-     query = messages.course_messages.where("user_id = ?", User.current.id)
-     query.update_all(:viewed => true);
-   end
+    @course.journals_for_messages.each do |messages|
+      query = messages.course_messages.where("user_id = ?", User.current.id)
+      query.update_all(:viewed => true);
+    end
 
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
@@ -738,20 +751,20 @@ class CoursesController < ApplicationController
 
   #从课程创建的老师那里选择课程大纲
   def course_outline
-      @teacher = User.find(@course.tea_id)
-      @blog_articles = @teacher.blog.articles
-      @is_in_show_outline_page = params[:is_in_show_outline_page]
-      respond_to do |format|
-        format.js
-      end
+    @teacher = User.find(@course.tea_id)
+    @blog_articles = @teacher.blog.articles
+    @is_in_show_outline_page = params[:is_in_show_outline_page]
+    respond_to do |format|
+      format.js
+    end
   end
 
   #根据关键字搜索，查找方法一样的，但返回内容不一样
   def search_course_outline
-     @article_title = params[:title]
-     @teacher = User.find(@course.tea_id)
-     @blog_articles = @teacher.blog.articles.like(@article_title)
-     render :json=>@blog_articles.to_json
+    @article_title = params[:title]
+    @teacher = User.find(@course.tea_id)
+    @blog_articles = @teacher.blog.articles.like(@article_title)
+    render :json=>@blog_articles.to_json
   end
 
   #设置或者更改课程的大纲
@@ -771,10 +784,23 @@ class CoursesController < ApplicationController
       format.html {render :layout => 'base_courses'}
     end
   end
-  #删除课程
-  #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
-  def destroy
 
+  #删除课程
+  #删除课程只是将课程的is_deleted状态改为false，is_deleted为false状态的课程只有管理员可以看到
+  def destroy
+    @course.update_attributes(:is_delete => true)
+    @course = nil
+    redirect_to user_url(User.current)
+  end
+
+  # 恢复已删除的课程
+  def renew
+    if User.current.admin?
+      @course.update_attributes(:is_delete => false)
+      redirect_to course_path(@course)
+    else
+      return 404
+    end
   end
 
   private
@@ -797,7 +823,7 @@ class CoursesController < ApplicationController
   def can_show_course
     @first_page = FirstPage.find_by_page_type('project')
     if @first_page.try(:show_course) == 2
-       render_404
+      render_404
     end
   end
 
diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index a99ab32ec..8fa90ea46 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -1,8 +1,10 @@
 class ExerciseController < ApplicationController
   layout "base_courses"
 
-  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,:show_student_result]
-  before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list]
+  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy,
+                                                        :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise,
+                                                        :show_student_result,:student_exercise_list]
+  before_filter :find_course, :only => [:index,:new,:create]
   include ExerciseHelper
 
   def index
@@ -18,16 +20,16 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    if @course.is_public == 0 && !User.current.member_of_course?(@course)
+    if @course.is_public == 0 && !(User.current.member_of_course?(@course)||User.current.admin?)
       render_403
       return
     end
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-    if @is_teacher
+    if @is_teacher || User.current.admin?
       exercises = @course.exercises.order("created_at asc")
     else
-      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
+      exercises = @course.exercises.where("exercise_status <> 1").order("created_at asc")
     end
     @exercises = paginateHelper exercises,20 #分页
     respond_to do |format|
@@ -48,47 +50,32 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    unless User.current.member_of_course?(@course)
+    unless User.current.member_of_course?(@course) || User.current.admin?
       render_403
       return
     end
     @exercise = Exercise.find params[:id]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
-      render_403
-      return
-    end
     exercise_end = @exercise.end_time > Time.now
     if @exercise.time == -1
       @can_edit_excercise = exercise_end
     else
-      @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin?
+      @can_edit_excercise = !has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end
     end
-    @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
-      # 学生点击的时候即创建关联,自动保存
-      #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
-
-    # 已提交问卷的用户不能再访问该界面
-=begin
-    if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
-    else
-=end
-      if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
+    unless @is_teacher
+      @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
+      if @exercise_user.nil?
         eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
         @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
       end
-      # @percent = get_percent(@exercise,User.current)
-      exercise_questions = @exercise.exercise_questions
-      @exercise_questions = paginateHelper exercise_questions,5 #分页
       score = calculate_student_score(@exercise, User.current)
-      eu = get_exercise_user(@exercise.id, User.current.id)
-      eu.update_attributes(:score => score)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
+      @exercise_user.update_attributes(:score => score)
+    end
+    # @percent = get_percent(@exercise,User.current)
+    @exercise_questions = @exercise.exercise_questions
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
     #end
   end
 
@@ -369,8 +356,20 @@ class ExerciseController < ApplicationController
   end
 
   def student_exercise_list
+=begin
+    if @exercise.end_time <= Time.now
+      @course.student.each do |student|
+        if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,@exercise.id).empty?
+          ExerciseUser.create(:user_id => student.student_id, :exercise_id => @exercise.id, :start_at => @exercise.end_time, :status => true,:score=>0)
+        end
+
+        s_score = calculate_student_score(@exercise, student.student)
+        exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", student.student_id, @exercise.id).first
+        exercise_user.update_attributes(:score => s_score)
+      end
+    end
+=end
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    @exercise = Exercise.find params[:id]
     @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     @exercise_count = @exercise.exercise_users.where('score is not NULL').count
     if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time <= Time.now)
@@ -537,12 +536,9 @@ class ExerciseController < ApplicationController
       # @score = 100
       if @uncomplete_question.count < 1
         # 查看是否有已提交记录
-        eu = get_exercise_user(@exercise.id, User.current.id)
-        eu.user_id = User.current.id
-        eu.exercise_id = @exercise.id
-        eu.score = @score
-        if eu.save
-          #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
+        cur_exercise_user.score = @score
+        if cur_exercise_user.save
+        #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
           @status = 0 #提交成功
         else
           @status = 2 #未知错误
@@ -550,6 +546,7 @@ class ExerciseController < ApplicationController
       else
         @status = 1 #有未做得必答题
       end
+      @save = params[:save].to_i if params[:save]
       respond_to do |format|
         format.js
       end
@@ -560,11 +557,11 @@ class ExerciseController < ApplicationController
   def show_student_result
     @user = User.find params[:user_id]
     @can_edit_excercise = false
-    @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
     @exercise_questions = @exercise.exercise_questions
     score = calculate_student_score(@exercise, @user)
     eu = get_exercise_user(@exercise.id, @user.id)
     eu.update_attributes(:score => score)
+    @exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", @user.id, @exercise.id).first
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end
@@ -582,15 +579,15 @@ class ExerciseController < ApplicationController
       standard_answer = get_user_standard_answer(question, user)
       unless answer.empty?
         # 问答题有多个答案
-        if question.question_type == 3
+        if question.question_type == 3 && !standard_answer.empty?
           if standard_answer.include?(answer.first.answer_text)
             score1 = score1+ question.question_score unless question.question_score.nil?
           end
-        elsif question.question_type == 1
+        elsif question.question_type == 1 && !standard_answer.nil?
           if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id
             score2 = score2 + question.question_score unless question.question_score.nil?
           end
-        else
+        elsif question.question_type == 2 && !standard_answer.nil?
           arr = get_mulscore(question, user)
           if arr.to_i == standard_answer.exercise_choice_id
             score3 = score3 + question.question_score unless question.question_score.nil?
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index b15be4896..328446fbb 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -186,7 +186,7 @@ class FilesController < ApplicationController
     @order = ""
     @is_remote = false
     if params[:project_id]
-      @isproject = true
+      @container_type = 0
 
       if params[:sort]
         params[:sort].split(",").each do |sort_type|
@@ -246,7 +246,7 @@ class FilesController < ApplicationController
         format.js
       end
     elsif params[:course_id]
-      @isproject = false
+      @container_type = 1
 
       if params[:sort]
         params[:sort].split(",").each do |sort_type|
@@ -297,6 +297,13 @@ class FilesController < ApplicationController
       @tag_list = attachment_tag_list @all_attachments
 
       render :layout => 'base_courses'
+    elsif params[:org_subfield_id]
+      @container_type = 2
+      @organization = Organization.find(params[:organization_id])
+      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+      show_attachments @containers
+      render :layout => 'base_org'
+      # @subfield = params[:org_subfield_id]
     end
 
   end
@@ -421,8 +428,39 @@ class FilesController < ApplicationController
            redirect_to course_files_url(@course)
          }
        end
-     end
+     elsif @org_subfield
+       @addTag=false
+       # if params[:in_org_subfield_toolbar]
+       #   @in_org_subfield_toolbar = params[:in_org_subfield_toolbar]
+       # end
+       attachments = Attachment.attach_filesex(@org_subfield, params[:attachments], params[:org_subfield_attachment_type])
 
+       # if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+       #   Mailer.run.attachments_added(attachments[:files])
+       # end
+
+       # TODO: 临时用 nyan
+       sort_init 'created_on', 'desc'
+       sort_update 'created_on' => "#{Attachment.table_name}.created_on",
+                   'filename' => "#{Attachment.table_name}.filename",
+                   'size' => "#{Attachment.table_name}.filesize",
+                   'downloads' => "#{Attachment.table_name}.downloads"
+
+       @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)] #modify by Long Jun
+       # @containers += @org_subfield.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+
+       show_attachments @containers
+
+       @attachtype = 0
+       @contenttype = 0
+
+       respond_to do |format|
+         format.js
+         format.html {
+           redirect_to org_subfield_files_url(@org_subfield)
+         }
+       end
+     end
    end
   end
 
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 67499655f..a8d6dfe8f 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -126,14 +126,33 @@ class HomeworkCommonController < ApplicationController
     if @homework_detail_manual.comment_status == 1
       student_works = @homework.student_works
       if student_works && student_works.size >= 2
-        student_works.each_with_index do |work, index|
-          user = work.user
-          n = @homework_detail_manual.evaluation_num
-          n = n < student_works.size ? n : student_works.size - 1
-          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-          assigned_homeworks.each do |h|
-            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-            student_works_evaluation_distributions.save
+        if @homework.homework_type == 3
+          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
+          student_work_projects.each_with_index do |pro_work, pro_index|
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            work_index = -1
+            student_works.each_with_index do |stu_work, stu_index|
+              if stu_work.id.to_i == pro_work.student_work_id.to_i
+                work_index = stu_index
+              end
+            end
+            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+        else
+          student_works.each_with_index do |work, index|
+            user = work.user
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
           end
         end
         @homework_detail_manual.update_column('comment_status', 2)
@@ -143,7 +162,8 @@ class HomeworkCommonController < ApplicationController
         Mailer.send_mail_anonymous_comment_open(@homework).deliver
       else
         @statue = 2
-      end
+
+    end
     else
       @statue = 3
     end
@@ -277,6 +297,7 @@ class HomeworkCommonController < ApplicationController
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
     @homework_detail_programing = @homework.homework_detail_programing
+    @homework_detail_group = @homework.homework_detail_group
     @course = @homework.course
   rescue
     render_404
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index edf055370..7cdc838e2 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -142,6 +142,13 @@ class IssuesController < ApplicationController
     @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
 
+    #id name email
+    #1. issues list persons
+    #2. project persons
+    @at_persons = @journals.map(&:user) + @issue.project.users
+    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
+    @at_persons = nil
+
     respond_to do |format|``
     format.html {
       retrieve_previous_and_next_issue_ids
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index c53dcbed5..0883b3799 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -85,7 +85,7 @@ class MyController < ApplicationController
       flash[:notice] = l(:notice_mail_notification_updated)
       redirect_to my_account_url
     else
-      redirect_to signin_url    
+      redirect_to signin_url
     end
   end
 
@@ -129,7 +129,7 @@ class MyController < ApplicationController
         @user.safe_attributes = params[:user]
         @user.pref.attributes = params[:pref]
         @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
-        @user.login = params[:login]
+        #@user.login = params[:login]
         unless @user.user_extensions.nil?
           if @user.user_extensions.identity == 2
             @user.firstname = params[:enterprise_name]
@@ -223,7 +223,7 @@ class MyController < ApplicationController
     end
     flash.now[:error] = l(:notice_account_old_wrong_password)
   end
-  render :template => 'my/account',:layout=>'base_users_new'
+  render :template => 'my/account',:layout=>'new_base_user'
   end
 
   # Create a new feeds key
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 00b88fdaa..1dc7885fe 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -17,4 +17,8 @@ class OrgSubfieldsController < ApplicationController
     @organization = Organization.find(@subfield.organization_id)
     @subfield.update_attributes(:name => params[:name])
   end
+
+  def show
+    
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 200bd4d69..ab2cfa2ba 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -30,7 +30,7 @@ class ProjectsController < ApplicationController
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
-  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
+  before_filter :require_admin, :only => [ :copy, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   # before_filter :memberAccess, only: :member
@@ -697,7 +697,11 @@ class ProjectsController < ApplicationController
         flash[:error] = l(:error_can_not_archive_project)
       end
     end
-    redirect_to admin_projects_url(:status => params[:status])
+    if params[:type] == "project"
+      redirect_to user_path(User.current)
+    else
+      redirect_to admin_projects_url(:status => params[:status])
+    end
   end
 
   def unarchive
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 99e0d68b3..b35471286 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -75,6 +75,9 @@ class RepositoriesController < ApplicationController
         redirect_to repository_url(@repository)
       else
         g = Gitlab.client
+        if User.current.gid.nil?
+          g.sync_user(User.current)
+        end
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject
           copy_project(@project, gproject)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 77868c689..b79adda2d 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -3,7 +3,7 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
@@ -95,12 +95,27 @@ class StudentWorkController < ApplicationController
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.where(:user_id => User.current.id)
+        end
         @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
         if my_work.empty?
           @stundet_works = []
         else
@@ -116,12 +131,27 @@ class StudentWorkController < ApplicationController
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
-        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.where(:user_id => User.current.id)
+        end
         @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        if @homework.homework_type == 3
+          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+        else
+          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+        end
         if my_work.empty?
           @stundet_works = []
         else
@@ -190,6 +220,10 @@ class StudentWorkController < ApplicationController
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(student_work)
+      if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
+        @student_work_project = @homework.student_work_projects.where("user_id = #{User.current.id}").first
+        student_work.project_id = @student_work_project.project_id
+      end
       #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
@@ -197,6 +231,35 @@ class StudentWorkController < ApplicationController
         student_work.late_penalty = 0
       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
+            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
+            end
+            stu_project.save
+          end
+        end
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
         if course_activity
           course_activity.updated_at = Time.now
@@ -207,6 +270,9 @@ class StudentWorkController < ApplicationController
           user_activity.updated_at = Time.now
           user_activity.save
         end
+        course_message = CourseMessage.new(:user_id =>User.current.id,:content=>"new",:course_message_id=>student_work.id,:course_id => @course.id,:course_message_type=>"StudentWork", :status => 9) #作品提交记录
+        course_message.save
+
         @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
           format.js
@@ -236,10 +302,11 @@ class StudentWorkController < ApplicationController
       @submit_result = true
       @work.name = params[:student_work][:name]
       @work.description = params[:student_work][:description]
-      @work.project_id = params[:student_work][:project]
       @work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@work)
       if @work.save
+        course_message = CourseMessage.new(:user_id =>User.current.id,:content=>"edit",:course_message_id=>@work.id,:course_id => @course.id,:course_message_type=>"StudentWork", :status => 9) #作品提交记录
+        course_message.save
 =begin
         respond_to do |format|
           format.html {
@@ -276,6 +343,18 @@ class StudentWorkController < ApplicationController
 
   def destroy
     if @work.destroy
+      if @homework.homework_type == 3 &&  @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_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
       respond_to do |format|
         format.html {
           redirect_to student_work_index_url(:homework => @homework.id)
@@ -288,12 +367,36 @@ class StudentWorkController < ApplicationController
     @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
     if @work
       @work.destroy
+      if @homework.homework_type == 3 &&  @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_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
     end
     redirect_to user_homeworks_user_path(User.current.id)
   end
 
   def retry_work
     if @work.destroy
+      if @homework.homework_type == 3 &&  @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_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
+        @work.student_work_projects.each do |pro2|
+          pro2.destroy
+        end
+      end
       @student_work = StudentWork.new
       respond_to do |format|
         format.js
@@ -540,7 +643,90 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def new_student_work_project
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #创建作业的关联项目
+  def student_work_project
+    @project = StudentWorkProject.new
+    @project.homework_common_id = @homework.id
+    @project.project_id = (Project.find params[:projectName].to_i).id
+    @project.user_id = User.current.id
+    @project.is_leader = 1
+    if @project.save
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
+      respond_to do |format|
+        format.js
+      end
+    end
+
+  end
+
+  #查找学生创建的项目列表
+  def search_user_projects
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    @project_ids = Project.where("user_id = #{User.current.id} and name like '#{condition}'")
+    @first = params[:first].to_i
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #查找课程的学生
+  def search_course_students
+    name = ""
+    unless params[:name].nil?
+      name = params[:name]
+    end
+    all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    all_students = User.where("id in #{all_student_ids}")
+    @commit_student_ids = @homework.student_work_projects.map{|student| student.user_id}
+    @users = searchstudent_by_name all_students,name
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def cancel_relate_project
+    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
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
+  def searchstudent_by_name  users, name
+    mems = []
+    if name != ""
+      name = name.to_s.downcase
+      users.each do |m|
+        username = m.lastname.to_s.downcase + m.firstname.to_s.downcase
+        if(m.login.to_s.downcase.include?(name) ||  m.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+      mems = users
+    end
+    mems
+  end
+
   def hsd_committed_work?(user, homework)
     sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
     sw.nil? ? result = false : result = true
@@ -737,7 +923,7 @@ class StudentWorkController < ApplicationController
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 834009d71..b6d336547 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -551,12 +551,21 @@ class UsersController < ApplicationController
               )
             end
           end
+        end
 
+        #分组作业
+        if homework.homework_type == 3
+          homework_detail_group = HomeworkDetailGroup.new
+          homework.homework_detail_group = 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
         end
 
         if homework.save
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
+          homework_detail_group.save if homework_detail_group
 
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 815a44839..1508fc871 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -161,7 +161,7 @@ class WelcomeController < ApplicationController
                                                                  query: @name,
                                                                  type:"most_fields",
                                                                  operator: "or",
-                                                                 fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                                 fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                              }
                                                          },
                                                          highlight: {
@@ -173,10 +173,12 @@ class WelcomeController < ApplicationController
                                                                  lastname: {},
                                                                  name:{},
                                                                  description:{},
-                                                                 filename:{}
+                                                                 filename:{},
+                                                                 subject:{},
+                                                                 content:{}
                                                              }
                                                          }
-                                                     },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
+                                                     },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
       when 'user'
               @users = User.search(@name).page(params[:page] || 1).per(20)
       when 'project'
@@ -185,6 +187,8 @@ class WelcomeController < ApplicationController
               @courses = Course.search(@name).page(params[:page] || 1).per(20).results
       when 'attachment'
               @attachments = Attachment.search(@name).page(params[:page] || 1).per(20).results
+      when 'memo'
+             @memos = Memo.search(@name).page(params[:page] || 1).per(20).results
       else
               @alls = Elasticsearch::Model.search({
                                                                      query: {
@@ -192,7 +196,7 @@ class WelcomeController < ApplicationController
                                                                              query: @name,
                                                                              type:"most_fields",
                                                                              operator: "or",
-                                                                             fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                                             fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                                          }
                                                                      },
                                                                      highlight: {
@@ -204,10 +208,12 @@ class WelcomeController < ApplicationController
                                                                              lastname: {},
                                                                              name:{},
                                                                              description:{},
-                                                                             filename:{}
+                                                                             filename:{},
+                                                                             subject:{},
+                                                                             content:{}
                                                                          }
                                                                      }
-                                                                 },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
+                                                                 },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
 
     end
 
@@ -216,13 +222,14 @@ class WelcomeController < ApplicationController
     @course_count = Course.search(@name).results.total
     @attach_count = Attachment.search(@name).results.total
     @project_count = Project.search(@name).results.total
+    @memo_count = Memo.search(@name).results.total
     @total_count = Elasticsearch::Model.search({
                                                    query: {
                                                        multi_match: {
                                                            query: @name,
                                                            type:"most_fields",
                                                            operator: "or",
-                                                           fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                           fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                        }
                                                    },
                                                    highlight: {
@@ -234,10 +241,12 @@ class WelcomeController < ApplicationController
                                                            lastname: {},
                                                            name:{},
                                                            description:{},
-                                                           filename:{}
+                                                           filename:{},
+                                                           subject:{},
+                                                           content:{}
                                                        }
                                                    }
-                                               },[User,Course,Attachment,Project] ).results.total
+                                               },[User,Course,Attachment,Project,Memo] ).results.total
     # search_type = params[:search_type].to_sym unless search_condition.blank?
     # search_by = params[:search_by]
     #
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 46a20dd4c..5a9563b73 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1934,6 +1934,8 @@ module ApplicationHelper
         candown = true
       elsif attachment.container.class.to_s=="StudentWork"
         candown = true
+      elsif attachment.container.class.to_s=="BlogComment"
+        candown = true
       elsif attachment.container.class.to_s == "User"
         candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
@@ -2435,10 +2437,19 @@ module ApplicationHelper
         link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
+        project = cur_user_projects_for_homework homework
         if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
+            link_to "提交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
+          else
+            link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          end
         elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
-          link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
+            link_to "补交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
+          else
+            link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
@@ -2446,7 +2457,7 @@ module ApplicationHelper
             link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
             link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
-          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
             link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
           else
             link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
@@ -2459,6 +2470,24 @@ module ApplicationHelper
 
   end
 
+  def relate_project homework,is_teacher,is_in_course,user_activity_id,course_activity
+    if User.current.member_of_course?(homework.course)
+      if is_teacher
+        #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      else
+        projects = cur_user_projects_for_homework homework
+        works = cur_user_works_for_homework homework
+        if works.nil? && projects.nil?
+          link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目'
+        elsif works.nil?
+          link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目'
+        else
+          #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+        end
+      end
+    end
+  end
+
   def student_anonymous_comment homework
     if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
@@ -2474,7 +2503,20 @@ module ApplicationHelper
 
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_works_for_homework homework
-    homework.student_works.where("user_id = ?",User.current).first
+    work = homework.student_works.where("user_id = ?",User.current).first
+    if homework.homework_type == 3
+      pro = homework.student_work_projects.where("user_id = #{User.current.id}").first
+      if pro.nil? || pro.student_work_id == "" || pro.student_work_id.nil?
+        work = nil
+      else
+        work = StudentWork.find pro.student_work_id
+      end
+    end
+    work
+  end
+  #获取当前用户在指定作业下关联的项目的集合
+  def cur_user_projects_for_homework homework
+    homework.student_work_projects.where("user_id = ?",User.current).first
   end
 
   def file_preview_tag(file, html_options={})
@@ -2619,4 +2661,38 @@ int main(int argc, char** argv){
       true
     end
   end
+
+  def import_ke(default_opt={})
+    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    ss  = ''
+    if opt[:enable_at]
+      ss = '<script type="text/javascript">'
+      ss += 'window.atPersonLists = [];'
+
+      @at_persons && @at_persons.each_with_index do |person,index|
+        ss += "var o = {id: #{index}, name: '#{person.show_name}', login: '#{person.login}', searchKey: '#{person.get_at_show_name}'};"
+        ss += "atPersonLists.push(o);"
+      end
+
+      ss += "</script>"
+    end
+
+    ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
+    if opt[:enable_at]
+      ss += javascript_include_tag('/assets/kindeditor/at/jquery.caret.min.js', '/assets/kindeditor/at/jquery.atwho.js', '/assets/kindeditor/at/config.js')
+      ss += stylesheet_link_tag("/assets/kindeditor/at/jquery.atwho.css")
+    end
+
+    if opt[:prettify]
+      ss += javascript_include_tag 'prettify'
+      ss += stylesheet_link_tag 'prettify'
+    end
+
+    if opt[:init_activity]
+      ss += javascript_include_tag "init_activity_KindEditor"
+    end
+
+    ss.html_safe
+  end
+
 end
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 9a1765ddc..cf9cbcc32 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -113,7 +113,8 @@ module FilesHelper
       if attachment.is_public? ||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))||
-          attachment.author_id == User.current.id
+          attachment.author_id == User.current.id ||
+          attachment.container_type == "OrgSubfield"
         result << attachment
       end
     end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 999cefdaa..ad5655b02 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -22,6 +22,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
   belongs_to :course, foreign_key: 'container_id', conditions: "attachments.container_type = 'Course'"
+  belongs_to :org_subfield, foreign_key: 'container_id', conditions: "attachements.container_type = 'OrgSubfield'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
@@ -46,7 +47,7 @@ class Attachment < ActiveRecord::Base
   settings index: { number_of_shards: 5 } do
     mappings dynamic: 'false' do
       indexes :filename, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :downloads, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :downloads, index:"not_analyzed",index_options: 'offsets'
     end
   end
 
diff --git a/app/models/course.rb b/app/models/course.rb
index 1c1bedb3b..0194a2a9d 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -16,11 +16,11 @@ class Course < ActiveRecord::Base
     mappings dynamic: 'false' do
       indexes :name, analyzer: 'smartcn',index_options: 'offsets'
       indexes :description, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :updated_at, analyzer: 'smartcn',index_options: 'offsets',type:"date"
+      indexes :updated_at, index:"not_analyzed",type:"date"
     end
   end
   
-  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name
+  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
@@ -86,7 +86,8 @@ class Course < ActiveRecord::Base
   'is_public',
   'description',
   'class_period',
-  'open_student'
+  'open_student',
+  'is_delete'
 
   acts_as_customizable
 
@@ -94,7 +95,7 @@ class Course < ActiveRecord::Base
   scope :active, lambda { where(:status => STATUS_ACTIVE) }
   scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
   scope :all_public, lambda { where(:is_public => true) }
-  scope :visible, lambda {|*args| where(Course.visible_condition(args.shift || User.current, *args)) }
+  scope :visible, lambda {|*args| where(Course.where("is_delete =?", 0).visible_condition(args.shift || User.current, *args)) }
   scope :allowed_to, lambda {|*args|
     user = User.current
     permission = nil
@@ -114,7 +115,7 @@ class Course < ActiveRecord::Base
       where(" LOWER(name) LIKE :p ", :p => pattern)
     end
   }
-  scope :indexable,lambda { where('is_public = 1') }
+  scope :indexable,lambda { where('is_public = 1 and is_delete = 0') }
   def self.search(query)
     __elasticsearch__.search(
         {
@@ -399,12 +400,12 @@ class Course < ActiveRecord::Base
   #   __elasticsearch__.delete_document
   # end
   def create_course_ealasticsearch_index
-    if self.is_public == 1
+    if self.is_public == 1 and self.is_delete == 0  #公开 和 没有被删除的课程才被索引
       self.__elasticsearch__.index_document
     end
   end
   def update_course_ealasticsearch_index
-    if self.is_public == 1 #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
+    if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
         self.__elasticsearch__.update_document
       rescue => e
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 11b0165c5..79d27f3c5 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -1,5 +1,5 @@
 class CourseMessage < ActiveRecord::Base
-  # status说明： status在课程不同的类型，区分不同的功能
+  # status说明： status在课程不同的类型，区分不同的功能 status = 9 作品的提交记录
   # HomeworkCommon：status：
   # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败
   attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed, :content, :status
@@ -19,7 +19,7 @@ class CourseMessage < ActiveRecord::Base
 
   def add_user_message
     #unless self.course_message_type == 'JoinCourseRequest'
-      if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil? && self.status != 9
         self.message_alls << MessageAll.new(:user_id => self.user_id)
       end
     #end
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 8d421a98f..0ad667bd1 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -9,6 +9,8 @@ class HomeworkCommon < ActiveRecord::Base
   belongs_to :user
   has_one :homework_detail_manual, :dependent => :destroy
   has_one :homework_detail_programing, :dependent => :destroy
+  has_one :homework_detail_group, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   has_many :homework_tests, :dependent => :destroy
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
@@ -74,6 +76,10 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
+  def is_group_homework?
+    self.homework_type == 3 && self.homework_detail_group
+  end
+
   ###添加回复
   def self.add_homework_jour(user, notes, id , options = {})
     homework = HomeworkCommon.find(id)
diff --git a/app/models/homework_detail_group.rb b/app/models/homework_detail_group.rb
new file mode 100644
index 000000000..0a9cb5fe2
--- /dev/null
+++ b/app/models/homework_detail_group.rb
@@ -0,0 +1,4 @@
+class HomeworkDetailGroup < ActiveRecord::Base
+  belongs_to :homework_common
+  attr_accessible :base_on_project, :homework_common_id, :max_num, :min_num
+end
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index ec6390408..396133c7a 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -267,7 +267,7 @@ class JournalsForMessage < ActiveRecord::Base
 
   # 课程成员得分（英雄榜）
   def act_as_student_score
-    unless self.user.allowed_to?(:as_teacher, self.jour)
+    if !self.user.allowed_to?(:as_teacher, self.jour) && self.jour_type == "Course"
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
     end
   end
diff --git a/app/models/memo.rb b/app/models/memo.rb
index 7c4fbdcf1..ee9f4c8db 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -1,7 +1,9 @@
+require 'elasticsearch/model'
 class Memo < ActiveRecord::Base
 	include Redmine::SafeAttributes
   include UserScoreHelper
   include ApplicationHelper
+  include Elasticsearch::Model
 	belongs_to :forum
   has_many_kindeditor_assets :assets, :dependent => :destroy
 	belongs_to :author, :class_name => "User", :foreign_key => 'author_id'
@@ -12,6 +14,36 @@ class Memo < ActiveRecord::Base
 	validates_length_of :content, maximum: 30000
 	validate :cannot_reply_to_locked_topic, :on => :create
 
+
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: {
+      number_of_shards: 5 ,
+      analysis: {
+          char_filter: {
+              and_filter: {
+                type: "mapping",
+                mappings: [ "&=> and "]
+             }
+          },
+          analyzer: {
+              my_analyzer: {
+                  type: 'custom',
+                  tokenizer: 'standard',
+                  filter: ['classic'],
+                  char_filter: ['html_strip']
+              }
+          }
+      }
+  } do
+    mappings dynamic: 'false' do
+      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'#, char_filter: 'html_strip'
+      indexes :content, analyzer:'my_analyzer',index_options: 'offsets',search_analyzer: 'smartcn'
+      indexes :updated_at,index:"not_analyzed" ,type:'date'
+    end
+  end
+
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"
 	acts_as_attachable
   has_many :user_score_details,  :class_name => 'UserScoreDetails',:as => :score_changeable_obj
@@ -47,9 +79,9 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message
-	# after_update :update_memos_forum
-	after_destroy :reset_counters!,:delete_kindeditor_assets#,:down_user_score  -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message,:create_memo_ealasticsearch_index
+	after_update :update_memo_ealasticsearch_index
+	after_destroy :reset_counters!,:delete_kindeditor_assets,:delete_memo_ealasticsearch_index#,:down_user_score  -- 公共区发帖暂不计入得分,
 	# after_create :send_notification
 	# after_save :plusParentAndForum
 	# after_destroy :minusParentAndForum
@@ -57,6 +89,36 @@ class Memo < ActiveRecord::Base
 	# scope :visible, lambda { |*args|
 	# 	includes(:forum => ).where()
 	# }
+  scope :indexable,lambda {
+    where('parent_id is null')
+  }
+
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['subject','content^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_at:{order: "desc" }
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    subject: {},
+                    content: {}
+                }
+            }
+        }
+    )
+  end
 
   def send_mail
       Mailer.run.forum_message_added(self) if Setting.notified_events.include?('forum_message_added')
@@ -203,6 +265,22 @@ class Memo < ActiveRecord::Base
   # Author lizanle
   # Description 从硬盘上删除资源
   def delete_kindeditor_assets
-    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MEMO
+      delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MEMO
+  end
+
+  def create_memo_ealasticsearch_index
+    if self.parent_id.nil?
+      self.__elasticsearch__.index_document
+    end
+  end
+  def update_memo_ealasticsearch_index
+    if self.parent_id.nil?
+        self.__elasticsearch__.update_document
+    end
+  end
+  def delete_memo_ealasticsearch_index
+    if self.parent_id.nil?
+      self.__elasticsearch__.delete_document
+    end
   end
 end
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index efe9699c3..f95bb3eba 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -1,4 +1,9 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
   has_many :org_document_comments, :dependent => :destroy
+  has_many :files
+  acts_as_attachable
+
+  def project
+  end
 end
\ No newline at end of file
diff --git a/app/models/project.rb b/app/models/project.rb
index ff546e098..cd4036810 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -39,10 +39,11 @@ class Project < ActiveRecord::Base
     mappings dynamic: 'false' do
       indexes :name, analyzer: 'smartcn',index_options: 'offsets'
       indexes :description, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :updated_on, analyzer: 'smartcn',index_options: 'offsets', type:'date'
+      indexes :updated_on, index:"not_analyzed", type:'date'
     end
   end
 
+  has_many :student_work_projects,:dependent => :destroy
   has_many :student_works
   has_many :time_entry_activities
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
@@ -86,6 +87,7 @@ class Project < ActiveRecord::Base
 
   # end
   #ADDED BY NIE
+  has_one :project_score, :dependent => :destroy
   has_many :project_infos, :dependent => :destroy 
   has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   has_many :user_grades, :class_name => "UserGrade", :dependent => :destroy
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 884f4a089..144f3859f 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -4,6 +4,7 @@ class StudentWork < ActiveRecord::Base
 
   belongs_to :homework_common
   belongs_to :user
+  has_many :student_work_projects
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project
@@ -45,7 +46,7 @@ class StudentWork < ActiveRecord::Base
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
diff --git a/app/models/student_work_project.rb b/app/models/student_work_project.rb
new file mode 100644
index 000000000..676071817
--- /dev/null
+++ b/app/models/student_work_project.rb
@@ -0,0 +1,7 @@
+class StudentWorkProject < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :homework_common
+  belongs_to :student_work
+  belongs_to :project
+  belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index b9d9de029..0c8d65481 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -35,7 +35,7 @@ class User < Principal
       indexes :login, analyzer: 'smartcn',index_options: 'offsets'
       indexes :firstname, analyzer: 'smartcn',index_options: 'offsets'
       indexes :lastname, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :last_login_on, analyzer: 'smartcn',index_options: 'offsets',type: 'date'
+      indexes :last_login_on,  index:"not_analyzed",type: 'date'
     end
   end
 
@@ -107,6 +107,7 @@ class User < Principal
   has_many :student_works, :dependent => :destroy
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
@@ -409,10 +410,14 @@ class User < Principal
     else
       name = lastname+firstname
     end
-    name = name.empty? || name.nil? ? login : name
-    name
+    name.empty? || name.nil? ? login : name
   end
   ## end
+
+  def get_at_show_name
+    name = show_name
+    name = "#{name} #{self.login}" if name != self.login
+  end
   
   #added by nie
   def count_new_journal_reply
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 8b39c39ab..8df42fb41 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -228,7 +228,7 @@ class UsersService
     end
     course_list
   end
-  
+
   #修改密码
   def change_password params
     @current_user =  User.find(params[:current_user_id])
diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb
index f87741dd9..e4d053d49 100644
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@@ -1,4 +1,6 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false) %>
+<% end %>
 <h3 style="float: left">
   <%=l(:label_system_message)%>
 </h3><br/>
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index cfbe68085..02a613e6e 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,8 +1,7 @@
 <% if @is_destroy%>
     $("#attachment_<%= @attachment.id%>").remove();
-    if(document.getElementById("uploadReviseBox")) {
-        $("#uploadReviseBox").removeClass('disable_link');
-        $("#choose_revise_attach").attr("onclick","_file.click();");
+    if(document.getElementById("revise_attachment_div_<%= @attachment.id%>")) {
+        $("#revise_attachment_div_<%= @attachment.id%>").remove();
     }
 <%else%>
     var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb
index 554702d97..9fb8cbc59 100644
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@@ -1,5 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %>
-<%= stylesheet_link_tag 'prettify'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: true) %>
+<% end %>
+
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
     <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
 <% end %>
diff --git a/app/views/blog_comments/_edit.html.erb b/app/views/blog_comments/_edit.html.erb
index 375c948d4..c7065ece4 100644
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@@ -1,9 +1,13 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
+
 <div class="resources mt10">
   <div id="new_course_topic">
     <div class="homepagePostBrief c_grey">
       <div>
-        <input  type="text" value="<%= article.title%>" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255"  onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " />
+        <input  type="text" value="<%= article.title%>" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255"  onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" />
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: block;">
diff --git a/app/views/blog_comments/_new.html.erb b/app/views/blog_comments/_new.html.erb
index 48f152c4e..e336c7d01 100644
--- a/app/views/blog_comments/_new.html.erb
+++ b/app/views/blog_comments/_new.html.erb
@@ -1,9 +1,12 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
 <div class="resources mt10">
   <div id="new_course_topic">
     <div class="homepagePostBrief c_grey">
       <div>
-        <input  type="text" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " >
+        <input  type="text" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" >
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: none;">
diff --git a/app/views/blog_comments/_reply_form.html.erb b/app/views/blog_comments/_reply_form.html.erb
index cc4c0e952..32f4333c2 100644
--- a/app/views/blog_comments/_reply_form.html.erb
+++ b/app/views/blog_comments/_reply_form.html.erb
@@ -1,4 +1,6 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
 <li>
   <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
       <div style="display: none;"><%= f.text_field :title, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge({ hidden: "hidden"}) %></div>
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index cf24f0f2d..e46a7249f 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor",'blog' %>
+<% end %>
 
 <script type="text/javascript">
     $(function(){
diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb
index b8bcc9ad0..a91dd8151 100644
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
index 0e69d1654..8128cd088 100644
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@@ -27,8 +27,7 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= import_ke(enable_at: false, prettify: false) %>
 
 
 <%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 61bbb85d2..e4cf57ae3 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <div class="resources mt10">
   <div id="new_course_topic">
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 3fb97bd9d..306a0c7ce 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 4ca0857c1..4151c91f3 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -27,8 +27,9 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
 
 
 
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index a54e0667e..b4c560fa4 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     div.ke-toolbar {
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 12dd67c91..ce775da4d 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -1,16 +1,16 @@
 <style type="text/css">
-  div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-  span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-  span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-  div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-  span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-  span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-  div.ke-toolbar .ke-outline{border:none;}
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
 
-  div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-  div.recall_con{width:570px;}
-  div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-  /*.ke-container{height: 80px !important;}*/
+    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.recall_con{width:570px;}
+    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    /*.ke-container{height: 80px !important;}*/
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
 <script >
@@ -20,21 +20,21 @@
   <h4><%= l(:label_leave_message) %></h4>
 
   <% if !User.current.logged?%>
-    <div style="font-size: 14px;margin:20px;">
-      <%= l(:label_user_login_tips) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-      <hr/>
-    </div>
+      <div style="font-size: 14px;margin:20px;">
+        <%= l(:label_user_login_tips) %>
+        <%= link_to l(:label_user_login_new), signin_path %>
+        <hr/>
+      </div>
   <% else %>
       <div nhname='new_message_' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%>
+        <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'}, :html=>{:id => "course_feedback_new"},:method => "post") do |f|%>
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
             <div nhname='toolbar_container_' style="float:left;padding-top:3px;margin-bottom: 15px;"></div>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
-            <a id="new_message_submit_btn_" href="javascript:void(0)" class="blue_btn fr ml10 mt10">留言</a>
-        <% end%>
+            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
+        <% end %>
       </div>
   <% end %>
 </div>
@@ -50,37 +50,42 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 
 <script type="text/javascript">
-  $(function(){
-    KindEditor.ready(function(K){
-      $("a[nhname='reply_btn']").live('click',function(){
-        var params = {};
-        params.kindutil = K;
-        params.container = $(this).parent('div').parent('div');
-        params.div_form = $(">.respond-form",params.container);
-        params.form = $("form",params.div_form);
-        params.textarea = $("textarea[name='user_notes']",params.div_form);
-        params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
-        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
-        params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
-          params.height = 55;
-        if(params.textarea.data('init') == undefined){
-          params.editor = init_editor(params);
-          init_form(params);
-          params.cancel_btn.click(function(){
-            nh_reset_form(params);
-          });
-        }
-        params.cancel_btn.click();
-        toggleAndSettingWordsVal(params.div_form, params.textarea);
-        setTimeout(function(){
-          if(!params.div_form.is(':hidden')){
-            params.textarea.show();
-            params.textarea.focus();
-            params.textarea.hide();
-          }
-        },300);
-        params.textarea.data('init',1);
-      });
+
+    $(function(){
+        $("#submit_feedback_course").one('click',function() {
+            $("#course_feedback_new").submit();
+        });
+        KindEditor.ready(function(K){
+            $("a[nhname='reply_btn']").live('click',function(){
+                var params = {};
+                params.kindutil = K;
+                params.container = $(this).parent('div').parent('div');
+                params.div_form = $(">.respond-form",params.container);
+                params.form = $("form",params.div_form);
+                params.textarea = $("textarea[name='user_notes']",params.div_form);
+                params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+                params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+                params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+                params.height = 55;
+                if(params.textarea.data('init') == undefined){
+                    params.editor = init_editor(params);
+                    init_form(params);
+                    params.cancel_btn.click(function(){
+                        nh_reset_form(params);
+                    });
+                }
+                params.cancel_btn.click();
+                toggleAndSettingWordsVal(params.div_form, params.textarea);
+                setTimeout(function(){
+                    if(!params.div_form.is(':hidden')){
+                        params.textarea.show();
+                        params.textarea.focus();
+                        params.textarea.hide();
+                    }
+                },300);
+                params.textarea.data('init',1);
+            });
+        });
     });
-  });
+
 </script>
diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb
index 40049f104..1bfe3cbd7 100644
--- a/app/views/courses/_member.html.erb
+++ b/app/views/courses/_member.html.erb
@@ -1,6 +1,7 @@
 <% @members.each do |member| %>
     <li >
-      <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+      <%#= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+      <%= link_to "#{member.principal}（#{member.principal.show_name}）", user_path(member.principal), :class => "w150 linkBlue fl" %>
       <span class="w150 fl">
         <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %>
         <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 3aa7d4b57..2fe18c4eb 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -12,3 +12,4 @@
     <%= render :partial => 'course_teacher', :locals => {:members => @members} %>
 <% end%>
 
+
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 3456634d5..634f26495 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -88,6 +88,15 @@
           </li>
       <% end %>
     </ul>
+    <% if @course.is_delete == 1 %>
+        <div class="mt30"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
+    <% else %>
+        <div class="mt30">
+          <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
+          <span>（友情提示：删除该课程后如果您想恢复该课程，请联系系统管理员！）</span>
+        </div>
+    <% end %>
+
   </div>
 
   <div class="hwork_undis" id="tbc_02">
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index bb3421cba..f4b8ce8a4 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -1,9 +1,14 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    span.ke-toolbar-icon-url{background-image:url("/images/public_icon.png")}
     div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
@@ -191,7 +196,7 @@
           <div class="homepagePostReplyInputContainer" style="margin-top: 8px">
             <div nhname='new_message_<%= @article.id%>' style="display:none;">
               <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
-                  <input type="hidden" name="course_id" value="<%= @course.id%>"
+                  <input type="hidden" name="course_id" value="<%= @course.id%>">
                 <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
                   <input type="hidden" name="blog_comment[sticky]" value="0">
                   <input type="hidden" name="quote[quote]" value="">
diff --git a/app/views/exercise/_commit_alert.html.erb b/app/views/exercise/_commit_alert.html.erb
index e9c3ebf57..bed7b6d82 100644
--- a/app/views/exercise/_commit_alert.html.erb
+++ b/app/views/exercise/_commit_alert.html.erb
@@ -1,12 +1,15 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
-  <% if status == 0 && exercise.time != -1%>
+  <% if @save == 1 %>
+      <h3 style="font-weight: normal;color: green">保存成功，测验日期截止前您还可以继续答题。</h3>
+      <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
+  <% elsif status == 0 && exercise.time != -1%>
       <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
       <%= link_to "确定", exercise_path(),:class => 'commit'%>
   <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %>
-      <h3 style="font-weight: normal;color: green">提交成功!</h3>
+      <h3 style="font-weight: normal;color: green">提交成功，测验日期截止前您还可以修改，祝您考高分。</h3>
       <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
   <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
-      <h3 style="font-weight: normal;color: red">保存成功!</h3>
+      <h3 style="font-weight: normal;color: red">提交成功，您还有未完成的题目，测验日期截止前您还可以继续答题，祝您考高分。</h3>
       <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => 'commit'%>
   <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") <= Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
       <h3 style="font-weight: normal;color: red">时间已到!</h3>
diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index db412672c..19bc520d4 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -24,11 +24,11 @@
         <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
     <%# end%>
     <% if exercise.exercise_status == 1 %>
-        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr10 ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
     <% elsif exercise.exercise_status == 2%>
-        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr10 ml5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
     <% else%>
-        <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+        <li class="pollsbtn fr mr10 pollsbtn_grey ml5">发布试卷</li>
     <% end%>
 
     <% if exercise.exercise_status == 1%>
@@ -42,18 +42,24 @@
     <% if exercise.exercise_status == 1 %>
         <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
         <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <% else%>
+    <% elsif exercise.exercise_status == 2 %>
         <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
         <li class="polls_date fr">已发布</li>
+    <% else %>
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已截止</li>
     <% end%>
 
 <% else%>
-    <% if exercise.exercise_status == 2%>
+    <% if exercise.exercise_status != 1%>
         <%# if has_commit%>
             <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
             <li class="pollsbtn_tip fl ml5">已答</li-->
         <%#else%>
-            <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <% if exercise.end_time <= Time.now && has_commit_exercise?(exercise.id, User.current.id) %>
+            <li class="pollsbtn_tip fl ml5">已答</li>
+        <% end %>
         <%#end%>
     <% end%>
     <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index adaab5021..8a1f3dbd6 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -3,10 +3,6 @@
         $("#RSide").removeAttr("id");
         $("#homework_page_right").css("min-height",$("#LSide").height()-30);
         $("#Container").css("width","1000px");
-        <%uncomplete_question =get_uncomplete_question(exercise, User.current) %>;
-        <% if (uncomplete_question.count < 1) %>
-            $("#exercise_submit_btn").html("提交");
-        <% end %>
         var end_time = <%=exercise.end_time.to_i%>;
         getTime(end_time);
         /*start_time = new Date();
@@ -104,11 +100,6 @@
                                               {
                                                   obj.checked = false;
                                               }
-                                              if(dataObj.complete == 1) {
-                                                  $("#exercise_submit_btn").html("提交");
-                                              } else {
-                                                  $("#exercise_submit_btn").html("保存");
-                                              }
                                           }
                                       });
                                   }
@@ -163,11 +154,6 @@
                                               {
                                                   obj.checked = false;
                                               }
-                                              if(dataObj.complete == 1) {
-                                                  $("#exercise_submit_btn").html("提交");
-                                              } else {
-                                                  $("#exercise_submit_btn").html("保存");
-                                              }
                                           }
                                       });
                                   }
@@ -210,11 +196,6 @@
                               success: function (data) {
                                   var dataObj = eval(data);
                                   obj.value = dataObj.text;
-                                  if(dataObj.complete == 1) {
-                                      $("#exercise_submit_btn").html("提交");
-                                  } else {
-                                      $("#exercise_submit_btn").html("保存");
-                                  }
                               }
                           });
 
@@ -228,7 +209,8 @@
       <% end %>
     </div>
     <div class="ur_buttons">
-      <%= link_to "保存",commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
+      <%= link_to "保存",commit_exercise_exercise_path(exercise,:save => 1),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:format => 'js',:remote=>true %>
+      <%= link_to "提交",commit_exercise_exercise_path(exercise), :data => {:confirm => "您确定要提交吗？"},:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:20px;",:format => 'js',:remote=>true %>
     </div>
     <div class="cl"></div>
     <!--contentbox end-->
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 529a73da3..58ebcaf20 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -78,7 +78,7 @@
                     <% else %>
                         ×
                     <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(standard_answer.first.exercise_choice_id.to_s) if !standard_answer.empty? %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 24687d28b..586c033a1 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -32,7 +32,7 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)  if exercise_question.exercise_standard_answers.first  %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
@@ -64,7 +64,7 @@
               <div>
                 <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)  if exercise_question.exercise_standard_answers.first%>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 4e27d57cb..bbbe9026d 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -33,6 +33,21 @@
         }).mouseleave(function(){
             $("#work_click_<%= exercise.id%>").hide();
         });
+        $(function(){
+            <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+                $("#show_student_result_div_<%= exercise.id%>").on('click',function() {
+                    window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
+                });
+            <% else %>
+                $("#show_student_result_div_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            <% end %>
+        });
+        /*function show_result(id) {
+            window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+        }*/
     </script>
     <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
       <li class="hworkList340 width530">
@@ -40,22 +55,16 @@
           <li class="hworkPortrait mt15 mr10">
             <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
           </li>
-          <div onclick="" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
+          <div id="show_student_result_div_<%= exercise.id%>" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
             <li>
               <ul class="mt10 fl">
-                <li class="hworkStName mr15 mt16" title="姓名">
-                  <% name = exercise.user.show_name %>
-                  <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
-                    <%= link_to name,show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>
-                  <% else %>
-                    <span title="截止日期未到，暂不能查看学生答题结果。"><%=name%></span>
-                      <%#= link_to name,'',:title=>"截止日期未到，暂不能查看学生答题结果。" %>
-                  <% end %>
+                <li class="hworkStName mr15 mt16" title="姓名" id="student_name_<%= exercise.id%>">
+                  <%=exercise.user.show_name %>
                 </li>
-                <li class="hworkStID mr10 mt16" title="学号">
+                <li class="hworkStID mr10 mt16" title="学号" id="student_id_<%= exercise.id%>">
                   <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
                 </li>
-                <li class="hworkStID mt16" title="班级">
+                <li class="hworkStID mt16" title="班级"  id="student_class_<%= exercise.id%>">
                   --
                 </li>
               </ul>
@@ -63,7 +72,7 @@
           </div>
         </ul>
       </li>
-      <li class="hworkList130 c_grey student_work_<%= exercise.id%>" onclick="" style="cursor: pointer;">
+      <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
         <% if exercise.created_at%>
             <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
         <% end %>
diff --git a/app/views/exercise/commit_exercise.js.erb b/app/views/exercise/commit_exercise.js.erb
index 5ede8a951..ac8c242d1 100644
--- a/app/views/exercise/commit_exercise.js.erb
+++ b/app/views/exercise/commit_exercise.js.erb
@@ -1,6 +1,5 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
 showModal('ajax-modal', '270px');
-$('#ajax-modal').css('height','110px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
diff --git a/app/views/exercise/edit.html.erb b/app/views/exercise/edit.html.erb
index 0b20dc90e..48d307c78 100644
--- a/app/views/exercise/edit.html.erb
+++ b/app/views/exercise/edit.html.erb
@@ -1 +1,9 @@
-<%= render :partial => 'exercise_form'%>
\ No newline at end of file
+<%= render :partial => 'exercise_form'%>
+<script type="text/javascript">
+  $(function() {
+      <% if @exercise.exercise_name != "" && @exercise.end_time != "" %>
+        $("#polls_head_show").show();
+        $("#polls_head_edit").hide();
+      <% end %>
+  });
+</script>
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 25cc7f68a..a9d399511 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -20,6 +20,25 @@
                                :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
+<% elsif @project %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :style => ie8? ? '': 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :lebel_file_uploding => l(:lebel_file_uploding),
+                               :delete_all_files => l(:text_are_you_sure_all)
+                       } %>
 <% else %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
new file mode 100644
index 000000000..a8aa13458
--- /dev/null
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -0,0 +1,56 @@
+<% delete_allowed = User.current.admin? %>
+<div class="re_con_top">
+  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
+  <p class="f_r" style="color: #808080">
+    <% if order == "asc" %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% else %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% end %>
+  </p>
+</div>
+<div class="cl"></div>
+
+<!--<div class="files_tag" id="files_tag">-->
+  <!--<%#= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>-->
+<!--</div>-->
+<div class="cl"></div>
+
+<div class="for_img_thumbnails">
+  <% org_subfield_attachments.each do |file| %>
+      <% if 1 %>
+          <div class="re_con_box" id="container_files_<%= file.id %>">
+            <div class="">
+              <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                          download_named_attachment_path(file.id, file.filename),
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+              <% if User.current.logged? %>
+                  <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>
+              <% end %>
+            </div>
+            <div class="cl"></div>
+            <div class="mt5">
+              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <%= link_to( l(:button_delete), attachment_path(file),
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%>
+              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+            </div>
+            <div class="cl"></div>
+            <!--<div class="tag_h">-->
+              <!--&lt;!&ndash; container_type = 1 代表是课程里的资源 &ndash;&gt;-->
+              <!--<%#= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+              <!--<%#= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+            <!--</div>-->
+            <div class="cl"></div>
+          </div><!---re_con_box end-->
+      <% end %>
+  <% end %>
+</div>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+</ul>
+<div class="cl"></div>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
new file mode 100644
index 000000000..ea408c7a6
--- /dev/null
+++ b/app/views/files/_subfield_files.html.erb
@@ -0,0 +1,97 @@
+<%= stylesheet_link_tag 'courses' %>
+<script>
+    function searchone4reload(fileid){
+        var url = "<%= searchone4reload_org_subfield_files_path(@org_subfield)%>";
+        var data = {};data.fileid=fileid;
+        $.ajax({
+            url:url,dataType:'text',data:data,success:function(text){
+                var container_file_div = $("#container_files_"+fileid);
+                container_file_div.after(text);
+                container_file_div.remove();
+            }
+        });
+    }
+    function show_upload(obj)
+    {
+        switch(obj)
+        {
+            case 1:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+                break;
+            case 2:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>');
+                break;
+            case 3:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 3}) %>');
+                break;
+            case 4:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>');
+                break;
+            case 6:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
+                break;
+            default:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>');
+        }
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function closeModal()
+    {
+        hideModal($("#popbox_upload"));
+    }
+
+    function presscss(id)
+    {
+        if(id == "inorg_subfield")
+        {
+            $('#inorg_subfield').attr("class", "re_schbtn b_dblue");
+            $('#insite').attr("class", "re_schbtn b_lblue");
+        }
+        else
+        {
+            $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
+            $('#insite').attr("class", "re_schbtn b_dblue");
+        }
+    }
+    function buttoncss()
+    {
+        $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
+</script>
+
+<div class="container">
+  <div class="resources"><!--资源库内容开始--->
+    <div class="re_top" style="width:710px;">
+      <%= form_tag( search_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
+          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+      <% end %>
+      <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %>  <!-- show_window('light','fade','20%','35%')-->
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+          <p class="c_grey fr mt10 mr5">
+            上传：
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
+          </p>
+      <%# end %>
+    </div><!---re_top end-->
+    <div class="cl"></div>
+
+    <div class="re_con" id="org_subfield_list">
+      <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
+    </div><!---re_con end-->
+
+  </div>
+</div>
+<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/files/_subfield_files_list.html.erb b/app/views/files/_subfield_files_list.html.erb
new file mode 100644
index 000000000..d762743ad
--- /dev/null
+++ b/app/views/files/_subfield_files_list.html.erb
@@ -0,0 +1,55 @@
+<% delete_allowed = User.current.admin? %>
+<div class="re_con_top">
+  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
+  <p class="f_r" style="color: #808080">
+    <% if order == "asc" %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% else %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% end %>
+  </p>
+</div>
+<div class="cl"></div>
+
+<div class="files_tag" id="files_tag">
+  <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
+</div>
+<div class="cl"></div>
+
+<div class="for_img_thumbnails">
+  <% curse_attachments.each do |file| %>
+      <% if file.is_public? || User.current.admin? %>
+          <div class="re_con_box" id="container_files_<%= file.id %>">
+            <div class="">
+              <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                          download_named_attachment_path(file.id, file.filename),
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+            </div>
+            <div class="cl"></div>
+            <div class="mt5">
+              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <%= link_to( l(:button_delete), attachment_path(file),
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%>
+              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+            </div>
+            <div class="cl"></div>
+            <div class="tag_h">
+              <!-- container_type = 1 代表是课程里的资源 -->
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+            </div>
+            <div class="cl"></div>
+          </div><!---re_con_box end-->
+      <% else %>
+          <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+      <% end %>
+  <% end %>
+</div>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+</ul>
+<div class="cl"></div>
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
new file mode 100644
index 000000000..c3ca72ecd
--- /dev/null
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -0,0 +1,31 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(org_subfield_files_path(org_subfield), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">-->
+          <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">
+          <%= render :partial => 'files/attachement_list',:locals => {:org_subfield => org_subfield} %>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 9de7aa042..4d8bb26ca 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -52,6 +52,17 @@ $('#upload_file_div').slideToggle('slow');
             setTimeout( function(){div.remove();},3000)
         <% end %>
     <%end%>
+    <% elsif @org_subfield %>
+        hideModal();
+        $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+//        $("#courses_files_count_info").html("<%#= @all_attachments.count%>");
+//        $("#courses_files_count_nav").html("(<%#= @all_attachments.count%>)")
+        //    添加文件上传成功提示,
+        <% unless params[:attachments].nil? %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#org_subfield_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 3dad88868..dff20a20b 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,8 +1,10 @@
 <div id="resource_list">
-  <% if @isproject %>
+  <% if @container_type == 0 %>
       <%= render :partial => 'project_file_new', locals: {project: @project} %>
-  <% else %>
+  <% elsif @container_type == 1 %>
       <%= render :partial => 'course_file', locals: {course: @course} %>
+  <% elsif @container_type == 2 %>
+      <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %>
   <% end %>
 </div>
 
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 1fcbc6cab..c51304dbf 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -1,5 +1,8 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>
 
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %>
 <script>
 
 
diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb
index 9bce17416..e61ca493e 100644
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -5,7 +5,8 @@
 <% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
 <h1 style="margin-top: 2%; margin-left: 49%"><%= l :label_forum_new %></h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <%= render 'form_create_mode' %>
 
 <%#= link_to l(:button_back), forums_path %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index ad9195804..2a7a02e57 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>
+
 
 <div class="postRightContainer">
   <div id="create_memo_div" style="display: none">
@@ -115,10 +119,7 @@
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
                 type:'post',
-                data:{
-                    'memo[content]':$("#memo_content").val(),
-                    'memo[subject]':$("#memo_subject").val()
-                },
+                data:$("#new_memo").serialize(),
                 success:function(data){
 
                 },
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 3b3877228..010bc8ec9 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -4,7 +4,7 @@
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
-        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
+        $("#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_editor").toggle();
     }
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index f6b41f36d..b8f362429 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index e182fbd19..6fc1898d0 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -8,7 +8,7 @@
           <% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
           <% unless issue.author.nil? || issue.author.name == "Anonymous" %>
               <span class ="<%= get_issue_type(column_content[1])[0] %>" title="<%= get_issue_type(column_content[1])[1] %>"></span>
-            <div class="problem_txt fl">
+            <div class="problem_txt fl w600">
                 <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                 <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
               <div class="problem_tit_div fl break_word">
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 26aff7d61..9c6ad647c 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
 <div class="project_r_h" xmlns="http://www.w3.org/1999/html">
   <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 76e178120..80d3aaac1 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+<%= import_ke(enable_at: true) %>
+<% end %>
+
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index dba26f1f6..eb2e83ba2 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -2,9 +2,9 @@
   <div class="footerAboutContainer">
     <ul class="footerAbout">
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
+      <li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
         <select class="languageBox">
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 752853c60..13730fd96 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -4,7 +4,7 @@
       <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
       <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
       <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
+      <li class="fl"><%= link_to l(:label_surpport_group), "https://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
       <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
 
     </ul>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index d100e79a5..bdd35ebd4 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -13,7 +13,7 @@
         <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl mr30">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db p10">帮助中心</a>
+        <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
       </li>
     </ul>
   </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 162f59ed4..b16a78921 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -5,7 +5,7 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl mr40">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 p10">帮助中心</a>
+        <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
       </li>
     </ul>
   </div>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index c37af0dc1..e0a6ece50 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -188,10 +188,10 @@
           <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
         </div>
         <% end %>
-        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
+        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count) %>
         <div class="subNav">
           <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
-          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
+          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
           <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
         </div>
         <% end %>
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 6749bd117..b5e13d801 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -10,7 +10,10 @@
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
+
+        <%= import_ke(enable_at: false, prettify: true, init_activity: false) %>
+
+
 		<%= heads_for_theme %>
 
 		<%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 9e9bd688f..26f5b6c03 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -14,6 +14,7 @@
   <%= heads_for_theme %>
   <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
+
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
@@ -103,17 +104,17 @@
 
       <!--邀请加入-->
       <div class="subNavBox">
-        <% if User.current.member_of?(@project) %>
-          <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" nhtype="toggle4cookie" data-id="expand_invit" data-target="#navContent_invit" data-val="expand">
-            <%= l(:label_invite)%>
-          </div>
-          <ul class="navContent " style="display:block" id="navContent_invit">
-            <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
-            <!--<%# if User.current.allowed_to?(:manage_members, @project) %>-->
+        <%# if User.current.member_of?(@project) %>
+          <!--<div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" nhtype="toggle4cookie" data-id="expand_invit" data-target="#navContent_invit" data-val="expand">-->
+            <!--<%#= l(:label_invite)%>-->
+          <!--</div>-->
+          <!--<ul class="navContent " style="display:block" id="navContent_invit">-->
+            <!--<li><%#=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>-->
+            <!--&lt;!&ndash;<%# if User.current.allowed_to?(:manage_members, @project) %>&ndash;&gt;-->
               <!--<li><%#=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>-->
             <!--<%# end %>-->
-          </ul>
-        <% end %><!--end-->
+          <!--</ul>-->
+        <%# end %><!--end-->
         <!--menu 左侧工具栏 -->
         <%#--project_new_type: 1为开发组；2为科研组；3为朋友圈子--%>
 
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 00d15fad0..b77c5b875 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -147,7 +147,7 @@
               <% end%>
           <% end%>
         </div>
-        <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
+        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 56e3a96b3..c8510c8cf 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -1,4 +1,9 @@
-<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>
+
+
 <script>
 
   function check_and_submit(){
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 792c8d55a..627fce5b4 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -4,8 +4,12 @@
    @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!-- <h1>New memo</h1> -->
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-    <div class="top-content">
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
+<div class="top-content">
         <table>
             <tr>
                 <td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index c05b63427..44f3e5a64 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,4 +1,9 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor","forum" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'forum' %>
+<% end %>
+
+
 <style type="text/css">
     /*回复框*/
     div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index f4a1675b1..0f39b73d2 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 
 <script type="text/javascript">
     $(function(){
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index 86a6df836..f3ee5371c 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index dc9ee10b6..604953ad9 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
           <li>&nbsp;&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1", :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index a51b85870..7c0863836 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <li>
     <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
     <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 34e6e943f..a976dbe1e 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
diff --git a/app/views/news/_project_form.html.erb b/app/views/news/_project_form.html.erb
index 269420bfe..b39ee0a9f 100644
--- a/app/views/news/_project_form.html.erb
+++ b/app/views/news/_project_form.html.erb
@@ -1,18 +1,22 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <li>
-  <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
-  <input  type="text" name="news[title]" class="hwork_input_news" id="news_title" width="576px" onblur="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
+  <label style="float: left"><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
+  <input  type="text" name="news[title]" class="hwork_input_news fl" id="news_title" width="576px" onblur="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
+  <div class="cl"></div>
   <p id="title_notice_span" class="ml55"></p>
 </li>
 <li class="mb10">
   <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'project_news_description_editor' %>
+      <%= f.kindeditor :description,:width=>'90%',:editor_id=>'project_news_description_editor' %>
       <p id="description_notice_span" class="ml55"></p>
   <% else %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%', :editor_id=>'project_news_description_editor', :owner_id => @news.id, :owner_type => OwnerTypeHelper::NEWS %>
+      <%= f.kindeditor :description,:width=>'90%', :editor_id=>'project_news_description_editor', :owner_id => @news.id, :owner_type => OwnerTypeHelper::NEWS %>
       <p id="description_notice_span" class="ml55"></p>
   <% end %>
 
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
index 5fbae6f72..c2ba15588 100644
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb
index a7ce22548..8d9eb6b02 100644
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
     function check_org_title()
     {
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index d35489452..787bd3185 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1,3 +1,6 @@
 //location.reload();
-//window.location.href = '<%#= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'
-window.location.reload();
\ No newline at end of file
+<% if params[:detail_page] %>
+    window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>';
+<% else %>
+    window.location.reload();
+<% end %>
\ No newline at end of file
diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index e4ac22bf7..700211433 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
     function check_org_title(title)
     {
diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb
index 9a9f74ac6..9c46aded7 100644
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index af938b498..24160f6eb 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
     function check_org_title()
     {
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 7655f996e..7a64e4514 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -46,7 +46,7 @@
                     <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
                   </li>
                   <li>
-                    <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete',
+                    <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete',
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :remote => true, :class => 'postOptionLink' %>
                   </li>
diff --git a/app/views/org_subfields/_resource.html.erb b/app/views/org_subfields/_resource.html.erb
new file mode 100644
index 000000000..3cce9748f
--- /dev/null
+++ b/app/views/org_subfields/_resource.html.erb
@@ -0,0 +1,96 @@
+<script>
+    function searchone4reload(fileid){
+        var url = "<%= searchone4reload_course_files_path(@course)%>";
+        var data = {};data.fileid=fileid;
+        $.ajax({
+            url:url,dataType:'text',data:data,success:function(text){
+                var container_file_div = $("#container_files_"+fileid);
+                container_file_div.after(text);
+                container_file_div.remove();
+            }
+        });
+    }
+    function show_upload(obj)
+    {
+        switch(obj)
+        {
+            case 1:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+                break;
+            case 2:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 2}) %>');
+                break;
+            case 3:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 3}) %>');
+                break;
+            case 4:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 4}) %>');
+                break;
+            case 6:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 6}) %>');
+                break;
+            default:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 5}) %>');
+        }
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function closeModal()
+    {
+        hideModal($("#popbox_upload"));
+    }
+
+    function presscss(id)
+    {
+        if(id == "incourse")
+        {
+            $('#incourse').attr("class", "re_schbtn b_dblue");
+            $('#insite').attr("class", "re_schbtn b_lblue");
+        }
+        else
+        {
+            $('#incourse').attr("class", "re_schbtn b_lblue");
+            $('#insite').attr("class", "re_schbtn b_dblue");
+        }
+    }
+    function buttoncss()
+    {
+        $('#incourse').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
+</script>
+
+<div class="container">
+  <div class="resource"><!--资源库内容开始--->
+    <div class="re_top">
+      <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+      <% end %>
+      <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>  <!-- show_window('light','fade','20%','35%')-->
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+          <p class="c_grey fr mt10 mr5">
+            上传：
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
+          </p>
+      <% end %>
+    </div><!---re_top end-->
+    <div class="cl"></div>
+
+    <div class="re_con" id="course_list">
+      <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}  %>
+    </div><!---re_con end-->
+
+  </div>
+</div>
+<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 9c9e0a1be..367c23843 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -25,8 +25,13 @@
 </div>
 <% organization.org_subfields.each do |field| %>
     <div class="homepageLeftMenuBlock">
-      <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
-      <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
+      <% if field.field_type == "Post" %>
+        <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+        <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
+      <% else %>
+        <%#= link_to "#{field.name}", org_subfield_files_path(field, :organization_id => organization.id), :class => "homepageMenuText" %>
+          <a href="javascript:void(0);" class="homepageMenuText"><%= field.name %></a>
+      <% end %>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
     </div>
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index f67b25811..f5a277634 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -11,14 +11,10 @@
                 <ul style="text-align: left;" >
                   <%= radio_button_tag 'org_member[role_ids][]', role.id, member.roles.include?(role) %>
                   <!--编辑时候显示成员，中英文切换后面需从数据库的角度优化-->
-                  <% if User.current.language == "zh" %>
-                      <% if role.id == 11 %>
-                          <label >管理人员</label>
-                      <% elsif role.id == 12 %>
-                          <label >组织成员</label>
-                      <% end %>
-                  <% else %>
-                      <label ><%= h role %></label>
+                  <% if role.id == 11 %>
+                      <label >管理人员</label>
+                  <% elsif role.id == 12 %>
+                      <label >组织成员</label>
                   <% end %>
                 </ul>
                 <!--<br/>-->
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 6ba60245a..642a5ffd0 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -1,22 +1,26 @@
 
   <ul class="orgListRow">
     <li class="orgListUser fb">已有栏目</li>
-    <li class="orgListRole fb">状态</li>
+    <li class="orgListUser fb">状态</li>
+    <li class="orgListStatus fb">类型</li>
     <div class="cl"></div>
   </ul>
   <ul class="orgListRow">
     <li class="orgListUser">动态</li>
     <li class="orgListUser">默认</li>
+    <li class="orgListStatus">默认</li>
     <div class="cl"></div>
   </ul>
   <ul class="orgListRow">
     <li class="orgListUser">项目</li>
     <li class="orgListUser">默认</li>
+    <li class="orgListStatus">默认</li>
     <div class="cl"></div>
   </ul>
   <ul class="orgListRow">
     <li class="orgListUser">课程</li>
     <li class="orgListUser">默认</li>
+    <li class="orgListStatus">默认</li>
     <div class="cl"></div>
   </ul>
   <% subfields.each do |field| %>
@@ -24,6 +28,7 @@
         <li class="orgListUser"><div id="subfield_show_<%= field.id %>"><%= field.name %></div><div id="subfield_edit_<%= field.id %>" style="display:none;">
           <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;" /></div></li>
         <li class="orgListUser">新增</li>
+        <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子":"资源"  %></li>
         <%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %>
         <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
         <div class="cl"></div>
diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb
index 5b56d57b3..97824bb3a 100644
--- a/app/views/organizations/set_homepage.js.erb
+++ b/app/views/organizations/set_homepage.js.erb
@@ -1,2 +1,2 @@
 //location.reload();
-window.location.href ='<%= organization_path(@org, :show_homepage => params[:show_homepage])%>';
\ No newline at end of file
+window.location.href ='<%= organization_path(@org, :show_homepage => 1)%>';
\ No newline at end of file
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index 3fb45376f..c50ff50ab 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,5 +1,9 @@
 <%= javascript_include_tag "jquery.infinitescroll.js" %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 919abfcbf..6095bac96 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -11,7 +11,10 @@
     div.recall_con{width:570px;}
     div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_user_response) %></h4>
@@ -29,7 +32,8 @@
           <p nhname="contentmsg"></p>
           <div class="fl mt10" style="padding-top:5px;" nhname="toolbar_container"></div>
           <%#= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr mt10 mb10" %>
-          <%= link_to l(:button_leave_meassge), "javascript:void(0)", :onclick => 'submitProjectFeedback();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fr mt10 mb10' %>
+          <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_project" >留言</a>
+          <%#= link_to l(:button_leave_meassge), "javascript:void(0)", :onclick => 'submitProjectFeedback();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fr mt10 mb10' %>
       <% end %>
 
   <% end %>
@@ -43,6 +47,9 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
     $(function(){
+        $("#submit_feedback_project").one('click',function() {
+            $("#project_feedback_form").submit();
+        });
 
         function init_editor(params){
             params.textarea.removeAttr('placeholder');
diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index b38871a60..1d204a52b 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -26,4 +26,13 @@
     </ul>
     <a href="javascript:void(0)" class="blue_btn ml110" onclick="submit_edit_project(<%= @project.id %>);" >保存</a>
 <% end %>
+<% if User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
+       <div class="mt30">
+      <img src="/images/pic_del.gif" class="mr5">
+         <%= link_to(l(:button_delete_project), { :controller => 'projects', :action => 'archive', :id => @project, :status => params[:status], :type =>"project" },
+                     :data => {:confirm => l(:text_are_you_sure)}, :method => :post) unless @project.archived? %>
+         <%#=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
+      <span>（友情提示：删除该项目后如果您想恢复该项目，请联系系统管理员！）</span>
+    </div>
+<% end %>
 <div class="cl"></div>
diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb
index fc3784d46..0e2a402ae 100644
--- a/app/views/repositories/_link_to_functions.html.erb
+++ b/app/views/repositories/_link_to_functions.html.erb
@@ -5,9 +5,9 @@
 <% if @repository.supports_cat? %>
     <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
-<% if @repository.supports_annotate? %>
-    <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
+<%# if @repository.supports_annotate? %>
+    <%#= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %>
+<%# end %>
 <%= link_to(l(:button_download),
             {:action => 'raw', :id => @project,
              :repository_id => @repository.identifier_param,
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 0e42f7146..e7616a020 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -25,8 +25,8 @@
       <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%=@repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
-      <!--<div class="fr mt5"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_fork"></span>Fork</a> <span href="javascript:void(0);" class="vl_btn_2 fb">0</span> </div>-->
-      <% unless User.current.id == @project.user_id %>
+      <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
+      <% if User.current.id != @project.user_id %>
           <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn"%>
             <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
           </div>
@@ -53,7 +53,7 @@
 
         <span class="fr mr5"><font class="fb ml2 mr2 vl_commit">
 
-            <%=link_to"全部提交次数", {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font>
+            <%=link_to"提交明细", {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %></font>
 
         </span>
       </div>
diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb
new file mode 100644
index 000000000..1ec8ed0fa
--- /dev/null
+++ b/app/views/student_work/_choose_group_member.html.erb
@@ -0,0 +1,96 @@
+<div id="popbox02">
+  <div>
+    <div class="relateText fl">请添加小组成员</div>
+  </div>
+  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="clickCanel();"></a></div>
+  <div class="cl"></div>
+  <div>
+    <form class="resourcesSearchBox">
+      <input type="text" name="serach" placeholder="输入关键字搜索" class="searchResourcePopup" />
+    </form>
+  </div>
+  <ul class="addMemberC fl" id="all_students_list"></ul>
+  <div class="rightArrow"><img src="/images/course/right-arrow.png" width="16" height="30" /></div>
+  <ul class="addMemberC fr" id="choose_students_list">
+    <li id="choose_student_<%=User.current.id %>"><%=User.current.show_name %>
+      <% unless User.current.user_extensions.student_id == "" %>
+          (<%=User.current.user_extensions.student_id %>)
+      <% end %>
+    </li>
+  </ul>
+  <div class="cl"></div>
+  <div class="courseSendCancel mr15" style="float:right;"><a href="javascript:void(0);" class="sendSourceText" onclick="clickCanel();">取消</a></div>
+  <div class="courseSendSubmit" style="float:right;"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK()">确定</a></div>
+  <div class="cl"></div>
+</div>
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_stus(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?name='+ e.target.value+'&homework='+<%=@homework.id %>,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询
+    $("input[name='serach']").on('input', function (e) {
+        throttle(search_stus,window,e);
+    });
+
+    function clickOK() {
+        var str="";
+        var show = "合作成员：";
+        var lists = $("#choose_students_list li");
+        if(lists.length > 0) {
+            for(var i=0; i<lists.length; i++) {
+                var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
+                str += id;
+                var show_name = $(lists[i]).html();
+                var index = show_name.indexOf("(");
+                if (index != -1) {
+                    var name = show_name.substring(0,show_name.indexOf("("));
+                } else {
+                    var name = show_name;
+                }
+                show += name;
+                if (i == 0) {
+                    show += "(组长)";
+                }
+                if (i != lists.length -1) {
+                    str += ",";
+                    show += "、";
+                }
+            }
+            $("#group_member_ids").val(str);
+        }
+        hideModal("#popbox02");
+        $("#group_members_show").show().html(show);
+    }
+
+    function delete_student(id) {
+        $("#choose_student_"+id).remove();
+        $("#student_"+id).one("click",function choose_student() {
+            $("#choose_students_list").append("<li id='choose_student_"+id+"' onclick='delete_student("+id+");'>"+$("#student_"+id).html()+"</li>");
+        });
+    }
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
+            type:'get'
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index cfd9632c2..7398dbee1 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,8 +1,12 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 width505">
     <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
-    <span class="HomeworkStuTitle f14 fb fl">姓名</span>
-    <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+    <% end %>
   </li>
 
   <li class="hworkList130 hworkH30 fb ml10">
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 4ed0a538a..66b96431e 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,8 +1,12 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr140 ml50'%>">作品名称</span>
-    <span class="c_dark f14 fb fl mr50">姓名</span>
-    <span class="c_dark f14 fb fl">学号</span>
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="c_dark f14 fb fl mr50">姓名</span>
+        <span class="c_dark f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="c_dark f14 fb fl">关联项目</span>
+    <% end %>
   </li>
 
   <li class="hworkList130 hworkH30">
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 2a0962244..641405fe4 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -13,14 +13,22 @@
           </div>
         </li>
         <li>
-          <ul class="mt10 fl">
-            <li class="hworkStName mr10 mt16" title="姓名">
-              <%= student_work.user.show_name%>
-            </li>
-            <li class="hworkStID mt16" title="学号">
-              <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-            </li>
-          </ul>
+          <% if @homework.homework_type != 3 %>
+              <ul class="mt10 fl">
+                <li class="hworkStName mr10 mt16" title="姓名">
+                  <%= student_work.user.show_name%>
+                </li>
+                <li class="hworkStID mt16" title="学号">
+                  <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+                </li>
+              </ul>
+          <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+              <ul class="mt10 fl">
+                <li class="hworkPrName mr10 mt12" title="项目名称">
+                  <%= student_work.project.name %>
+                </li>
+              </ul>
+          <% end %>
         </li>
       </div>
     </ul>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index e336b0282..db680cbec 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -1,46 +1,67 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
 <ul class="hworkListRow" id="student_work_<%= student_work.id%>">
-  <% is_my_work = student_work.user == User.current%>
+  <% if @homework.homework_type != 3 %>
+    <% is_my_work = student_work.user == User.current%>
+  <% else %>
+    <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+    <% is_my_work = pro && pro.student_work_id == student_work.id%>
+  <% end %>
   <li class="hworkList340 width525">
     <ul>
       <% if is_my_work%>
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width285 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
             <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
             <div>
               <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                <%= student_work.user.show_name%>
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-              </li>
-            </ul>
+            <% if @homework.homework_type != 3 %>
+                <ul class="mt10 fl">
+                  <li class="hworkStName mr10 mt16" title="姓名">
+                    <%= student_work.user.show_name%>
+                  </li>
+                  <li class="hworkStID mt16" title="学号">
+                    <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+                  </li>
+                </ul>
+            <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+                <ul class="mt10 fl">
+                  <li class="hworkPrName mr10 mt12" title="项目名称">
+                    <%= student_work.project.name %>
+                  </li>
+                </ul>
+            <% end %>
           </li>
       <% else%>
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width285 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
             <div>
               <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-            <ul class="mt10 fl">
-              <li class="hworkStName mr10 mt16" title="姓名">
-                匿名
-              </li>
-              <li class="hworkStID mt16" title="学号">
-                --
-              </li>
-            </ul>
+            <% if @homework.homework_type != 3 %>
+                <ul class="mt10 fl">
+                  <li class="hworkStName mr10 mt16" title="姓名">
+                    匿名
+                  </li>
+                  <li class="hworkStID mt16" title="学号">
+                    --
+                  </li>
+                </ul>
+            <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+                <ul class="mt10 fl">
+                  <li class="hworkPrName mr10 mt12" title="项目名称">
+                    匿名
+                  </li>
+                </ul>
+            <% end %>
           </li>
       <% end%>
 
diff --git a/app/views/student_work/_new_student_work_alert.html.erb b/app/views/student_work/_new_student_work_alert.html.erb
index 8e0c8a954..42a891d60 100644
--- a/app/views/student_work/_new_student_work_alert.html.erb
+++ b/app/views/student_work/_new_student_work_alert.html.erb
@@ -2,7 +2,11 @@
   <div class="ni_con_work">
     <p>
       当前作业
-      <span class="c_pink">已开启匿评</span>
+      <% if @homework.homework_detail_manual.comment_status == 2 %>
+        <span class="c_pink">已开启匿评</span>
+      <% elsif @homework.homework_detail_manual.comment_status == 3 %>
+        <span class="c_pink">已关闭匿评</span>
+      <% end %>
       您提交作品后将
       <span class="c_pink">不会收到任何匿评作品</span>,
       您的作品也
diff --git a/app/views/student_work/_relate_project.html.erb b/app/views/student_work/_relate_project.html.erb
new file mode 100644
index 000000000..43f59c9c9
--- /dev/null
+++ b/app/views/student_work/_relate_project.html.erb
@@ -0,0 +1,58 @@
+<div id="popbox02" style="">
+  <span class="f16 fontBlue">关联项目</span>
+  <a href="javascript:void(0);" class="popClose" onclick="clickCanel();"></a>
+  <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
+      <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
+      <div class="cl"></div>
+      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未参与任何项目，请先加入项目再关联。</p>
+      <ul id="search_project_list" class="maxHeight100"></ul>
+      <p id="notes" class="c_red"></p>
+      <div class="courseSendSubmit mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK();">确定</a></div>
+      <div class="courseSendCancel mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickCanel();">取消</a></div>
+      <div class="cl"></div>
+  <% end %>
+</div>
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_pros(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?name='+ e.target.value,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='project']").on('input', function (e) {
+        throttle(search_pros,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'student_work', :action => 'search_user_projects') %>'+'?first=1',
+            type:'get'
+        });
+    });
+
+    function clickOK() {
+        var radio = $("input[name='projectName']:checked");
+        if(radio.length < 1) {
+            $("#notes").html("请先选择一个项目");
+            return false;
+        } else {
+            $("#student_work_relate_project").submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/_revise_attachment.html.erb b/app/views/student_work/_revise_attachment.html.erb
index 968a4853b..4d85b1813 100644
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@@ -4,7 +4,7 @@
         <div class="resubAtt mb15">
           <span class="resubTitle">追加修订附件</span>
         </div>
-        <div class="mb10">
+        <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
           <span class="tit_fb"> 追加附件：</span>
           <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
           <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)
@@ -15,7 +15,7 @@
           <span class="resubTitle">追加修订附件</span>
         </div>
         <% if revise_attachment %>
-            <div class="mb10">
+            <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
               <span class="tit_fb"> 追加附件：</span>
               <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
               <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 993b0f2aa..f92614e10 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -1,5 +1,12 @@
 <div class="show_hwork_arrow"></div>
 <div class="showHwork">
+  <% is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin? %>
+  <% if @homework.homework_type != 3 %>
+      <% is_my_work = work.user == User.current%>
+  <% else %>
+      <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+      <% is_my_work = pro && pro.student_work_id == work.id%>
+  <% end %>
   <ul>
     <li class="fl" >
       <span class="tit_fb">上交时间：</span>
@@ -15,7 +22,7 @@
           <%= link_to "",edit_student_work_path(work),:class => "pic_edit",:title => "修改"%>
         </li>
     <% end%>
-    <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
+    <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
         <!-- 匿评结束阶段，显示点赞按钮 -->
         <li class="fr" id="student_work_praise_<%= work.id%>">
           <%= render :partial => 'student_work_praise' %>
@@ -25,11 +32,29 @@
 
     <!--<li ><span class="tit_fb"> 参与人员：</span>程梦雯&nbsp;&nbsp;王强</li>-->
 
-    <% if work.project%>
-        <li >
-          <span class="tit_fb"> 关联项目：</span>
-          <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+    <% 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>
+          <%= link_to(work.user.show_name+"（组长）", user_path(work.user.id), :class => "linkBlue" )%>
+          <% members = work.student_work_projects.where("is_leader = 0") %>
+          <% members.each do |member| if !members.empty? %>
+            、<%=link_to((User.find member.user_id).show_name, user_path(member.user.id), :class => "linkBlue" ) %>
+          <% end %>
+          <% end %>
         </li>
+        <% 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? %>
+                  <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+              <% else %>
+                  <span title ="该项目是私有的"><%=work.project.name %></span>
+              <% end %>
+              <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+              <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
+            </li>
+        <% end %>
     <% end%>
 
     <li >
@@ -52,7 +77,7 @@
       <div class="cl"></div>
     </li>
     <li >
-      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && work.user != User.current)%>
+      <% 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}%>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index e9b056c84..5598092e9 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -40,12 +40,17 @@
     <% end%>
     <div class="cl"></div>
     <div id="about_hwork_<%= student_work.id%>">
-      <% if student_work.user == User.current && !@is_evaluation %>
+      <% if @homework.homework_type != 3 && student_work.user == User.current && !@is_evaluation %>
         <% if @homework.homework_type == 2%>
             <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
         <% else %>
             <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
         <% end %>
+      <% elsif @homework.homework_type == 3 %>
+          <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+          <% if pro && pro.student_work_id == student_work.id && !@is_evaluation %>
+            <%=render :partial => 'show' , :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
+          <% end %>
       <% end %>
     </div>
     <div class="cl"></div>
diff --git a/app/views/student_work/cancel_relate_project.js.erb b/app/views/student_work/cancel_relate_project.js.erb
new file mode 100644
index 000000000..3aa853a00
--- /dev/null
+++ b/app/views/student_work/cancel_relate_project.js.erb
@@ -0,0 +1,7 @@
+<% if @user_activity_id != -1 %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else%>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index d506b5542..bfdf8c316 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -48,7 +48,7 @@
         </div>
 
         <div id="homework_attachments">
-          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false} %>
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false,:has_group=>false} %>
         </div>
 
         <div class="mt5">
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index ee0dd7e9b..c3a61d4c8 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -34,6 +34,44 @@
           )
       }
   }
+  // 添加组成员
+  function show_group_member() {
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/choose_group_member',:locals => {:homework=>@homework}) %>');
+      showModal('ajax-modal', '528px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","");
+      $('#ajax-modal').parent().addClass("addMemberCP");
+  }
+  // 关联项目
+  function show_project() {
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/relate_project',:locals => {:homework=>@homework}) %>');
+      showModal('ajax-modal', '320px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').parent().css("top","").css("left","");
+      $('#ajax-modal').parent().addClass("groupPopUp");
+  }
+  // 作品校验
+  function popupRegex(){
+      if(regexStudentWorkName()&&regexStudentWorkDescription())
+      {
+          if($("#group_member_ids").length > 0) {
+              if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                  $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+                  showModal('ajax-modal', '500px');
+                  $('#ajax-modal').siblings().remove();
+                  $('#ajax-modal').parent().css("top","").css("left","");
+                  $('#ajax-modal').parent().addClass("anonymos");
+              }
+          } else {
+              $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+              showModal('ajax-modal', '500px');
+              $('#ajax-modal').siblings().remove();
+              $('#ajax-modal').parent().css("top","").css("left","");
+              $('#ajax-modal').parent().addClass("anonymos");
+          }
+      }
+  }
+
 </script>
 
 <div class="homepageRightBanner mb10">
@@ -78,7 +116,11 @@
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>
         <div class="cl"></div>
-
+        <% if @homework.homework_type == 3 %>
+            <span id="min_num_member" style="display: none"><%=@homework.homework_detail_group.min_num %></span>
+            <span id="max_num_member" style="display: none"><%=@homework.homework_detail_group.max_num %></span>
+            <%=hidden_field_tag 'group_member_ids', params[:group_member_ids], :value=>User.current.id %>
+        <% end %>
         <div>
           <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
           <div class="cl"></div>
@@ -95,20 +137,29 @@
         </div>
 
         <div id="homework_attachments">
-          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false} %>
+        </div>
+        <div id="group_member">
+        </div>
+        <div id="relate_project">
         </div>
 
-        <div class="mt5 fl">
-          <a href="javascript:void(0);" class="RalationIcon fl  mt3" onclick="show_project();">关联项目</a>
-        </div>
-        <div class="cl"></div>
+        <% if @homework.homework_type == 3 %>
+            <div class="mt5 fl">
+              <a href="javascript:void(0);" class="memberBtn fl mt3 mr15" title="请添加小组的其他成员" onclick="show_group_member();">合作成员</a>
+            </div>
+        <% end %>
 
-        <div class="mt10 none" id="about_project">
-          <%= select_tag :project_id, options_for_select(user_projects_option, @student_work.project_id), {:class => "InputBox  W680 fl"} %>
+        <!--<div class="mt5 fl">
+            <a href="javascript:void(0);" class="RalationIcon fl  mt3" title="请选择作业的关联项目" onclick="show_project();">关联项目</a>
+        </div>-->
+
+        <!--<div class="mt10 none" id="about_project">
+          <%#= select_tag :project_id, options_for_select(user_projects_option, @student_work.project_id), {:class => "InputBox  W680 fl"} %>
           <%#=link_to "", new_project_path, :class => "ml5 mt5 SetUpIcon fl", :title => "快速创建"%>
           <a class=" ml5 mt5 SetUpIcon fl" href="javascript:void(0)" title="快速创建" onclick="new_project();"></a>
           <div class="cl"></div>
-        </div>
+        </div>-->
 
         <div class="mt5">
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();new_student_work();">提交</a>
@@ -118,16 +169,4 @@
         <div class="cl"></div>
     <% end%>
   </div><!----HomeWorkCon end-->
-</div>
-<script type="text/javascript">
-  function popupRegex(){
-      if(regexStudentWorkName()&&regexStudentWorkDescription())
-      {
-          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').parent().css("top","").css("left","");
-          $('#ajax-modal').parent().addClass("anonymos");
-      }
-  }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/student_work/new_student_work_project.js.erb b/app/views/student_work/new_student_work_project.js.erb
new file mode 100644
index 000000000..51df45f13
--- /dev/null
+++ b/app/views/student_work/new_student_work_project.js.erb
@@ -0,0 +1,5 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/relate_project') %>');
+showModal('ajax-modal', '320px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("groupPopUp");
\ No newline at end of file
diff --git a/app/views/student_work/retry_work.js.erb b/app/views/student_work/retry_work.js.erb
index c5fca76d4..c6f354875 100644
--- a/app/views/student_work/retry_work.js.erb
+++ b/app/views/student_work/retry_work.js.erb
@@ -1,2 +1,2 @@
 hideModal('#popbox02');
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false})%>");
\ No newline at end of file
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false,:has_group=>false})%>");
\ No newline at end of file
diff --git a/app/views/student_work/search_course_students.js.erb b/app/views/student_work/search_course_students.js.erb
new file mode 100644
index 000000000..1cea9f27e
--- /dev/null
+++ b/app/views/student_work/search_course_students.js.erb
@@ -0,0 +1,37 @@
+$("#all_students_list").empty();
+<% @users.each do |user|%>
+    var link = "<li id='student_<%=user.id %>'><%=user.show_name %>";
+    <% unless user.user_extensions.student_id == "" %>
+        link += "(<%=user.user_extensions.student_id %>)";
+    <% end %>
+    link += "</li>";
+    $("#all_students_list").append(link);
+
+    var str = "";
+    var lists = $("#choose_students_list li");
+    if(lists.length > 0) {
+        for(var i=0; i<lists.length; i++) {
+            var id = $(lists[i]).attr("id").replace(/[^0-9]/ig,"");
+            str += id;
+            if (i != lists.length -1) {
+                str += ",";
+        }
+    }
+}
+    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").one("click",function choose_student() {
+                var li = "<li id='choose_student_<%=user.id %>'";
+                <% if user.id.to_i != User.current.id.to_i %>
+                    li += " onclick='delete_student(<%=user.id %>);'";
+                <% end %>
+                li += ">" + $("#student_<%=user.id %>").html()+"</li>";
+                $("#choose_students_list").append(li);
+            });
+        }
+    <% else %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").attr("title","该学生已加入其它分组");
+        }
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/search_user_projects.js.erb b/app/views/student_work/search_user_projects.js.erb
new file mode 100644
index 000000000..7751821a5
--- /dev/null
+++ b/app/views/student_work/search_user_projects.js.erb
@@ -0,0 +1,9 @@
+<% if @first == 1 && @project_ids.empty? %>
+    $("#no_search_result").show();
+<% else %>
+    $("#search_project_list").html("");
+    <% @project_ids.each do |project|%>
+    link = "<li><label><input type='radio' class='courseSendCheckbox' name='projectName' value='<%=project.id%>'/><span class='sendCourseName'> <%=project.name %> </span></label></li>";
+    $("#search_project_list").append(link );
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/student_work/student_work_project.js.erb b/app/views/student_work/student_work_project.js.erb
new file mode 100644
index 000000000..405dccca4
--- /dev/null
+++ b/app/views/student_work/student_work_project.js.erb
@@ -0,0 +1,8 @@
+hideModal("#popbox02");
+<% if @user_activity_id != -1 %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% else%>
+    $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
+    init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 309b8b95a..a3aa5d5b1 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -44,7 +44,27 @@
               <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
+      <div class="cl"></div>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
+          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
+      <% end %>
       <div class="homepagePostSubmitContainer">
+        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%>
+            <% projects = cur_user_projects_for_homework activity %>
+            <% works = cur_user_works_for_homework activity %>
+            <% if works.nil? && projects.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
+                </div>
+            <% elsif works.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+                </div>
+            <% end %>
+        <% end %>
         <div class="homepagePostSubmit">
           <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
           <%= user_for_homework_common activity,is_teacher %>
@@ -77,6 +97,26 @@
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
         <div class="cl"></div>
       </div>
+      <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %>
+      <div class="mt10">
+        <div class="fl mr5 fontGrey3">
+          <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
+          已关联项目：
+        </div>
+        <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
+            <div class="mr10 mb10 fl">
+              <% project = Project.find pro.project_id %>
+              <% if project.is_public || User.current.member_of?(project) || User.current.admin?%>
+                <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
+              <% else %>
+                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+              <% end %>
+              <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+            </div>
+        <% end %>
+      </div>
+      <% end %>
+      <div class="cl"></div>
       <% if is_teacher%>
           <% comment_status = activity.homework_detail_manual.comment_status %>
           <div class="homepagePostSetting">
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 669953afa..4f1d3a5d8 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
new file mode 100644
index 000000000..aa8166a04
--- /dev/null
+++ b/app/views/users/_user_group_attr.html.erb
@@ -0,0 +1,31 @@
+<span class="f16 fontBlue">分组设置</span>
+<a href="javascript:void(0);" class="popClose" title="关闭弹框"></a>
+<div class="mt10">
+  <span class="f14 fontGrey3 mr5">每组最小人数：</span>
+  <input id="min_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" />人
+</div>
+<div class="mt10">
+  <span class="f14 fontGrey3 mr5">每组最大人数：</span>
+  <input id="max_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" />人
+</div>
+<div class="mb10 mt10">
+  <label>
+    <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 0 %>" id="base_on_project"/>
+    <span class="f14 fontGrey3 mr10">是否基于项目实施</span>
+  </label>
+  <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>
+</div>
+<div class="courseSendSubmit">
+  <a href="javascript:void(0);" class="group_btn sendSourceText">确定</a>
+</div>
+<div class="courseSendCancel">
+  <a href="javascript:void(0);" class="sendSourceText linkGrey6" id="cancel_group">取消</a>
+</div>
+<div class="cl"></div>
+<script type="text/javascript">
+  $(function(){
+      if($.trim($("#base_on_project").val()) == 1) {
+          $("#base_on_project").attr('checked','checked');
+      }
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 24d37ae63..bba7627b1 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -43,16 +43,38 @@
                              :lebel_file_uploding => l(:lebel_file_uploding),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
+  <span class="fl fontGrey2 group_detail_info"></span>
+  <div class="cl"></div>
+  <span class="fl fontGrey2" id="group_members"></span>
+  <div class="cl"></div>
+  <% if @homework && @homework.homework_type == 3 %>
+    <sapn class="fl fontGrey2" id="group_members_show">
+      合作成员：<%=User.current.show_name %>(组长)
+    </sapn>
+    <span id="student_work_group_textarea" class="ml10 c_red fl"></span>
+  <% end %>
+  <div class="cl"></div>
+  <span class="fl fontGrey2" id="relate_project_show">
+    <% if @homework && @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <% unless @homework.student_work_projects.where("user_id = #{User.current.id}").empty? %>
+            <% project = Project.find @homework.student_work_projects.where("user_id = #{User.current.id}").first.project_id %>
+            关联项目：<%=project.name %>
+        <% end %>
+    <% end %>
+  </span>
 </div>
 <div class="cl"></div>
 
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
-  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr20" onclick="$('#_file').click();">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr20",:remote => true%>
+  <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
+  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
   <% if defined?(has_program) && has_program %>
-    <a href="javascript:void(0);" class="ProBtn fl mt3">编程</a>
-    <span class="fl C_lgrey mt3 program_detail_info"></span>
+    <a href="javascript:void(0);" class="ProBtn fl mt3" title="请设置编程语言和输入测试集">编程</a>
+    <span class="fl C_lgrey mt3 program_detail_info mr15"></span>
+  <% end %>
+  <% if defined?(has_group) && has_group %>
+    <a href="javascript:void(0);" class="groupBtn fl mt3" title="请设置分组作业的相关参数">分组</a>
   <% end %>
 </div>
 
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 5bf406c59..4217cf1a9 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -44,8 +44,25 @@
               <span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
-
+      <div class="cl"></div>
+      <% if homework_common.homework_type == 3%>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% end %>
       <div class="homepagePostSubmitContainer">
+        <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(homework_common.course) %>
+            <% projects = cur_user_projects_for_homework homework_common %>
+            <% works = cur_user_works_for_homework homework_common %>
+            <% if works.nil? && projects.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
+                </div>
+            <% elsif works.nil? %>
+                <div class="homepagePostSubmit">
+                  <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %>
+                </div>
+            <% end %>
+        <% end %>
         <div class="homepagePostSubmit">
           <%= user_for_homework_common homework_common,is_teacher %>
         </div>
@@ -82,6 +99,26 @@
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
         <div class="cl"></div>
       </div>
+      <% if homework_common.homework_type == 3 && !homework_common.student_work_projects.empty?  && homework_common.homework_detail_group.base_on_project == 1 %>
+          <div class="mt10">
+            <div class="fl mr5 fontGrey3">
+              <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
+              已关联项目：
+            </div>
+            <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
+                <div class="mr10 mb10 fl">
+                  <% project = Project.find pro.project_id %>
+                  <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+                  <% end %>
+                  <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+                </div>
+            <% end %>
+          </div>
+      <% end %>
+      <div class="cl"></div>
       <% if is_teacher%>
           <% comment_status = homework_common.homework_detail_manual.comment_status%>
           <div class="homepagePostSetting">
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index cfc098645..464baf213 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -1,9 +1,13 @@
 <% content_for :header_tags do %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+
     <%= javascript_include_tag 'homework','baiduTemplate' %>
     <script type="text/javascript">
       $(function(){
         $("#BluePopupBox a.BlueCirBtn").click();
+        <% if edit_mode && homework.is_group_homework? %>
+            $("#GroupPopupBox a.group_btn").click();
+        <% end %>
       });
     </script>
 <% end %>
@@ -54,7 +58,7 @@
 
     <div id="homework_attachments">
       <!-- 编辑作业 && 作业类型为匿评作业   时没有编程选项-->
-      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type == 1)} %>
+      <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type != 2), :has_group=>!(edit_mode && homework.homework_type != 3)} %>
     </div>
 
 
@@ -97,7 +101,18 @@
   </div>
 </script>
 
-
+<script id="t:group-input-list" type="text/html">
+  <div class="group-input">
+    <input type="hidden" name="min_num" value="<!= min_num !>" />
+    <input type="hidden" name="max_num" value="<!= max_num !>" />
+    <input type="hidden" name="base_on_project" value="<!= base_on_project !>" />
+  </div>
+</script>
+  
 <div class="BluePopupBox" id="BluePopupBox" style="display:none">
   <%= render :partial => 'users/user_programing_attr', :locals => {:edit_mode => edit_mode, :homework=>homework} %>
 </div><!----BluePopupBox end-->
+
+<div class="BluePopupBox" style="display:none" id="GroupPopupBox">
+  <%= render :partial => 'users/user_group_attr', :locals => {:edit_mode => edit_mode, :homework=>homework}%>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 2e530d489..ec48055b6 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index 75a7d0fda..14be64ce0 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -11,7 +11,10 @@
   div.recall_con{width:570px;}
   div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="dis">
   <div class="msg_box" id='leave-message'>
     <% reply_allow = JournalsForMessage.create_by_user? User.current %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 640f98b1f..9f7b90ee4 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -45,12 +45,12 @@
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
             <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
-                <%= link_to "作业题目：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
+                <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
                             :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>
             <% else %>
-                <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                             :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                             :onmouseover => "message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>
@@ -103,7 +103,7 @@
             user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师" %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
           <li class="homepageHomeworkContent fl">
-            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                         :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
@@ -142,7 +142,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
           </li>
@@ -173,19 +173,25 @@
             <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
                        user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))"%>
           </li>
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：
+              该作业已经关闭了匿评。作业信息如下：
             </p>
             <ul class="ul_grey">
               <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>作业标题：<%= ma.course_message.name %></li>
             </ul>
+            <p></p>
+            <p class="c_red">注：缺省情况下，系统将在作业提交截止日期后14天自动关闭匿评。</p>
+            <p></p>
+            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
+                <p>祝您的教学活动高效、顺利、愉快！</p>
+            <% end %>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -202,7 +208,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
           </li>
@@ -213,7 +219,6 @@
 
             </p>
             <ul class="ul_normal_color">
-              <li>失败原因：<span style="color:red;">提交作品的人数低于2人</span></li>
               <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
               <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
               <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
@@ -385,7 +390,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span>
           </li>
           <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to "作业题目：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
+            <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
                         :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a>
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 94890a368..967941a88 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -22,6 +22,7 @@
     <% end %>
     <!--被管理员拉入项目-->
     <% if ma.forge_message_type == "JoinProject" %>
+      <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
@@ -52,9 +53,11 @@
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
+      <% end %>
     <% end %>
-    <!-被管理员移出项目-->
+    <!--被管理员移出项目-->
     <% if ma.forge_message_type == "RemoveFromProject" %>
+      <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
@@ -85,6 +88,7 @@
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
+      <% end %>
     <% end %>
     <!--邀请加入项目-->
     <% if ma.forge_message_type == "ProjectInvite" %>
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index 60ddd6d9c..2a0c98cad 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -15,4 +15,6 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' style='margin-left: 435px;' class='resourceClose'></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+var val =  $("#search_course_input").val();
+$("#search_course_input").val("").focus().val(val);
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 26a0f265c..f38d9edc8 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -12,3 +12,6 @@ $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' st
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+//$("#search_project_input").focus();
+var val =  $("#search_project_input").val();
+$("#search_project_input").val("").focus().val(val);
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 121450d4d..7be803720 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -4,7 +4,7 @@
       $("#homework_publish_time").val("");
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
-      $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
+      $("#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_editor").toggle();
   }
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index b94e33b16..30ba54b28 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag "user" %>
+<% end %>
+
 <style type="text/css">
     /*回复框*/
     div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
@@ -19,12 +23,12 @@
 
   <div class="message_box mb10" id="users_setting">
     <div nhname='new_message' style="display:none;">
-      <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>
+      <%= form_for('new_form',:url =>  leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
           <p nhname='contentmsg'></p>
           <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
           <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
-          <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">留言</a>
+          <a href="javascript:void(0);" class="blue_n_btn fr mr5" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
       <% end%>
     </div>
     <div class="cl"></div>
@@ -43,4 +47,13 @@
     </div>
     <div class="cl"></div>
   </div><!--message_box end-->
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+    $(function(){
+        $("#submit_feedback_user").one('click',function() {
+            $("#submit_feedback_user").submit();
+        });
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index a6d8d18c7..ae17eb733 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -361,12 +361,11 @@
         if(user_id === '<%= User.current.id%>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();
-            line.children().eq(1).html('<%= form_tag(url_for(:controller => 'users',:action => 'rename_resource',:method => 'post',:remote=>true,:id=>@user.id),:id=>"res_name_form" ) do%>' +
+            line.children().eq(1).html(
                     '<input name="res_name" id="res_name" ' +
-                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
                     'value="'+res_name+
-                    '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>'+
-                    '<% end %>');
+                    '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
             $("#res_name").focus();
             $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
         }else{
@@ -382,6 +381,8 @@
         return str.slice(0, i + 1);
     }
 
+
+
     //恢复编辑状态到链接状态
     //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
     //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
@@ -395,22 +396,22 @@
             if( name && name != res_name.trim()){
 
                 if(confirm('确定修改为 '+name)){
-                    $.post(
-                            '<%=rename_resource_user_path(@user) %>',
-                                    "res_name="+$('#res_name').val()+"&res_id="+$("#res_id").val(),
-                            function (data){
-                                if(data != 'fail'){//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                          $.ajax({
+                              url:  '<%=rename_resource_user_path(@user) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                            {
+                                if (data != 'fail') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
                                     last_line.children().eq(1).html(res_link);
-                                    last_line.children().eq(1).children().attr('title',name);
-                                    last_line.children().eq(1).children().attr('href',data);
-                                    last_line.children().eq(1).children().html(name.length > 17? name.substring(0,17)+'...' : name);
-                                }else{
+                                    last_line.children().eq(1).children().attr('title', name);
+                                    last_line.children().eq(1).children().attr('href', data);
+                                    last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                                } else {
                                     last_line.children().eq(1).html(res_link);
                                     res_link = null; //如果修改失败，恢复之后将res_link置空
                                 }
-                            },
-                            'text'
-                    );
+                            }
+                        } );
                 }else{
                     last_line.children().eq(1).html(res_link);
                     res_link = null; //如果没有做修改，恢复之后将res_link置空
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 1d9cc8d70..cd94a6816 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -5,7 +5,7 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 <% if @select_course == "0"%>
     $("#course_id").val("<%= @homework.course_id%>");
 <% end%>
-$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true })%>");
+$("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true })%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
 $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
 //$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index 014c6b487..34ef9a8eb 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -72,6 +72,22 @@
               </li>
               <div class="cl"></div>
             </ul>
+        <% when 'memo'%>
+            <ul class="searchContent">
+              <li class="fl">
+              </li>
+              <li class="fl searchContentDes">
+                <ul class="fl">
+                  <li class="f16 mb5"><a href="<%= forum_memo_path(:forum_id=>item.forum_id,:id=>item.id)%>" class="fontGrey3 fl"><%= item.try(:highlight).try(:subject) ? item.highlight.subject[0].html_safe : item.subject  %></a>
+                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">帖子</span></div>
+                    <div class="cl"></div>
+                  </li>
+                  <li class="fontGrey3 mb5"><%= item.try(:highlight).try(:content) ? item.highlight.content[0].html_safe : item.content.html_safe%></li>
+                  <li class="f12 fontGrey2"><span class="mr30">发帖人：<%=  item.author_id ?  User.find(item.author_id).login : '无' %></span><span class="mr30">创建时间:<%= format_date( item.created_at) %></span></li>
+                </ul>
+              </li>
+              <div class="cl"></div>
+            </ul>
     <%end %>
 <% end %>
     <div class="pageRoll">
diff --git a/app/views/welcome/_search_memo_results.html.erb b/app/views/welcome/_search_memo_results.html.erb
new file mode 100644
index 000000000..c5fe9cc72
--- /dev/null
+++ b/app/views/welcome/_search_memo_results.html.erb
@@ -0,0 +1,24 @@
+<% unless memos.nil? || memos.empty?%>
+    <% memos.each do |memo|%>
+        <ul class="searchContent">
+          <li class="fl">
+            <!--<img src="images/homepageImage.jpg" alt="个人图片" width="75" height="75" class="searchCourseImage" />-->
+            <%= link_to image_tag(url_to_avatar(User.find(memo.author_id)), :width => "75", :height => "75",:class=>'searchCourseImage'), forum_memo_path(:forum_id=>memo.forum_id,:id=>memo.id), :alt => "贴吧图片" %>
+          </li>
+          <li class="fl searchContentDes">
+            <ul class="fl">
+              <li class="f16 mb5"><a href="<%= forum_memo_path(:forum_id=>memo.forum_id,:id=>memo.id)%>" class="fontGrey3 fl"><%= memo.try(:highlight).try(:subject) ? memo.highlight.subject[0].html_safe : memo.subject  %></a>
+                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">帖子</span></div>
+                <div class="cl"></div>
+              </li>
+              <li class="fontGrey3 mb5"><%= memo.try(:highlight).try(:content) ? memo.highlight.content[0].html_safe : memo.content.html_safe%></li>
+              <li class="f12 fontGrey2"><span class="mr30">发帖人：<%=  memo.author_id ?  User.find(memo.author_id).login : '无' %></span><span class="mr30">创建时间:<%= format_date( memo.created_at) %></span></li>
+            </ul>
+          </li>
+          <div class="cl"></div>
+        </ul>
+    <% end %>
+    <div class="pageRoll">
+      <%= paginate memos,:params => {:controller => 'welcome', :action => 'search',:search_type=>'memo'}%>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/welcome/search.html.erb b/app/views/welcome/search.html.erb
index c25d7bfb1..ca26ba8c3 100644
--- a/app/views/welcome/search.html.erb
+++ b/app/views/welcome/search.html.erb
@@ -3,7 +3,7 @@
     function g(o){return document.getElementById(o);}
     function HoverLi(n){
 //如果有N个标签,就将i<=N;
-        for(var i=1;i<=5;i++){
+        for(var i=1;i<=6;i++){
             g('searchBaner_'+i).className='searchBannerNormal';
             g('searchContent_'+i).className='undis';g('searchNum_'+i).className="numRed";
             g('searchType_'+i).className="fontGrey2 f14";
@@ -28,6 +28,8 @@
             search('attachment')
         }else if(n == 5){
             search('project')
+        }else if(n == 6){
+            search('memo')
         }
     }
 
@@ -56,6 +58,10 @@
         }else if('<%= @search_type%>' == 'project'){
             HoverLi(5)
             $("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>');
+        }else if('<%= @search_type%>' == 'memo')
+        {
+            HoverLi(6)
+            $("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>');
         }
     })
     //如果要做成点击后再转到请将<li>中的onmouseover 改成 onclick;
@@ -76,6 +82,7 @@
           <li id="searchBaner_3" onclick="HoverLi(3);on_click_search(3);"><a href="javascript:void(0);" id="searchType_3" class="fontGrey2 f14">课程<span style="font-weight:normal;"><font id="searchNum_3" class="numRed">(<%=@course_count%>)</font></span></a></li>
           <li id="searchBaner_4" onclick="HoverLi(4);on_click_search(4);"><a href="javascript:void(0);" id="searchType_4" class="fontGrey2 f14">资源<span class="numRed" style="font-weight:normal;"><font id="searchNum_4" class="numRed">(<%= @attach_count%>)</font></span></a></li>
           <li id="searchBaner_5" onclick="HoverLi(5);on_click_search(5);"><a href="javascript:void(0);" id="searchType_5" class="fontGrey2 f14">项目<span class="numRed" style="font-weight:normal;"><font id="searchNum_5" class="numRed">(<%= @project_count%>)</font></span></a></li>
+          <li id="searchBaner_6" onclick="HoverLi(6);on_click_search(6);"><a href="javascript:void(0);" id="searchType_6" class="fontGrey2 f14">帖子<span class="numRed" style="font-weight:normal;"><font id="searchNum_6" class="numRed">(<%= @memo_count%>)</font></span></a></li>
           <div class="cl"></div>
         </ul>
         <ul id="searchTips" style="display:none;">
@@ -94,6 +101,9 @@
         </div>
         <div id="searchContent_5" class="undis">
 
+        </div>
+        <div id="searchContent_6" class="undis">
+
         </div>
     </div>
     </div>
diff --git a/app/views/welcome/search.js.erb b/app/views/welcome/search.js.erb
index c53c5d219..5cb446896 100644
--- a/app/views/welcome/search.js.erb
+++ b/app/views/welcome/search.js.erb
@@ -9,5 +9,7 @@ $("#searchContent_3").html('<%= escape_javascript(render :partial => 'search_cou
 $("#searchContent_5").html('<%= escape_javascript(render :partial => 'search_project_results',:locals => {:projects=>@projects})%>');
 <% when 'attachment'%>
 $("#searchContent_4").html('<%= escape_javascript(render :partial => 'search_attachment_results',:locals => {:attachments=>@attachments})%>');
+<% when 'memo'%>
+$("#searchContent_6").html('<%= escape_javascript(render :partial => 'search_memo_results',:locals => {:memos=>@memos})%>');
 <%else%>
 <%end %>
\ No newline at end of file
diff --git a/config/configuration.yml b/config/configuration.yml
deleted file mode 100644
index 3790045aa..000000000
--- a/config/configuration.yml
+++ /dev/null
@@ -1,235 +0,0 @@
-# = Redmine configuration file
-#
-# Each environment has it's own configuration options.  If you are only
-# running in production, only the production block needs to be configured.
-# Environment specific configuration options override the default ones.
-#
-# Note that this file needs to be a valid YAML file.
-# DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
-#
-# == Outgoing email settings (email_delivery setting)
-#
-# === Common configurations
-#
-# ==== Sendmail command
-#
-# production:
-#   email_delivery:
-#     delivery_method: :sendmail
-#
-# ==== Simple SMTP server at localhost
-#
-# production:
-#   email_delivery:
-#     delivery_method: :smtp
-#     smtp_settings:
-#       address: smtp.163.com
-#       port: 25
-#
-# ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
-#
-# production:
-#   email_delivery:
-#     delivery_method: :smtp
-#     smtp_settings:
-#       address: smtp.gmail.com
-#       port: 587
-#       authentication: :login
-#       domain: 'foo.com'
-#       user_name: senluowanxiangt@gmail.com
-#       password: 1913TXBja
-#
-# ==== SMTP server at example.com using PLAIN authentication
-#
-# production:
-#   email_delivery:
-#     delivery_method: :smtp
-#     smtp_settings:
-#       address: smtp.gmail.com
-#       port: 587
-#       authentication: :plain
-#       domain: 'example.com'
-#       user_name: senluowanxiangt@gmail.com
-#       password: 1913TXBja
-#
-# ==== SMTP server at using TLS (GMail)
-#
-# This might require some additional configuration. See the guides at:
-# http://www.redmine.org/projects/redmine/wiki/EmailConfiguration
-#
-# production:
-#   email_delivery:
-#     delivery_method: :smtp
-#     smtp_settings:
-#       enable_starttls_auto: true
-#       address: smtp.gmail.com
-#       port: 587
-#       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
-#       authentication: :plain
-#       user_name: senluowanxiangt@gmail.com
-#       password: 1913TXBja
-#
-#
-# === More configuration options
-#
-# See the "Configuration options" at the following website for a list of the
-# full options allowed:
-#
-# http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
-
-
-
-default:
-  email_delivery:
-    delivery_method: :smtp
-    smtp_settings:
-          address: mail.trustie.net
-          port: 25
-          domain: mail.trustie.net
-          authentication: :login
-          user_name: "mail@trustie.net"
-          password: "loong2010"
-
-  # Absolute path to the directory where attachments are stored.
-  # The default is the 'files' directory in your Redmine instance.
-  # Your Redmine instance needs to have write permission on this
-  # directory.
-  # Examples:
-  # attachments_storage_path: /var/redmine/files
-  # attachments_storage_path: D:/redmine/files
-  attachments_storage_path:
-
-  # Configuration of the autologin cookie.
-  # autologin_cookie_name: the name of the cookie (default: autologin)
-  # autologin_cookie_path: the cookie path (default: /)
-  # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name: "autologin_trustie"
-  autologin_cookie_path:
-  autologin_cookie_secure:
-
-  # Configuration of SCM executable command.
-  #
-  # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
-  # On Windows + CRuby, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
-  #
-  # On Windows + JRuby 1.6.2, path which contains spaces does not work.
-  # For example, "C:\Program Files\TortoiseHg\hg.exe".
-  # If you want to this feature, you need to install to the path which does not contains spaces.
-  # For example, "C:\TortoiseHg\hg.exe".
-  #
-  # Examples:
-  # scm_subversion_command: svn                                       # (default: svn)
-  # scm_mercurial_command:  C:\Program Files\TortoiseHg\hg.exe        # (default: hg)
-  # scm_git_command:        /usr/local/bin/git                        # (default: git)
-  # scm_cvs_command:        cvs                                       # (default: cvs)
-  # scm_bazaar_command:     bzr.exe                                   # (default: bzr)
-  # scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
-  #
-  scm_subversion_command:
-  scm_mercurial_command:
-  scm_git_command:
-  scm_cvs_command:
-  scm_bazaar_command:
-  scm_darcs_command:
-
-  # Absolute path to the SCM commands errors (stderr) log file.
-  # The default is to log in the 'log' directory of your Redmine instance.
-  # Example:
-  # scm_stderr_log_file: /var/log/redmine_scm_stderr.log
-  scm_stderr_log_file:
-
-  # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
-  # If you don't want to enable data encryption, just leave it blank.
-  # WARNING: losing/changing this key will make encrypted data unreadable.
-  #
-  # If you want to encrypt existing passwords in your database:
-  # * set the cipher key here in your configuration file
-  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
-  #
-  # If you have encrypted data and want to change this key, you have to:
-  # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
-  # * change the cipher key here in your configuration file
-  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
-  database_cipher_key:
-
-  # Set this to false to disable plugins' assets mirroring on startup.
-  # You can use `rake redmine:plugins:assets` to manually mirror assets
-  # to public/plugin_assets when you install/upgrade a Redmine plugin.
-  #
-  #mirror_plugins_assets_on_startup: false
-
-  # Your secret key for verifying cookie session data integrity. If you
-  # change this key, all old sessions will become invalid! Make sure the
-  # secret is at least 30 characters and all random, no regular words or
-  # you'll be exposed to dictionary attacks.
-  #
-  # If you have a load-balancing Redmine cluster, you have to use the
-  # same secret token on each machine.
-  #secret_token: 'change it to a long random string'
-
-  # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
-  # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
-  imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
-
-  # Configuration of RMagcik font.
-  #
-  # Redmine uses RMagcik in order to export gantt png.
-  # You don't need this setting if you don't install RMagcik.
-  #
-  # In CJK (Chinese, Japanese and Korean),
-  # in order to show CJK characters correctly,
-  # you need to set this configuration.
-  #
-  # Because there is no standard font across platforms in CJK,
-  # you need to set a font installed in your server.
-  #
-  # This setting is not necessary in non CJK.
-  #
-  # Examples for Japanese:
-  #   Windows:
-  #     rmagick_font_path: C:\windows\fonts\msgothic.ttc
-  #   Linux:
-  #     rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
-  #
-  rmagick_font_path:
-
-  # Maximum number of simultaneous AJAX uploads
-  #max_concurrent_ajax_uploads: 2
-  #pic_types: "bmp,jpeg,jpg,png,gif"
-
-  repository_root_path: '/tmp/htdocs'
-  judge_server: 'http://judge.trustie.net/'
-
-  # Git's url
-  gitlab_address: 'http://gitfast.trustie.net'
-
-# specific configuration options for production environment
-# that overrides the default ones
-production:
-  # CJK support
-  rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
-  judge_server: 'http://192.168.80.21:8080/'
-  repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
-  cookie_domain: ".trustie.net"
-  email_delivery:
-    delivery_method: :smtp
-    smtp_settings:
-      address: mail.trustie.net
-      port: 25
-      domain: mail.trustie.net
-      authentication: :login
-      user_name: "mail@trustie.net"
-      password: "loong2010"
-
-# specific configuration options for development environment
-# that overrides the default ones
-development:
-  email_delivery:
-    delivery_method: :smtp
-    smtp_settings:
-      address: mail.trustie.net
-      port: 25
-      domain: mail.trustie.net
-      authentication: :login
-      user_name: "mail@trustie.net"
-      password: "loong2010"
diff --git a/config/initializers/gitlab_config.rb b/config/initializers/gitlab_config.rb
deleted file mode 100644
index c82b2edff..000000000
--- a/config/initializers/gitlab_config.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-Gitlab.configure do |config|
-  # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
-  # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
-  config.endpoint       = 'http://gitfast.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
-  config.private_token  = 'fPc_gBmEiSANve8TCfxW'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
-  # Optional
-  # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
-  # config.sudo         = 'user'                       # username for sudo mode, default: nil
-end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7ccbb8410..81b20a67e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -921,6 +921,7 @@ zh:
   button_rollback: 恢复到这个版本
   button_reply: 回复
   button_archive: 存档
+  button_delete_project: 删除项目
   button_unarchive: 取消存档
   button_reset: 重置
   button_rename: 重命名/重定向
diff --git a/config/routes.rb b/config/routes.rb
index 15e41955d..52fa393ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,7 +72,17 @@ RedmineApp::Application.routes.draw do
   end
 
   resources :org_subfields do
-
+    resources :files, :only => [:index, :new, :create] do
+      collection do
+        match "getattachtype", :via =>  [:get, :post]
+        match "search",:via => [:post,:get]
+        match "searchone4reload",:via => [:post,:get]
+        match "search_tag_attachment", :via => [:post,:get]
+      end
+      member do
+        match "quote_resource_show", :via => [:get]
+      end
+    end
   end
 
   resources :org_document_comments do
@@ -219,6 +229,11 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       post 'add_score_reply'
+      post 'student_work_project'
+      get 'new_student_work_project'
+      get 'search_user_projects'
+      get 'search_course_students'
+      get 'cancel_relate_project'
       get 'delete_work'
       get 'destroy_score_reply'
       get 'student_work_absence_penalty'
@@ -485,7 +500,7 @@ RedmineApp::Application.routes.draw do
       post "add_exist_file_to_course"
       post "add_exist_file_to_project"
       get 'resource_preview'
-      post 'rename_resource'
+      get 'rename_resource'
       get 'search_user_project'
       get 'user_resource_type'
       get 'user_ref_resource_search'
@@ -890,6 +905,7 @@ RedmineApp::Application.routes.draw do
       get 'member_score', :to => 'courses#member_score'
       post 'finishcourse'
       post 'restartcourse'
+      match "renew", :to => 'courses#renew', :via => [:post, :get], :as =>'renew'
       match "searchmembers", :controller => 'courses', :action => 'searchmembers', :via => [:post,:get]
       match "searchgroupmembers", :via => [:post, :get]
       match 'member_score_sort', :via => [:get]
diff --git a/db/migrate/20151202064455_create_homework_detail_groups.rb b/db/migrate/20151202064455_create_homework_detail_groups.rb
new file mode 100644
index 000000000..a77e50f01
--- /dev/null
+++ b/db/migrate/20151202064455_create_homework_detail_groups.rb
@@ -0,0 +1,14 @@
+class CreateHomeworkDetailGroups < ActiveRecord::Migration
+  def change
+    create_table :homework_detail_groups do |t|
+      t.integer :homework_common_id
+      t.integer :min_num
+      t.integer :max_num
+      t.integer :base_on_project
+      t.references :homework_common
+
+      t.timestamps
+    end
+    add_index :homework_detail_groups, :homework_common_id
+  end
+end
diff --git a/db/migrate/20151208015409_add_is_delete_to_courses.rb b/db/migrate/20151208015409_add_is_delete_to_courses.rb
new file mode 100644
index 000000000..cf037e010
--- /dev/null
+++ b/db/migrate/20151208015409_add_is_delete_to_courses.rb
@@ -0,0 +1,5 @@
+class AddIsDeleteToCourses < ActiveRecord::Migration
+  def change
+    add_column :courses, :is_delete, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20151208025236_create_student_work_projects.rb b/db/migrate/20151208025236_create_student_work_projects.rb
new file mode 100644
index 000000000..134823377
--- /dev/null
+++ b/db/migrate/20151208025236_create_student_work_projects.rb
@@ -0,0 +1,13 @@
+class CreateStudentWorkProjects < ActiveRecord::Migration
+  def change
+    create_table :student_work_projects do |t|
+      t.integer :homework_common_id
+      t.integer :student_work_id
+      t.integer :project_id
+      t.integer :user_id
+      t.integer :is_leader
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20151208032013_add_index_to_student_work_project.rb b/db/migrate/20151208032013_add_index_to_student_work_project.rb
new file mode 100644
index 000000000..b55c313ff
--- /dev/null
+++ b/db/migrate/20151208032013_add_index_to_student_work_project.rb
@@ -0,0 +1,8 @@
+class AddIndexToStudentWorkProject < ActiveRecord::Migration
+  def change
+    add_index :student_work_projects, :homework_common_id
+    add_index :student_work_projects, :user_id
+    add_index :student_work_projects, :project_id
+    add_index :student_work_projects, :student_work_id
+  end
+end
diff --git a/db/migrate/20151215070238_delete_validate_course_contributor.rb b/db/migrate/20151215070238_delete_validate_course_contributor.rb
new file mode 100644
index 000000000..704ca893d
--- /dev/null
+++ b/db/migrate/20151215070238_delete_validate_course_contributor.rb
@@ -0,0 +1,13 @@
+class DeleteValidateCourseContributor < ActiveRecord::Migration
+  def up
+    course_contributors = CourseContributorScore.where("course_id>? and created_at<? ", 450, "2015-12-15 19:51:48")
+    course_contributors.delete_all
+    c170 = CourseContributorScore.where("course_id =?", 170)
+    c170.delete_all
+    c436 = CourseContributorScore.where("course_id =?", 436)
+    c436.delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151215105425_delete_exercise_user.rb b/db/migrate/20151215105425_delete_exercise_user.rb
new file mode 100644
index 000000000..781337454
--- /dev/null
+++ b/db/migrate/20151215105425_delete_exercise_user.rb
@@ -0,0 +1,9 @@
+class DeleteExerciseUser < ActiveRecord::Migration
+  def up
+    eus=ExerciseUser.where("score is null and status=?",0)
+    eus.delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151217051447_delete_valid_project.rb b/db/migrate/20151217051447_delete_valid_project.rb
new file mode 100644
index 000000000..fd99ac08e
--- /dev/null
+++ b/db/migrate/20151217051447_delete_valid_project.rb
@@ -0,0 +1,15 @@
+class DeleteValidProject < ActiveRecord::Migration
+  def up
+    projects = Project.where("project_type =?", 1)
+    begin
+      projects.each do |p|
+        p.delete
+      end
+    rescue => e
+      logger.error "Delete project failed ====>#{e}"
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6813ef6ed..27de276b1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151204062220) do
+ActiveRecord::Schema.define(:version => 20151217051447) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -459,6 +459,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "open_student",                  :default => 0
     t.integer  "outline",                       :default => 0
     t.integer  "publish_resource",              :default => 0
+    t.integer  "is_delete",                     :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -744,6 +745,17 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
 
   add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
 
+  create_table "homework_detail_groups", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.integer  "base_on_project"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id"
+
   create_table "homework_detail_manuals", :force => true do |t|
     t.float    "ta_proportion"
     t.integer  "comment_status"
@@ -1149,6 +1161,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.datetime "updated_at",                         :null => false
     t.boolean  "locked",          :default => false
     t.integer  "sticky",          :default => 0
+    t.integer  "org_subfield_id"
   end
 
   create_table "org_member_roles", :force => true do |t|
@@ -1175,6 +1188,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.string   "name"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.string   "field_type"
   end
 
   create_table "organizations", :force => true do |t|
@@ -1497,6 +1511,21 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
     t.integer  "project_id"
   end
 
+  create_table "student_work_projects", :force => true do |t|
+    t.integer  "homework_common_id"
+    t.integer  "student_work_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "is_leader"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id"
+  add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id"
+  add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id"
+  add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id"
+
   create_table "student_work_tests", :force => true do |t|
     t.integer  "student_work_id"
     t.datetime "created_at",                     :null => false
@@ -1525,7 +1554,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
-  add_index "student_works", ["homework_common_id"], :name => "index"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
index e56a740db..8824ca3e9 100644
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -58,6 +58,23 @@ class Gitlab::Client
     end
     alias_method :repo_commits, :commits
 
+    # Gets a list of project commits.
+    #
+    # @example
+    #   Gitlab.commits('viking')
+    #   Gitlab.repo_commits('gitlab', :ref_name => 'api')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :ref_name The branch or tag name of a project repository.
+    # @option options [Integer] :page The page number.
+    # @option options [Integer] :per_page The number of results per page.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def commits_total_count(project, options={})
+      get("/projects/#{project}/repository/commits_total_count", :query => options)
+    end
+    alias_method :repo_commits, :commits_total_count
+
     # Gets a specific commit identified by the commit hash or name of a branch or tag.
     #
     # @example
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index eef2eb576..08f4da0ad 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -1,5 +1,6 @@
 module RailsKindeditor
   module Helper
+    EVAL_STR = %Q|eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin("autoheight")})|
 
     def kindeditor_tag(name, content = nil, options = {})
       id = sanitize_to_id(name)
@@ -9,7 +10,7 @@ module RailsKindeditor
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                             :autoHeightMode=>true,
-                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                            afterCreate: EVAL_STR,
                                                             emotionsBasePath: 'http://' + Setting.host_name
                                                             )))
     end
@@ -22,7 +23,7 @@ module RailsKindeditor
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                  :autoHeightMode=>true,
-                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                                                afterCreate: EVAL_STR,
                                                                                 emotionsBasePath: 'http://' + Setting.host_name
                                                                                 )))
     end
diff --git a/lib/tasks/elasticsearch_batch_op.rake b/lib/tasks/elasticsearch_batch_op.rake
index fb2c638bc..91c2ddff9 100644
--- a/lib/tasks/elasticsearch_batch_op.rake
+++ b/lib/tasks/elasticsearch_batch_op.rake
@@ -28,4 +28,11 @@ namespace :importer do
     ENV['BATCH']='1000'
     Rake::Task["elasticsearch:import:model"].invoke
   end
+  task :importmemo do
+    ENV['CLASS']='Memo'
+    ENV['SCOPE']='indexable'
+    ENV['FORCE']='y'
+    ENV['BATCH']='1000'
+    Rake::Task["elasticsearch:import:model"].invoke
+  end
 end
\ No newline at end of file
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 84082eb9b..585d91737 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -14,14 +14,33 @@ namespace :homework_evaluation do
       if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
         student_works = homework_common.student_works
         if student_works && student_works.size >= 2
-          student_works.each_with_index do |work, index|
-            user = work.user
-            n = homework_detail_manual.evaluation_num
-            n = n < student_works.size ? n : student_works.size - 1
-            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-            assigned_homeworks.each do |h|
-              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-              student_works_evaluation_distributions.save
+          if homework_common.homework_type == 3
+            student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")
+            student_work_projects.each_with_index do |pro_work, pro_index|
+              n = homework_detail_manual.evaluation_num
+              n = n < student_works.size ? n : student_works.size - 1
+              work_index = -1
+              student_works.each_with_index do |stu_work, stu_index|
+                if stu_work.id.to_i == pro_work.student_work_id.to_i
+                  work_index = stu_index
+                end
+              end
+              assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+              assigned_homeworks.each do |h|
+                student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+                student_works_evaluation_distributions.save
+              end
+            end
+          else
+            student_works.each_with_index do |work, index|
+              user = work.user
+              n = homework_detail_manual.evaluation_num
+              n = n < student_works.size ? n : student_works.size - 1
+              assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+              assigned_homeworks.each do |h|
+                student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+                student_works_evaluation_distributions.save
+              end
             end
           end
           homework_detail_manual.update_column('comment_status', 2)
diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js
new file mode 100644
index 000000000..b9769c42e
--- /dev/null
+++ b/public/assets/kindeditor/at/config.js
@@ -0,0 +1,38 @@
+function enableAt(_editor) {
+    var editor = _editor;
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+
+    var ifr = editor.edit.iframe[0];
+    var doc = ifr.contentDocument || iframe.contentWindow.document;
+    var ifrBody = doc.body;
+    ifrBody.contentEditable = true;
+    console.log("enable at");
+
+    $.fn.atwho.debug = true;
+    if(!atPersonLists){
+        return;
+    }
+    var names = atPersonLists;
+
+    //var names = ["Jacob","Isabella","Ethan","Emma","Michael","Olivia","Alexander","Sophia","William","Ava","Joshua","Emily","Daniel","Madison","Jayden","Abigail","Noah","Chloe","你好","你你你", "가"];
+    //
+    //var names = $.map(names,function(value,i) {
+    //    return {'id':i,'name':value,'email':value+"@email.com"};
+    //});
+
+    var at_config = {
+        at: "@",
+        data: names,
+        insertTpl: '<span style="color:#269ac9">@${name}(${login})</span>',
+        displayTpl: "<li>${name} <small>${login}</small></li>",
+        searchKey: 'searchKey',
+        limit: 200
+    }
+
+    $inputor = $(ifrBody).atwho(at_config);
+    window.aaa= $inputor;
+    $inputor.caret('pos', 47);
+    $inputor.focus().atwho('run');
+};
diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css
new file mode 100644
index 000000000..a07390887
--- /dev/null
+++ b/public/assets/kindeditor/at/jquery.atwho.css
@@ -0,0 +1,49 @@
+.atwho-view {
+    position:absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    margin-top: 18px;
+    background: white;
+    color: black;
+    border: 1px solid #DDD;
+    border-radius: 3px;
+    box-shadow: 0 0 5px rgba(0,0,0,0.1);
+    min-width: 120px;
+    max-height: 200px;
+    overflow: auto;
+    z-index: 11110 !important;
+}
+
+.atwho-view .cur {
+    background: #3366FF;
+    color: white;
+}
+.atwho-view .cur small {
+    color: white;
+}
+.atwho-view strong {
+    color: #3366FF;
+}
+.atwho-view .cur strong {
+    color: white;
+    font:bold;
+}
+.atwho-view ul {
+    /* width: 100px; */
+    list-style:none;
+    padding:0;
+    margin:auto;
+}
+.atwho-view ul li {
+    display: block;
+    padding: 5px 10px;
+    border-bottom: 1px solid #DDD;
+    cursor: pointer;
+    /* border-top: 1px solid #C8C8C8; */
+}
+.atwho-view small {
+    font-size: smaller;
+    color: #777;
+    font-weight: normal;
+}
diff --git a/public/assets/kindeditor/at/jquery.atwho.js b/public/assets/kindeditor/at/jquery.atwho.js
new file mode 100644
index 000000000..1e6c8ec25
--- /dev/null
+++ b/public/assets/kindeditor/at/jquery.atwho.js
@@ -0,0 +1,1161 @@
+/*! jquery.atwho - v1.4.0 %>
+* Copyright (c) 2015 chord.luo <chord.luo@gmail.com>;
+* homepage: http://ichord.github.com/At.js
+* Licensed MIT
+*/
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module unless amdModuleId is set
+    define(["jquery"], function (a0) {
+      return (factory(a0));
+    });
+  } else if (typeof exports === 'object') {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory(require("jquery"));
+  } else {
+    factory(jQuery);
+  }
+}(this, function (jquery) {
+
+var $, Api, App, Controller, DEFAULT_CALLBACKS, EditableController, KEY_CODE, Model, TextareaController, View,
+  slice = [].slice,
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
+
+$ = jquery;
+
+App = (function() {
+  function App(inputor) {
+    this.currentFlag = null;
+    this.controllers = {};
+    this.aliasMaps = {};
+    this.$inputor = $(inputor);
+    this.setupRootElement();
+    this.listen();
+  }
+
+  App.prototype.createContainer = function(doc) {
+    var ref;
+    if ((ref = this.$el) != null) {
+      ref.remove();
+    }
+    return $(doc.body).append(this.$el = $("<div class='atwho-container'></div>"));
+  };
+
+  App.prototype.setupRootElement = function(iframe, asRoot) {
+    var error;
+    if (asRoot == null) {
+      asRoot = false;
+    }
+    if (iframe) {
+      this.window = iframe.contentWindow;
+      this.document = iframe.contentDocument || this.window.document;
+      this.iframe = iframe;
+    } else {
+      this.document = this.$inputor[0].ownerDocument;
+      this.window = this.document.defaultView || this.document.parentWindow;
+      try {
+        this.iframe = this.window.frameElement;
+      } catch (_error) {
+        error = _error;
+        this.iframe = null;
+        if ($.fn.atwho.debug) {
+          throw new Error("iframe auto-discovery is failed.\nPlease use `setIframe` to set the target iframe manually.\n" + error);
+        }
+      }
+    }
+    return this.createContainer((this.iframeAsRoot = asRoot) ? this.document : document);
+  };
+
+  App.prototype.controller = function(at) {
+    var c, current, currentFlag, ref;
+    if (this.aliasMaps[at]) {
+      current = this.controllers[this.aliasMaps[at]];
+    } else {
+      ref = this.controllers;
+      for (currentFlag in ref) {
+        c = ref[currentFlag];
+        if (currentFlag === at) {
+          current = c;
+          break;
+        }
+      }
+    }
+    if (current) {
+      return current;
+    } else {
+      return this.controllers[this.currentFlag];
+    }
+  };
+
+  App.prototype.setContextFor = function(at) {
+    this.currentFlag = at;
+    return this;
+  };
+
+  App.prototype.reg = function(flag, setting) {
+    var base, controller;
+    controller = (base = this.controllers)[flag] || (base[flag] = this.$inputor.is('[contentEditable]') ? new EditableController(this, flag) : new TextareaController(this, flag));
+    if (setting.alias) {
+      this.aliasMaps[setting.alias] = flag;
+    }
+    controller.init(setting);
+    return this;
+  };
+
+  App.prototype.listen = function() {
+    return this.$inputor.on('compositionstart', (function(_this) {
+      return function(e) {
+        var ref;
+        if ((ref = _this.controller()) != null) {
+          ref.view.hide();
+        }
+        _this.isComposing = true;
+        return null;
+      };
+    })(this)).on('compositionend', (function(_this) {
+      return function(e) {
+        _this.isComposing = false;
+        return null;
+      };
+    })(this)).on('keyup.atwhoInner', (function(_this) {
+      return function(e) {
+        return _this.onKeyup(e);
+      };
+    })(this)).on('keydown.atwhoInner', (function(_this) {
+      return function(e) {
+        return _this.onKeydown(e);
+      };
+    })(this)).on('blur.atwhoInner', (function(_this) {
+      return function(e) {
+        var c;
+        if (c = _this.controller()) {
+          c.expectedQueryCBId = null;
+          return c.view.hide(e, c.getOpt("displayTimeout"));
+        }
+      };
+    })(this)).on('click.atwhoInner', (function(_this) {
+      return function(e) {
+        return _this.dispatch(e);
+      };
+    })(this)).on('scroll.atwhoInner', (function(_this) {
+      return function() {
+        var lastScrollTop;
+        lastScrollTop = _this.$inputor.scrollTop();
+        return function(e) {
+          var currentScrollTop, ref;
+          currentScrollTop = e.target.scrollTop;
+          if (lastScrollTop !== currentScrollTop) {
+            if ((ref = _this.controller()) != null) {
+              ref.view.hide(e);
+            }
+          }
+          lastScrollTop = currentScrollTop;
+          return true;
+        };
+      };
+    })(this)());
+  };
+
+  App.prototype.shutdown = function() {
+    var _, c, ref;
+    ref = this.controllers;
+    for (_ in ref) {
+      c = ref[_];
+      c.destroy();
+      delete this.controllers[_];
+    }
+    this.$inputor.off('.atwhoInner');
+    return this.$el.remove();
+  };
+
+  App.prototype.dispatch = function(e) {
+    var _, c, ref, results;
+    ref = this.controllers;
+    results = [];
+    for (_ in ref) {
+      c = ref[_];
+      results.push(c.lookUp(e));
+    }
+    return results;
+  };
+
+  App.prototype.onKeyup = function(e) {
+    var ref;
+    switch (e.keyCode) {
+      case KEY_CODE.ESC:
+        e.preventDefault();
+        if ((ref = this.controller()) != null) {
+          ref.view.hide();
+        }
+        break;
+      case KEY_CODE.DOWN:
+      case KEY_CODE.UP:
+      case KEY_CODE.CTRL:
+      case KEY_CODE.ENTER:
+        $.noop();
+        break;
+      case KEY_CODE.P:
+      case KEY_CODE.N:
+        if (!e.ctrlKey) {
+          this.dispatch(e);
+        }
+        break;
+      default:
+        this.dispatch(e);
+    }
+  };
+
+  App.prototype.onKeydown = function(e) {
+    var ref, view;
+    view = (ref = this.controller()) != null ? ref.view : void 0;
+    if (!(view && view.visible())) {
+      return;
+    }
+    switch (e.keyCode) {
+      case KEY_CODE.ESC:
+        e.preventDefault();
+        view.hide(e);
+        break;
+      case KEY_CODE.UP:
+        e.preventDefault();
+        view.prev();
+        break;
+      case KEY_CODE.DOWN:
+        e.preventDefault();
+        view.next();
+        break;
+      case KEY_CODE.P:
+        if (!e.ctrlKey) {
+          return;
+        }
+        e.preventDefault();
+        view.prev();
+        break;
+      case KEY_CODE.N:
+        if (!e.ctrlKey) {
+          return;
+        }
+        e.preventDefault();
+        view.next();
+        break;
+      case KEY_CODE.TAB:
+      case KEY_CODE.ENTER:
+      case KEY_CODE.SPACE:
+        if (!view.visible()) {
+          return;
+        }
+        if (!this.controller().getOpt('spaceSelectsMatch') && e.keyCode === KEY_CODE.SPACE) {
+          return;
+        }
+        if (!this.controller().getOpt('tabSelectsMatch') && e.keyCode === KEY_CODE.TAB) {
+          return;
+        }
+        if (view.highlighted()) {
+          e.preventDefault();
+          view.choose(e);
+        } else {
+          view.hide(e);
+        }
+        break;
+      default:
+        $.noop();
+    }
+  };
+
+  return App;
+
+})();
+
+Controller = (function() {
+  Controller.prototype.uid = function() {
+    return (Math.random().toString(16) + "000000000").substr(2, 8) + (new Date().getTime());
+  };
+
+  function Controller(app1, at1) {
+    this.app = app1;
+    this.at = at1;
+    this.$inputor = this.app.$inputor;
+    this.id = this.$inputor[0].id || this.uid();
+    this.expectedQueryCBId = null;
+    this.setting = null;
+    this.query = null;
+    this.pos = 0;
+    this.range = null;
+    if ((this.$el = $("#atwho-ground-" + this.id, this.app.$el)).length === 0) {
+      this.app.$el.append(this.$el = $("<div id='atwho-ground-" + this.id + "'></div>"));
+    }
+    this.model = new Model(this);
+    this.view = new View(this);
+  }
+
+  Controller.prototype.init = function(setting) {
+    this.setting = $.extend({}, this.setting || $.fn.atwho["default"], setting);
+    this.view.init();
+    return this.model.reload(this.setting.data);
+  };
+
+  Controller.prototype.destroy = function() {
+    this.trigger('beforeDestroy');
+    this.model.destroy();
+    this.view.destroy();
+    return this.$el.remove();
+  };
+
+  Controller.prototype.callDefault = function() {
+    var args, error, funcName;
+    funcName = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+    try {
+      return DEFAULT_CALLBACKS[funcName].apply(this, args);
+    } catch (_error) {
+      error = _error;
+      return $.error(error + " Or maybe At.js doesn't have function " + funcName);
+    }
+  };
+
+  Controller.prototype.trigger = function(name, data) {
+    var alias, eventName;
+    if (data == null) {
+      data = [];
+    }
+    data.push(this);
+    alias = this.getOpt('alias');
+    eventName = alias ? name + "-" + alias + ".atwho" : name + ".atwho";
+    return this.$inputor.trigger(eventName, data);
+  };
+
+  Controller.prototype.callbacks = function(funcName) {
+    return this.getOpt("callbacks")[funcName] || DEFAULT_CALLBACKS[funcName];
+  };
+
+  Controller.prototype.getOpt = function(at, default_value) {
+    var e;
+    try {
+      return this.setting[at];
+    } catch (_error) {
+      e = _error;
+      return null;
+    }
+  };
+
+  Controller.prototype.insertContentFor = function($li) {
+    var data, tpl;
+    tpl = this.getOpt('insertTpl');
+    data = $.extend({}, $li.data('item-data'), {
+      'atwho-at': this.at
+    });
+    return this.callbacks("tplEval").call(this, tpl, data, "onInsert");
+  };
+
+  Controller.prototype.renderView = function(data) {
+    var searchKey;
+    searchKey = this.getOpt("searchKey");
+    data = this.callbacks("sorter").call(this, this.query.text, data.slice(0, 1001), searchKey);
+    return this.view.render(data.slice(0, this.getOpt('limit')));
+  };
+
+  Controller.arrayToDefaultHash = function(data) {
+    var i, item, len, results;
+    if (!$.isArray(data)) {
+      return data;
+    }
+    results = [];
+    for (i = 0, len = data.length; i < len; i++) {
+      item = data[i];
+      if ($.isPlainObject(item)) {
+        results.push(item);
+      } else {
+        results.push({
+          name: item
+        });
+      }
+    }
+    return results;
+  };
+
+  Controller.prototype.lookUp = function(e) {
+    var query, wait;
+    if (e && e.type === 'click' && !this.getOpt('lookUpOnClick')) {
+      return;
+    }
+    if (this.getOpt('suspendOnComposing') && this.app.isComposing) {
+      return;
+    }
+    query = this.catchQuery(e);
+    if (!query) {
+      this.expectedQueryCBId = null;
+      return query;
+    }
+    this.app.setContextFor(this.at);
+    if (wait = this.getOpt('delay')) {
+      this._delayLookUp(query, wait);
+    } else {
+      this._lookUp(query);
+    }
+    return query;
+  };
+
+  Controller.prototype._delayLookUp = function(query, wait) {
+    var now, remaining;
+    now = Date.now ? Date.now() : new Date().getTime();
+    this.previousCallTime || (this.previousCallTime = now);
+    remaining = wait - (now - this.previousCallTime);
+    if ((0 < remaining && remaining < wait)) {
+      this.previousCallTime = now;
+      this._stopDelayedCall();
+      return this.delayedCallTimeout = setTimeout((function(_this) {
+        return function() {
+          _this.previousCallTime = 0;
+          _this.delayedCallTimeout = null;
+          return _this._lookUp(query);
+        };
+      })(this), wait);
+    } else {
+      this._stopDelayedCall();
+      if (this.previousCallTime !== now) {
+        this.previousCallTime = 0;
+      }
+      return this._lookUp(query);
+    }
+  };
+
+  Controller.prototype._stopDelayedCall = function() {
+    if (this.delayedCallTimeout) {
+      clearTimeout(this.delayedCallTimeout);
+      return this.delayedCallTimeout = null;
+    }
+  };
+
+  Controller.prototype._generateQueryCBId = function() {
+    return {};
+  };
+
+  Controller.prototype._lookUp = function(query) {
+    var _callback;
+    _callback = function(queryCBId, data) {
+      if (queryCBId !== this.expectedQueryCBId) {
+        return;
+      }
+      if (data && data.length > 0) {
+        return this.renderView(this.constructor.arrayToDefaultHash(data));
+      } else {
+        return this.view.hide();
+      }
+    };
+    this.expectedQueryCBId = this._generateQueryCBId();
+    return this.model.query(query.text, $.proxy(_callback, this, this.expectedQueryCBId));
+  };
+
+  return Controller;
+
+})();
+
+TextareaController = (function(superClass) {
+  extend(TextareaController, superClass);
+
+  function TextareaController() {
+    return TextareaController.__super__.constructor.apply(this, arguments);
+  }
+
+  TextareaController.prototype.catchQuery = function() {
+    var caretPos, content, end, isString, query, start, subtext;
+    content = this.$inputor.val();
+    caretPos = this.$inputor.caret('pos', {
+      iframe: this.app.iframe
+    });
+    subtext = content.slice(0, caretPos);
+    query = this.callbacks("matcher").call(this, this.at, subtext, this.getOpt('startWithSpace'));
+    isString = typeof query === 'string';
+    if (isString && query.length < this.getOpt('minLen', 0)) {
+      return;
+    }
+    if (isString && query.length <= this.getOpt('maxLen', 20)) {
+      start = caretPos - query.length;
+      end = start + query.length;
+      this.pos = start;
+      query = {
+        'text': query,
+        'headPos': start,
+        'endPos': end
+      };
+      this.trigger("matched", [this.at, query.text]);
+    } else {
+      query = null;
+      this.view.hide();
+    }
+    return this.query = query;
+  };
+
+  TextareaController.prototype.rect = function() {
+    var c, iframeOffset, scaleBottom;
+    if (!(c = this.$inputor.caret('offset', this.pos - 1, {
+      iframe: this.app.iframe
+    }))) {
+      return;
+    }
+    if (this.app.iframe && !this.app.iframeAsRoot) {
+      iframeOffset = $(this.app.iframe).offset();
+      c.left += iframeOffset.left;
+      c.top += iframeOffset.top;
+    }
+    scaleBottom = this.app.document.selection ? 0 : 2;
+    return {
+      left: c.left,
+      top: c.top,
+      bottom: c.top + c.height + scaleBottom
+    };
+  };
+
+  TextareaController.prototype.insert = function(content, $li) {
+    var $inputor, source, startStr, suffix, text;
+    $inputor = this.$inputor;
+    source = $inputor.val();
+    startStr = source.slice(0, Math.max(this.query.headPos - this.at.length, 0));
+    suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || " ";
+    content += suffix;
+    text = "" + startStr + content + (source.slice(this.query['endPos'] || 0));
+    $inputor.val(text);
+    $inputor.caret('pos', startStr.length + content.length, {
+      iframe: this.app.iframe
+    });
+    if (!$inputor.is(':focus')) {
+      $inputor.focus();
+    }
+    return $inputor.change();
+  };
+
+  return TextareaController;
+
+})(Controller);
+
+EditableController = (function(superClass) {
+  extend(EditableController, superClass);
+
+  function EditableController() {
+    return EditableController.__super__.constructor.apply(this, arguments);
+  }
+
+  EditableController.prototype._getRange = function() {
+    var sel;
+    sel = this.app.window.getSelection();
+    if (sel.rangeCount > 0) {
+      return sel.getRangeAt(0);
+    }
+  };
+
+  EditableController.prototype._setRange = function(position, node, range) {
+    if (range == null) {
+      range = this._getRange();
+    }
+    if (!range) {
+      return;
+    }
+    node = $(node)[0];
+    if (position === 'after') {
+      range.setEndAfter(node);
+      range.setStartAfter(node);
+    } else {
+      range.setEndBefore(node);
+      range.setStartBefore(node);
+    }
+    range.collapse(false);
+    return this._clearRange(range);
+  };
+
+  EditableController.prototype._clearRange = function(range) {
+    var sel;
+    if (range == null) {
+      range = this._getRange();
+    }
+    sel = this.app.window.getSelection();
+    if (this.ctrl_a_pressed == null) {
+      sel.removeAllRanges();
+      return sel.addRange(range);
+    }
+  };
+
+  EditableController.prototype._movingEvent = function(e) {
+    var ref;
+    return e.type === 'click' || ((ref = e.which) === KEY_CODE.RIGHT || ref === KEY_CODE.LEFT || ref === KEY_CODE.UP || ref === KEY_CODE.DOWN);
+  };
+
+  EditableController.prototype._unwrap = function(node) {
+    var next;
+    node = $(node).unwrap().get(0);
+    if ((next = node.nextSibling) && next.nodeValue) {
+      node.nodeValue += next.nodeValue;
+      $(next).remove();
+    }
+    return node;
+  };
+
+  EditableController.prototype.catchQuery = function(e) {
+    var $inserted, $query, _range, index, inserted, isString, lastNode, matched, offset, query, query_content, range;
+    if (!(range = this._getRange())) {
+      return;
+    }
+    if (!range.collapsed) {
+      return;
+    }
+    if(!e){
+      return;
+    }
+    if (e.which === KEY_CODE.ENTER) {
+      ($query = $(range.startContainer).closest('.atwho-query')).contents().unwrap();
+      if ($query.is(':empty')) {
+        $query.remove();
+      }
+      ($query = $(".atwho-query", this.app.document)).text($query.text()).contents().last().unwrap();
+      this._clearRange();
+      return;
+    }
+    if (/firefox/i.test(navigator.userAgent)) {
+      if ($(range.startContainer).is(this.$inputor)) {
+        this._clearRange();
+        return;
+      }
+      if (e.which === KEY_CODE.BACKSPACE && range.startContainer.nodeType === document.ELEMENT_NODE && (offset = range.startOffset - 1) >= 0) {
+        _range = range.cloneRange();
+        _range.setStart(range.startContainer, offset);
+        if ($(_range.cloneContents()).contents().last().is('.atwho-inserted')) {
+          inserted = $(range.startContainer).contents().get(offset);
+          this._setRange('after', $(inserted).contents().last());
+        }
+      } else if (e.which === KEY_CODE.LEFT && range.startContainer.nodeType === document.TEXT_NODE) {
+        $inserted = $(range.startContainer.previousSibling);
+        if ($inserted.is('.atwho-inserted') && range.startOffset === 0) {
+          this._setRange('after', $inserted.contents().last());
+        }
+      }
+    }
+    $(range.startContainer).closest('.atwho-inserted').addClass('atwho-query').siblings().removeClass('atwho-query');
+    if (($query = $(".atwho-query", this.app.document)).length > 0 && $query.is(':empty') && $query.text().length === 0) {
+      $query.remove();
+    }
+    if (!this._movingEvent(e)) {
+      $query.removeClass('atwho-inserted');
+    }
+    if ($query.length > 0) {
+      switch (e.which) {
+        case KEY_CODE.LEFT:
+          this._setRange('before', $query.get(0), range);
+          $query.removeClass('atwho-query');
+          return;
+        case KEY_CODE.RIGHT:
+          this._setRange('after', $query.get(0).nextSibling, range);
+          $query.removeClass('atwho-query');
+          return;
+      }
+    }
+    if ($query.length > 0 && (query_content = $query.attr('data-atwho-at-query'))) {
+      $query.empty().html(query_content).attr('data-atwho-at-query', null);
+      this._setRange('after', $query.get(0), range);
+    }
+    _range = range.cloneRange();
+    _range.setStart(range.startContainer, 0);
+    matched = this.callbacks("matcher").call(this, this.at, _range.toString(), this.getOpt('startWithSpace'));
+    isString = typeof matched === 'string';
+    if ($query.length === 0 && isString && (index = range.startOffset - this.at.length - matched.length) >= 0) {
+      range.setStart(range.startContainer, index);
+      $query = $('<span/>', this.app.document).attr(this.getOpt("editableAtwhoQueryAttrs")).addClass('atwho-query');
+      range.surroundContents($query.get(0));
+      lastNode = $query.contents().last().get(0);
+      if (/firefox/i.test(navigator.userAgent)) {
+        range.setStart(lastNode, lastNode.length);
+        range.setEnd(lastNode, lastNode.length);
+        this._clearRange(range);
+      } else {
+        this._setRange('after', lastNode, range);
+      }
+    }
+    if (isString && matched.length < this.getOpt('minLen', 0)) {
+      return;
+    }
+    if (isString && matched.length <= this.getOpt('maxLen', 20)) {
+      query = {
+        text: matched,
+        el: $query
+      };
+      this.trigger("matched", [this.at, query.text]);
+      return this.query = query;
+    } else {
+      this.view.hide();
+      this.query = {
+        el: $query
+      };
+      if ($query.text().indexOf(this.at) >= 0) {
+        if (this._movingEvent(e) && $query.hasClass('atwho-inserted')) {
+          $query.removeClass('atwho-query');
+        } else if (false !== this.callbacks('afterMatchFailed').call(this, this.at, $query)) {
+          this._setRange("after", this._unwrap($query.text($query.text()).contents().first()));
+        }
+      }
+      return null;
+    }
+  };
+
+  EditableController.prototype.rect = function() {
+    var $iframe, iframeOffset, rect;
+    rect = this.query.el.offset();
+    if (this.app.iframe && !this.app.iframeAsRoot) {
+      iframeOffset = ($iframe = $(this.app.iframe)).offset();
+      rect.left += iframeOffset.left - this.$inputor.scrollLeft();
+      rect.top += iframeOffset.top - this.$inputor.scrollTop();
+    }
+    rect.bottom = rect.top + this.query.el.height();
+    return rect;
+  };
+
+  EditableController.prototype.insert = function(content, $li) {
+    var data, range, suffix, suffixNode;
+    suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || "\u00A0";
+    data = $li.data('item-data');
+    this.query.el.removeClass('atwho-query').addClass('atwho-inserted').html(content).attr('data-atwho-at-query', "" + data['atwho-at'] + this.query.text);
+    if (range = this._getRange()) {
+      range.setEndAfter(this.query.el[0]);
+      range.collapse(false);
+      range.insertNode(suffixNode = this.app.document.createTextNode("\u200D" + suffix));
+      this._setRange('after', suffixNode, range);
+    }
+    if (!this.$inputor.is(':focus')) {
+      this.$inputor.focus();
+    }
+    return this.$inputor.change();
+  };
+
+  return EditableController;
+
+})(Controller);
+
+Model = (function() {
+  function Model(context) {
+    this.context = context;
+    this.at = this.context.at;
+    this.storage = this.context.$inputor;
+  }
+
+  Model.prototype.destroy = function() {
+    return this.storage.data(this.at, null);
+  };
+
+  Model.prototype.saved = function() {
+    return this.fetch() > 0;
+  };
+
+  Model.prototype.query = function(query, callback) {
+    var _remoteFilter, data, searchKey;
+    data = this.fetch();
+    searchKey = this.context.getOpt("searchKey");
+    data = this.context.callbacks('filter').call(this.context, query, data, searchKey) || [];
+    _remoteFilter = this.context.callbacks('remoteFilter');
+    if (data.length > 0 || (!_remoteFilter && data.length === 0)) {
+      return callback(data);
+    } else {
+      return _remoteFilter.call(this.context, query, callback);
+    }
+  };
+
+  Model.prototype.fetch = function() {
+    return this.storage.data(this.at) || [];
+  };
+
+  Model.prototype.save = function(data) {
+    return this.storage.data(this.at, this.context.callbacks("beforeSave").call(this.context, data || []));
+  };
+
+  Model.prototype.load = function(data) {
+    if (!(this.saved() || !data)) {
+      return this._load(data);
+    }
+  };
+
+  Model.prototype.reload = function(data) {
+    return this._load(data);
+  };
+
+  Model.prototype._load = function(data) {
+    if (typeof data === "string") {
+      return $.ajax(data, {
+        dataType: "json"
+      }).done((function(_this) {
+        return function(data) {
+          return _this.save(data);
+        };
+      })(this));
+    } else {
+      return this.save(data);
+    }
+  };
+
+  return Model;
+
+})();
+
+View = (function() {
+  function View(context) {
+    this.context = context;
+    this.$el = $("<div class='atwho-view'><ul class='atwho-view-ul'></ul></div>");
+    this.timeoutID = null;
+    this.context.$el.append(this.$el);
+    this.bindEvent();
+  }
+
+  View.prototype.init = function() {
+    var id;
+    id = this.context.getOpt("alias") || this.context.at.charCodeAt(0);
+    return this.$el.attr({
+      'id': "at-view-" + id
+    });
+  };
+
+  View.prototype.destroy = function() {
+    return this.$el.remove();
+  };
+
+  View.prototype.bindEvent = function() {
+    var $menu;
+    $menu = this.$el.find('ul');
+    return $menu.on('mouseenter.atwho-view', 'li', function(e) {
+      $menu.find('.cur').removeClass('cur');
+      return $(e.currentTarget).addClass('cur');
+    }).on('click.atwho-view', 'li', (function(_this) {
+      return function(e) {
+        $menu.find('.cur').removeClass('cur');
+        $(e.currentTarget).addClass('cur');
+        _this.choose(e);
+        return e.preventDefault();
+      };
+    })(this));
+  };
+
+  View.prototype.visible = function() {
+    return this.$el.is(":visible");
+  };
+
+  View.prototype.highlighted = function() {
+    return this.$el.find(".cur").length > 0;
+  };
+
+  View.prototype.choose = function(e) {
+    var $li, content;
+    if (($li = this.$el.find(".cur")).length) {
+      content = this.context.insertContentFor($li);
+      this.context._stopDelayedCall();
+      this.context.insert(this.context.callbacks("beforeInsert").call(this.context, content, $li), $li);
+      this.context.trigger("inserted", [$li, e]);
+      this.hide(e);
+    }
+    if (this.context.getOpt("hideWithoutSuffix")) {
+      return this.stopShowing = true;
+    }
+  };
+
+  View.prototype.reposition = function(rect) {
+    var _window, offset, overflowOffset, ref;
+    _window = this.context.app.iframeAsRoot ? this.context.app.window : window;
+    if (rect.bottom + this.$el.height() - $(_window).scrollTop() > $(_window).height()) {
+      rect.bottom = rect.top - this.$el.height();
+    }
+    if (rect.left > (overflowOffset = $(_window).width() - this.$el.width() - 5)) {
+      rect.left = overflowOffset;
+    }
+    offset = {
+      left: rect.left,
+      top: rect.bottom
+    };
+    if ((ref = this.context.callbacks("beforeReposition")) != null) {
+      ref.call(this.context, offset);
+    }
+    this.$el.offset(offset);
+    return this.context.trigger("reposition", [offset]);
+  };
+
+  View.prototype.next = function() {
+    var cur, next;
+    cur = this.$el.find('.cur').removeClass('cur');
+    next = cur.next();
+    if (!next.length) {
+      next = this.$el.find('li:first');
+    }
+    next.addClass('cur');
+    return this.scrollTop(Math.max(0, cur.innerHeight() * (next.index() + 2) - this.$el.height()));
+  };
+
+  View.prototype.prev = function() {
+    var cur, prev;
+    cur = this.$el.find('.cur').removeClass('cur');
+    prev = cur.prev();
+    if (!prev.length) {
+      prev = this.$el.find('li:last');
+    }
+    prev.addClass('cur');
+    return this.scrollTop(Math.max(0, cur.innerHeight() * (prev.index() + 2) - this.$el.height()));
+  };
+
+  View.prototype.scrollTop = function(scrollTop) {
+    var scrollDuration;
+    scrollDuration = this.context.getOpt('scrollDuration');
+    if (scrollDuration) {
+      return this.$el.animate({
+        scrollTop: scrollTop
+      }, scrollDuration);
+    } else {
+      return this.$el.scrollTop(scrollTop);
+    }
+  };
+
+  View.prototype.show = function() {
+    var rect;
+    if (this.stopShowing) {
+      this.stopShowing = false;
+      return;
+    }
+    if (!this.visible()) {
+      this.$el.show();
+      this.$el.scrollTop(0);
+      this.context.trigger('shown');
+    }
+    if (rect = this.context.rect()) {
+      return this.reposition(rect);
+    }
+  };
+
+  View.prototype.hide = function(e, time) {
+    var callback;
+    if (!this.visible()) {
+      return;
+    }
+    if (isNaN(time)) {
+      this.$el.hide();
+      return this.context.trigger('hidden', [e]);
+    } else {
+      callback = (function(_this) {
+        return function() {
+          return _this.hide();
+        };
+      })(this);
+      clearTimeout(this.timeoutID);
+      return this.timeoutID = setTimeout(callback, time);
+    }
+  };
+
+  View.prototype.render = function(list) {
+    var $li, $ul, i, item, len, li, tpl;
+    if (!($.isArray(list) && list.length > 0)) {
+      this.hide();
+      return;
+    }
+    this.$el.find('ul').empty();
+    $ul = this.$el.find('ul');
+    tpl = this.context.getOpt('displayTpl');
+    for (i = 0, len = list.length; i < len; i++) {
+      item = list[i];
+      item = $.extend({}, item, {
+        'atwho-at': this.context.at
+      });
+      li = this.context.callbacks("tplEval").call(this.context, tpl, item, "onDisplay");
+      $li = $(this.context.callbacks("highlighter").call(this.context, li, this.context.query.text));
+      $li.data("item-data", item);
+      $ul.append($li);
+    }
+    this.show();
+    if (this.context.getOpt('highlightFirst')) {
+      return $ul.find("li:first").addClass("cur");
+    }
+  };
+
+  return View;
+
+})();
+
+KEY_CODE = {
+  DOWN: 40,
+  UP: 38,
+  ESC: 27,
+  TAB: 9,
+  ENTER: 13,
+  CTRL: 17,
+  A: 65,
+  P: 80,
+  N: 78,
+  LEFT: 37,
+  UP: 38,
+  RIGHT: 39,
+  DOWN: 40,
+  BACKSPACE: 8,
+  SPACE: 32
+};
+
+DEFAULT_CALLBACKS = {
+  beforeSave: function(data) {
+    return Controller.arrayToDefaultHash(data);
+  },
+  matcher: function(flag, subtext, should_startWithSpace, acceptSpaceBar) {
+    var _a, _y, match, regexp, space;
+    flag = flag.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+    if (should_startWithSpace) {
+      flag = '(?:^|\\s)' + flag;
+    }
+    _a = decodeURI("%C3%80");
+    _y = decodeURI("%C3%BF");
+    space = acceptSpaceBar ? "\ " : "";
+    regexp = new RegExp(flag + "([A-Za-z" + _a + "-" + _y + "0-9_" + space + "\'\.\+\-]*)$|" + flag + "([^\\x00-\\xff]*)$", 'gi');
+    match = regexp.exec(subtext);
+    if (match) {
+      return match[2] || match[1];
+    } else {
+      return null;
+    }
+  },
+  filter: function(query, data, searchKey) {
+    var _results, i, item, len;
+    _results = [];
+    for (i = 0, len = data.length; i < len; i++) {
+      item = data[i];
+      if (~new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase())) {
+        _results.push(item);
+      }
+    }
+    return _results;
+  },
+  remoteFilter: null,
+  sorter: function(query, items, searchKey) {
+    var _results, i, item, len;
+    if (!query) {
+      return items;
+    }
+    _results = [];
+    for (i = 0, len = items.length; i < len; i++) {
+      item = items[i];
+      item.atwho_order = new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase());
+      if (item.atwho_order > -1) {
+        _results.push(item);
+      }
+    }
+    return _results.sort(function(a, b) {
+      return a.atwho_order - b.atwho_order;
+    });
+  },
+  tplEval: function(tpl, map) {
+    var error, template;
+    template = tpl;
+    try {
+      if (typeof tpl !== 'string') {
+        template = tpl(map);
+      }
+      return template.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
+        return map[key];
+      });
+    } catch (_error) {
+      error = _error;
+      return "";
+    }
+  },
+  highlighter: function(li, query) {
+    var regexp;
+    if (!query) {
+      return li;
+    }
+    regexp = new RegExp(">\\s*(\\w*?)(" + query.replace("+", "\\+") + ")(\\w*)\\s*<", 'ig');
+    return li.replace(regexp, function(str, $1, $2, $3) {
+      return '> ' + $1 + '<strong>' + $2 + '</strong>' + $3 + ' <';
+    });
+  },
+  beforeInsert: function(value, $li) {
+    return value;
+  },
+  beforeReposition: function(offset) {
+    return offset;
+  },
+  afterMatchFailed: function(at, el) {}
+};
+
+Api = {
+  load: function(at, data) {
+    var c;
+    if (c = this.controller(at)) {
+      return c.model.load(data);
+    }
+  },
+  isSelecting: function() {
+    var ref;
+    return !!((ref = this.controller()) != null ? ref.view.visible() : void 0);
+  },
+  hide: function() {
+    var ref;
+    return (ref = this.controller()) != null ? ref.view.hide() : void 0;
+  },
+  reposition: function() {
+    var c;
+    if (c = this.controller()) {
+      return c.view.reposition(c.rect());
+    }
+  },
+  setIframe: function(iframe, asRoot) {
+    this.setupRootElement(iframe, asRoot);
+    return null;
+  },
+  run: function() {
+    return this.dispatch();
+  },
+  destroy: function() {
+    this.shutdown();
+    return this.$inputor.data('atwho', null);
+  }
+};
+
+$.fn.atwho = function(method) {
+  var _args, result;
+  _args = arguments;
+  result = null;
+  this.filter('textarea, input, [contenteditable=""], [contenteditable=true]').each(function() {
+    var $this, app;
+    if (!(app = ($this = $(this)).data("atwho"))) {
+      $this.data('atwho', (app = new App(this)));
+    }
+    if (typeof method === 'object' || !method) {
+      return app.reg(method.at, method);
+    } else if (Api[method] && app) {
+      return result = Api[method].apply(app, Array.prototype.slice.call(_args, 1));
+    } else {
+      return $.error("Method " + method + " does not exist on jQuery.atwho");
+    }
+  });
+  if (result != null) {
+    return result;
+  } else {
+    return this;
+  }
+};
+
+$.fn.atwho["default"] = {
+  at: void 0,
+  alias: void 0,
+  data: null,
+  displayTpl: "<li>${name}</li>",
+  insertTpl: "${atwho-at}${name}",
+  callbacks: DEFAULT_CALLBACKS,
+  searchKey: "name",
+  suffix: void 0,
+  hideWithoutSuffix: false,
+  startWithSpace: true,
+  highlightFirst: true,
+  limit: 5,
+  maxLen: 20,
+  minLen: 0,
+  displayTimeout: 300,
+  delay: null,
+  spaceSelectsMatch: false,
+  tabSelectsMatch: true,
+  editableAtwhoQueryAttrs: {},
+  scrollDuration: 150,
+  suspendOnComposing: true,
+  lookUpOnClick: true
+};
+
+$.fn.atwho.debug = false;
+
+
+}));
diff --git a/public/assets/kindeditor/at/jquery.atwho.min.js b/public/assets/kindeditor/at/jquery.atwho.min.js
new file mode 100644
index 000000000..34887327e
--- /dev/null
+++ b/public/assets/kindeditor/at/jquery.atwho.min.js
@@ -0,0 +1 @@
+!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(a){return b(a)}):"object"==typeof exports?module.exports=b(require("jquery")):b(jQuery)}(this,function(a){var b,c,d,e,f,g,h,i,j,k,l=[].slice,m=function(a,b){function c(){this.constructor=a}for(var d in b)n.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},n={}.hasOwnProperty;b=a,d=function(){function a(a){this.currentFlag=null,this.controllers={},this.aliasMaps={},this.$inputor=b(a),this.setupRootElement(),this.listen()}return a.prototype.createContainer=function(a){var c;return null!=(c=this.$el)&&c.remove(),b(a.body).append(this.$el=b("<div class='atwho-container'></div>"))},a.prototype.setupRootElement=function(a,c){var d;if(null==c&&(c=!1),a)this.window=a.contentWindow,this.document=a.contentDocument||this.window.document,this.iframe=a;else{this.document=this.$inputor[0].ownerDocument,this.window=this.document.defaultView||this.document.parentWindow;try{this.iframe=this.window.frameElement}catch(e){if(d=e,this.iframe=null,b.fn.atwho.debug)throw new Error("iframe auto-discovery is failed.\nPlease use `setIframe` to set the target iframe manually.\n"+d)}}return this.createContainer((this.iframeAsRoot=c)?this.document:document)},a.prototype.controller=function(a){var b,c,d,e;if(this.aliasMaps[a])c=this.controllers[this.aliasMaps[a]];else{e=this.controllers;for(d in e)if(b=e[d],d===a){c=b;break}}return c?c:this.controllers[this.currentFlag]},a.prototype.setContextFor=function(a){return this.currentFlag=a,this},a.prototype.reg=function(a,b){var c,d;return d=(c=this.controllers)[a]||(c[a]=this.$inputor.is("[contentEditable]")?new g(this,a):new j(this,a)),b.alias&&(this.aliasMaps[b.alias]=a),d.init(b),this},a.prototype.listen=function(){return this.$inputor.on("compositionstart",function(a){return function(b){var c;return null!=(c=a.controller())&&c.view.hide(),a.isComposing=!0,null}}(this)).on("compositionend",function(a){return function(b){return a.isComposing=!1,null}}(this)).on("keyup.atwhoInner",function(a){return function(b){return a.onKeyup(b)}}(this)).on("keydown.atwhoInner",function(a){return function(b){return a.onKeydown(b)}}(this)).on("blur.atwhoInner",function(a){return function(b){var c;return(c=a.controller())?(c.expectedQueryCBId=null,c.view.hide(b,c.getOpt("displayTimeout"))):void 0}}(this)).on("click.atwhoInner",function(a){return function(b){return a.dispatch(b)}}(this)).on("scroll.atwhoInner",function(a){return function(){var b;return b=a.$inputor.scrollTop(),function(c){var d,e;return d=c.target.scrollTop,b!==d&&null!=(e=a.controller())&&e.view.hide(c),b=d,!0}}}(this)())},a.prototype.shutdown=function(){var a,b,c;c=this.controllers;for(a in c)b=c[a],b.destroy(),delete this.controllers[a];return this.$inputor.off(".atwhoInner"),this.$el.remove()},a.prototype.dispatch=function(a){var b,c,d,e;d=this.controllers,e=[];for(b in d)c=d[b],e.push(c.lookUp(a));return e},a.prototype.onKeyup=function(a){var c;switch(a.keyCode){case h.ESC:a.preventDefault(),null!=(c=this.controller())&&c.view.hide();break;case h.DOWN:case h.UP:case h.CTRL:case h.ENTER:b.noop();break;case h.P:case h.N:a.ctrlKey||this.dispatch(a);break;default:this.dispatch(a)}},a.prototype.onKeydown=function(a){var c,d;if(d=null!=(c=this.controller())?c.view:void 0,d&&d.visible())switch(a.keyCode){case h.ESC:a.preventDefault(),d.hide(a);break;case h.UP:a.preventDefault(),d.prev();break;case h.DOWN:a.preventDefault(),d.next();break;case h.P:if(!a.ctrlKey)return;a.preventDefault(),d.prev();break;case h.N:if(!a.ctrlKey)return;a.preventDefault(),d.next();break;case h.TAB:case h.ENTER:case h.SPACE:if(!d.visible())return;if(!this.controller().getOpt("spaceSelectsMatch")&&a.keyCode===h.SPACE)return;if(!this.controller().getOpt("tabSelectsMatch")&&a.keyCode===h.TAB)return;d.highlighted()?(a.preventDefault(),d.choose(a)):d.hide(a);break;default:b.noop()}},a}(),e=function(){function a(a,c){this.app=a,this.at=c,this.$inputor=this.app.$inputor,this.id=this.$inputor[0].id||this.uid(),this.expectedQueryCBId=null,this.setting=null,this.query=null,this.pos=0,this.range=null,0===(this.$el=b("#atwho-ground-"+this.id,this.app.$el)).length&&this.app.$el.append(this.$el=b("<div id='atwho-ground-"+this.id+"'></div>")),this.model=new i(this),this.view=new k(this)}return a.prototype.uid=function(){return(Math.random().toString(16)+"000000000").substr(2,8)+(new Date).getTime()},a.prototype.init=function(a){return this.setting=b.extend({},this.setting||b.fn.atwho["default"],a),this.view.init(),this.model.reload(this.setting.data)},a.prototype.destroy=function(){return this.trigger("beforeDestroy"),this.model.destroy(),this.view.destroy(),this.$el.remove()},a.prototype.callDefault=function(){var a,c,d;d=arguments[0],a=2<=arguments.length?l.call(arguments,1):[];try{return f[d].apply(this,a)}catch(e){return c=e,b.error(c+" Or maybe At.js doesn't have function "+d)}},a.prototype.trigger=function(a,b){var c,d;return null==b&&(b=[]),b.push(this),c=this.getOpt("alias"),d=c?a+"-"+c+".atwho":a+".atwho",this.$inputor.trigger(d,b)},a.prototype.callbacks=function(a){return this.getOpt("callbacks")[a]||f[a]},a.prototype.getOpt=function(a,b){var c;try{return this.setting[a]}catch(d){return c=d,null}},a.prototype.insertContentFor=function(a){var c,d;return d=this.getOpt("insertTpl"),c=b.extend({},a.data("item-data"),{"atwho-at":this.at}),this.callbacks("tplEval").call(this,d,c,"onInsert")},a.prototype.renderView=function(a){var b;return b=this.getOpt("searchKey"),a=this.callbacks("sorter").call(this,this.query.text,a.slice(0,1001),b),this.view.render(a.slice(0,this.getOpt("limit")))},a.arrayToDefaultHash=function(a){var c,d,e,f;if(!b.isArray(a))return a;for(f=[],c=0,e=a.length;e>c;c++)d=a[c],b.isPlainObject(d)?f.push(d):f.push({name:d});return f},a.prototype.lookUp=function(a){var b,c;if((!a||"click"!==a.type||this.getOpt("lookUpOnClick"))&&(!this.getOpt("suspendOnComposing")||!this.app.isComposing))return(b=this.catchQuery(a))?(this.app.setContextFor(this.at),(c=this.getOpt("delay"))?this._delayLookUp(b,c):this._lookUp(b),b):(this.expectedQueryCBId=null,b)},a.prototype._delayLookUp=function(a,b){var c,d;return c=Date.now?Date.now():(new Date).getTime(),this.previousCallTime||(this.previousCallTime=c),d=b-(c-this.previousCallTime),d>0&&b>d?(this.previousCallTime=c,this._stopDelayedCall(),this.delayedCallTimeout=setTimeout(function(b){return function(){return b.previousCallTime=0,b.delayedCallTimeout=null,b._lookUp(a)}}(this),b)):(this._stopDelayedCall(),this.previousCallTime!==c&&(this.previousCallTime=0),this._lookUp(a))},a.prototype._stopDelayedCall=function(){return this.delayedCallTimeout?(clearTimeout(this.delayedCallTimeout),this.delayedCallTimeout=null):void 0},a.prototype._generateQueryCBId=function(){return{}},a.prototype._lookUp=function(a){var c;return c=function(a,b){return a===this.expectedQueryCBId?b&&b.length>0?this.renderView(this.constructor.arrayToDefaultHash(b)):this.view.hide():void 0},this.expectedQueryCBId=this._generateQueryCBId(),this.model.query(a.text,b.proxy(c,this,this.expectedQueryCBId))},a}(),j=function(a){function c(){return c.__super__.constructor.apply(this,arguments)}return m(c,a),c.prototype.catchQuery=function(){var a,b,c,d,e,f,g;return b=this.$inputor.val(),a=this.$inputor.caret("pos",{iframe:this.app.iframe}),g=b.slice(0,a),e=this.callbacks("matcher").call(this,this.at,g,this.getOpt("startWithSpace")),d="string"==typeof e,d&&e.length<this.getOpt("minLen",0)?void 0:(d&&e.length<=this.getOpt("maxLen",20)?(f=a-e.length,c=f+e.length,this.pos=f,e={text:e,headPos:f,endPos:c},this.trigger("matched",[this.at,e.text])):(e=null,this.view.hide()),this.query=e)},c.prototype.rect=function(){var a,c,d;if(a=this.$inputor.caret("offset",this.pos-1,{iframe:this.app.iframe}))return this.app.iframe&&!this.app.iframeAsRoot&&(c=b(this.app.iframe).offset(),a.left+=c.left,a.top+=c.top),d=this.app.document.selection?0:2,{left:a.left,top:a.top,bottom:a.top+a.height+d}},c.prototype.insert=function(a,b){var c,d,e,f,g;return c=this.$inputor,d=c.val(),e=d.slice(0,Math.max(this.query.headPos-this.at.length,0)),f=""===(f=this.getOpt("suffix"))?f:f||" ",a+=f,g=""+e+a+d.slice(this.query.endPos||0),c.val(g),c.caret("pos",e.length+a.length,{iframe:this.app.iframe}),c.is(":focus")||c.focus(),c.change()},c}(e),g=function(a){function c(){return c.__super__.constructor.apply(this,arguments)}return m(c,a),c.prototype._getRange=function(){var a;return a=this.app.window.getSelection(),a.rangeCount>0?a.getRangeAt(0):void 0},c.prototype._setRange=function(a,c,d){return null==d&&(d=this._getRange()),d?(c=b(c)[0],"after"===a?(d.setEndAfter(c),d.setStartAfter(c)):(d.setEndBefore(c),d.setStartBefore(c)),d.collapse(!1),this._clearRange(d)):void 0},c.prototype._clearRange=function(a){var b;return null==a&&(a=this._getRange()),b=this.app.window.getSelection(),null==this.ctrl_a_pressed?(b.removeAllRanges(),b.addRange(a)):void 0},c.prototype._movingEvent=function(a){var b;return"click"===a.type||(b=a.which)===h.RIGHT||b===h.LEFT||b===h.UP||b===h.DOWN},c.prototype._unwrap=function(a){var c;return a=b(a).unwrap().get(0),(c=a.nextSibling)&&c.nodeValue&&(a.nodeValue+=c.nodeValue,b(c).remove()),a},c.prototype.catchQuery=function(a){var c,d,e,f,g,i,j,k,l,m,n,o;if((o=this._getRange())&&o.collapsed){if(a.which===h.ENTER)return(d=b(o.startContainer).closest(".atwho-query")).contents().unwrap(),d.is(":empty")&&d.remove(),(d=b(".atwho-query",this.app.document)).text(d.text()).contents().last().unwrap(),void this._clearRange();if(/firefox/i.test(navigator.userAgent)){if(b(o.startContainer).is(this.$inputor))return void this._clearRange();a.which===h.BACKSPACE&&o.startContainer.nodeType===document.ELEMENT_NODE&&(l=o.startOffset-1)>=0?(e=o.cloneRange(),e.setStart(o.startContainer,l),b(e.cloneContents()).contents().last().is(".atwho-inserted")&&(g=b(o.startContainer).contents().get(l),this._setRange("after",b(g).contents().last()))):a.which===h.LEFT&&o.startContainer.nodeType===document.TEXT_NODE&&(c=b(o.startContainer.previousSibling),c.is(".atwho-inserted")&&0===o.startOffset&&this._setRange("after",c.contents().last()))}if(b(o.startContainer).closest(".atwho-inserted").addClass("atwho-query").siblings().removeClass("atwho-query"),(d=b(".atwho-query",this.app.document)).length>0&&d.is(":empty")&&0===d.text().length&&d.remove(),this._movingEvent(a)||d.removeClass("atwho-inserted"),d.length>0)switch(a.which){case h.LEFT:return this._setRange("before",d.get(0),o),void d.removeClass("atwho-query");case h.RIGHT:return this._setRange("after",d.get(0).nextSibling,o),void d.removeClass("atwho-query")}if(d.length>0&&(n=d.attr("data-atwho-at-query"))&&(d.empty().html(n).attr("data-atwho-at-query",null),this._setRange("after",d.get(0),o)),e=o.cloneRange(),e.setStart(o.startContainer,0),k=this.callbacks("matcher").call(this,this.at,e.toString(),this.getOpt("startWithSpace")),i="string"==typeof k,0===d.length&&i&&(f=o.startOffset-this.at.length-k.length)>=0&&(o.setStart(o.startContainer,f),d=b("<span/>",this.app.document).attr(this.getOpt("editableAtwhoQueryAttrs")).addClass("atwho-query"),o.surroundContents(d.get(0)),j=d.contents().last().get(0),/firefox/i.test(navigator.userAgent)?(o.setStart(j,j.length),o.setEnd(j,j.length),this._clearRange(o)):this._setRange("after",j,o)),!(i&&k.length<this.getOpt("minLen",0)))return i&&k.length<=this.getOpt("maxLen",20)?(m={text:k,el:d},this.trigger("matched",[this.at,m.text]),this.query=m):(this.view.hide(),this.query={el:d},d.text().indexOf(this.at)>=0&&(this._movingEvent(a)&&d.hasClass("atwho-inserted")?d.removeClass("atwho-query"):!1!==this.callbacks("afterMatchFailed").call(this,this.at,d)&&this._setRange("after",this._unwrap(d.text(d.text()).contents().first()))),null)}},c.prototype.rect=function(){var a,c,d;return d=this.query.el.offset(),this.app.iframe&&!this.app.iframeAsRoot&&(c=(a=b(this.app.iframe)).offset(),d.left+=c.left-this.$inputor.scrollLeft(),d.top+=c.top-this.$inputor.scrollTop()),d.bottom=d.top+this.query.el.height(),d},c.prototype.insert=function(a,b){var c,d,e,f;return e=""===(e=this.getOpt("suffix"))?e:e||" ",c=b.data("item-data"),this.query.el.removeClass("atwho-query").addClass("atwho-inserted").html(a).attr("data-atwho-at-query",""+c["atwho-at"]+this.query.text),(d=this._getRange())&&(d.setEndAfter(this.query.el[0]),d.collapse(!1),d.insertNode(f=this.app.document.createTextNode("‍"+e)),this._setRange("after",f,d)),this.$inputor.is(":focus")||this.$inputor.focus(),this.$inputor.change()},c}(e),i=function(){function a(a){this.context=a,this.at=this.context.at,this.storage=this.context.$inputor}return a.prototype.destroy=function(){return this.storage.data(this.at,null)},a.prototype.saved=function(){return this.fetch()>0},a.prototype.query=function(a,b){var c,d,e;return d=this.fetch(),e=this.context.getOpt("searchKey"),d=this.context.callbacks("filter").call(this.context,a,d,e)||[],c=this.context.callbacks("remoteFilter"),d.length>0||!c&&0===d.length?b(d):c.call(this.context,a,b)},a.prototype.fetch=function(){return this.storage.data(this.at)||[]},a.prototype.save=function(a){return this.storage.data(this.at,this.context.callbacks("beforeSave").call(this.context,a||[]))},a.prototype.load=function(a){return!this.saved()&&a?this._load(a):void 0},a.prototype.reload=function(a){return this._load(a)},a.prototype._load=function(a){return"string"==typeof a?b.ajax(a,{dataType:"json"}).done(function(a){return function(b){return a.save(b)}}(this)):this.save(a)},a}(),k=function(){function a(a){this.context=a,this.$el=b("<div class='atwho-view'><ul class='atwho-view-ul'></ul></div>"),this.timeoutID=null,this.context.$el.append(this.$el),this.bindEvent()}return a.prototype.init=function(){var a;return a=this.context.getOpt("alias")||this.context.at.charCodeAt(0),this.$el.attr({id:"at-view-"+a})},a.prototype.destroy=function(){return this.$el.remove()},a.prototype.bindEvent=function(){var a;return a=this.$el.find("ul"),a.on("mouseenter.atwho-view","li",function(c){return a.find(".cur").removeClass("cur"),b(c.currentTarget).addClass("cur")}).on("click.atwho-view","li",function(c){return function(d){return a.find(".cur").removeClass("cur"),b(d.currentTarget).addClass("cur"),c.choose(d),d.preventDefault()}}(this))},a.prototype.visible=function(){return this.$el.is(":visible")},a.prototype.highlighted=function(){return this.$el.find(".cur").length>0},a.prototype.choose=function(a){var b,c;return(b=this.$el.find(".cur")).length&&(c=this.context.insertContentFor(b),this.context._stopDelayedCall(),this.context.insert(this.context.callbacks("beforeInsert").call(this.context,c,b),b),this.context.trigger("inserted",[b,a]),this.hide(a)),this.context.getOpt("hideWithoutSuffix")?this.stopShowing=!0:void 0},a.prototype.reposition=function(a){var c,d,e,f;return c=this.context.app.iframeAsRoot?this.context.app.window:window,a.bottom+this.$el.height()-b(c).scrollTop()>b(c).height()&&(a.bottom=a.top-this.$el.height()),a.left>(e=b(c).width()-this.$el.width()-5)&&(a.left=e),d={left:a.left,top:a.bottom},null!=(f=this.context.callbacks("beforeReposition"))&&f.call(this.context,d),this.$el.offset(d),this.context.trigger("reposition",[d])},a.prototype.next=function(){var a,b;return a=this.$el.find(".cur").removeClass("cur"),b=a.next(),b.length||(b=this.$el.find("li:first")),b.addClass("cur"),this.scrollTop(Math.max(0,a.innerHeight()*(b.index()+2)-this.$el.height()))},a.prototype.prev=function(){var a,b;return a=this.$el.find(".cur").removeClass("cur"),b=a.prev(),b.length||(b=this.$el.find("li:last")),b.addClass("cur"),this.scrollTop(Math.max(0,a.innerHeight()*(b.index()+2)-this.$el.height()))},a.prototype.scrollTop=function(a){var b;return b=this.context.getOpt("scrollDuration"),b?this.$el.animate({scrollTop:a},b):this.$el.scrollTop(a)},a.prototype.show=function(){var a;return this.stopShowing?void(this.stopShowing=!1):(this.visible()||(this.$el.show(),this.$el.scrollTop(0),this.context.trigger("shown")),(a=this.context.rect())?this.reposition(a):void 0)},a.prototype.hide=function(a,b){var c;if(this.visible())return isNaN(b)?(this.$el.hide(),this.context.trigger("hidden",[a])):(c=function(a){return function(){return a.hide()}}(this),clearTimeout(this.timeoutID),this.timeoutID=setTimeout(c,b))},a.prototype.render=function(a){var c,d,e,f,g,h,i;if(!(b.isArray(a)&&a.length>0))return void this.hide();for(this.$el.find("ul").empty(),d=this.$el.find("ul"),i=this.context.getOpt("displayTpl"),e=0,g=a.length;g>e;e++)f=a[e],f=b.extend({},f,{"atwho-at":this.context.at}),h=this.context.callbacks("tplEval").call(this.context,i,f,"onDisplay"),c=b(this.context.callbacks("highlighter").call(this.context,h,this.context.query.text)),c.data("item-data",f),d.append(c);return this.show(),this.context.getOpt("highlightFirst")?d.find("li:first").addClass("cur"):void 0},a}(),h={DOWN:40,UP:38,ESC:27,TAB:9,ENTER:13,CTRL:17,A:65,P:80,N:78,LEFT:37,UP:38,RIGHT:39,DOWN:40,BACKSPACE:8,SPACE:32},f={beforeSave:function(a){return e.arrayToDefaultHash(a)},matcher:function(a,b,c,d){var e,f,g,h,i;return a=a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),c&&(a="(?:^|\\s)"+a),e=decodeURI("%C3%80"),f=decodeURI("%C3%BF"),i=d?" ":"",h=new RegExp(a+"([A-Za-z"+e+"-"+f+"0-9_"+i+"'.+-]*)$|"+a+"([^\\x00-\\xff]*)$","gi"),g=h.exec(b),g?g[2]||g[1]:null},filter:function(a,b,c){var d,e,f,g;for(d=[],e=0,g=b.length;g>e;e++)f=b[e],~new String(f[c]).toLowerCase().indexOf(a.toLowerCase())&&d.push(f);return d},remoteFilter:null,sorter:function(a,b,c){var d,e,f,g;if(!a)return b;for(d=[],e=0,g=b.length;g>e;e++)f=b[e],f.atwho_order=new String(f[c]).toLowerCase().indexOf(a.toLowerCase()),f.atwho_order>-1&&d.push(f);return d.sort(function(a,b){return a.atwho_order-b.atwho_order})},tplEval:function(a,b){var c,d;d=a;try{return"string"!=typeof a&&(d=a(b)),d.replace(/\$\{([^\}]*)\}/g,function(a,c,d){return b[c]})}catch(e){return c=e,""}},highlighter:function(a,b){var c;return b?(c=new RegExp(">\\s*(\\w*?)("+b.replace("+","\\+")+")(\\w*)\\s*<","ig"),a.replace(c,function(a,b,c,d){return"> "+b+"<strong>"+c+"</strong>"+d+" <"})):a},beforeInsert:function(a,b){return a},beforeReposition:function(a){return a},afterMatchFailed:function(a,b){}},c={load:function(a,b){var c;return(c=this.controller(a))?c.model.load(b):void 0},isSelecting:function(){var a;return!!(null!=(a=this.controller())?a.view.visible():void 0)},hide:function(){var a;return null!=(a=this.controller())?a.view.hide():void 0},reposition:function(){var a;return(a=this.controller())?a.view.reposition(a.rect()):void 0},setIframe:function(a,b){return this.setupRootElement(a,b),null},run:function(){return this.dispatch()},destroy:function(){return this.shutdown(),this.$inputor.data("atwho",null)}},b.fn.atwho=function(a){var e,f;return e=arguments,f=null,this.filter('textarea, input, [contenteditable=""], [contenteditable=true]').each(function(){var g,h;return(h=(g=b(this)).data("atwho"))||g.data("atwho",h=new d(this)),"object"!=typeof a&&a?c[a]&&h?f=c[a].apply(h,Array.prototype.slice.call(e,1)):b.error("Method "+a+" does not exist on jQuery.atwho"):h.reg(a.at,a)}),null!=f?f:this},b.fn.atwho["default"]={at:void 0,alias:void 0,data:null,displayTpl:"<li>${name}</li>",insertTpl:"${atwho-at}${name}",callbacks:f,searchKey:"name",suffix:void 0,hideWithoutSuffix:!1,startWithSpace:!0,highlightFirst:!0,limit:5,maxLen:20,minLen:0,displayTimeout:300,delay:null,spaceSelectsMatch:!1,tabSelectsMatch:!0,editableAtwhoQueryAttrs:{},scrollDuration:150,suspendOnComposing:!0,lookUpOnClick:!0},b.fn.atwho.debug=!1});
\ No newline at end of file
diff --git a/public/assets/kindeditor/at/jquery.caret.min.js b/public/assets/kindeditor/at/jquery.caret.min.js
new file mode 100644
index 000000000..5e6700b8c
--- /dev/null
+++ b/public/assets/kindeditor/at/jquery.caret.min.js
@@ -0,0 +1,2 @@
+/*! jquery.caret 2015-02-01 */
+!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(c){return a.returnExportsGlobal=b(c)}):"object"==typeof exports?module.exports=b(require("jquery")):b(jQuery)}(this,function(a){"use strict";var b,c,d,e,f,g,h,i,j,k,l;k="caret",b=function(){function b(a){this.$inputor=a,this.domInputor=this.$inputor[0]}return b.prototype.setPos=function(){return this.domInputor},b.prototype.getIEPosition=function(){return this.getPosition()},b.prototype.getPosition=function(){var a,b;return b=this.getOffset(),a=this.$inputor.offset(),b.left-=a.left,b.top-=a.top,b},b.prototype.getOldIEPos=function(){var a,b;return b=h.selection.createRange(),a=h.body.createTextRange(),a.moveToElementText(this.domInputor),a.setEndPoint("EndToEnd",b),a.text.length},b.prototype.getPos=function(){var a,b,c;return(c=this.range())?(a=c.cloneRange(),a.selectNodeContents(this.domInputor),a.setEnd(c.endContainer,c.endOffset),b=a.toString().length,a.detach(),b):h.selection?this.getOldIEPos():void 0},b.prototype.getOldIEOffset=function(){var a,b;return a=h.selection.createRange().duplicate(),a.moveStart("character",-1),b=a.getBoundingClientRect(),{height:b.bottom-b.top,left:b.left,top:b.top}},b.prototype.getOffset=function(){var b,c,d,e,f;return j.getSelection&&(d=this.range())?(d.endOffset-1>0&&d.endContainer===!this.domInputor&&(b=d.cloneRange(),b.setStart(d.endContainer,d.endOffset-1),b.setEnd(d.endContainer,d.endOffset),e=b.getBoundingClientRect(),c={height:e.height,left:e.left+e.width,top:e.top},b.detach()),c&&0!==(null!=c?c.height:void 0)||(b=d.cloneRange(),f=a(h.createTextNode("|")),b.insertNode(f[0]),b.selectNode(f[0]),e=b.getBoundingClientRect(),c={height:e.height,left:e.left,top:e.top},f.remove(),b.detach())):h.selection&&(c=this.getOldIEOffset()),c&&(c.top+=a(j).scrollTop(),c.left+=a(j).scrollLeft()),c},b.prototype.range=function(){var a;if(j.getSelection)return a=j.getSelection(),a.rangeCount>0?a.getRangeAt(0):null},b}(),c=function(){function b(a){this.$inputor=a,this.domInputor=this.$inputor[0]}return b.prototype.getIEPos=function(){var a,b,c,d,e,f,g;return b=this.domInputor,f=h.selection.createRange(),e=0,f&&f.parentElement()===b&&(d=b.value.replace(/\r\n/g,"\n"),c=d.length,g=b.createTextRange(),g.moveToBookmark(f.getBookmark()),a=b.createTextRange(),a.collapse(!1),e=g.compareEndPoints("StartToEnd",a)>-1?c:-g.moveStart("character",-c)),e},b.prototype.getPos=function(){return h.selection?this.getIEPos():this.domInputor.selectionStart},b.prototype.setPos=function(a){var b,c;return b=this.domInputor,h.selection?(c=b.createTextRange(),c.move("character",a),c.select()):b.setSelectionRange&&b.setSelectionRange(a,a),b},b.prototype.getIEOffset=function(a){var b,c,d,e;return c=this.domInputor.createTextRange(),a||(a=this.getPos()),c.move("character",a),d=c.boundingLeft,e=c.boundingTop,b=c.boundingHeight,{left:d,top:e,height:b}},b.prototype.getOffset=function(b){var c,d,e;return c=this.$inputor,h.selection?(d=this.getIEOffset(b),d.top+=a(j).scrollTop()+c.scrollTop(),d.left+=a(j).scrollLeft()+c.scrollLeft(),d):(d=c.offset(),e=this.getPosition(b),d={left:d.left+e.left-c.scrollLeft(),top:d.top+e.top-c.scrollTop(),height:e.height})},b.prototype.getPosition=function(b){var c,e,f,g,h,i,j;return c=this.$inputor,g=function(b){return a("<div></div>").text(b).html().replace(/\r\n|\r|\n/g,"<br/>").replace(/\s/g,"&nbsp;")},void 0===b&&(b=this.getPos()),j=c.val().slice(0,b),f=c.val().slice(b),h="<span style='position: relative; display: inline;'>"+g(j)+"</span>",h+="<span id='caret' style='position: relative; display: inline;'>|</span>",h+="<span style='position: relative; display: inline;'>"+g(f)+"</span>",i=new d(c),e=i.create(h).rect()},b.prototype.getIEPosition=function(a){var b,c,d,e,f;return d=this.getIEOffset(a),c=this.$inputor.offset(),e=d.left-c.left,f=d.top-c.top,b=d.height,{left:e,top:f,height:b}},b}(),d=function(){function b(a){this.$inputor=a}return b.prototype.css_attr=["borderBottomWidth","borderLeftWidth","borderRightWidth","borderTopStyle","borderRightStyle","borderBottomStyle","borderLeftStyle","borderTopWidth","boxSizing","fontFamily","fontSize","fontWeight","height","letterSpacing","lineHeight","marginBottom","marginLeft","marginRight","marginTop","outlineWidth","overflow","overflowX","overflowY","paddingBottom","paddingLeft","paddingRight","paddingTop","textAlign","textOverflow","textTransform","wordBreak","wordWrap"],b.prototype.mirrorCss=function(){var b,c=this;return b={position:"absolute",left:-9999,top:0,zIndex:-2e4,whiteSpace:"pre-wrap"},"TEXTAREA"===this.$inputor.prop("tagName")&&this.css_attr.push("width"),a.each(this.css_attr,function(a,d){return b[d]=c.$inputor.css(d)}),b},b.prototype.create=function(b){return this.$mirror=a("<div></div>"),this.$mirror.css(this.mirrorCss()),this.$mirror.html(b),this.$inputor.after(this.$mirror),this},b.prototype.rect=function(){var a,b,c;return a=this.$mirror.find("#caret"),b=a.position(),c={left:b.left,top:b.top,height:a.height()},this.$mirror.remove(),c},b}(),e={contentEditable:function(a){return!(!a[0].contentEditable||"true"!==a[0].contentEditable)}},g={pos:function(a){return a||0===a?this.setPos(a):this.getPos()},position:function(a){return h.selection?this.getIEPosition(a):this.getPosition(a)},offset:function(a){var b;return b=this.getOffset(a)}},h=null,j=null,i=null,l=function(a){var b;return(b=null!=a?a.iframe:void 0)?(i=b,j=b.contentWindow,h=b.contentDocument||j.document):(i=void 0,j=window,h=document)},f=function(a){var b;h=a[0].ownerDocument,j=h.defaultView||h.parentWindow;try{return i=j.frameElement}catch(c){b=c}},a.fn.caret=function(d,f,h){var i;return g[d]?(a.isPlainObject(f)?(l(f),f=void 0):l(h),i=e.contentEditable(this)?new b(this):new c(this),g[d].apply(i,[f])):a.error("Method "+d+" does not exist on jQuery.caret")},a.fn.caret.EditableCaret=b,a.fn.caret.InputCaret=c,a.fn.caret.Utils=e,a.fn.caret.apis=g});
\ No newline at end of file
diff --git a/public/images/course/proRelated.png b/public/images/course/proRelated.png
new file mode 100644
index 000000000..2cc1252cc
Binary files /dev/null and b/public/images/course/proRelated.png differ
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 15968772f..c147850ef 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -598,11 +598,11 @@ function regex_evaluation_end(){
     }
     var evaluation_start_time = new Date(evaluation_start);
     var evaluation_end_time = new Date(evaluation_end);
-    if(evaluation_end_time > evaluation_start_time){
+    if(evaluation_end_time >= evaluation_start_time){
         $("#homework_evaluation_end_time").text("");
         return true;
     }else{
-        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能小于开启匿评日期");
         return false;
     }
 }
@@ -960,13 +960,31 @@ function regexStudentWorkDescription()
     }
 }
 
+function regexStudentWorkMember(min, max) {
+    var members = $.trim($("#group_member_ids").val()).split(',');
+    if ( min <= members.length  && members.length <= max ){
+        $("#student_work_group_textarea").text("");
+        return true;
+    } else {
+        $("#student_work_group_textarea").text("合作成员人数应为:"+min+"-"+max+"人");
+        return false;
+    }
+}
+
 //提交新建作品
 function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
     {
-        $("#new_student_work").submit();
-        $("#ajax-indicator").hide();
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                $("#new_student_work").submit();
+                $("#ajax-indicator").hide();
+            }
+        } else {
+            $("#new_student_work").submit();
+            $("#ajax-indicator").hide();
+        }
     }
 }
 
@@ -1362,4 +1380,11 @@ $(function(){
     });
 
     personalized_init();
-});
\ No newline at end of file
+});
+function submit_course_feedback() {
+    var flag = false;
+    if(flag == false){
+        $("#course_feedback_new").submit();
+        var flag = true
+    }
+}
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 468548179..373cce51c 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -124,7 +124,6 @@ $(function(){
         $('#textarea_input_test').focus();
     });
 
-
     var saveProgramAnswers = function() {
         var test_numbers = 0;
         var valid = true;  
@@ -198,6 +197,68 @@ $(function(){
         $(this).parent('.mt10').remove();
     });
 
+    //分组作业
+    $("#GroupPopupBox").dialog({
+        modal: true,
+        autoOpen: false,
+        dialogClass: 'BluePopupBox',
+        minWidth: 290
+    });
+
+    $('a.groupBtn').live('click', function(){
+        $("#GroupPopupBox").dialog("open");
+        $(".ui-dialog-titlebar").hide();
+        $("a.popClose").on('click', function(){
+            $("#GroupPopupBox" ).dialog("close");
+        });
+        $("#cancel_group").on('click', function(){
+            $("#GroupPopupBox" ).dialog("close");
+        });
+        $('#min_num').focus();
+    });
+
+    var saveGroupAttr = function() {
+        var valid = true;
+        var base_on_project = 0;
+        var min = $.trim($("#min_num").val());
+        var max = $.trim($("#max_num").val());
+        if(min.length <= 0) {
+            $("#min_num").focus();
+            valid = false;
+            return false;
+        }
+        if(max.length <= 0) {
+            $("#max_num").focus();
+            valid = false;
+            return false;
+        }
+        if ($("#base_on_project").is(":checked")) {
+            base_on_project = 1;
+        }
+        if (valid) {
+            $("input[name=homework_type]").val(3);
+            $('span.group_detail_info').text('分组人数：'+min+'-'+max+' 人');
+            //保存js值
+            var data = {
+                base_on_project: base_on_project,
+                min_num: min,
+                max_num: max
+            };
+            //构建到form中
+            $('.group-input').remove();
+            var html=bt('t:group-input-list',data);
+            $("input[name=homework_type]").after(html);
+        }
+        return valid;
+    };
+
+    $("#GroupPopupBox a.group_btn").live('click', function(){
+        if(saveGroupAttr()){
+            if($( "#GroupPopupBox" ).dialog( "isOpen" )){
+                $("#GroupPopupBox").dialog( "close" );
+            }
+        }
+    });
 
     //代码编辑器
     if (typeof CodeMirror != "undefined") {
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 977c62117..a23b83607 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){
 
     div_form = $("div[nhname='new_message_" + id + "']");
     $(".ke-edit", div_form).css("height","33px");
+    $(".ke-edit-iframe",div_form).css("height","33px");
 }
\ No newline at end of file
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index a0647b592..67892fe0f 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -213,11 +213,11 @@ function regex_evaluation_end(){
     }
     var evaluation_start_time = new Date(evaluation_start);
     var evaluation_end_time = new Date(evaluation_end);
-    if(evaluation_end_time > evaluation_start_time){
+    if(evaluation_end_time >= evaluation_start_time){
         $("#homework_evaluation_end_time").text("");
         return true;
     }else{
-        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能小于开启匿评日期");
         return false;
     }
 }
@@ -251,8 +251,15 @@ function new_student_work()
 {
     if(regexStudentWorkName()&&regexStudentWorkDescription())
     {
-        $("#new_student_work").submit();
-        $("#ajax-indicator").hide();
+        if($("#group_member_ids").length > 0) {
+            if(regexStudentWorkMember(parseInt($.trim($("#min_num_member").html())),parseInt($.trim($("#max_num_member").html())))) {
+                $("#new_student_work").submit();
+                $("#ajax-indicator").hide();
+            }
+        } else {
+            $("#new_student_work").submit();
+            $("#ajax-indicator").hide();
+        }
     }
 }
 
@@ -298,12 +305,36 @@ function regexStudentWorkDescription()
     }
 }
 
+function regexStudentWorkMember(min, max) {
+    var members = $.trim($("#group_member_ids").val()).split(',');
+    if ( min <= members.length  && members.length <= max ){
+        $("#student_work_group_textarea").text("");
+        return true;
+    } else {
+        $("#student_work_group_textarea").text("合作成员人数应为:"+min+"-"+max+"人");
+        return false;
+    }
+}
+
 //学生作品
 function show_project()
 {
     $("#about_project").slideToggle();
 }
 
+//添加分组成员
+function show_group_member(){
+    $("#chooseGroupMember").dialog("open");
+    $(".ui-dialog-titlebar").hide();
+    $("a.popClose").on('click', function(){
+        $("#chooseGroupMember" ).dialog("close");
+    });
+    $("#cancel_add").on('click', function(){
+        $("#chooseGroupMember" ).dialog("close");
+    });
+    //$('#min_num').focus();
+}
+
 //textarea自适应高度 纯js写的 有浏览器判断
 /**
  * 文本框根据输入内容自适应高度
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 54e550426..25d0d6a32 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -83,6 +83,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width180{width: 180px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
+.width255{width: 255px;}
 .width530{width: 530px;}
 .mr95{margin-right: 95px;}
 .mr140 {margin-right: 140px;}
@@ -1182,21 +1183,32 @@ a:hover.testBtn{background: url(/images/course/hwork_icon.png) -81px -5px no-rep
 a.groupBtn{  background: url(/images/course/hwork_icon.png) -2px -61px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.groupBtn{background: url(/images/course/hwork_icon.png) -80px -61px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-right:5px; text-align:center; padding-left:0px;}
-.groupPopUp {width:290px; height:auto;  padding:15px; background-color:#ffffff; z-index:1000; position:relative;}
+.groupPopUp {border:3px solid #269ac9; width:290px; height:auto;  padding:15px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .popClose {background:url(/images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:2px; top:3px;}
 a.memberBtn{  background: url(/images/course/hwork_icon.png) -7px -90px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .addMemberC {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:227px; background-color:#f1f1f1; min-height:150px; padding-top:10px;}
 .addMemberC li {padding-left:10px; line-height:18px;}
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
-.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
-
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
 .resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
 .resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
 a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.blueCir{ background:#3598db; color:#fff;}
+.proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
+
+.borderRadius {border-radius:5px;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.proRelateWrap {width:38px; height:38px; border:1px solid #cecece; border-radius:3px; background-color:#f1f1f1;}
+.mt7 {margin-top:7px;}
+.ml7 {margin-left:7px;}
+.tac {text-align:center;}
+.proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
+.hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
+.mr150 {margin-right:150px;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
@@ -1213,4 +1225,8 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
 .mb10 {margin-bottom: 10px}
 .mb15 {margin-bottom: 15px}
-div.disable_link {background-color: #c1c1c1 !important;}
\ No newline at end of file
+div.disable_link {background-color: #c1c1c1 !important;}
+
+/*新课程资源库*/
+.reCon{ margin:5px; width:710px;}
+.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a9edee92d..0ed4df627 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1355,13 +1355,29 @@ a:hover.testBtn{background: url(/images/course/hwork_icon.png) -81px -5px no-rep
 a.groupBtn{  background: url(/images/course/hwork_icon.png) -2px -61px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.groupBtn{background: url(/images/course/hwork_icon.png) -80px -61px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-right:5px; text-align:center; padding-left:0px;}
-.groupPopUp {width:290px; height:auto;  padding:15px; background-color:#ffffff; z-index:1000; position:relative;}
+.groupPopUp {border:3px solid #269ac9; width:290px; height:auto;  padding:15px; background-color:#ffffff;position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .popClose {background:url(/images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:2px; top:3px;}
 a.memberBtn{  background: url(/images/course/hwork_icon.png) -7px -90px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .addMemberC {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:227px; background-color:#f1f1f1; min-height:150px; padding-top:10px;}
 .addMemberC li {padding-left:10px; line-height:18px;}
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
-.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
+.addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
+.resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
+a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.blueCir{ background:#3598db; color:#fff;}
+.proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
+
+.borderRadius {border-radius:5px;}
+.maxHeight100 {max-height:100px; overflow-x:hidden; overflow-y:auto;}
+.proRelateWrap {width:38px; height:38px; border:1px solid #cecece; border-radius:3px; background-color:#f1f1f1;}
+.mt7 {margin-top:7px;}
+.ml7 {margin-left:7px;}
+.tac {text-align:center;}
+.proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;}
+.hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;}
+.mr150 {margin-right:150px;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 220120346..584f1bafa 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -68,4 +68,19 @@ a.linkGrey8:hover {color:#585858;}
 .orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
\ No newline at end of file
+#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+
+.orgListStatus {width:55px; float:left;}
+.reCon{ margin:5px; width:710px;}
+.retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
+.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
+.b_lblue{ background:#64bdd9;}
+.c_grey{ color:#888888;}
+.re_con{ margin:5px; width:665px;}
+.re_con_top{color:#494949; }
+.re_con_top span{ color:#999999; font-weight:bold;}
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index cfc3b1b4a..bcace8cf2 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -145,7 +145,7 @@ a:hover.btn_pu{ background:#3cb761;}
 
 /*问卷提交时弹出框*/
 .alert_box{width:250px;height:180px;position:fixed !important;z-index:100;left:60%;top:65%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.commit{height: 28px;display: block;width: 80px;color: #fff !important;background: #15bccf;text-align: center;padding-top: 4px;margin-left: 60px;margin-top: 4px;margin-right: 10px;}
+.commit{font-size: 1.2em;height: 28px;display: block;width: 80px;color: #fff !important;background: #15bccf;text-align: center;padding-top: 4px;margin-left: 70px;margin-top: 4px;margin-right: 10px;}
 /******确定弹框***********/
 .poll_alert_form{width:140px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .polls_alert_btn_box{width: 100%;margin: 0 auto;padding-left: 45px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 32ee5a7c6..b1367b882 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1063,4 +1063,6 @@ a.homepagePostTypeMessage {
 a.homepagePostTypeQuiz {
      background: transparent url("../images/homepage_icon.png") no-repeat scroll -90px -124px;
      padding-left: 23px;
- }
\ No newline at end of file
+ }
+
+.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 70aad2cbe..fa1767ad7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -145,7 +145,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w583{ width:583px;}
 .w350{ width:350px;}
 .w610{ width:610px;}
-.w600{ width:600px;}
+.w600{ width:600px !important;}
 .h20{height: 20px;}
 .h22{ height:22px;}
 .h26{ height:26px;}
diff --git a/spec/factories/homework_detail_groups.rb b/spec/factories/homework_detail_groups.rb
new file mode 100644
index 000000000..86897c68e
--- /dev/null
+++ b/spec/factories/homework_detail_groups.rb
@@ -0,0 +1,11 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :homework_detail_group do
+    homework_common_id 1
+    min_num 1
+    max_num 1
+    base_on_project 1
+    homework_common nil
+  end
+end
diff --git a/spec/factories/student_work_projects.rb b/spec/factories/student_work_projects.rb
new file mode 100644
index 000000000..d6ecb2657
--- /dev/null
+++ b/spec/factories/student_work_projects.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :student_work_project do
+  end
+end
diff --git a/spec/models/homework_detail_group_spec.rb b/spec/models/homework_detail_group_spec.rb
new file mode 100644
index 000000000..2217ad28d
--- /dev/null
+++ b/spec/models/homework_detail_group_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe HomeworkDetailGroup, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/student_work_project_spec.rb b/spec/models/student_work_project_spec.rb
new file mode 100644
index 000000000..42a65b35e
--- /dev/null
+++ b/spec/models/student_work_project_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe StudentWorkProject, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end