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

2015-12-18 14:30:43 +08:00 · 2015-12-18 14:30:43 +08:00 · b3b5bc7ffd
parent 85bc9ce43d e867358bc1
commit b3b5bc7ffd
144 changed files with 2057 additions and 1148 deletions
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@ -0,0 +1,152 @@
+#coding=utf-8
+
+class AtController < ApplicationController
+  respond_to :json
+
+  def show
+    @logger = Logger.new(Rails.root.join('log', 'at.log').to_s)
+    users = find_at_users(params[:type], params[:id])
+    @users = users
+    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id } if users
+  end
+
+  private
+  def find_at_users(type, id)
+    @logger.info("#{type}, #{id}")
+    case type
+      when "Issue"
+        find_issue(id)
+      when 'Project'
+        find_project(id)
+      when 'Course'
+        find_course(id)
+      when 'Activity', 'CourseActivity', 'ForgeActivity','UserActivity', 'OrgActivity','PrincipalActivity'
+        find_activity(id, type)
+      when 'Attachment'
+        find_attachment(id)
+      when 'Message'
+        find_message(id)
+      when 'HomeworkCommon'
+        find_homework(id)
+      when 'Topic'
+        find_topic(id)
+      else
+        nil
+    end
+  end
+
+  def find_topic(id)
+
+  end
+
+  def find_issue(id)
+    #1. issues list persons
+    #2. project persons
+    issue = Issue.find(id)
+    journals = issue.journals
+    at_persons = journals.map(&:user) + issue.project.users
+    at_persons.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_project(id)
+    at_persons = Project.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_course(id)
+    at_persons = Course.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_activity(id, type)
+
+    ## 基本上是本类型中的 加上所属类型的用户
+    case type
+      when 'Activity'
+        activity = Activity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) ||[]) +
+            (find_at_users(activity.activity_container_type, activity.activity_container_id) || [])
+      when 'CourseActivity'
+        activity = CourseActivity.find(id)
+        (find_at_users(activity.course_act_type, activity.course_act_id) || []) + (find_course(activity.course.id) || [])
+      when 'ForgeActivity'
+        activity = ForgeActivity.find(id)
+        (find_at_users(activity.forge_act_type, activity.forge_act_id) ||[]) +
+            (find_project(activity.project_id) || [])
+      when 'UserActivity'
+        activity = UserActivity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'OrgActivity'
+        activity = OrgActivity.find(id)
+        (find_at_users(activity.org_act_type, activity.org_act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'PrincipalActivity'
+        activity = PrincipalActivity.find(id)
+        find_at_users(activity.principal_act_type, activity.principal_act_id)
+      else
+        nil
+    end
+  end
+
+  #作业应该是关联课程,取课程的用户列表
+  def find_homework(id)
+    homework = HomeworkCommon.find(id)
+    find_course(homework.course_id)
+  end
+
+  def find_attachment(id)
+    attachment = Attachment.find(id)
+    find_at_users(attachment.container_type, attachment.container_id)
+  end
+
+  #Message
+  def find_message(id)
+    message = Message.find(id)
+    at_persons =  message.board.messages.map(&:author)
+    (at_persons || []) + (find_project(message.board.project_id)||[])
+  end
+
+  #News
+  def find_news(id)
+    find_project(News.find(id).project_id)
+  end
+
+  #JournalsForMessage
+  def find_journals_for_message(id)
+    jounrnal = JournalsForMessage.find(id)
+    find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+  end
+
+  #Poll
+  def find_poll(id)
+  end
+
+  #Journal
+  def find_journal(id)
+    journal = Journal.find(id)
+    find_at_users(journal.journalized_type, journal.journalized_id)
+  end
+
+  #Document
+  def find_document(id)
+    find_project(Document.find(id).project_id)
+  end
+
+  #ProjectCreateInfo
+  def find_project_create_info(id)
+
+  end
+
+  #Principal
+  def find_principal(id)
+
+  end
+
+  #BlogComment
+  def find_blog_comment(id)
+    blog = BlogComment.find(id).blog
+    blog.users
+  end
+
+end
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@ -118,6 +118,7 @@ class BlogCommentsController < ApplicationController
    @blogComment.content = @quote + @blogComment.content
    @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
    @article.children << @blogComment
+    @article.save
    @user_activity_id = params[:user_activity_id]
    user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
    if user_activity
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@ -79,6 +79,13 @@ class BoardsController < ApplicationController
          end
        end
      end
+
+      @project.boards.each do |board|
+        board.messages.each do |m|
+          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+        end
+      end
+
    elsif @course
      query_course_messages = @board.messages
      query_course_messages.each do |query_course_message|
--- 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
@ -354,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)
@ -543,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
@ -565,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?
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@ -147,8 +147,8 @@ class ForumsController < ApplicationController
     order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}"
     @order_str = "reorder_time="+params[:reorder_time]
    else
-      order = "last_replies_memos.created_at desc, #{Memo.table_name}.created_at desc"
-      @order_str = "reorder_complex=desc"
+      order = "#{Memo.table_name}.updated_at desc"
+      @order_str = "reorder_time=desc"
    end
    @memo = Memo.new(:forum => @forum)
    @topic_count = @forum.topics.count
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
    @is_new = params[:is_new]
+
+    #设置at已读
+    @homeworks.each do |homework|
+      homework.journals_for_messages.each do |j|
+        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+      end
+    end
+
    respond_to do |format|
      format.js
      format.html
@ -84,9 +92,20 @@ class HomeworkCommonController < ApplicationController
          end
      end

+      #分组作业
+      if @homework.homework_type == 3
+        @homework.homework_detail_group ||= HomeworkDetailGroup.new
+        @homework_detail_group = @homework.homework_detail_group
+        @homework_detail_group.min_num = params[:min_num].to_i
+        @homework_detail_group.max_num = params[:max_num].to_i
+        @homework_detail_group.base_on_project = params[:base_on_project].to_i
+      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 => @course.id)
        elsif params[:is_in_course] == "0"
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -24,7 +24,7 @@ class IssuesController < ApplicationController
  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
  before_filter :find_project, :only => [:new, :create, :update_form]
  #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply]

  before_filter :find_optional_project, :only => [:index]
  before_filter :check_for_default_issue_status, :only => [:new, :create]
@ -81,12 +81,15 @@ class IssuesController < ApplicationController
      @status_id = params[:status_id]
      @subject = params[:subject]
      @issue_count = @query.issue_count
-      @issue_pages = Paginator.new @issue_count, @limit, params['page']
+      @issue_pages = Paginator.new @issue_count, @limit, params['page'].to_i + 1
      @offset ||= @issue_pages.offset
      @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                              :order => sort_clause,
                              :offset => @offset,
                              :limit => @limit)
+      if params[:set_filter]
+        @set_filter = params[:set_filter]
+      end
      @issue_count_by_group = @query.issue_count_by_group
      respond_to do |format|
        format.js
@ -115,6 +118,14 @@ class IssuesController < ApplicationController
    # 当前用户查看指派给他的缺陷消息，则设置消息为已读
    query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
    query.update_attribute(:viewed, true) unless query.nil?
+
+    # issue 新建的at消息
+    User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
+    # 回复的at消息
+    @issue.journals.each do |j|
+      User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
+    end
+
    # 缺陷状态更新
    query_journals = @issue.journals
      query_journals.each do |query_journal|
@ -142,24 +153,17 @@ 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
-      render :template => 'issues/show', :layout => @project_base_tag#by young
-    }
-    format.api
-    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-    format.pdf  {
-      pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
-    }
+    respond_to do |format|
+      format.html {
+        retrieve_previous_and_next_issue_ids
+        render :template => 'issues/show', :layout => @project_base_tag#by young
+      }
+      format.api
+      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+      format.pdf  {
+        pdf = issue_to_pdf(@issue, :journals => @journals)
+        send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
+      }
    end
  end

@ -216,7 +220,7 @@ class IssuesController < ApplicationController
    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
    saved = false
    begin
-      saved = @issue.save_issue_with_child_records(params, @time_entry)
+      @saved = @issue.save_issue_with_child_records(params, @time_entry)
    rescue ActiveRecord::StaleObjectError
      @conflict = true
      if params[:last_journal_id]
@ -225,7 +229,7 @@ class IssuesController < ApplicationController
      end
    end

-    if saved
+    if @saved
      #修改界面增加跟踪者
      watcherlist = @issue.watcher_users
      select_users = []
@ -254,13 +258,16 @@ class IssuesController < ApplicationController
      if reply_id > 0
        JournalReply.add_reply(@issue.current_journal.id, reply_id, User.current.id)
      end
-      flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
+      #flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? 去掉这个notice，因为现在更新都是ajax操作
      respond_to do |format|
+        format.js
        format.html { redirect_to issue_url(@issue.id) }
        format.api  { render_api_ok }
      end
    else
      respond_to do |format|
+
+        format.js
        format.html { render :action => 'edit' }
        format.api  { render_validation_errors(@issue) }
      end
@ -398,6 +405,9 @@ class IssuesController < ApplicationController
      user_activity.updated_at = jour.created_on
      user_activity.save
      @user_activity_id = params[:user_activity_id]
+      if params[:issue_id]
+        @issue_id = params[:issue_id]
+      end
      respond_to do |format|
        format.js
      end
@ -421,6 +431,43 @@ class IssuesController < ApplicationController
    end
  end

+  #对某个journ回复,显示回复框
+  def reply
+    @issue = Issue.find(params[:id])
+    @jour = Journal.find(params[:journal_id])
+    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #给issue添加journ。回复内容包含 对某个被回复的journ的内容
+  def add_reply
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:quote]+params[:notes]
+      @issue = Issue.find params[:id]
+      jour.journalized = @issue
+      jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #
+  def delete_journal
+     @issue = Issue.find(params[:id])
+     Journal.destroy(params[:journal_id])
+    respond_to do |format|
+      format.js
+    end
+  end
+
  private

  def find_project
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@ -159,7 +159,8 @@ class MemosController < ApplicationController
           @memo.update_column(:content, params[:memo][:content]) &&
           @memo.update_column(:sticky, params[:memo][:sticky]) &&
           @memo.update_column(:lock, params[:memo][:lock]) &&
-           @memo.update_column(:subject,params[:memo][:subject]))
+           @memo.update_column(:subject,params[:memo][:subject]) &&
+           @memo.update_column(:updated_at,Time.now))
        @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
        @flag = @memo.save
        # @memo.root.update_attribute(:updated_at, @memo.updated_at)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -348,10 +348,6 @@ update
      #   end
      # end

-
-
-
-
      @changesets = g.commits(@project.gpid, :ref_name => @rev)
      # @changesets = @repository.latest_changesets(@path, @rev)
      # @changesets_count = @repository.latest_changesets(@path, @rev).count
@ -378,19 +374,6 @@ update

  alias_method :browse, :show

-  #add by hx
-  def count_commits(project_id , left , right)
-    count = 0
-    (left..right).each do |page|
-      if $g.commits(project_id,:page => page).count == 0
-        break
-      else
-        count = count + $g.commits(project_id,:page => page).count
-      end
-    end
-    return count
-  end
-
  def changes
    @entry = @repository.entry(@path, @rev)
    (show_error_not_found; return) unless @entry
@ -400,26 +383,10 @@ update
    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)

    #add by hx
-    if g.commits(@project.gpid , :page=>200).count > 0
-      count = 4020
-    elsif g.commits(@project.gpid , :page=>25).count==0
-      count = count_commits(@project.gpid , 0 , 25)
-    elsif g.commits(@project.gpid , :page=>50).count ==0
-      count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
-    elsif g.commits(@project.gpid , :page=>75).count ==0
-      count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
-    elsif g.commits(@project.gpid , :page=>100).count== 0
-      count = count_commits(@project.gpid , 75 , 100) + 75 * 20
-    elsif g.commits(@project.gpid , :page=>125).count==0
-      count = count_commits(@project.gpid , 100 , 125) + 100 * 20
-    elsif g.commits(@project.gpid , :page=>150).count==0
-      count = count_commits(@project.gpid , 125 , 150) + 125 * 20
-    else
-      count = count_commits(@project.gpid , 150 ,200) + 150 * 20
-    end
+    rep_count = commit_count(@project)

    #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
-    @commits_count = count
+    @commits_count = rep_count
    @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]

    @commit = g.commit(@project.gpid,@rev)
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -215,7 +215,6 @@ class StudentWorkController < ApplicationController
      student_work ||= StudentWork.new
      student_work.name = params[:student_work][:name]
      student_work.description = params[:student_work][:description]
-      student_work.project_id = params[:student_work][:project_id]
      student_work.homework_common_id = @homework.id
      student_work.user_id = User.current.id
      student_work.save_attachments(params[:attachments])
@ -305,15 +304,28 @@ class StudentWorkController < ApplicationController
      @work.save_attachments(params[:attachments])
      render_attachment_warning_if_needed(@work)
      if @work.save
+        if @homework.homework_type == 3
+          @student_work_project = @homework.student_work_projects.where("user_id=?",User.current.id).first
+          student_work_projects = @homework.student_work_projects.where("student_work_id=? and is_leader =?",@work.id,0)
+          student_work_projects.delete_all
+          members = params[:group_member_ids].split(',')
+          for i in 1 .. members.count-1
+            stu_project = StudentWorkProject.new
+            stu_project.homework_common_id = @homework.id
+            stu_project.student_work_id = @work.id
+            if @homework.homework_detail_group.base_on_project == 1
+              stu_project.project_id = @student_work_project.project_id
+            else @homework.homework_detail_group.base_on_project == 0
+              stu_project.project_id = -1
+            end
+            stu_project.user_id = members[i].to_i
+            stu_project.is_leader = 0
+            stu_project.save
+          end
+        end
+
        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 {
-            flash[:notice] = l(:notice_successful_edit)
-            redirect_to student_work_index_url(:homework => @homework.id)
-          }
-=end
        @student_work = @work
        respond_to do |format|
          format.js
@ -689,7 +701,12 @@ class StudentWorkController < ApplicationController
    unless params[:name].nil?
      name = params[:name]
    end
-    all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    if @homework.homework_detail_group.base_on_project == 0
+      all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
+    else
+      pro = Project.find @homework.student_work_projects.where("user_id=?",User.current.id).first.project_id
+      all_student_ids = "(" + pro.members.map{|member| member.user_id}.join(",") + ")"
+    end
    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
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -415,6 +415,7 @@ class UsersController < ApplicationController
  def user_select_homework
    homework = HomeworkCommon.find_by_id params[:checkMenu]
    homework_detail_programing = homework.homework_detail_programing
+    homework_detail_group = homework.homework_detail_group
    @homework = HomeworkCommon.new
    @select_course = params[:select_course] || 0
    if homework
@ -444,6 +445,14 @@ class UsersController < ApplicationController
          )
        end
      end
+
+      if homework_detail_group
+        @homework.homework_detail_group = HomeworkDetailGroup.new
+        @homework_detail_group = @homework.homework_detail_group
+        @homework_detail_group.min_num = homework_detail_group.min_num
+        @homework_detail_group.max_num = homework_detail_group.max_num
+        @homework_detail_group.base_on_project = homework_detail_group.base_on_project
+      end
    end
    respond_to do |format|
      format.js
@ -1432,7 +1441,8 @@ class UsersController < ApplicationController
  def search_user_course
    @user = User.current
    if !params[:search].nil?
-      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like '%#{params[:search.to_s]}%'")
+      search = "%#{params[:search].to_s.strip.downcase}%"
+      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search)
      .select { |course|  @user.allowed_to?(:as_teacher,course)}
    else
      @course = @user.courses
@ -1451,7 +1461,8 @@ class UsersController < ApplicationController
  def search_user_project
    @user = User.current
    if !params[:search].nil?
-      @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like '%#{params[:search.to_s]}%'")
+      search = "%#{params[:search].to_s.strip.downcase}%"
+      @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like :p",:p=>search)
    else
      @projects = @user.projects
    end
@ -1866,46 +1877,46 @@ class UsersController < ApplicationController

  # 根据资源关键字进行搜索
  def resource_search
-    search = params[:search].to_s.strip.downcase
+    search = "%#{params[:search].strip.downcase}%"
    if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') #全部
      if User.current.id.to_i == params[:id].to_i
        user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
        @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                            " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+                                            " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like :p) ",:p=>search).order("created_on desc")
      else
        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type in" +
                                            " ('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon'))"+
                                            " or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )" +
-                                            " and (filename like '%#{search}%') ").order("created_on desc")
+                                            " and (filename like :p) ",:p=>search).order("created_on desc")
      end
    elsif params[:type] == "2" #课程资源
      if User.current.id.to_i == params[:id].to_i
        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("created_on desc")
      else
        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
-                                            " and (filename like '%#{search}%') ").order("created_on desc")
+                                            " and (filename like :p) ",:p=>search).order("created_on desc")
      end
    elsif params[:type] == "3" #项目资源
      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("created_on desc")
      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like '%#{search}%') ").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like :p) ",:p=>search).order("created_on desc")
      end
    elsif params[:type] == "4" #附件
      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("created_on desc")
      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("created_on desc")
      end
    elsif params[:type] == "5" #用户资源
      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("created_on desc")
      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like '%#{search}%')").order("created_on desc")
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like :p)",:p=>search).order("created_on desc")
      end
    end
    @type = params[:type]
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -668,6 +668,42 @@ module ApplicationHelper
    return rep.blank? ? true :false
  end

+  # 获取Gitlab版本库提交总数
+  def commit_count(project)
+    g = Gitlab.client
+    #add by hx
+    if g.commits(project.gpid , :page=>200).count > 0
+      count = 4020
+    elsif g.commits(project.gpid , :page=>25).count==0
+      count = count_commits(project.gpid , 0 , 25)
+    elsif g.commits(project.gpid , :page=>50).count ==0
+      count = count_commits(project.gpid , 25 , 50)+ 25 * 20
+    elsif g.commits(project.gpid , :page=>75).count ==0
+      count = count_commits(project.gpid , 50 , 75)+ 50 * 20
+    elsif g.commits(project.gpid , :page=>100).count== 0
+      count = count_commits(project.gpid , 75 , 100) + 75 * 20
+    elsif g.commits(project.gpid , :page=>125).count==0
+      count = count_commits(project.gpid , 100 , 125) + 100 * 20
+    elsif g.commits(project.gpid , :page=>150).count==0
+      count = count_commits(project.gpid , 125 , 150) + 125 * 20
+    else
+      count = count_commits(project.gpid , 150 ,200) + 150 * 20
+    end
+  end
+
+  #add by hx
+  def count_commits(project_id , left , right)
+    count = 0
+    (left..right).each do |page|
+      if $g.commits(project_id,:page => page).count == 0
+        break
+      else
+        count = count + $g.commits(project_id,:page => page).count
+      end
+    end
+    return count
+  end
+
  # 获取单一gitlab项目
  def gitlab_repository(project)
    rep = Repository.where("project_id =? and type =?", project.id,"Repository::Gitlab" ).first
@ -1716,6 +1752,13 @@ module ApplicationHelper
  #
  def javascript_include_tag(*sources)
    options = sources.last.is_a?(Hash) ? sources.pop : {}
+
+    @sources ||= []
+    sources = sources.delete_if do|source|
+      @sources.include?(source)
+    end
+    @sources += sources
+
    if plugin = options.delete(:plugin)
      sources = sources.map do |source|
        if plugin
@ -1725,7 +1768,12 @@ module ApplicationHelper
        end
      end
    end
-    super sources, options
+
+     if sources && !sources.empty?
+       super(sources, options)
+     else
+       ''
+     end
  end

  def content_for(name, content = nil, &block)
@ -1936,7 +1984,9 @@ module ApplicationHelper
        candown = true
      elsif attachment.container.class.to_s=="StudentWork"
        candown = true
-      elsif attachment.container.class.to_s=="BlogComment"
+      elsif attachment.container.class.to_s=="BlogComment" #博客资源允许下载
+        candown = true
+      elsif attachment.container.class.to_s=="Memo" #论坛资源允许下载
        candown = true
      elsif attachment.container.class.to_s == "User"
        candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
@ -2674,19 +2724,8 @@ int main(int argc, char** argv){
  end

  def import_ke(default_opt={})
-    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    opt = {enable_at: false, 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]
--- a/app/helpers/exercise_helper.rb
+++ b/app/helpers/exercise_helper.rb
@ -43,8 +43,9 @@ module ExerciseHelper
    ecs.each do |ec|
      arr << ec.exercise_choice.choice_position
    end
-    arr.sort
-    arr = arr.join("")
+    #arr = arr.sort
+    str = arr.sort.join("")
+    return str
  end

  # 判断用户是否已经提交了问卷
--- a/app/helpers/project_score_helper.rb
+++ b/app/helpers/project_score_helper.rb
@ -22,6 +22,7 @@ module ProjectScoreHelper

  #代码提交数量
  def changesets_num project
+    # commit_count(project)
    project.changesets.count
  end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -19,6 +19,7 @@

 include AvatarHelper
 include StudentWorkHelper
+include ApiHelper
 module ProjectsHelper
  def link_to_version(version, options = {})
    return '' unless version && version.is_a?(Version)
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -89,7 +89,8 @@ module UsersHelper
    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+    at_count = user.at_messages.where(viewed: false).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
  end

  def user_mail_notification_options(user)
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@ -0,0 +1,102 @@
+#coding=utf-8
+
+class AtMessage < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :sender, class_name: "User", foreign_key: "sender_id"
+  attr_accessible :at_message, :container, :viewed, :user_id, :sender_id
+  belongs_to :at_message, polymorphic: true
+  belongs_to :container, polymorphic: true
+
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
+  validates :user_id, :sender_id, :at_message_id, :at_message_type, presence: true
+
+  after_create :add_user_message
+
+  scope :unviewed, ->(type, id){
+    where(at_message_type: type, at_message_id:id, viewed: false)
+  }
+
+  def viewed!
+    update_attribute :viewed, true
+  end
+
+  def at_valid?
+    return true if at_message_type == 'Issue'
+    return true if 'Journal' == at_message_type
+    return true if 'JournalsForMessage' == at_message_type
+    return true if 'Message' == at_message_type
+    false
+  end
+
+  def add_user_message
+    if MessageAll.where(message_type: self.class.name,message_id: self.id).empty?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
+  end
+
+  def subject
+    case at_message_type
+      when "Issue"
+        "新建问题: " + at_message.subject
+      when "Journal"
+        "问题留言: " + at_message.journalized.subject
+      when 'Message'
+        if(at_message.topic?)
+          "发布新帖: "
+        else
+          "回复帖子: "
+        end +  at_message.subject
+      when 'JournalsForMessage'
+        "作业: #{at_message.jour.name} 中留言"
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def description
+    case at_message_type
+      when "Issue"
+        at_message.description
+      when "Journal"
+        at_message.notes
+      when 'Message'
+        at_message.content
+      when "JournalsForMessage"
+        at_message.notes
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def author
+    case at_message_type
+      when "Issue"
+        at_message.author
+      when "Journal"
+        at_message.user
+      when 'Message'
+        at_message.author
+      when 'JournalsForMessage'
+        at_message.user
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+  end
+
+  def url
+    case at_message_type
+      when "Issue"
+        {controller: :issues, action: :show, id: at_message}
+      when "Journal"
+        {controller: :issues, action: :show, id: at_message.journalized}
+      when 'Message'
+        {controller: :boards, action: :show, project_id: at_message.board.project, id: at_message.board}
+      when 'JournalsForMessage'
+        {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+      else
+        logger.error "error type: #{at_message_type}"
+    end
+
+  end
+
+end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@ -52,6 +52,7 @@ class Issue < ActiveRecord::Base
  # ForgeMessage虚拟关联(多态)
  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy

+  has_many :at_messages, class_name: 'AtMessage', as: :at_message ,:dependent => :destroy

  acts_as_nested_set :scope => 'root_id', :dependent => :destroy
  acts_as_attachable :before_add => :attachment_added, :after_remove => :attachment_removed
@ -82,7 +83,7 @@ class Issue < ActiveRecord::Base
  attr_reader :current_journal
  
  # fq
-  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
  after_update :be_user_score
  after_destroy :down_user_score
  # after_create :be_user_score
@ -156,6 +157,14 @@ class Issue < ActiveRecord::Base
    end
  end

+  # at 功能添加消息提醒
+  def act_as_at_message
+    users = self.description.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
+
  # 更新缺陷
  #def act_as_forge_message_update
  #  unless self.author_id == self.assigned_to_id
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@ -28,10 +28,12 @@ class Journal < ActiveRecord::Base
  has_one :journal_reply
  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
  # 被ForgeActivity虚拟关联
-  has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  #has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy 评论不应该算入
  # 被ForgeMessage虚拟关联
  has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
-  # end
+
+  has_many :at_messages, as: :at_message, dependent: :destroy
+
  attr_accessor :indice

  acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
@ -50,7 +52,7 @@ class Journal < ActiveRecord::Base
  before_create :split_private_notes
  
  # fq
-  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
+  after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message
  # end
  #after_destroy :down_user_score
  #before_save :be_user_score
@ -160,14 +162,14 @@ class Journal < ActiveRecord::Base
  end
  # end

-  # Time 2015-02-27 13:30:19
-  # Author lizanle
-  # Description 公共表中需要保存一份该记录
-  def act_as_forge_activity
-    self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
-                                            :project_id => self.issue.project.id)
-
-  end
+  # # Time 2015-02-27 13:30:19
+  # # Author lizanle
+  # # Description 公共表中需要保存一份该记录
+  # def act_as_forge_activity
+  #   self.forge_acts << ForgeActivity.new(:user_id => self.user_id,
+  #                                           :project_id => self.issue.project.id)
+  #
+  # end

  # 缺陷状态更改，消息提醒
  def act_as_forge_message
@ -184,6 +186,13 @@ class Journal < ActiveRecord::Base
    end
  end

+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
+
  # 更新用户分数     -by zjc
  def be_user_score
      #新建了缺陷留言且留言不为空，不为空白
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@ -64,8 +64,10 @@ class JournalsForMessage < ActiveRecord::Base
  has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy

+  has_many :at_messages, as: :at_message, dependent: :destroy
+
  validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
  after_create :reset_counters!
  after_destroy :reset_counters!
  after_save :be_user_score
@ -240,6 +242,12 @@ class JournalsForMessage < ActiveRecord::Base
    end
  end

+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
  # 用户留言消息通知
  def act_as_user_feedback_message
    # 主留言
@ -267,7 +275,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
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -395,13 +395,13 @@ class Mailer < ActionMailer::Base
    user = User.find_by_mail(recipients)
    @user = user
    @token = Token.get_token_from_user(user, 'autologin')
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)

    # edit
-    @issue_author_url = url_for(user_activities_url(@author,:token => @token.value))
-    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
+    @issue_author_url = url_for(user_activities_url(@author))
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id)

-    @user_url = url_for(my_account_url(user,:token => @token.value))
+    @user_url = url_for(my_account_url(user))


    subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
@ -471,7 +471,7 @@ class Mailer < ActionMailer::Base
    recipients = @project.manager_recipients
    s = l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name)
    @token = Token.get_token_from_user(@user, 'autologin')
-    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members', :token => @token.value)
+    @applied_url =  url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members')
    mail :to => recipients,
         :subject => s
  end
--- a/app/models/message.rb
+++ b/app/models/message.rb
@ -38,7 +38,7 @@ class Message < ActiveRecord::Base
  # 课程/项目 消息
  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
-  #end
+  has_many :at_messages, as: :at_message, dependent: :destroy

  has_many :ActivityNotifies,:as => :activity, :dependent => :destroy

@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
  after_update :update_messages_board
  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
  
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
  #before_save :be_user_score

  scope :visible, lambda {|*args|
@ -96,6 +96,10 @@ class Message < ActiveRecord::Base
      end
    }

+  def topic?
+    parent_id.nil?
+  end
+
  def visible?(user=User.current)
    if project
      !user.nil? && user.allowed_to?(:view_messages, project)
@ -237,6 +241,13 @@ class Message < ActiveRecord::Base
      end
    end
  end
+
+  def act_as_at_message
+    users = self.content.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
  
  #更新用户分数     -by zjc
  def be_user_score
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -161,6 +161,7 @@ class User < Principal
  has_many :user_feedback_messages
  has_one :onclick_time
  has_many :system_messages
+  has_many :at_messages

 # 虚拟转换
  has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@ -400,16 +401,7 @@ class User < Principal
  end
  
  def show_name
-    name = ""
-    unless self.user_extensions.nil?
-      if self.user_extensions.identity == 2
-        name = firstname
-      else
-        name = lastname+firstname
-      end
-    else
-      name = lastname+firstname
-    end
+    name = lastname + firstname
    name.empty? || name.nil? ? login : name
  end
  ## end
--- a/app/views/at/show.json.erb
+++ b/app/views/at/show.json.erb
@ -0,0 +1,6 @@
+[
+  <% @users && @users.each_with_index do |person,index| %>
+  {"id":<%=index%>, "userid": <%=person.id%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+  <%= index != @users.size-1 ? ',' : '' %>
+  <% end %>
+]
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@ -7,8 +7,10 @@
 <% if defined?(container) && container && container.saved_attachments %>
  <% container.attachments.each_with_index do |attachment, i| %>
    <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly => 'readonly') %>
+      <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
+      <!--<span class="ispublic-label"><%#= l(:field_is_public) %>:</span>-->
+      <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
      <%= if attachment.id.nil?
            #待补充代码
          else
@ -21,24 +23,7 @@
    </span>
    <div class="cl"></div>
  <% end %>
-  <% container.saved_attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
-      <%= if attachment.id.nil?
-            #待补充代码
-          else
-            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
-          end
-      %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>

-      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
-    <div class="cl"></div>
-  <% end %>
 <% end %>
 </span>
  <% project = project %>
--- a/app/views/bids/_new_homework_form.html.erb
+++ b/app/views/bids/_new_homework_form.html.erb
@ -15,10 +15,10 @@
      <label class="fl" >&nbsp;&nbsp;<%= l(:field_quote)%>&nbsp;&nbsp;：</label>
      <!--<textarea  name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl"></textarea>-->
      <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0 %>
+        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0,act_id: @course.id, act_type: @course.class.to_s %>
      <% else %>
          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0 %>
+          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0, act_id: @course.id, act_type: @course.class.to_s %>
      <% end %>
    </li>
    <div class="cl"></div>
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
    <%= javascript_include_tag 'blog' %>
 <% end %>

@ -34,7 +34,9 @@
                           :class => 'talk_text fl',
                           :input_html => { :id => 'message_content',
                                            :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           act_id: article.id, act_type: article.class.to_s
+          %>
          <div class="cl"></div>
          <p id="message_content_span"></p>
        </div>
--- a/app/views/blog_comments/_reply_form.html.erb
+++ b/app/views/blog_comments/_reply_form.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 <li>
  <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
@ -27,7 +27,9 @@
                       :minHeight=>100,
                       :input_html => { :id => 'message_content',
                                        :class => 'talk_text fl',
-                                        :maxlength => 5000 }%>
+                                        :maxlength => 5000 },
+                       at_id: article.id, at_type: article.class.to_s
+      %>
  <div class="cl"></div>
  <p id="message_content_span"></p>
 </li>
--- a/app/views/blog_comments/quote.js.erb
+++ b/app/views/blog_comments/quote.js.erb
@ -3,7 +3,7 @@ if($("#reply_message_<%= @blogComment.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%", "<%=@blogComment.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @blogComment.id%>").length >0) {
    $("#reply_to_message_<%= @blogComment.id%>").replaceWith("<p id='reply_message_<%= @blogComment.id%>'></p>");
--- a/app/views/blog_comments/reply.js.erb
+++ b/app/views/blog_comments/reply.js.erb
@ -1,7 +1,7 @@
 <% if @in_user_center%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% else%>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@ -27,7 +27,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>');
        showNormalImage('message_description_<%= @article.id %>');
    });
 </script>
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@ -74,7 +74,7 @@
              }

              $(function () {
-                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
                  showNormalImage('activity_description_<%= topic.id %>');
                  /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
                   if (description_images.length>0) {
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>

 <%= error_messages_for 'message' %>
@ -34,7 +34,9 @@
                           :class => 'talk_text fl',
                           :input_html => { :id => 'message_content',
                                            :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
          <div class="cl"></div>
          <p id="message_content_span"></p>
        </div>
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
    <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>

@ -74,7 +74,7 @@
          }

          $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+              init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
              showNormalImage('activity_description_<%= topic.id %>');
              /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
              if (description_images.length>0) {
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@ -20,7 +20,7 @@
  <% end %>
  <div class="cl"></div>
  <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:none;">
+    <div class="talk_new ml15 mb10" nhname="about_talk" data-at-id="<%= project.id %>" data-at-type="Project" style="display:none;">
      <ul>
        <%= render :partial => 'project_new_topic' %>
      </ul>
@ -111,7 +111,7 @@
              <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
            <% end %>
            <div class="cl"></div>
-            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
+            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
              <ul>
                <%= render :partial => 'edit',locals:  {:topic => topic} %>
              </ul>
@ -120,7 +120,7 @@
            <div class="talkWrapBox">
              <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
              <% if !topic.locked? && authorize_for('messages', 'reply') %>
-                  <div class="talkWrapMsg" nhname="about_talk_reply" style="display: none;">
+                  <div class="talkWrapMsg" nhname="about_talk_reply" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;">
                    <em class="talkWrapArrow"></em>
                    <div class="cl"></div>
                    <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@ -28,7 +28,7 @@
        window.attachEvent("onload", buildsubmenus)
 </script>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>


@ -102,6 +102,10 @@ function nh_init_board(params){
                  if(/trident/.test(userAgent)){
                    $("div.talk_new .ke-container").css({'margin-left':'0px'});
                  }
+
+                  if(typeof enableAt === 'function'){
+                    enableAt(this,params.about_talk.attr('data-at-id'), params.about_talk.attr('data-at-type'));
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@ -3,4 +3,4 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>

 <style type="text/css">
@ -19,7 +19,7 @@
    }

    span.ke-toolbar-icon-url {
-        background-image: url(/images/public_icon.png)
+        background-image: url("/images/public_icon.png")
    }

    div.ke-toolbar .ke-outline {
@ -72,7 +72,7 @@
            }

            $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                showNormalImage('activity_description_<%= activity.id %>');
                if($("#intro_content_<%= activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= activity.id %>").show();
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@ -1,22 +1,21 @@
 <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>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag "init_KindEditor"  %>
 <% end %>
-
-
 <script >
    init_KindEditor_data('',80);
 </script>
@ -24,11 +23,11 @@
  <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'}, :html=>{:id => "course_feedback_new"},:method => "post") do |f|%>
@ -59,37 +58,37 @@
        $("#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);
-      });
+        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>
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@ -1,6 +1,6 @@

 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
    <%= javascript_include_tag 'blog' %>
 <% end %>

@ -40,7 +40,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
        showNormalImage('message_description_<%= @article.id %>');
    });
 </script>
--- 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">
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@ -35,17 +35,19 @@
        });
        $(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").on('click',show_result);
+                $("#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").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#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() {
-            window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
-        }
+        /*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">
@ -53,7 +55,7 @@
          <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 id="show_student_result_div" 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="姓名" id="student_name_<%= exercise.id%>">
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@ -30,9 +30,11 @@
    <% end %>
  </div>
  <div class="postDetailBanner">
-    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveD"></a></div>
    <div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0);"  id="reorder_popu" class=""></a></div>
-    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class=""></a></div>
+
+    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class=""></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+
    <div class="creatPost" id="create_memo_btn"><a href="javascript:void(0);" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#create_memo_div').slideToggle();$(this).parent().slideToggle();">发布新帖</a></div>
    <div class="cl"></div>
  </div>
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@ -2,10 +2,10 @@
    alert('启动成功');
    <% if @user_activity_id == -1 %>
        $("#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%");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
    <% else %>
        $("#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%");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
    <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@ -1,10 +1,10 @@
 alert('关闭成功');
 <% if @user_activity_id == -1 %>
 $("#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%");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#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%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@ -2,5 +2,5 @@
 <%#= watcher_link_issue(@issue, User.current) %>
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
-<%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:button_edit), 'javascript:void(0);', :onclick => 'issueEditShow();', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
+<%#= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@ -1,7 +1,6 @@
 <%= labelled_fields_for :issue, @issue do |f| %>
    <div class="newpro_box">
-      <fieldset class="collapsible">
-        <legend onclick="toggleFieldset(this);"><strong><%= l(:label_change_properties) %></strong></legend>
+      <fieldset class="collapsible" style="border: none">
        <ul class="fl">
          <li>
            <label class="label"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
@ -54,7 +53,7 @@
          <div class="cl"></div>

        </ul>
-        <ul class="fl ml90">
+        <ul class="fl ml160">
          <li>
            <label class="label02"><%= l(:field_start_date) %>：</label>
            <% if @issue.safe_attribute? 'start_date' %>
--- a/app/views/issues/_attributes_show.html.erb
+++ b/app/views/issues/_attributes_show.html.erb
@ -1,5 +1,5 @@
 <!--属性-->
-<div class="pro_info_box mb10">
+<div class="proInfoBox mb10">
  <%= issue_fields_rows do |rows| %>
      <ul class="fl" >
        <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@ -0,0 +1,38 @@
+<div id="issue_detail" style="display: block">
+<div class="ping_dispic">
+  <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
+</div>
+<div class="talk_txt fl">
+  <p class="pro_page_tit" style="word-break:break-all;"> <span class="issues fl fl" title="缺陷"></span> <span style="padding-left: 5px;"><%= @issue.subject %></span>
+    <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
+  <br>
+  <div class="cl"></div>
+  由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>添加于 <%= format_time(@issue.created_on).html_safe %>
+</div>
+
+<!--talk_txt end-->
+<a href="javascript:void(0)" class="talk_edit fr"> </a>
+<%= render :partial => 'action_menu' %>
+<div class="cl"></div>
+<% if @issue.description? || @issue.attachments.any? -%>
+    <div class="talk_info mb10 issue_desc" style="word-break:break-all;">
+      <% if @issue.description? %>
+          <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
+          <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
+      <% end %>
+    </div>
+<% end -%>
+<% if  @issue.attachments.any? %>
+    <div class="pro_pic_box mb10">
+      <a href="javascript:void(0)" class="link_img fl">
+        <!--显示附件、图片-->
+        <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
+      <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+    </div><!--pro_pic_box  end-->
+    <div class="cl"></div>
+<% end %>
+
+<!--属性-->
+<%= render :partial => 'issues/attributes_show' %>
+<div class="cl"></div>
+    </div>
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@ -1,31 +1,28 @@
+<div id="issue_edit" style="display: none">
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>

-
-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true,:remote=>true} do |f| %>
    <%= error_messages_for 'issue', 'time_entry' %>
    <%= render :partial => 'conflict' if @conflict %>
    <!--编辑的整个属性-->
-    <% if @edit_allowed || !@allowed_statuses.empty? %>
-        <div id="all_attributes" style="display:none;">
-          <%= render :partial => 'form', :locals => {:f => f} %>
-          <div class="ping_C mb10 ml10"></div>
-        </div>
-    <% end %><!--end-->
+        <div id="all_attributes" >
+          <%= render :partial => 'issues/form', :locals => {:f => f} %>

-    <% if @journals.present? %>
-        <div id="history">
-          <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
        </div>
-    <% end %>
+    <%# if @journals.present? %>
+        <!--<div id="history">-->
+          <!--<%#= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>-->
+        <!--</div>-->
+    <%# end %>
    <div id="journal_issue_note" class="wiki">

    </div>
    <input name="issue_quote_new" type="hidden" value="<%= %>" />
-    <fieldset><legend>回复</legend>
-    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
-    </fieldset>
+    <!--<fieldset><legend>回复</legend>-->
+    <%#= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply', at_id: @issue.id, at_type: @issue.class.to_s %>
+    <!--</fieldset>-->
    <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
    <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
    <!--<%# end %>-->
@ -42,5 +39,4 @@
    <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
    <%= hidden_field_tag 'reference_user_id', params[:reference_user_id] %>
 <% end %>
-
-<div id="preview" class="wiki"></div>
+</div>
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@ -1,5 +1,5 @@
 <%= labelled_fields_for :issue, @issue do |f| %>
-    <%= call_hook(:view_issues_form_details_top, {:issue => @issue, :form => f}) %>
+    <%#= call_hook(:view_issues_form_details_top, {:issue => @issue, :form => f}) %>
    <div class="newpro_box">
      <ul>
        <li>
@ -28,7 +28,7 @@
        <li>
          <% if @issue.safe_attribute? 'subject' %>
              <label class="label"><span class="c_red f12">*</span>&nbsp;主题&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :subject, :class => "w576", :maxlength => 255, :style => "font-size:small", :no_label => true %>
+              <%= f.text_field :subject, :class => "w606", :maxlength => 255, :style => "font-size:small", :no_label => true %>
              <!--Added by young-->
              <%= javascript_tag do %>
                  observeAutocompleteField('issue_subject',
@ -49,7 +49,7 @@
              <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
              <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
              <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
              <%# end %>
              <%#= wikitoolbar_for 'issue_description' %>
          <% end %>
@ -102,3 +102,5 @@
    <!--</div>-->
    <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
+<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
+<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50" > 取消 </a>
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@ -0,0 +1,82 @@
+<ul>
+  <% issue.journals.reorder("created_on desc").each do |reply| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= reply.id %>');
+          });
+      </script>
+      <% replies_all_i=replies_all_i + 1 %>
+      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
+        <div class="homepagePostReplyPortrait" >
+          <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher mt-4">
+            <% if reply.try(:user).try(:realname) == ' ' %>
+                <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+            <% else %>
+                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+            <% end %>
+            <%#= format_time(reply.created_on) %>
+          </div>
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+            <% if reply.details.any? %>
+                <% details_to_strings(reply.details).each do |string| %>
+                    <p><%= string %></p>
+                <% end %>
+            <% end %>
+            <P><%= reply.notes.html_safe %></P>
+          </div>
+          <div style="margin-top: 7px">
+            <%= format_time(reply.created_on) %>
+            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+              <%= link_to(
+                          l(:button_reply),
+                          {:controller => 'issues',:action => 'reply',:user_id=>reply.user_id, :id => issue.id,:journal_id=>reply.id},
+                          :remote => true,
+                          :method => 'get',
+                          :class => 'fr newsBlue',
+                          :title => l(:button_reply)) if  User.current.logged?  %>
+              <%= link_to(
+                          l(:button_delete),
+                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
+                          :method => :get,
+                          :remote=>true,
+                          :class => 'fr newsGrey mr10',
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :title => l(:button_delete)
+                  ) if reply.user_id == User.current.id %>
+            </div>
+          </div>
+          <p id="reply_message_<%= reply.id%>"></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
+<div class="homepagePostReplyContainer borderBottomNone minHeight48">
+
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+  </div>
+
+  <div class="homepagePostReplyInputContainer mb10">
+    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+      <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+          <!--<div class="cl"></div>-->
+          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+          <div class="cl"></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+          <div class="cl"></div>
+          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
+    <div class="cl"></div>
+
+  </div>
+</div>
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@ -0,0 +1,27 @@
+<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
+
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+  </div>
+
+  <div class="ReplyToMessageInputContainer mb10">
+    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+          <!--<div class="cl"></div>-->
+          <input type="hidden" name="quote" value=""/>
+          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+          <div class="cl"></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+          <div class="cl"></div>
+          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
+    <div class="cl"></div>
+
+  </div>
+</div>
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@ -1,35 +1,53 @@
 <% issue_list(issues) do |issue, level| -%>
-        <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
-            <% reset_cycle %>
-            <% previous_group = group %>
-        <% end %>
-        <!-- CONTENT LIST -->
-        <div class="problem_main">
-          <% 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 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">
-                <%=link_to "#{column_content[4]}<span class = '#{get_issue_priority(column_content[3])[0]}'>#{get_issue_priority(column_content[3])[1]}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
-              </div>
-              <div class="cl"></div>
-                <p>
-                  <% unless issue.assigned_to_id.nil? %>
-                    <%= l(:field_assigned_to) %>
-                    <%=link_to issue.assigned_to(@user), user_path(issue.assigned_to(@user)), :class => "problem_name c_orange f1" %>
-                  <% end %>
-                  <%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
-                </p>
-            </div>
-              <%=link_to "<span class = 'pic_mes'>#{issue.journals.all.count}</span>".html_safe, issue_path(issue.id), :class => "pro_mes_w" %>
+     <script>
+         function expand_reply(container, btnid) {
+             var target = $(container);
+             var btn = $(btnid);
+             if (btn.data('init') == '0') {
+                 btn.data('init', 1);
+                 btn.html('收起回复');
+                 target.show();
+             } else {
+                 btn.data('init', 0);
+                 btn.html('展开更多');
+                 target.hide();
+                 target.eq(0).show();
+                 target.eq(1).show();
+                 target.eq(2).show();
+             }
+         }

-              <div class="cl"></div>
-          <% end %>
-          <div class="cl"></div>
-        </div>
- <% end -%>
- <ul class="wlist">
-   <%= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>
- </ul>
+         $(function () {
+             init_activity_KindEditor_data(<%= issue.id%>, null, "87%");
+             showNormalImage('activity_description_<%= issue.id %>');
+             if ($("#intro_content_<%= issue.id %>").height() > 360) {
+                 $("#intro_content_show_<%= issue.id %>").show();
+             }
+             $("#intro_content_show_<%= issue.id %>").click(function () {
+                 $("#activity_description_<%= issue.id %>").toggleClass("maxh360");
+                 $("#activity_description_<%= issue.id%>").toggleClass("lh18");
+                 $("#intro_content_show_<%= issue.id %>").hide();
+                 $("#intro_content_hide_<%= issue.id %>").show();
+             });
+             $("#intro_content_hide_<%= issue.id %>").click(function () {
+                 $("#activity_description_<%= issue.id %>").toggleClass("maxh360");
+                 $("#activity_description_<%= issue.id%>").toggleClass("lh18");
+                 $("#intro_content_hide_<%= issue.id %>").hide();
+                 $("#intro_content_show_<%= issue.id %>").show();
+             });
+         });
+     </script>
+     <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
+ <% end %>
+ <% if issues.count == 10%>
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
+     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+ <% end%>
+ <!--<ul class="wlist">-->
+   <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
+ <!--</ul>-->
+ <script type="text/javascript">
+     $("#show_more_issues").mouseover(function(){
+         $("#more_issues_link").click();
+     });
+ </script>
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@ -1,3 +1,9 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
-
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% if @issue_id%> //issue详情中回复
+    $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
+    $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+<%else%>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+   init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
+   // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
+<%end %>
--- a/app/views/issues/add_journal_in_org.js.erb
+++ b/app/views/issues/add_journal_in_org.js.erb
@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");

-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
--- a/app/views/issues/delete_journal.js.erb
+++ b/app/views/issues/delete_journal.js.erb
@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@ -1,10 +1,28 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true,init_activity: true) %>
+<% 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 )}
+    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;}
+    .ke-inline-block{display: none;}
+    div.ke-container{float:left;}
+</style>
 <script>
    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
        $("input[nhname='date_show']").change(function(){
            if($(this).val()=='创建日期起始' || $(this).val()=='创建日期结束')return;
            $("input[nhname='date_val']",$(this).parent('div')).val($(this).val());
            remote_function();
        });
+
    });
    function remote_function() {
        $("#issue_query_form").submit();
@ -39,144 +57,147 @@


 </script>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_issue_tracking) %></h2>
-</div>
-<div class="problem_top">
-  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-      <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'true', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
-          <%= hidden_field_tag 'set_filter', '1' %>
-          <div class="problem_search" >
-            <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
-            <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
-            <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
-          </div><!--problem_search end-->
-          <%= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
-          <p class="problem_p fr" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
-            <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
-          </p>
+<div  class="homepageRight mt0 ml10" >
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName"><%= l(:label_issue_tracking) %></div>
+  </div>
+  <div class="resources mt10" >
+      <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+          <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'true', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
+              <%= hidden_field_tag 'set_filter', '1' %>
+              <div class="problem_search fr" >
+                <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+                <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
+                <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
+              </div><!--problem_search end-->
+              <%#= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
+              <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
+                <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
+              </p>

-          <div class="cl"></div>
-          <div id="filter_form" class="fl">
+              <div class="cl"></div>
+              <div id="filter_form" class="fl">
+
+                <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
+                            { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
+                            },
+                            {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"w90 mr18"}
+                    )
+                %>
+                <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
+                            { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
+                            },
+                            {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w90 mr18"}
+                    )
+                %>
+                <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
+                            { :include_blank => false,:selected=>@status_id ? @status_id : 0
+                            },
+                            {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w90 mr18"}
+                    )
+                %>
+                <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
+                            { :include_blank => false,:selected=>@author_id ? @author_id : 0
+                            },
+                            {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"w90 mr18"}
+                    )
+                %>
+              </div><!--filter_form end-->
+              <div>
+                <div class="fl">&nbsp;</div>
+                <div>
+                  <input name="issue_create_date_start" nhname="date_val" type="hidden"/>
+                  <%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+                  <%= calendar_for('issue_create_date_start_show') %>
+                </div>
+                <div style="float:left;">&nbsp;-&nbsp;</div>
+                <div>
+                  <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
+                  <%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+                  <%= calendar_for('issue_create_date_end_show') %>
+                </div>
+              </div>
+              <div class="cl"></div>
+          <% end %>

-            <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
-                        { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
-                        },
-                        {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"w90"}
-                )
-            %>
-            <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
-                        { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
-                        },
-                        {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w90"}
-                )
-            %>
-            <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
-                        { :include_blank => false,:selected=>@status_id ? @status_id : 0
-                        },
-                        {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w90"}
-                )
-            %>
-            <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
-                        { :include_blank => false,:selected=>@author_id ? @author_id : 0
-                        },
-                        {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"w90"}
-                )
-            %>
-          </div><!--filter_form end-->
-          <div>
-            <div class="fl">&nbsp;</div>
-            <div>
-              <input name="issue_create_date_start" nhname="date_val" type="hidden"/>
-              <%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
-              <%= calendar_for('issue_create_date_start_show') %>
-            </div>
-            <div style="float:left;">&nbsp;-&nbsp;</div>
-            <div>
-              <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
-              <%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
-              <%= calendar_for('issue_create_date_end_show') %>
-            </div>
-          </div>
          <div class="cl"></div>
      <% end %>
+  </div>

-      <div class="cl"></div>
-  <% end %>
-</div>
-<div class="contextual">
-  <% if !@query.new_record? && @query.editable_by?(User.current) %>
-      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
-      <%= delete_link query_path(@query) %>
-  <% end %>
-</div>
+    <div class="contextual">
+      <% if !@query.new_record? && @query.editable_by?(User.current) %>
+          <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+          <%= delete_link query_path(@query) %>
+      <% end %>
+    </div>

-<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-<div style="clear:right; ">
-</div>
+    <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
+    <div style="clear:right; ">
+    </div>

-<%= error_messages_for 'query' %>
+    <%= error_messages_for 'query' %>

-<% if @query.valid? %>
-    <% if @issues.empty? %>
-        <p class="nodata">
-          <%= l(:label_no_data) %>
-        </p>
-    <% else %>
-        <div id="issue_list">
-        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count} %>
+    <% if @query.valid? %>
+        <% if @issues.empty? %>
+            <p class="nodata">
+              <%= l(:label_no_data) %>
+            </p>
+        <% else %>
+            <div id="issue_list">
+            <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
+            </div>
+
+
+        <% end %>
+
+        <!--<div style="float: left; padding-top: 30px">-->
+          <!--<%# other_formats_links do |f| %>-->
+              <!--<%#= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>-->
+              <!--<%#= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>-->
+              <!--<%#= f.link_to 'PDF', :url => params %>-->
+          <!--<%# end %>-->
+        <!--</div>-->
+
+        <div id="csv-export-options" style="display:none;">
+          <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+          <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
+              <p>
+                <label>
+                  <%= radio_button_tag 'columns', 'all' %>
+                  <%= l(:description_all_columns) %>
+                </label>
+              </p>
+
+              <p>
+                <label>
+                  <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
+                  <%= l(:field_description) %>
+                </label>
+              </p>
+
+              <p class="buttons">
+                <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
+                <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+              </p>
+          <% end %>
        </div>
-
-
+    <% end %>
+    <%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
+    <% content_for :sidebar do %>
+        <%= render :partial => 'issues/sidebar' %>
    <% end %>

-    <div style="float: left; padding-top: 30px">
-      <% other_formats_links do |f| %>
-          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-          <%= f.link_to 'PDF', :url => params %>
-      <% end %>
-    </div>
+    <% content_for :header_tags do %>
+        <%= auto_discovery_link_tag(:atom,
+                                    {:query_id => @query, :format => 'atom',
+                                     :page => nil, :key => User.current.rss_key},
+                                    :title => l(:label_issue_plural)) %>
+        <%= auto_discovery_link_tag(:atom,
+                                    {:controller => 'journals', :action => 'index',
+                                     :query_id => @query, :format => 'atom',
+                                     :page => nil, :key => User.current.rss_key},
+                                    :title => l(:label_changes_details)) %>
+    <% end %>

-    <div id="csv-export-options" style="display:none;">
-      <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-      <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
-          <p>
-            <label>
-              <%= radio_button_tag 'columns', 'all' %>
-              <%= l(:description_all_columns) %>
-            </label>
-          </p>
-
-          <p>
-            <label>
-              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
-              <%= l(:field_description) %>
-            </label>
-          </p>
-
-          <p class="buttons">
-            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
-            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
-          </p>
-      <% end %>
-    </div>
-<% end %>
-<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
-<% content_for :sidebar do %>
-    <%= render :partial => 'issues/sidebar' %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_issue_plural)) %>
-    <%= auto_discovery_link_tag(:atom,
-                                {:controller => 'journals', :action => 'index',
-                                 :query_id => @query, :format => 'atom',
-                                 :page => nil, :key => User.current.rss_key},
-                                :title => l(:label_changes_details)) %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
+    <%= context_menu issues_context_menu_path %>
+</div>
--- a/app/views/issues/index.js.erb
+++ b/app/views/issues/index.js.erb
@ -1,3 +1,6 @@
-$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
-$("#v_subject").focus();
-$("#v_subject").blur();
+//$("#issue_list").html("<%#= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
+<% if @set_filter && @issue_pages.page == 1%> //只有搜索的第一页才需要替换整个issue_list，其余的都是替换show_more_issues
+    $("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project})%>");
+<%else%>
+    $("#show_more_issues").replaceWith("<%= escape_javascript( render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project}  )%>");
+<%end%>
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@ -1,27 +1,35 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<div  class="homepageRight mt0 ml10" >
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">新建问题</div>
+  </div>
+  <div class="resources mt10" style="min-height:619px;">
+    <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
+    <%= labelled_form_for @issue, :url => project_issues_path(@project),
+                          :html => {:id => 'issue-form', :multipart => true} do |f| %>
+        <%= error_messages_for 'issue' %>
+        <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
+        <div>
+          <%= render :partial => 'issues/form', :locals => {:f => f} %>
+        </div>
+        <!--<%#= javascript_tag "$('#issue_subject').focus();" %>-->
+        <!--<a href="#" class="blue_btn fl ml80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">-->
+          <!--<%#= l(:button_create) %>-->
+        <!--</a>-->
+        <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
+    <% end %>
+    <div id="preview" class="wiki"></div>

-
-<div class="project_r_h" xmlns="http://www.w3.org/1999/html">
-  <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
-</div>
-<%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
-<%= labelled_form_for @issue, :url => project_issues_path(@project),
-                      :html => {:id => 'issue-form', :multipart => true} do |f| %>
-    <%= error_messages_for 'issue' %>
-    <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
-    <div>
-      <%= render :partial => 'issues/form', :locals => {:f => f} %>
+    <% content_for :header_tags do %>
+        <%= robot_exclusion_tag %>
+    <% end %>
    </div>
-    <!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
-    <a href="#" class="blue_btn fl ml80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
-      <%= l(:button_create) %>
-    </a>
-    <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
-<% end %>
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-    <%= robot_exclusion_tag %>
-<% end %>
+</div>
--- a/app/views/issues/reply.js.erb
+++ b/app/views/issues/reply.js.erb
@ -0,0 +1,9 @@
+if($("#reply_message_<%= @jour.id%>").length > 0) {
+    $("#reply_message_<%= @jour.id%>").replaceWith("<%= escape_javascript(render :partial => 'issues/issue_reply_ke_form') %>");
+    $(function(){
+        $('input[name=quote]').val("<%= raw escape_javascript(@tempContent.html_safe) %>");
+        sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    });
+}else if($("#reply_to_message_<%= @issue.id%>").length >0) {
+    $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
+}
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@ -1,106 +1,45 @@
 <%= content_for(:header_tags) do %>
-<%= import_ke(enable_at: true) %>
+    <%= import_ke(enable_at: false) %>
+    <%= javascript_include_tag 'create_kindeditor'%>
 <% end %>
-
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
-</div>
-<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
-<div class="pro_page_box">
-  <div class="pro_page_top break_word">
-    <%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %>
-    <a href="javascript:void(0)"><%= "#" + @issue.id.to_s %></a>
-  </div>
-  <div class="problem_main">
-    <div class="ping_dispic">
-      <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
+<script>
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+</script>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<div  class="homepageRight mt0 ml10" >
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">问题跟踪</div>
    </div>

-    <div class="talk_txt fl">
-      <p class="pro_page_tit" style="word-break:break-all;">
-        <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
-        <span style="padding-left: 5px;"><%= @issue.subject %></span>
-        <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span>
-      </p><br/>
-
-      <div class="cl"></div>
-      由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>添加于 <%= format_time(@issue.created_on).html_safe %>
-    </div>
-
-    <!--talk_txt end-->
-    <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
-    <div class="cl"></div>
-    <% if @issue.description? || @issue.attachments.any? -%>
-        <div class="talk_info mb10 issue_desc" style="word-break:break-all;">
-          <% if @issue.description? %>
-              <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
-              <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
-          <% end %>
-        </div>
-    <% end -%>
-
-    <div class="pro_pic_box mb10">
-      <a href="javascript:void(0)" class="link_img fl">
-        <!--显示附件、图片-->
-        <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
-      <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-    </div><!--pro_pic_box  end-->
-    <div class="cl"></div>
-
-    <!--属性-->
-    <%= render :partial => 'attributes_show' %>
-    <!--pro_info_box 属性 end-->
-
-    <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %>
-    <!--<div class="cl"></div>-->
-    <!--<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %>-->
-    <div class="cl"></div>
-  </div>
-
-  <!--problem_main end-->
-  <div style="clear: both;"></div>
-
-  <!--留言-->
-  <% if @issue.editable? %>
-      <div id="update">
-        <%= render :partial => 'edit' %>
+  <div class="resources mt10" >
+    <div class="pro_page_box">
+      <div  class="problem_main borderBottomNone">
+          <%= render :partial => 'issues/detail'%>
+          <%= render :partial => 'issues/edit'%>
      </div>
-      <p style="padding-top: 5px"></p>
-      <%#--引用时不能修改，剥离出引用内容--%>
-      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();issue_journal_kind_reply.sync();$('#issue-form').submit();">
-        <%= l(:button_submit) %>
-      </a>
-  <% end %>
-  <%#= submit_tag l(:button_submit) %>
-  <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%>
+
+      <!--problem_main end-->
+      <div style="clear: both;"></div>
+      <div class="homepagePostReply">
+            <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
+            <div class="homepagePostReplyBanner" >
+              <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
+              <div class="homepagePostReplyBannerTime"></div>
+            </div>
+
+            <div class="" id="reply_div_<%= @issue.id %>" >
+                       <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
+            </div>
+
+
+
+         </div>
+     </div>
+  </div>
 </div>
-
-<% if @changesets.present? %>
-    <div id="issue-changesets">
-      <h3><%= l(:label_associated_revisions) %></h3>
-      <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %>
-    </div>
-<% end %>
-
-<div class="cl"></div>
-<% other_formats_links do |f| %>
-    <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-    <%= f.link_to 'PDF' %>
-<% end %>
-
-<% content_for :sidebar do %>
-    <%= render :partial => 'issues/sidebar' %>
-    <br>
-    <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
-            (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
-        <div id="watchers">
-          <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
-        </div>
-    <% end %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
+    </div>
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@ -0,0 +1,23 @@
+<% if @saved %>
+$("#issue_detail").replaceWith('<%= escape_javascript(render :partial => 'issues/detail') %>')
+$("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
+
+$("#issue_detail").show();
+$("#issue_edit").hide();
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+$(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
+//edit里的编辑器貌似显示不出来，所以手动js生成。
+issue_desc_editor = KindEditor.create('#issue_description',
+        {"width":"85%",
+            "resizeType":0,
+            "no_label":true,
+            "autoHeightMode":true,
+            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})",
+            "emotionsBasePath":"http://localhost:3000","height":300,
+            "allowFileManager":true,
+            "uploadJson":"/kindeditor/upload",
+            "fileManagerJson":"/kindeditor/filemanager"});
+<%else%>
+    alert('<%=  @issue.errors.full_messages[0].to_s%>')
+<%end %>
--- 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">
--- 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>
--- 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>
@ -54,7 +54,7 @@
    <% name = name%>

    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户以及资源"/>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户、资源以及帖子"/>
      <input type="hidden" name="search_type" id="type" value="all"/>
      <input type="text" style="display: none;"/>
      <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
--- 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>
@ -52,7 +52,7 @@
    <% name = name%>

    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户以及资源" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
        <input type="hidden" name="search_type" id="type" value="all"/>
        <input type="text" style="display: none;"/>
        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -247,6 +247,7 @@
      }
  </script>
 </div>
+
 <div id="fade" class="black_overlay">123</div>
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@ -34,7 +34,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%", "<%=@memo.class.to_s%>");
    });

    function del_confirm(){
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@ -27,7 +27,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
        showNormalImage('message_description_<%= @topic.id %>');
    });
 </script>
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@ -11,7 +11,7 @@ if($("#reply_message_<%= @message.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @message.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @message.id%>,null,"85%", "<%=@message.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @message.id%>").length >0) {
    $("#reply_to_message_<%= @message.id%>").replaceWith("<p id='reply_message_<%= @message.id%>'></p>");
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@ -3,4 +3,4 @@
 <%elsif @course%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/org_document_comments/_reply_form.html.erb
+++ b/app/views/org_document_comments/_reply_form.html.erb
@ -1,2 +1,2 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@ -1,3 +1,2 @@
-
 $("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
-init_activity_KindEditor_data(<%= @act.id %>,"","87%");
+init_activity_KindEditor_data(<%= @act.id %>,"","87%", "<%=@act.class.to_s%>");
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@ -19,7 +19,7 @@
    <% @documents.each do |document| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%");
+                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%", "OrgActivity");
            });
        </script>
          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
--- a/app/views/org_document_comments/quote.js.erb
+++ b/app/views/org_document_comments/quote.js.erb
@ -3,7 +3,7 @@ if($("#reply_message_<%= @org_comment.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%", "<%=@org_comment.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @org_comment.id %>").length >0) {
    $("#reply_to_message_<%= @org_comment.id%>").replaceWith("<p id='reply_message_<%= @org_comment.id %>'></p>");
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@ -1,11 +1,7 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<%= javascript_include_tag 'blog' %>
-<% end %>
-
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
 <script>
    $(function() {
-        init_activity_KindEditor_data(<%= @document.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
        showNormalImage('message_description_<%= @document.id %>');
    });
 </script>
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@ -2,7 +2,7 @@
    <% org_activities.each do |act| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
            });
        </script>
        <% if act.container_type == 'Organization' %>
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@ -61,7 +61,7 @@
 <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
    <script>
        $(function() {
-            init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%");
+            init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%", 'OrgActivity');
        });
    </script>
    <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
--- a/app/views/projects/_attachment_acts.html.erb
+++ b/app/views/projects/_attachment_acts.html.erb
@ -20,7 +20,7 @@
      <div class="homepagePostDate">
        发布时间：<%= format_time(activity.created_on) %>
      </div>
-      <p class="mt5 break_word"><%= textAreailizable act, :description %><br/></p>
+      <p class="mt5 break_word"><%= textAreailizable activity, :description %><br/></p>
      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id %>">
        <div id="intro_content_<%= user_activity_id %>">
          <%#= activity.description.html_safe %>
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
@ -32,7 +32,7 @@
            }

            $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                showNormalImage('activity_description_<%= activity.id %>');
                if ($("#intro_content_<%= activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= activity.id %>").show();
--- 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,
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@ -20,42 +20,31 @@
          <div class="col-md-10 col-sm-12">
            <ul class="bordered-list">
              <li class="commit js-toggle-container">
-                <div class="commit-row-title">
-                  <strong class="str-truncated">
-                    <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
-                  </strong>
-
-                  <div class="pull-right" title="修订号">
-                    <%= h truncate(changeset.short_id.to_s, :length => 20) %>
-                  </div>
-                  <div class="notes_count">
-                  </div>
-                </div>
                <div class="commit-row-info">
                  <% if !user_commit_rep(changeset.author_email).nil? %>
                      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
-                    <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>
-                      提交于
+                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+                        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>
-                          前
-                        </time>
-                        &nbsp;
+                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
                      </div>
                  <% else %>
-                      <span class="commit-author-name"><%= changeset.author_email %></span>
-                      提交于
+                      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>
-                          前
-                        </time>
-                        &nbsp;
+                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
                      </div>
                  <% end %>
-
-
                </div>
+                <div style="padding-left:30px;" class="commit-row-title">
+                <strong class="str-truncated">
+                  <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
+                </strong>
+                <div class="pull-right" title="修订号">
+                  <%= h truncate(changeset.short_id.to_s, :length => 20) %>
+                </div>
+                <div class="notes_count">
+                </div>
+              </div>
              </li>
            </ul>
          </div>
@ -65,7 +54,6 @@
    <p style="padding-top: 10px;">
      <%#= submit_tag(l(:label_view_diff), :name => nil, :class=>"c_blue") if show_diff %>
    </p>
-
    <ul class="wlist">
      <%= pagination_links_full commits_pages, commits_count, :per_page_links => false, :remote => false, :flag => true %>
    </ul>
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@ -22,12 +22,12 @@
  <% else %>
      <%= render :partial => 'navigation' %>
      <div class="fl c_grey02 mt5 mr5">克隆网址:</div>
-      <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>
+      <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>
      <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
      <% 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"%>
+          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"确认要fork该项目吗？" %>
            <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
          </div>
      <% end %>
@ -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>
--- a/app/views/student_work/_choose_group_member.html.erb
+++ b/app/views/student_work/_choose_group_member.html.erb
@ -1,6 +1,6 @@
 <div id="popbox02">
  <div>
-    <div class="relateText fl">请添加小组成员</div>
+    <div class="relateText fl">请从<%= @homework.homework_detail_group.base_on_project == 1 ? '项目成员':'课程成员' %>中添加小组成员</div>
  </div>
  <div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="clickCanel();"></a></div>
  <div class="cl"></div>
@ -92,5 +92,17 @@
            url: '<%= url_for(:controller => 'student_work', :action => 'search_course_students') %>'+'?homework='+<%=@homework.id %>,
            type:'get'
        });
+        <% if defined?(edit_mode) && edit_mode %>
+            <% pro = @homework.student_work_projects.where("user_id = ?",User.current.id).first.project_id.to_i %>
+            <% members = @homework.student_work_projects.where("project_id = ? and is_leader =?",pro,0) %>
+            <% members.each do |member| %>
+                var link = "<li id='choose_student_<%=member.user_id%>' onclick='delete_student(<%=member.user_id %>);'><%=member.user.show_name %>";
+                <% unless member.user.user_extensions.student_id == "" %>
+                link += "(<%=member.user.user_extensions.student_id %>)";
+                <% end %>
+                link += "</li>";
+                $("#choose_students_list").append(link);
+            <% end %>
+        <% end %>
    });
 </script>
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@ -57,7 +57,7 @@

  <% if @homework.anonymous_comment == 0%>
    <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
-    <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
+    <%= student_work.student_score.nil? ? "未参与" : format("%.1f",student_work.student_score)%>
    <% unless student_work.student_score.nil?%>
        <span class="linkBlue">
          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
@ -84,7 +84,7 @@
          缺评扣分
          <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
          最终成绩为
-          <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
+          <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
        </div>
    <% end%>
  </li>
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@ -25,8 +25,8 @@

    <li >
      <span class="tit_fb ">编程代码：</span>
-      <div class="showHworkP break_word"><pre class="fontGrey2 font_cus"><%= text_format(work.description) if work.description%>
-        </pre>
+      <div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code">
+        </div>
      </div>
      <div class="cl"></div>
    </li>
--- a/app/views/student_work/_relate_project.html.erb
+++ b/app/views/student_work/_relate_project.html.erb
@ -4,7 +4,7 @@
  <%=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>
+      <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>
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@ -7,7 +7,7 @@

  <div class="HomeWorkBox">
    <div class="">
-      <div class="homepagePostTitle fl">
+      <div class="homepagePostTitle fl m_w530 hidden">
        <%= @homework.name%>（作业名称）
      </div>
      <span class="fr c_grey">
@ -31,7 +31,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>
          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
          <div class="cl"></div>
@ -51,6 +55,12 @@
          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false,:has_group=>false} %>
        </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="mt5">
          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="popupRegex();edit_student_work(<%= @work.id%>);">确定</a>
          <span class="fr mr10 mt3">或</span>
@ -61,14 +71,44 @@
  </div><!----HomeWorkCon end-->
 </div>
 <script type="text/javascript">
+    <% if @homework.homework_detail_group %>
+    $(function(){
+        <%members = @work.student_work_projects.where("is_leader =?",0) %>
+        var str = $('#group_members_show').html();
+        <% members.each do |member| %>
+            str += '、<%= (User.find member.user_id).show_name %>';
+        <% end %>
+        $('#group_members_show').html(str);
+        $('span.group_detail_info').text('分组人数：<%=@homework.homework_detail_group.min_num %>-<%=@homework.homework_detail_group.max_num %> 人');
+    });
+    <% end %>
+    // 添加组成员
+    function show_group_member() {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/choose_group_member',:locals => {:homework=>@homework,:edit_mode => true}) %>');
+        showModal('ajax-modal', '528px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("addMemberCP");
+    }
+
    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");
+            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>
--- a/app/views/student_work/forbidden_anonymous_comment.js.erb
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@ -1,7 +1,7 @@
 <% if @user_activity_id == -1 %>
 $("#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%");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#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%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% end %>
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@ -1,3 +1,8 @@
+<% content_for :header_tags do %>
+<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c"  %>
+<%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
+<% end %>
+
 <script type="text/javascript">
  $(function(){
      $("#RSide").removeAttr("id");
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@ -11,6 +11,11 @@
        $('#ajax-modal').parent().addClass("anonymos_work");
    });
  <% end%>
+  <% if @homework.homework_detail_group %>
+      $(function(){
+          $('span.group_detail_info').text('分组人数：<%=@homework.homework_detail_group.min_num %>-<%=@homework.homework_detail_group.max_num %> 人');
+      });
+  <% end %>

  //快速创建项目的弹框
  function new_project(){
@ -83,7 +88,7 @@

  <div class="HomeWorkBox">
    <div class="">
-      <div class="homepagePostTitle fl">
+      <div class="homepagePostTitle fl m_w530 hidden">
        <%= @homework.name%>（作业名称）
      </div>
      <span class="fr c_grey">
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@ -18,7 +18,7 @@ $("#all_students_list").empty();
        }
    }
 }
-    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? %>
+    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? && user.member_of_course?(@course) %>
        if (str.indexOf(<%=user.id.to_s %>) < 0) {
            $("#student_<%=user.id %>").one("click",function choose_student() {
                var li = "<li id='choose_student_<%=user.id %>'";
@ -29,6 +29,10 @@ $("#all_students_list").empty();
                $("#choose_students_list").append(li);
            });
        }
+    <% elsif !user.member_of_course?(@course) %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").attr("title","该项目成员不是本课程的学生");
+        }
    <% else %>
        if (str.indexOf(<%=user.id.to_s %>) < 0) {
            $("#student_<%=user.id %>").attr("title","该学生已加入其它分组");
--- a/app/views/student_work/set_score_rule.js.erb
+++ b/app/views/student_work/set_score_rule.js.erb
@ -1,8 +1,8 @@
 clickCanel();
 <% if @user_activity_id %>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
 <% 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 %>
+    init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
+<% end %>
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@ -4,6 +4,31 @@ if($("#about_hwork_<%= @work.id%>").children().length > 0){
 else{
  <% if @homework.homework_type == 2%>
    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
+
+    var program_name = "text/x-csrc";
+    var language = <%= @homework.language %>;
+    if (language == 1) {
+      program_name = 'text/x-csrc';
+    } else if(language==2){
+      program_name = 'text/x-c++src';
+    }else if(language==3){
+      program_name = 'text/x-cython';
+    } else if(language==4){
+      program_name = 'text/x-java';
+    }
+
+    var editor = CodeMirror(document.getElementById("work-code"), {
+          mode: {name: program_name,
+            version: 2,
+            singleLineStringErrors: false},
+          lineNumbers: true,
+          indentUnit: 2,
+          matchBrackets: true,
+      readOnly: true,
+      value: document.getElementById("work-src").innerText
+        }
+    );
+
  <% else%>
    $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
  <% end%>
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -13,7 +13,7 @@
        <% end %> TO <!--+"(课程名称)" -->
        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
      </div>
-      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
      </div>
      <% if activity.homework_detail_manual%>
@ -56,7 +56,7 @@
            <% 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=> '请选择分组作业关联的项目' %>
+                  <%=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? %>
@ -81,7 +81,11 @@
              <%= activity.language_name%>
            </div>
        <% end %>
-
+        <% if activity.homework_type == 3 && activity.homework_detail_group%>
+            <div class="homepagePostDeadline mr15">
+              分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
+            </div>
+        <% end %>
        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
      </div>
      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
@ -93,25 +97,49 @@
      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
      <div class="cl"></div>
+      <div class="mt5">
+        <div class="homepagePostDeadline">
+          匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        </div>
+        <div class="homepagePostDeadline ml15">
+          匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        </div>
+      </div>
+      <div class="cl"></div>
      <div>
        <%= 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 %>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
      <div class="mt10">
+        <% projects = activity.student_work_projects.where("is_leader = 1") %>
        <div class="fl mr5 fontGrey3">
-          <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
-          已关联项目：
+          已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
        </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 =>"项目头像" %>
+        <% projects.each do |pro| %>
+            <% project = Project.find pro.project_id %>
+            <script type="text/javascript">
+                $(document).ready(function(){
+                    $("#project_img_<%=project.id %>").mouseover(function(){
+                        $("#relatePInfo_<%=project.id %>").css("display","block");
+                    }).mouseout(function(){
+                        $("#relatePInfo_<%=project.id %>").css("display","none");
+                    })
+                });
+            </script>
+            <div class="mr20 mb10 fl">
+              <% 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),:id=>"project_img_"+project.id.to_s,:alt =>"项目头像" %>
              <% else %>
-                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
+                  <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s,:alt =>"项目头像") %>
              <% end %>
-              <p class="c_red tac" title="综合评分"><%=project.project_score.score.to_i %></p>
+              <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
+                项目名称：<%=project.name %><br />
+                创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
+                <% time=project.updated_on %>
+                <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
+                更新时间：<%=time_from_now time %>
+              </div>
            </div>
        <% end %>
      </div>
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@ -1,152 +1,152 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-  <div class="homepagePostBrief">
-    <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-    </div>
-    <div class="homepagePostDes">
-      <div class="homepagePostTo break_word mt-4">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-        <% end %>  TO
-        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
-      </div>
-      <div class="homepagePostTitle break_word">
-        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
-        <span class='<%= get_issue_priority(activity.priority_id)[0] %>'>
-          <%= get_issue_priority(activity.priority_id)[1] %>
-        </span>
-      </div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
-          <% unless activity.assigned_to_id.nil? %>
-              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-              <% else %>
-                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-              <% end %>
-          <% end %>
-        </div>
-        <div class="homepagePostDeadline">
-          时间：
-          <%=format_time(activity.created_on) %>
-        </div>
-      </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.description? %>
-              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-          <% end %>
-        </div>
-      </div>
-      <div class="cl"></div>
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <% if activity.attachments.any? %>
-            <% activity.attachments.each do |attachment| %>
-                <div class="break_word">
-                  <span class="fl">
-                  <span title="<%= attachment.filename %>" id="attachment_">
-                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%>
-                  </span>
-                  <% if attachment.is_text? %>
-                      <%= link_to image_tag('magnifier.png'),
-                                  :controller => 'attachments',
-                                  :action => 'show',
-                                  :id => attachment,
-                                  :class => 'fl',
-                                  :filename => attachment.filename %>
-                  <% end %>
-                  </span>
-                  <span class="postAttSize">(
-                    <%= number_to_human_size attachment.filesize %>)
-                  </span>
-                  <span class="author" title="<%= attachment.author%>">
-                    <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
-                    <%= format_time(attachment.created_on) %>
-                  </span>
-                </div>
-            <% end %>
-        <% end %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <% count = activity.journals.count %>
-  <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复（<%= count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <% if reply.details.any? %>
-                          <% details_to_strings(reply.details).each do |string| %>
-                              <p><%= string %></p>
-                          <% end %>
-                      <% end %>
-                      <P><%= reply.notes.html_safe %></P>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-          <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= user_activity_id%>'></p>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-
-  </div>
-</div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word mt-4">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>  TO
+        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
+      </div>
+      <div class="homepagePostTitle break_word">
+        <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
+        <span class='<%= get_issue_priority(activity.priority_id)[0] %>'>
+          <%= get_issue_priority(activity.priority_id)[1] %>
+        </span>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo"><span class="fontGrey3">指派给</span>&nbsp;&nbsp;
+          <% unless activity.assigned_to_id.nil? %>
+              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% end %>
+          <% end %>
+        </div>
+        <div class="homepagePostDeadline">
+          时间：
+          <%=format_time(activity.created_on) %>
+        </div>
+      </div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <% if activity.description? %>
+              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
+          <% end %>
+        </div>
+      </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <% if activity.attachments.any? %>
+            <% activity.attachments.each do |attachment| %>
+                <div class="break_word">
+                  <span class="fl">
+                  <span title="<%= attachment.filename %>" id="attachment_">
+                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%>
+                  </span>
+                  <% if attachment.is_text? %>
+                      <%= link_to image_tag('magnifier.png'),
+                                  :controller => 'attachments',
+                                  :action => 'show',
+                                  :id => attachment,
+                                  :class => 'fl',
+                                  :filename => attachment.filename %>
+                  <% end %>
+                  </span>
+                  <span class="postAttSize">(
+                    <%= number_to_human_size attachment.filesize %>)
+                  </span>
+                  <span class="author" title="<%= attachment.author%>">
+                    <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+                    <%= format_time(attachment.created_on) %>
+                  </span>
+                </div>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <% count = activity.journals.count %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复（<%= count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+      <% if count > 3 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+              展开更多
+            </a>
+          </div>
+      <% end %>
+    </div>
+
+    <% replies_all_i = 0 %>
+    <% if count > 0 %>
+        <div class="" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.journals.reorder("created_on desc").each do |reply| %>
+                <script type="text/javascript">
+                    $(function(){
+                        showNormalImage('reply_content_<%= reply.id %>');
+                    });
+                </script>
+                <% replies_all_i=replies_all_i + 1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher mt-4">
+                      <% if reply.try(:user).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_time(reply.created_on) %>
+                    </div>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                      <% if reply.details.any? %>
+                          <% details_to_strings(reply.details).each do |string| %>
+                              <p><%= string %></p>
+                          <% end %>
+                      <% end %>
+                      <P><%= reply.notes.html_safe %></P>
+                    </div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div>
+</div>
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@ -1,12 +1,12 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% 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;}
@ -39,7 +39,7 @@
            }

            $(function() {
-                init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%", "<%=user_activity.class.to_s%>");
                showNormalImage('activity_description_<%= user_activity.id %>');
                if($("#intro_content_<%= user_activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= user_activity.id %>").show();
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@ -0,0 +1,21 @@
+<% if AtMessage === ma && ma.at_valid? %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"),user_path(ma.author) %></a></li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <%= link_to ma.subject.html_safe, ma.url,
+                        :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                        :onmouseover =>"message_titile_show($(this),event)",
+                        :onmouseout => "message_titile_hide($(this))" %></li>
+          <div  style="display: none" class="message_title_red system_message_style">
+            <p><strong>标题：</strong><%= ma.subject %></p>
+            <% unless ma.description.nil? %>
+                <div class="fl"><strong>内容：</strong></div>
+                <div class="ml36"><%= ma.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+<% end %>
--- a/Show More
+++ b/Show More