diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 783e7d323..d6470ce51 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -770,6 +770,7 @@ class ApplicationController < ActionController::Base
   end
 
   def api_request?
+    return false if params[:controller] == 'at'
     %w(xml json).include? params[:format]
   end
 
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 23fe19333..cf4e6a8e9 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -74,6 +74,45 @@ class AttachmentsController < ApplicationController
       :disposition => 'attachment'    #inline can open in browser
   end
 
+  def direct_download_history
+    @attachment_history = AttachmentHistory.find(params[:id])
+    @attachment_history.increment_download
+    send_file @attachment_history.diskfile_history, :filename => filename_for_content_disposition(@attachment_history.filename),
+              :type => detect_content_type(@attachment_history),
+              :disposition => 'attachment'    #inline can open in browser
+  end
+
+  def download_history
+    @attachment_history = AttachmentHistory.find(params[:id])
+    candown = attachment_history_candown @attachment_history
+    if candown || User.current.admin? || User.current.id == @attachment_history.author_id
+      if stale?(:etag => @attachment_history.digest)
+        if params[:preview] == 'true'
+          convered_file = @attachment_history.diskfile_history
+          #如果本身不是pdf文件，则先寻找是不是已转换化，如果没有则转化
+          unless pdf?(convered_file)
+            convered_file = File.join(Rails.root, "files", "convered_office", @attachment.disk_filename + ".pdf")
+            unless File.exist?(convered_file)
+              office = Trustie::Utils::Office.new(@attachment_history.diskfile)
+              office.conver(convered_file)
+            end
+          end
+          if File.exist?(convered_file) && pdf?(convered_file)
+            send_file convered_file,  :type => 'application/pdf; charset=utf-8', :disposition => 'inline'
+          else
+            direct_download_history
+          end
+        else
+          direct_download_history
+        end
+      end
+    else
+      render_403 :message => :notice_not_authorized
+    end
+  rescue => e
+    redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
+  end
+
   def download
     # modify by nwb
     # 下载添加权限设置
@@ -212,7 +251,7 @@ class AttachmentsController < ApplicationController
       @history.version =  @old_history.nil? ? 1 :  @old_history.version + 1
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
-      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public")
+      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads")
       @old_attachment.save
       #删除当前记录
       @attachment.delete
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 97dacb178..36060d41c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -442,10 +442,14 @@ class CoursesController < ApplicationController
     @course = cs.create_course(params,User.current)[:course]
     if params[:copy_course]
       copy_course = Course.find params[:copy_course].to_i
-      @course.is_copy = 1
+      @course.is_copy = params[:copy_course].to_i
       @course.open_student = copy_course.open_student
       @course.publish_resource = copy_course.publish_resource
       @course.save
+
+      #copy avatar
+      copy_avatar(@course, copy_course)
+
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index c4932b1b2..e83a13ad9 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -488,6 +488,23 @@ class FilesController < ApplicationController
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
          Mailer.run.attachments_added(attachments[:files])
        end
+       if !attachments.empty? && attachments[:files]
+         attachments[:files].each do |attachment|
+           if params[:publish_time]
+             if params[:publish_time] == ""
+               attachment.publish_time = Date.today
+             else
+               attachment.publish_time = params[:publish_time]
+             end
+           else
+             attachment.publish_time = Date.today
+           end
+           if attachment.publish_time > Date.today
+             attachment.is_publish = 0
+           end
+           attachment.save
+         end
+       end
        if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array)
          params[:course_attachment_type].each do |type|
            tag_name = get_tag_name_by_type_number  type
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 398b385a4..a891d3354 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -344,7 +344,7 @@ class HomeworkCommonController < ApplicationController
 
   #当前用户是不是课程的成员
   def member_of_course
-    render_403 unless @course.is_public || User.current.member_of_course?(@course) || User.current.admin?
+    render_403 unless @course.is_public==1 || User.current.member_of_course?(@course) || User.current.admin?
   end
 
   def get_assigned_homeworks(student_works, n, index)
diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 78babc43c..1d7b4117d 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -214,6 +214,7 @@ class PollController < ApplicationController
   def publish_poll
     @poll.polls_status = 2
     @poll.published_at = Time.now
+    @poll.show_result = params[:show_result]
     if @poll.save
       if params[:is_remote]
         redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f2de6085f..2d1f8d771 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -112,7 +112,6 @@ class ProjectsController < ApplicationController
       @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
       @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
-      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
     @projects =   @project_pages.order("created_on desc")
     @limit = 10#per_page_option
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 707e87fd1..7655f1eb4 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -521,6 +521,13 @@ update
     end
   end
 
+  # 每次提交对应的文件差异
+  def commit_diff
+    @commit_diff = $g.commit_diff(@project.gpid, params[:changeset])
+    @commit_details = $g.commit(@project.gpid, params[:changeset])
+    render :layout => 'base_projects'
+  end
+
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index e0afc38ae..e6ff904f3 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -98,14 +98,22 @@ class StudentWorkController < ApplicationController
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          if pro.nil?
+            @stundet_works = []
+          else
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          end
         else
           @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          my_work = @homework.student_works.where(:id => pro.student_work_id)
+          if pro.nil?
+            my_work = []
+          else
+            my_work = @homework.student_works.where(:id => pro.student_work_id)
+          end
         else
           my_work = @homework.student_works.where(:user_id => User.current.id)
         end
@@ -113,7 +121,11 @@ class StudentWorkController < ApplicationController
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          if pro.nil?
+            my_work = []
+          else
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          end
         else
           my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         end
@@ -134,14 +146,22 @@ class StudentWorkController < ApplicationController
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          if pro.nil?
+            @stundet_works = []
+          else
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          end
         else
           @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         end
       elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          my_work = @homework.student_works.where(:id => pro.student_work_id)
+          if pro.nil?
+            my_work = []
+          else
+            my_work = @homework.student_works.where(:id => pro.student_work_id)
+          end
         else
           my_work = @homework.student_works.where(:user_id => User.current.id)
         end
@@ -149,7 +169,11 @@ class StudentWorkController < ApplicationController
       elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
         if @homework.homework_type == 3
           pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          if pro.nil?
+            my_work = []
+          else
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+          end
         else
           my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 12f112345..fb35d8495 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -458,9 +458,9 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #全部
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'} and (name like '%#{search}%')").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
     elsif params[:type] == "2" #课程资源
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
     end
     @type = params[:type]
     @limit = 15
@@ -2144,22 +2144,22 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #全部
       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','OrgSubfield','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(',')}))").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_publish = 1 and container_type in('Project','OrgSubfield','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 is_publish = 1)").order("created_on desc")
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and is_publish = 1 " +
                                             "and container_type in('Project','OrgSubfield','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(',')}))").order("created_on desc")
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1)").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(',')})) ").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").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(',')}))").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course' and is_publish = 1)"+
+                                            "or (container_type = 'Course' and is_public = 1 and is_publish = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
       end
     elsif params[:type] == "3" #项目资源
       if User.current.id.to_i == params[:id].to_i
@@ -2283,7 +2283,7 @@ class UsersController < ApplicationController
         @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
       end
     else
-      if params[:send_type].present? and params[:send_type] == 'news'
+      if params[:send_type].present? and (params[:send_type] == 'news' or params[:send_type] == 'message')
         @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Post'").count > 0}
       else
         @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9f516ae1a..9d08be378 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -67,7 +67,7 @@ module ApplicationHelper
   # 获取项目/课程总分
   # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分
   def static_project_score obj
-    score = obj.issue_num * 4 + obj.issue_journal_num + obj.changeset_num * 4 + obj.board_num * 2 + obj.board_message_num + obj.news_num + obj.attach_num * 5
+    score = obj.issue_num * 4 + obj.issue_journal_num + (obj.changeset_num||0) * 4 + obj.board_num * 2 + obj.board_message_num + obj.news_num + obj.attach_num * 5
   end
 
  # 获取组织成员中文名字
@@ -1997,6 +1997,18 @@ module ApplicationHelper
     courses_doing
   end
 
+  def attachment_history_candown attachment_history
+    if attachment_history.container_type == "Course"
+      course = Course.find(attachment_history.container_id)
+      candown = User.current.member_of?(course) || (course.is_public && attachment_history.is_public == 1)
+    elsif attachment_history.container_type == "Project"
+      project = Project.find(attachment_history.container_id)
+      candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)
+    elsif attachment_history.container_type == "OrgSubfield"
+      org = OrgSubfield.find(attachment_history.container_id)
+      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1)
+    end
+  end
 
   def attachment_candown attachment
     candown = false
@@ -2808,7 +2820,7 @@ int main(int argc, char** argv){
     end
 
     if opt[:init_activity]
-      ss += javascript_include_tag "init_activity_KindEditor"
+      ss += javascript_include_tag "create_kindeditor"
     end
 
     ss.html_safe
diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
index 3f6802f59..5c3ffd950 100644
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@@ -1,9 +1,24 @@
 module AvatarHelper
   
   AVATAR_SIZE="50x50"
+
+  def copy_avatar(des, src)
+    src_file = disk_filename(src.class,src.id)
+    des_file = disk_filename(des.class,des.id)
+
+    FileUtils.cp(src_file, des_file) if File.exist?(src_file)
+  end
   
-  def avatar_image(source)
-    File.join(relative_path, avatar_directory(source.class), source.id.to_s) 
+  def avatar_image(source, copyed=false)
+    source_type = source.class
+    source_id = source.id
+
+    course = Course.find(source_id) rescue nil
+    if course && copyed
+      source_id  = course.is_copy
+    end
+
+    File.join(relative_path, avatar_directory(source_type), source_id.to_s)
   end
      
   def relative_path
@@ -23,7 +38,18 @@ module AvatarHelper
   end
   
   def disk_filename(source_type,source_id,image_file=nil)
-    File.join(storage_path,avatar_directory(source_type),avatar_filename(source_id,image_file))   
+    File.join(storage_path,avatar_directory(source_type),avatar_filename(source_id,image_file))
+  end
+
+  def copy_course?(source_type, source_id)
+    file= disk_filename(source_type, source_id)
+    if source_type == Course && !File.exist?(file)
+      course = Course.find(source_id) rescue nil
+      if course && course.is_copy>0
+        return true
+      end
+    end
+    false
   end
   
   def file_extension(filename=nil)
@@ -35,7 +61,9 @@ module AvatarHelper
       return File.join(relative_path,'AnonymousUser','0')      
     end
     if source.class && source.id && File.exist?(disk_filename(source.class,source.id))
-      avatar_image(source)
+      avatar_image(source, false)
+    elsif copy_course?(source.class, source.id)
+      get_avatar(Course.find(source.is_copy)) rescue nil
     else
       File.join(relative_path,avatar_directory(source.class),'0')
     end
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 1e4cedf14..6d0066fbc 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -116,6 +116,34 @@ module CoursesHelper
     @course.journals_for_messages.where('m_parent_id IS NULL').count
   end
 
+  #当前学期
+  def current_time_and_term course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term.to_s
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term.to_s
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term.to_s
+    else
+      str = Time.now.year.to_s + cur_course_term.to_s
+    end
+    str
+  end
+
+  def set_term_value term
+    val = 0
+    if term == "春季学期"
+      val = 1
+    elsif term == "夏季学期"
+      val = 2
+    elsif term == "秋季学期"
+      val = 3
+    end
+    val
+  end
+
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
    # searchStudent(project).count
@@ -562,7 +590,7 @@ module CoursesHelper
     type = []
     month = Time.now.month
     now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
-    year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
+    year = month < 2 && now_year >=Time.now.year ? now_year - 1 : now_year
     for i in (year..year + 10)
       option = []
       option << i
@@ -592,8 +620,10 @@ module CoursesHelper
 
   def cur_course_term
     month = Time.now.month
-    if month >= 9 || month < 3
+    if month >= 9 || month < 2
       term = "秋季学期"
+    elsif (month >= 7 && Time.now.day >= 15) || month == 8
+      term = "夏季学期"
     else
       term = "春季学期"
     end
@@ -603,7 +633,7 @@ module CoursesHelper
   def course_in_current_or_next_term course
     is_current_term = false
     is_next_term = false
-    year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
+    year_now = Time.now.month < 2 ? Time.now.year - 1:Time.now.year
     if course.time == year_now && course.term == cur_course_term
       is_current_term = true
     end
@@ -612,6 +642,7 @@ module CoursesHelper
     elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "夏季学期"
       is_next_term = true
     elsif cur_course_term == "夏季学期" && course.time == year_now && course.term == "秋季学期"
+      is_next_term = true
     end
     is_current_term || is_next_term
   end
@@ -715,7 +746,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? || User.current.member_of_course?(course) || User.current.admin?
+      if attachment.is_public? ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index bd023f6d0..6b748649b 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -123,7 +123,8 @@ module FilesHelper
     attachments.each do |attachment|
       if attachment.is_public? ||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
-          (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))||
+          (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
+          (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
           attachment.container_type == "OrgSubfield"
         result << attachment
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index ff4aa61fb..36187b460 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -41,6 +41,16 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index ea9ad2cc0..588ee144d 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -643,8 +643,8 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1
-      self.container.project_score.update_attribute(:attach_num, aatach_count)
+      attach_count = self.container.project_score.attach_num - 1
+      self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
 end
diff --git a/app/models/attachment_history.rb b/app/models/attachment_history.rb
index 2160d242d..fb4e762ba 100644
--- a/app/models/attachment_history.rb
+++ b/app/models/attachment_history.rb
@@ -1,3 +1,14 @@
 class AttachmentHistory < ActiveRecord::Base
   belongs_to :attachment,foreign_key: 'attachment_id'
+  cattr_accessor :storage_history_path
+  @@storage_history_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
+
+  # Returns file's location on disk
+  def diskfile_history
+    File.join(self.class.storage_history_path, disk_directory.to_s, disk_filename.to_s)
+  end
+
+  def increment_download
+    increment!(:downloads)
+  end
 end
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
index 194e1183a..9c1431d5d 100644
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@@ -67,12 +67,13 @@ class CourseActivity < ActiveRecord::Base
   # 导语
   def add_course_lead
     if self.course_act_type == "Course"
-      name = Redmine::Configuration['course_message_lead_subject']
-      content = Redmine::Configuration['course_message_lead_content']
+      lead_message = Message.find(12440)
+      name = lead_message.subject
+      content = lead_message.content
       # message的status状态为0为正常，为1表示创建课程时发送的message
       message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
       # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
-      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1)
+      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1) if message.course_acts.first
     end
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index e1de4cd9e..c82f6f0be 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -184,7 +184,7 @@ class Issue < ActiveRecord::Base
   def decrease_issues_count
     unless self.project.project_score.nil?
       issue_count = self.project.project_score.issue_num - 1
-      self.project.project_score.update_attribute(:issue_num, issue_count)
+      self.project.project_score.update_attribute(:issue_num, issue_count < 0 ? 0 : issue_count)
     end
   end
 
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 2da815a44..c37b8d2c5 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -52,6 +52,7 @@ class Journal < ActiveRecord::Base
   
   # fq
   after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message
+  after_create :update_issue_time
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -218,8 +219,9 @@ class Journal < ActiveRecord::Base
   # 减少留言数量统计
   def decrease_issues_journal_count
     unless self.issue.project.nil?
-      project = self.issue.project
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
+      journal_count = self.issue.project.project_score.issue_journal_num - 1
+      # project = self.issue.project
+       self.issue.project.project_score.update_attribute(:issue_journal_num, journal_count < 0 ? 0 : journal_count)
     end
   end
 
@@ -230,4 +232,12 @@ class Journal < ActiveRecord::Base
       project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num + 1)
     end
   end
+
+  # 回复issue的时候，更新issue的时候
+  def update_issue_time
+    if self.journalized_type == "Issue"
+      forge_activity = ForgeActivity.where("forge_act_id =? and forge_act_type =?", self.issue, "Issue").first
+      forge_activity.update_attribute(:created_at, self.created_on) unless forge_activity.nil?
+    end
+  end
 end
diff --git a/app/models/member.rb b/app/models/member.rb
index ed7ee81e6..413fedc07 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("IF(final_score is null,null,final_score - absence_penalty - late_penalty) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,12 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").sum(:final_score).try(:round, 2).to_f
+    sql_select = "SELECT (SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))) as score
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{self.course_id}
+          AND student_works.user_id = #{self.user_id}"
+    score = StudentWork.find_by_sql(sql_select)
   end
 
   protected
diff --git a/app/models/message.rb b/app/models/message.rb
index 675d37790..6381f444f 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -146,10 +146,10 @@ class Message < ActiveRecord::Base
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
-        self.project.project_score.update_attribute(:board_num, count)
+        self.project.project_score.update_attribute(:board_num, count < 0 ? 0 : count)
       else # 回复
         count = self.project.project_score.board_message_num - 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
   end
diff --git a/app/models/news.rb b/app/models/news.rb
index fee5d2801..d0fccae17 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -126,7 +126,7 @@ class News < ActiveRecord::Base
   def decrease_news_count
     if self.project && !self.project.project_score.nil?
       count = self.project.project_score.news_num - 1
-      self.project.project_score.update_attribute(:news_num, count)
+      self.project.project_score.update_attribute(:news_num, count < 0 ? 0 : count)
     end
   end
 
diff --git a/app/models/secdomain.rb b/app/models/secdomain.rb
new file mode 100644
index 000000000..4d0abe5db
--- /dev/null
+++ b/app/models/secdomain.rb
@@ -0,0 +1,18 @@
+class Secdomain < ActiveRecord::Base
+  attr_accessible :pid, :subname, :sub_type, :desc
+
+  validates_presence_of :subname, :sub_type
+  validates_uniqueness_of :subname
+
+  def controller
+    return 'organizations' if sub_type == 2
+    return 'users' if sub_type == 3
+    nil
+  end
+
+  def action
+    return 'show' if sub_type == 2
+    return 'show' if sub_type == 3
+    nil
+  end
+end
diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index c1a6464e8..fb2afd308 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -1,54 +1,57 @@
-<!--<div class="resourceUploadPopup">-->
-<span class="uploadDialogText">更新资源版本</span>
-<!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer mt0">
-  <div>
-    <div>当前版本
-            <span class="attachment" >
-              <input readonly="readonly" name="attachments[1][filename]" value="<%=@attachment.filename%>" class="upload_filename readonly" type="text">
-            </span>
-    </div>
-    <% unless @attachment_histories.empty? %>
-
-    <div >历史版本</div>
-    <div style="max-height: 95px;overflow-y:auto; background-color: #e3e3e3;" class="mb10 p10">
-    <% @attachment_histories.each do |history| %>
-        <span class="attachment">
-          <input readonly="readonly" name="attachments_versions_<%= history.id%>" value="<%=history.filename%>" class="upload_filename readonly" type="text">
-          <span>版本号：<%= history.version %></span>
-        </span>
-
-    <% end %>
-    </div>
-    <% end %>
-
-  </div>
-  <%= form_tag(upload_attachment_version_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
-      <%= hidden_field_tag :old_attachment_id,@attachment.id %>
-      <div>
-        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
-        </span>
-      </div>
-      <div class="uploadBox">
-        <input type="hidden" name="attachment_type" value="1">
-        <%= render :partial => 'attachments/upload_attachment_new_version' %>
-        <div class="cl"></div>
-        <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
-        <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
-      </div>
-      <div class="uploadResourceIntr">
-        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
-        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
-      </div>
-      </div>
-      <div class="cl"></div>
-      <div style="margin-top: 10px" >
-        <div class="courseSendSubmit">
-          <!--<a href="javascript:void(0);" class="sendSourceText" onclick="">确定</a>-->
-          <%= submit_tag '确定',:onclick=>'upload_attachment_version(event);',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
-        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="hideModal();">取消</a></div>
-      </div>
-  <% end %>
-  <div class="cl"></div>
+<!--<div class="resourceUploadPopup">-->
+<span class="uploadDialogText">更新资源版本</span>
+<!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+<div class="uploadBoxContainer mt0">
+  <div>
+    <div>当前版本
+            <span class="attachment" >
+              <input readonly="readonly" name="attachments[1][filename]" value="<%=@attachment.filename%>" class="upload_filename readonly" type="text">
+            </span>
+    </div>
+    <% unless @attachment_histories.empty? %>
+
+    <div >历史版本</div>
+    <div style="max-height: 95px;overflow-y:auto; background-color: #e3e3e3;" class="mb10 p10">
+    <% @attachment_histories.each do |history| %>
+        <span class="attachment">
+          <%= link_to truncate(history.filename,length: 35, omission: '...'),
+                      download_history_attachment_path(history.id, history.filename),
+                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b link_file_a2 fl"  %>
+          <span class="fr">版本号：<%= history.version %></span>
+          <div class="cl"></div>
+        </span>
+
+    <% end %>
+    </div>
+    <% end %>
+
+  </div>
+  <%= form_tag(upload_attachment_version_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
+      <%= hidden_field_tag :old_attachment_id,@attachment.id %>
+      <div>
+        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+        </span>
+      </div>
+      <div class="uploadBox">
+        <input type="hidden" name="attachment_type" value="1">
+        <%= render :partial => 'attachments/upload_attachment_new_version' %>
+        <div class="cl"></div>
+        <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
+        <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
+      </div>
+      <div class="uploadResourceIntr">
+        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
+        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+      </div>
+      </div>
+      <div class="cl"></div>
+      <div style="margin-top: 10px" >
+        <div class="courseSendSubmit">
+          <!--<a href="javascript:void(0);" class="sendSourceText" onclick="">确定</a>-->
+          <%= submit_tag '确定',:onclick=>'upload_attachment_version(event);',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
+        </div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="hideModal();">取消</a></div>
+      </div>
+  <% end %>
+  <div class="cl"></div>
   <!--</div>-->
\ No newline at end of file
diff --git a/app/views/attachments/attachment_versions.js.erb b/app/views/attachments/attachment_versions.js.erb
index 4f3bf41c3..a5bb6672b 100644
--- a/app/views/attachments/attachment_versions.js.erb
+++ b/app/views/attachments/attachment_versions.js.erb
@@ -2,6 +2,6 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/sh
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","40%").css("left","46%");
+$('#ajax-modal').parent().css("top","40%").css("left","50%");
 $('#ajax-modal').parent().addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index 61669058b..292587cad 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -21,8 +21,8 @@
               <input type="hidden" name="course_id" id="" value="<%= course_id%>">
           <% end %>
           <input type="hidden" name="blog_comment[title]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <div nhname='toolbar_container_<%= reply.id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
           <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
diff --git a/app/views/blog_comments/quote.js.erb b/app/views/blog_comments/quote.js.erb
index cd53707d5..9bd226ce1 100644
--- 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%", "<%=@blogComment.class.to_s%>");
+        sd_create_editor_from_data(<%= @blogComment.id%>,null,"100%", "<%=@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>");
diff --git a/app/views/blog_comments/reply.js.erb b/app/views/blog_comments/reply.js.erb
index 2a4e71f1c..915ab892d 100644
--- a/app/views/blog_comments/reply.js.erb
+++ b/app/views/blog_comments/reply.js.erb
@@ -5,4 +5,4 @@
 $("#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%", 'UserActivity');
 <% end %>
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
\ No newline at end of file
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity');
\ No newline at end of file
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 4a407089f..c80274db4 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -1,6 +1,7 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor",'blog' %>
+    <%#= javascript_include_tag "init_activity_KindEditor",'blog' %>
+    <%= javascript_include_tag "create_kindeditor",'blog' %>
 <% end %>
 
 <script type="text/javascript">
@@ -27,7 +28,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>');
+        sd_create_editor_from_data(<%= @article.id%>,null,"100%", '<%=@article.class.to_s%>');
         showNormalImage('message_description_<%= @article.id %>');
     });
 </script>
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 4ca86e7ae..05f69055f 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -198,8 +198,8 @@
                   <input type="hidden" name="blog_comment[locked]" value="0">
                   <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-                  <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></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>
diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb
index ca85c0ba2..f3fd1aa61 100644
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@@ -1,19 +1,19 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
+    <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <script type="text/javascript">
     $(function(){
@@ -75,7 +75,7 @@
               }
 
               $(function () {
-                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
+                  sd_create_editor_from_data(<%= topic.id%>, null, "100%", "<%=topic.class.to_s%>");
               });
           </script>
           <% if topic %>
diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb
index 1898fce02..bc7b9667e 100644
--- a/app/views/boards/_course_show_detail.html.erb
+++ b/app/views/boards/_course_show_detail.html.erb
@@ -1,19 +1,19 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
+    <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <% if topics%>
     <% topics.each do |topic| %>
@@ -40,7 +40,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
+                sd_create_editor_from_data(<%= topic.id%>, null, "100%", "<%=topic.class.to_s%>");
             });
         </script>
         <% if topic %>
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 367f0552c..1d5cc3b75 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -1,18 +1,18 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
+    <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <% if topics%>
     <% topics.each do |topic| %>
@@ -39,7 +39,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                sd_create_editor_from_data(<%= topic.id%>, null, "100%");
             });
         </script>
         <% if topic %>
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
index f94eda065..0814b5f50 100644
--- a/app/views/comments/create.js.erb
+++ b/app/views/comments/create.js.erb
@@ -5,4 +5,4 @@
 <% else %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");
+sd_create_editor_from_data('<%= @user_activity_id%>',"","100%", "UserActivity");
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index 97443beea..486c760f1 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -8,7 +8,7 @@
       <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre>
+      <pre style="width:auto;white-space: nowrap;overflow: auto; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>
diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index a759946f6..c7547adcd 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -39,12 +39,13 @@
     <input name="copy_course" value="<%=@course.id %>" style="display: none"/>
     <li class="ml45 mb10">
       <a href="javascript:void(0)" class="upimg fl">
-        <%= image_tag(url_to_avatar(@new_course), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
+        <%= image_tag(url_to_avatar(@course), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
       </a> <!--<a href="javascript:void(0)" class="upbtn fl ml30" onclick="$('#upload_course_logo').click();">上传图片</a>-->
       <!--</span>-->
       <div class="cl"></div>
     </li>
     <li class="ml45">
+
       <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
       <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
       <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index 1b0d5330d..d65c0b3ab 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -38,54 +38,6 @@
     })
 </script>
 <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>
 <% course_activities.each do |activity| if course_activities %>
         <script>
@@ -107,7 +59,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
+                sd_create_editor_from_data(<%= activity.id%>, null, "100%", "<%= activity.class.to_s %>");
             });
         </script>
             <% if activity && activity.course_act%>
diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 0c4f4c1e0..c7e4a7428 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -32,9 +32,9 @@
       <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|%>
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+            <div nhname='toolbar_container_' ></div>
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
-            <div nhname='toolbar_container_' style="float:left;padding-top:3px;margin-bottom: 15px;"></div>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
             <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
         <% end %>
diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index 2b890ca5d..f26c5fd41 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -8,8 +8,13 @@
             <div class="fl">
               <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %></p>
               <p class="f12">
-                <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
-                <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span></p>
+                <% if e_course.attachments.count > 0 %>
+                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
+                <% end %>
+                <% if e_course.homework_commons.count > 0 %>
+                    <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
+                <% end %>
+              </p>
             </div>
             <div class="cl"></div>
           </li>
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 2d08e853e..612f408d7 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= @member_score.student_work_score_sum %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
     </ul>
 
   </div>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 617cefc93..b0c4a067f 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -139,6 +139,6 @@
         $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("anonymos");
     }
-    $("#time").click(select);
-    $("#term").click(select);
+    //$("#time").click(select);
+    //$("#term").click(select);
 </script>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index c9d333e6d..8182c949c 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -40,7 +40,8 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
+        //init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
+        sd_create_editor_from_data(<%= @article.id%>,null,"100%", "<%=@article.class.to_s%>");
         showNormalImage('message_description_<%= @article.id %>');
     });
 </script>
@@ -201,8 +202,8 @@
                   <input type="hidden" name="blog_comment[sticky]" value="0">
                   <input type="hidden" name="quote[quote]" value="">
                   <input type="hidden" name="blog_comment[locked]" value="0">
+                  <div nhname='toolbar_container_<%= @article.id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @article.id%>' name="blog_comment[content]"></textarea>
-                  <div nhname='toolbar_container_<%= @article.id%>' style="float:left; margin-left: 5px;"></div>
                   <a id="new_message_submit_btn_<%= @article.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= @article.id%>'></p>
@@ -217,8 +218,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @article.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @article.id %>").html(postContent);
+        $("#message_description_<%= @article.id %> p,#message_description_<%= @article.id %> span,#message_description_<%= @article.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 47c08d2fb..d7aade6c2 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -18,6 +18,9 @@
                             <span class="img_private ml5">私有</span>
                         <%end %>
                     </span>
+                    <% if file.is_publish == 0 %>
+                        <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
+                    <% end %>
                   </div>
                   <div class="mt5">
                     <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 7a5d95125..866cf6fd8 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -72,7 +72,7 @@
         <%=link_to "点击展开更多",  search_files_in_subfield_org_subfield_files_path(:org_subfield_id => org_subfield.id,:page => @page.to_i + 1, :name => params[:name],:insite => params[:insite]),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <% else %>
         <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page.nil? ? 2 :(@page + 1)), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+        <%=link_to "点击展开更多",  org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page.nil? ? 2 :(@page.to_i + 1)), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <%end%>
 <% end%>
 
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 6cce4bf2e..2e53f05d2 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -21,10 +21,20 @@
           <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <div class="cl"></div>
-
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
-          <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
-          <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
+          <% if User.current.allowed_to?(:as_teacher,course) %>
+              <div class="mb5">
+                <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>
+                <div class="calendar_div fl">
+                    <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly">
+                    <%#= calendar_for('attachment_publish_time')%>
+                </div>
+                <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <a href="javascript:void(0);" class=" fr courseSendCancel mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="c_white courseSendSubmit fr" onclick="submit_course_resource();"><%= l(:button_confirm)%></a>
+          <%#= submit_tag '确定',:onclick=>'submit_course_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
       <% end %>
     </div>
 
@@ -35,8 +45,39 @@
 </div>
 
 <script>
-    function submit_resource()
+    function regex_publish_time()
+    {
+        var myDate = new Date();
+        if($.trim($("#attachment_publish_time").val()) == "")
+        {
+            return true;
+        } else{
+            var publish_time = Date.parse($("#attachment_publish_time").val());
+            if(Date.parse(formate_date(myDate)) > publish_time)
+            {
+                $("#publish_time_notice").text("发布日期不能小于当前日期");
+                return false;
+
+            }
+            else
+            {
+                $("#publish_time_notice").text("");
+                return true;
+            }
+        }
+    }
+    function submit_course_resource()
     {
-        $('#submit_resource').parent().submit();
+        <% if User.current.allowed_to?(:as_teacher,course) %>
+            if(regex_publish_time()) {
+                $('#submit_resource').parent().submit();
+            }
+        <% else %>
+            $('#submit_resource').parent().submit();
+        <% end %>
     }
+    $(function(){
+        var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+        $('#attachment_publish_time').datepicker(datepickerOptions);
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index aa3eef59e..f71cec9a5 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
               :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
-    <input type="text" name="search" placeholder="输入作业关键词进行搜索" class="searchResource" />
+    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="searchResource" />
     <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
     <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
 <% end %>
\ No newline at end of file
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index ac772171d..f95739f26 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -5,7 +5,11 @@
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
-        homework_description_editor.html("");
+        //homework_description_editor.html("");
+        $("#homework_name_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_course_id_span").text("");
         $("#homework_editor").toggle();
     }
     function cancel_edit(){
@@ -26,7 +30,7 @@
 <div class="cl"></div>
 
 <!-- 老师身份才可以发布作业 -->
-<div class="HomeWork mb10">
+<div class="HomeWork mb10" nhname='homework_common_form'>
   <%= form_for @homework do |f| %>
       <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
       <input type="text" name="course_activity" class="none" value="<%= @course_activity%>"/>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 5c91a37fc..ac4ac9853 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -6,7 +6,11 @@
         document.getElementById("anonymous_comment").checked = true;
         $("#course_id").val($("#option_select").val());
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
-        homework_description_editor.html("");
+        //homework_description_editor.html("");
+        $("#homework_name_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_end_time_span").text("");
+        $("#homework_course_id_span").text("");
         $("#homework_editor").toggle();
     }
 
@@ -44,7 +48,7 @@
 
   <% if @is_teacher%>
       <!-- 老师身份才可以发布作业 -->
-      <div class="HomeWork mb10">
+      <div class="HomeWork mb10" nhname='homework_common_form'>
         <%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
             <div id="HomeWorkCon">
               <%= render :partial => 'users/user_homework_form', :locals => { :homework => @new_homework,:f => f,:edit_mode => false,:select_course => false } %>
diff --git a/app/views/homework_common/set_evaluation_attr.js.erb b/app/views/homework_common/set_evaluation_attr.js.erb
index 73436750c..987abd351 100644
--- a/app/views/homework_common/set_evaluation_attr.js.erb
+++ b/app/views/homework_common/set_evaluation_attr.js.erb
@@ -1,8 +1,8 @@
 clickCanel();
 <% if @user_activity_id != -1 %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "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%", "<%=@homework.class.to_s%>");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/homework_common/start_anonymous_comment.js.erb b/app/views/homework_common/start_anonymous_comment.js.erb
index 8b2e9ed04..91a68011e 100644
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@@ -3,11 +3,11 @@
     <% 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})%>");
         $("#evaluation_start_time_<%=@homework.id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
-        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
+        sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@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}) %>");
         $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
-        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
+        sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "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 %>
diff --git a/app/views/homework_common/stop_anonymous_comment.js.erb b/app/views/homework_common/stop_anonymous_comment.js.erb
index 2f8d8c6d6..874374476 100644
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@@ -2,11 +2,11 @@ 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})%>");
 $("#evaluation_end_time_<%=@homework.id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
-init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@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}) %>");
 $("#evaluation_end_time_<%=@user_activity_id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity');
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 2a1ae56d4..3ee20ee2a 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -18,7 +18,7 @@
          }
 
          $(function () {
-             init_activity_KindEditor_data(<%= issue.id%>, null, "87%", "<%= issue.class.name %>");
+             sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>");
          });
      </script>
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
diff --git a/app/views/issues/add_journal.js.erb b/app/views/issues/add_journal.js.erb
index 9099c31b6..21519d5a1 100644
--- a/app/views/issues/add_journal.js.erb
+++ b/app/views/issues/add_journal.js.erb
@@ -2,7 +2,7 @@
     $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
     $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
     $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
-    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%=@issue.class.name%>");
     issue_desc_editor = KindEditor.create('#issue_description',
         {"width":"85%",
             "resizeType":0,
@@ -18,9 +18,10 @@
             "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
     $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
-    sd_create_editor_from_data(<%= @issue.id %>, null, "100%");
+    sd_create_editor_from_data(<%= @issue.id %>, null, "100%","<%=@issue.class.name%>");
 <%else%>
     $("#div_user_issue_reply_<%=@user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
-   init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
+    sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity");
+//init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
    // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
 <%end %>
diff --git a/app/views/issues/add_journal_in_org.js.erb b/app/views/issues/add_journal_in_org.js.erb
index 34e874f13..ed4666d0c 100644
--- 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%", "UserActivity");
\ No newline at end of file
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/issues/add_reply.js.erb b/app/views/issues/add_reply.js.erb
index 0ee9d30e7..500451781 100644
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@@ -1,3 +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%");
\ No newline at end of file
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
diff --git a/app/views/issues/delete_journal.js.erb b/app/views/issues/delete_journal.js.erb
index 63a1a5f96..7c7f25c1c 100644
--- a/app/views/issues/delete_journal.js.erb
+++ b/app/views/issues/delete_journal.js.erb
@@ -1,3 +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%");
\ No newline at end of file
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 4217ca44e..ad5d971ed 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -3,15 +3,15 @@
 <% 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;}
+    /*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(){
diff --git a/app/views/issues/reply.js.erb b/app/views/issues/reply.js.erb
index 316c078f2..2d42475f6 100644
--- a/app/views/issues/reply.js.erb
+++ b/app/views/issues/reply.js.erb
@@ -2,7 +2,7 @@ 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%");
+        sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
     });
 }else if($("#reply_to_message_<%= @issue.id%>").length >0) {
     $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb
index ede4a0534..16ca863e4 100644
--- a/app/views/issues/update.js.erb
+++ b/app/views/issues/update.js.erb
@@ -5,7 +5,7 @@ $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/e
 $("#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%");
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
 $(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 1ba7e9483..7aa591aae 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -2,7 +2,7 @@
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                  :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%>
+                  :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 5f53e5203..138616fda 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -56,7 +56,7 @@
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
           <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
-          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= @course.term %></span></li>
+          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= current_time_and_term @course %></span></li>
           <% if @course.school%>
             <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
           <% end%>
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 9d3f76cc6..81c6e82a5 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -43,16 +43,11 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
-          <span class="orgMenuArrow" id="orgArrow">
-            <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
-              <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-            </ul>
-          </span>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
+            <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
+            <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
+            <%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
-          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 657873f8b..33c792aaf 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'header','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
+  <%= stylesheet_link_tag 'header','scm','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 3028f3369..16bc5c742 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -3,19 +3,6 @@
     <%= javascript_include_tag 'forum' %>
 <% 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 expand_reply(container,btnid){
         var target = $(container).children();
@@ -34,7 +21,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%", "<%=@memo.class.to_s%>");
+        sd_create_editor_from_data(<%= @memo.id%>,null,"100%", "<%=@memo.class.to_s%>");
     });
 
     function del_confirm(){
@@ -124,8 +111,8 @@
               <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
               <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
               <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
+              <div nhname='toolbar_container_<%= @memo.id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id%>' name="memo[content]"></textarea>
-              <div nhname='toolbar_container_<%= @memo.id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
               <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= @memo.id%>'></p>
@@ -139,8 +126,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @memo.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @memo.id %>").html(postContent);
+            $("#message_description_<%= @memo.id %> p,#message_description_<%= @memo.id %> span,#message_description_<%= @memo.id %> em").each(function(){
+                var postContent = $(this).html();
+                postContent = postContent.replace(/&nbsp;/g," ");
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                $(this).html(postContent);
+            });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 022b8c76b..49207d5c5 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -27,14 +27,18 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
+        sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>");
         showNormalImage('message_description_<%= @topic.id %>');
     });
 </script>
 <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
   <div class="postThemeContainer">
     <div class="postDetailPortrait">
-      <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+      <% if @topic.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
+          <%= link_to image_tag(url_to_avatar(@topic.author), :width => 50, :height => 50,:alt=>'图像' ), user_path(@topic.author) %>
+      <% end %>
     </div>
     <div class="postThemeWrap">
       <% if User.current.logged? %>
@@ -72,10 +76,14 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% if @topic.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
         <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% if @topic.try(:author).try(:realname) == ' ' %>
+                <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% else %>
+                <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% end %>
         <% end %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
@@ -171,8 +179,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
-</script>
+</script>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index fab0f752e..4d5af61dd 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -58,7 +58,8 @@
     }
 
     $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"94%", "<%=@topic.class.to_s%>");
+        //init_activity_KindEditor_data(<%= @topic.id%>,null,"94%", "<%=@topic.class.to_s%>");
+        sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>");
         showNormalImage('message_description_<%= @topic.id %>');
     });
 </script>
@@ -201,8 +202,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index a0e9db171..3a306ba74 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -88,7 +88,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
+        sd_create_editor_from_data(<%= @topic.id%>,null,"100%", "<%=@topic.class.to_s%>");
         showNormalImage('message_description_<%= @topic.id %>');
     });
 </script>
@@ -227,8 +227,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @topic.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @topic.id %>").html(postContent);
+        $("#message_description_<%= @topic.id %> p,#message_description_<%= @topic.id %> span,#message_description_<%= @topic.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index a859a088a..15cb465de 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -18,8 +18,8 @@
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
           <input type="hidden" name="quote[quote]" id="quote_quote">
           <input type="hidden" name="reply[subject]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply[content]"></textarea>
-          <div nhname='toolbar_container_<%= reply.id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
           <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index b0e8ecb85..89f953bb9 100644
--- 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%", "<%=@message.class.to_s%>");
+        sd_create_editor_from_data(<%= @message.id%>,null,"100%", "<%=@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>");
diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb
index f61de74f0..385a49a82 100644
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@@ -5,4 +5,4 @@
 <% elsif @org_subfield %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
-init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", "UserActivity");
\ No newline at end of file
+sd_create_editor_from_data(<%= @user_activity_id %>,"","100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/news/_course_news_detail.html.erb b/app/views/news/_course_news_detail.html.erb
index 954f7dbf1..61db84134 100644
--- a/app/views/news/_course_news_detail.html.erb
+++ b/app/views/news/_course_news_detail.html.erb
@@ -1,19 +1,19 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
+    <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <% if newss%>
     <% newss.each do |news| %>
@@ -40,7 +40,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= news.id%>, null, "87%");
+                sd_create_editor_from_data(<%= news.id%>, null, "100%");
                 showNormalImage('activity_description_<%= news.id %>');
             });
         </script>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 05a430d57..3236aa6a0 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -184,8 +184,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>
diff --git a/app/views/news/_organization_show.html.erb b/app/views/news/_organization_show.html.erb
index 3189b03bf..0a7770ac0 100644
--- a/app/views/news/_organization_show.html.erb
+++ b/app/views/news/_organization_show.html.erb
@@ -1,181 +1,186 @@
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<% end %>
-
-<script type="text/javascript">
-    $(function(){
-        $("#RSide").removeAttr("id");
-        $("#Container").css("width","1000px");
-    });
-</script>
-<script>
-    function expand_reply(container,btnid){
-        var target = $(container).children();
-        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();
-        }
-    }
-    $(function() {
-        showNormalImage('message_description_<%= @news.id %>');
-    });
-</script>
-
-<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
-  <div class="postThemeContainer">
-    <div class="postDetailPortrait">
-      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
-    </div>
-    <div class="postThemeWrap">
-      <% if User.current.logged? %>
-          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => @news},
-                                :class => 'postOptionLink'
-                        ) if @news.author == User.current %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(@news),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if @news.author == User.current %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-      <%end%>
-      <div class="postDetailTitle fl">
-        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
-      </div>
-      <div class="cl"></div>
-
-      <div class="postDetailCreater">
-        <% if @news.try(:author).try(:realname) == ' ' %>
-            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% else %>
-            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
-        <% end %>
-      </div>
-      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
-      <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
-        <%= @news.description.html_safe%>
-      </div>
-      <div class="cl"></div>
-      <div class="mt10" style="font-weight:normal;">
-        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
-      </div>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <div class="cl"></div>
-  <div class="homepagePostReply">
-    <% unless @comments.empty? %>
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
-          <div class="homepagePostReplyBannerTime"></div>
-        </div>
-        <div class="" id="reply_div_<%=@news.id %>">
-          <% @comments.each_with_index  do |reply,i| %>
-              <script type="text/javascript">
-                  $(function(){
-                      showNormalImage('reply_message_description_<%= reply.id %>');
-                  });
-              </script>
-              <div class="homepagePostReplyContainer" 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.author), :width => 33,:height => 33), user_path(reply.author) %>
-                </div>
-                <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <% if reply.try(:author).try(:realname) == ' ' %>
-                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% else %>
-                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
-                    <% end %>
-                  </div>
-                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
-                    <%= reply.comments.html_safe%>
-                  </div>
-                  <div style="margin-top: -7px; margin-bottom: 5px">
-                    <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-                      <%= link_to_if_authorized_course(
-                                  l(:button_delete),
-                                  {:controller => 'comments',
-                                   :action => 'destroy', :id => @news,
-                                   :comment_id => reply},
-                                  :method => :delete,
-                                  :class => 'fr newsGrey',
-                                  :data => {:confirm => l(:text_are_you_sure)},
-                                  :title => l(:button_delete)
-                          ) %>
-                    </div>
-                  </div>
-                  <p id="reply_message_<%= reply.id%>"></p>
-                </div>
-                <div class="cl"></div>
-              </div>
-          <% end %>
-        </div>
-
-    <% end %>
-    <div class="cl"></div>
-    <% if @news.commentable? %>
-        <div class="talkWrapMsg" nhname="about_talk_reply">
-          <em class="talkWrapArrow"></em>
-          <div class="cl"></div>
-          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
-            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
-                <div class="box"  id="news_comment">
-                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
-                                   :owner_id => @comment.nil? ? 0: @comment.id,
-                                   :owner_type => OwnerTypeHelper::COMMENT,
-                                   :width => '99%',
-                                   :height => 100,
-                                   :minHeight=>100,
-                                   :input_html => { :id => 'comment_content',
-                                                    :class => 'talk_text fl',
-                                                    :maxlength => 5000 }%>
-                </div>
-                <p id="add_reply_news"></p>
-                <p class="mt10">
-                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
-                    <%= l(:label_cancel_with_space) %>
-                  </a>
-                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
-                    <%= l(:label_comment_with_space) %>
-                  </a>
-                </p>
-            <% end %>
-            <div class="cl"></div>
-          </div>
-        </div>
-    <% end %>
-  </div>
-</div>
-<script type="text/javascript">
-    $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
-    });
-</script>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        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();
+        }
+    }
+    $(function() {
+        showNormalImage('message_description_<%= @news.id %>');
+    });
+</script>
+
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
+    </div>
+    <div class="postThemeWrap">
+      <% if User.current.logged? %>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @news},
+                                :class => 'postOptionLink'
+                        ) if @news.author == User.current %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(@news),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if @news.author == User.current %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @news.try(:author).try(:realname) == ' ' %>
+            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
+      <div class="cl"></div>
+      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+        <%= @news.description.html_safe%>
+      </div>
+      <div class="cl"></div>
+      <div class="mt10" style="font-weight:normal;">
+        <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @news} %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+  <div class="homepagePostReply">
+    <% unless @comments.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%=@news.id %>">
+          <% @comments.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" 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.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.comments.html_safe%>
+                  </div>
+                  <div style="margin-top: -7px; margin-bottom: 5px">
+                    <%= format_time(reply.created_on) %>
+                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <%= link_to_if_authorized_course(
+                                  l(:button_delete),
+                                  {:controller => 'comments',
+                                   :action => 'destroy', :id => @news,
+                                   :comment_id => reply},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+
+    <% end %>
+    <div class="cl"></div>
+    <% if @news.commentable? %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+                <div class="box"  id="news_comment">
+                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                                   :owner_id => @comment.nil? ? 0: @comment.id,
+                                   :owner_type => OwnerTypeHelper::COMMENT,
+                                   :width => '99%',
+                                   :height => 100,
+                                   :minHeight=>100,
+                                   :input_html => { :id => 'comment_content',
+                                                    :class => 'talk_text fl',
+                                                    :maxlength => 5000 }%>
+                </div>
+                <p id="add_reply_news"></p>
+                <p class="mt10">
+                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                    <%= l(:label_cancel_with_space) %>
+                  </a>
+                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                    <%= l(:label_comment_with_space) %>
+                  </a>
+                </p>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>
+<script type="text/javascript">
+    $(function(){
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
+    });
+</script>
diff --git a/app/views/news/_project_news_detail.html.erb b/app/views/news/_project_news_detail.html.erb
index fdb035bf5..518a29fa9 100644
--- a/app/views/news/_project_news_detail.html.erb
+++ b/app/views/news/_project_news_detail.html.erb
@@ -1,19 +1,19 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
+    <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <% if all_news %>
     <% all_news.each do |news| %>
@@ -40,7 +40,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= news.id%>, null, "87%");
+                sd_create_editor_from_data(<%= news.id%>, null, "100%");
                 showNormalImage('activity_description_<%= news.id %>');
             });
         </script>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 144b93b28..74378e3fd 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -184,8 +184,13 @@
 </div>
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#message_description_<%= @news.id %>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#message_description_<%= @news.id %>").html(postContent);
+        $("#message_description_<%= @news.id %> p,#message_description_<%= @news.id %> span,#message_description_<%= @news.id %> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
 </script>
diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb
index 86298a330..9acdc2dc8 100644
--- a/app/views/org_document_comments/_attachment.html.erb
+++ b/app/views/org_document_comments/_attachment.html.erb
@@ -7,7 +7,7 @@
 <% 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>
+      <%= 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?
             #待补充代码
diff --git a/app/views/org_document_comments/_reply_form.html.erb b/app/views/org_document_comments/_reply_form.html.erb
index 8808ff8b7..60db259c6 100644
--- 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%", "UserActivity");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
diff --git a/app/views/org_document_comments/_simple_ke_reply_form.html.erb b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
index cfa197ff4..c0166f5ce 100644
--- a/app/views/org_document_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
@@ -18,8 +18,8 @@
       <%= form_for @org_comment, :as => :reply, :url => {:controller => 'org_document_comments',:action => 'reply', :id => @org_comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %>
           <input type="hidden" name="quote[quote]" id="quote_quote">
           <input type="hidden" name="org_document_comment[title]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="org_document_comment[content]"></textarea>
-          <div nhname='toolbar_container_<%= reply.id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
           <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
           <div class="cl"></div>
           <p nhname='contentmsg_<%= reply.id%>'></p>
diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb
index 968d7295d..79858dd03 100644
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@@ -1,2 +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%", "<%=@act.class.to_s%>");
+sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index 1b807220d..a6681d047 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -1,9 +1,13 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor" %>
 <% end %>
 
 <script>
-    function check_org_title(title)
+    $(function(){
+        init_des_data(150);
+    });
+    function check_org_title()
     {
         if($("#document_title").val().trim() == "")
         {
@@ -20,16 +24,17 @@
 </div>
 <div class="cl"></div>
 <div>
-<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
-    <div class="resources">
-      <div>
+  <div class="resources" nhname="new_topic_form">
+      <%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
+    <div>
         <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
       </div>
       <div id="doc_title_hint"></div>
       <div class="cl"></div>
       <div id="org_document_editor" >
         <div class="mt10">
-          <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
+          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
         </div>
         <div class="cl"></div>
 
@@ -43,13 +48,12 @@
         </div>
         <div class="cl"></div>
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="org_document_description_editor.sync();$('#new_org_document_form').submit();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" onclick="location=document.referrer;" class="fr mr10 mt3">取消</a>
           <div class="cl"></div>
         </div>
-
       </div>
+    <% end %>
     </div>
-<% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb
index 7734a2853..219a05194 100644
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@@ -2,24 +2,12 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <%= render :partial => 'new' %>
 <% unless @documents.nil? %>
     <% @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%", "OrgActivity");
+                sd_create_editor_from_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "100%", "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} %>
diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb
index dd747f8fa..c95cfe805 100644
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@@ -1,8 +1,12 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_kindEditor"  %>
 <% end %>
 
 <script>
+    $(function(){
+        init_des_data(150);
+    });
     function check_org_title()
     {
         if($("#document_title").val().trim() == "")
@@ -28,15 +32,17 @@
         location.href = document.referrer;
     }
 </script>
-<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
-<div class="resources">
-      <div>
+<div class="resources" nhname="new_topic_form">
+  <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
+    <div>
         <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>
-      </div>
-      <div id="doc_title_hint"></div>
+    </div>
+    <div id="doc_title_hint">
+    </div>
     <div id="org_document_editor" class="mt15" >
       <div class="mt10">
-        <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+        <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+        <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
       </div>
       <div class="cl"></div>
       <p id="homework_course_id_span" class="c_red mt5"></p>
@@ -49,12 +55,11 @@
       <div class="cl"></div>
 
       <div class="mt5">
-            <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
+            <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
             <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
+            <a href="javascript:void(0);" onclick="cancel_create_org_document();" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
         <div class="cl"></div>
       </div>
-
     </div>
+  <% end %>
 </div>
-<% end %>
\ No newline at end of file
diff --git a/app/views/org_document_comments/quote.js.erb b/app/views/org_document_comments/quote.js.erb
index 7ea5daf7b..53d22eb58 100644
--- 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%", "<%=@org_comment.class.to_s%>");
+        sd_create_editor_from_data(<%= @org_comment.id%>,null,"100%", "<%=@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>");
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 405631369..be504a674 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -1,7 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
 <script>
     $(function() {
-        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
+        sd_create_editor_from_data(<%= @document.id%>,null,"100%", "<%=@document.class.to_s%>");
         showNormalImage('message_description_<%= @document.id %>');
     });
 </script>
@@ -150,9 +150,14 @@
 
 <script type="text/javascript">
     $(function(){
-        var postContent = $("#intro_content_<%= @document.id%>").html();
-        postContent = postContent.replace(/&nbsp;/g," ");
-        $("#intro_content_<%= @document.id%>").html(postContent);
+        $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+            var postContent = $(this).html();
+            postContent = postContent.replace(/&nbsp;/g," ");
+            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+            $(this).html(postContent);
+        });
     });
     function expand_reply(container, btnid) {
         var target = $(container);
diff --git a/app/views/org_subfields/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb
index eda9c9d57..3a605f75d 100644
--- a/app/views/org_subfields/_show_details.html.erb
+++ b/app/views/org_subfields/_show_details.html.erb
@@ -38,7 +38,7 @@
     <% org_activities.each do |act| %>
         <script>
             $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
+                sd_create_editor_from_data(<%= act.id%>, null, "100%", "<%=act.class.to_s%>");
             });
         </script>
         <% if act.container_type == 'Organization' %>
diff --git a/app/views/org_subfields/_show_post_type.html.erb b/app/views/org_subfields/_show_post_type.html.erb
index bc95c0774..59d39067e 100644
--- a/app/views/org_subfields/_show_post_type.html.erb
+++ b/app/views/org_subfields/_show_post_type.html.erb
@@ -4,19 +4,6 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
-
 <div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>">
   <div class="NewsBannerName"><%= @org_subfield.name %></div>
 </div>
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 6579ccbca..20b98ffa0 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -38,7 +38,7 @@
     <% org_activities.each do |act| %>
         <script>
             $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
+                sd_create_editor_from_data(<%= act.id%>, null, "100%", "<%=act.class.to_s%>");
             });
         </script>
         <% if act.container_type == 'Organization' %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 3dccdcc2b..b5e3c6958 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -326,8 +326,8 @@
           <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
               <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></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>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 339ff8b26..4f13e1b4f 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -142,8 +142,8 @@
               <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
                   <input type="hidden" name="quote[quote]" value="">
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></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>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index b6e2f74ef..665f5c1ae 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -108,8 +108,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></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>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 763a76d5e..2495e0044 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -125,8 +125,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="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>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 5feed27f2..55f03a367 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -145,8 +145,8 @@
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></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>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 41eb473e8..891ad14a7 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -128,8 +128,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></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>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index baa687107..6cc3f5740 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -120,8 +120,8 @@
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></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>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index f6d5fc9ea..0e725532e 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -1,72 +1,77 @@
-<div class="resources mt10">
-  <div class="homepagePostBrief">
-
-    <div class="homepagePostDes" style="width:690px;">
-      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-      <% unless document.content.blank? %>
-          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
-            <%= document.content.html_safe %>
-          </div>
-      <% end %>
-      <% if params[:show_homepage].nil? %>
-          <div class="homepagePostDate" style="float:right;">
-            发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
-          </div>
-          <div class="cl"></div>
-          <div class="homepagePostDate" style="float:right;">
-            最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
-          </div>
-      <% end %>
-      <!--    <%# if defined?(home_id) %>
-        <div style="float:right;">最后编辑：<%#= User.find() %></div>
-    <%# end %>-->
-      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li>
-                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
-                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
-                  </li>
-                  <li>
-                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :remote => true, :class => 'postOptionLink' %>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-  </div>
-
-</div>
-
-<script type="text/javascript">
-    var postContent = $("#intro_content_<%= document.id%>").html();
-    postContent = postContent.replace(/&nbsp;/g," ");
-    $("#intro_content_<%= document.id%>").html(postContent);
-    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="resources mt10">
+  <div class="homepagePostBrief">
+
+    <div class="homepagePostDes" style="width:690px;">
+      <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
+      <% unless document.content.blank? %>
+          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
+            <%= document.content.html_safe %>
+          </div>
+      <% end %>
+      <% if params[:show_homepage].nil? %>
+          <div class="homepagePostDate" style="float:right;">
+            发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
+          </div>
+          <div class="cl"></div>
+          <div class="homepagePostDate" style="float:right;">
+            最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
+          </div>
+      <% end %>
+      <!--    <%# if defined?(home_id) %>
+        <div style="float:right;">最后编辑：<%#= User.find() %></div>
+    <%# end %>-->
+      <% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
+                        <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
+                  </li>
+                  <li>
+                    <%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+    $("#intro_content_<%= document.id%> p,#intro_content_<%= document.id%> span,#intro_content_<%= document.id%> em").each(function(){
+        var postContent = $(this).html();
+        postContent = postContent.replace(/&nbsp;/g," ");
+        postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+        postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+        postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+        $(this).html(postContent);
+    });
+    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();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index b29bac7d1..da458636a 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -117,9 +117,8 @@
         <div nhname='new_message_<%= act.id %>' style="display:none;">
           <%= form_for('new_form', :url => add_reply_org_document_comment_path(:id => document.id, :act_id => act.id, :flag => flag), :method => "post", :remote => true) do |f| %>
               <input type="hidden" name="org_activity_id" value="<%= act.id %>"/>
+              <div nhname='toolbar_container_<%= act.id %>'></div>
               <textarea placeholder="有问题或建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= act.id %>' name="org_content"></textarea>
-
-              <div nhname='toolbar_container_<%= act.id %>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
               <a id="new_message_submit_btn_<%= act.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;line-height:18px;">发送</a>
 
               <div class="cl"></div>
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index a91a079ef..f2e4d5631 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -58,7 +58,7 @@
           <div class="w607 fr">http：//
             <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
-            <% if @organization.domain.present? %>
+            <% if @organization.domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == @organization.domain %>
                 <span>(已批准)</span>
             <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
                 <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index 78fb12279..f217f006e 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -4,18 +4,6 @@
     <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <% if params[:show_homepage].nil? and User.current.logged? %>
 <div class="homepageRightBanner">
   <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
@@ -61,7 +49,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%", 'OrgActivity');
+            sd_create_editor_from_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "100%", 'OrgActivity');
         });
     </script>
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index c03570072..b04f96db5 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -58,4 +58,11 @@
         <%end%>
     <% end%>
     <li class="polls_date fr mr10"><%= format_date poll.created_at.to_date%></li>
+    <% if poll.show_result == 1 %>
+        <% if has_commit%>
+            <li><%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fr mr10"%></li>
+        <%else%>
+            <li class="pollsbtn fr mr10 pollsbtn_grey" title="请先提交问卷再查看统计结果">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index e6b667075..e08b13033 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -315,7 +315,11 @@ function insert_MCQ(quest_type,quest_num,quest_id){
           alert("问卷标题不能为空");
       }
       else{
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+          if($("#show_result").is(":checked")) {
+              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false,:show_result=> 1}) %>');
+          } else{
+              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false,:show_result=> 0}) %>');
+          }
           showModal('ajax-modal', '310px');
           $('#ajax-modal').css('height','120px');
           $('#ajax-modal').siblings().remove();
@@ -377,7 +381,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       <%= l(:label_memo_create)%>
     </a>
     <div class="polls_cha">
-      <input type="checkbox" name="" value="" >
+      <input id="show_result" type="checkbox" checked name="show_result" value="1" >
       <label for="">允许学生查看调查结果</label>
     </div>
   </div>
diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb
index af3ca2d42..41e402dca 100644
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@@ -15,7 +15,7 @@
         是否确定发布该问卷？
       </p>
       <div class="polls_btn_box">
-        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote,:show_result => show_result), :class => "upload_btn", :onclick => "clickCanel();" %>
         <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
           取&nbsp;&nbsp;消
         </a>
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index deb0af842..062d64096 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -37,15 +37,15 @@
 </script>
 <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;}
+    /*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>
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
@@ -68,7 +68,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
+                sd_create_editor_from_data(<%= activity.id %>, null, "100%", "<%= activity.class.to_s %>");
             });
         </script>
         <!--创建-->
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 457a78b6c..518ee3a2b 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -108,8 +108,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></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>
diff --git a/app/views/repositories/_commit_details.html.erb b/app/views/repositories/_commit_details.html.erb
new file mode 100644
index 000000000..ef8faecd7
--- /dev/null
+++ b/app/views/repositories/_commit_details.html.erb
@@ -0,0 +1,15 @@
+<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>提交于
+      <div class="committed_ago">
+        <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>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
+      </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 81706c25e..dda0cddbd 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -24,10 +24,10 @@
 <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
-<td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
-<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%= entry.author %></td>
-<td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+      <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
+      <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+      <td class="author"><%= entry.author %></td>
+      <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
 <% end %>
 </tr>
 <% end %>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 4d6e39f88..a27789dc1 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -20,27 +20,13 @@
           <div class="col-md-10 col-sm-12">
             <ul class="bordered-list">
               <li class="commit js-toggle-container">
-                <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>提交于
-                      <div class="committed_ago">
-                        <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>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
-                      </div>
-                  <% end %>
-                </div>
+                <%= render :partial => 'commit_details', :locals => {:changeset => changeset} %>
                 <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) %>
+                  <%= link_to truncate(changeset.short_id.to_s, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :changeset => changeset.id} %>
                 </div>
                 <div class="notes_count">
                 </div>
diff --git a/app/views/repositories/changes.html.erb b/app/views/repositories/changes.html.erb
index 3780df172..726d5d19d 100644
--- a/app/views/repositories/changes.html.erb
+++ b/app/views/repositories/changes.html.erb
@@ -15,7 +15,7 @@
 
 <div class="mt10">
 
-  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path ,:revisions => @commits, :entry => @entry ,:commits_pages =>@commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
+  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path , :revisions => @commits, :entry => @entry , :commits_pages => @commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
 
 </div>
 <% content_for :header_tags do %>
diff --git a/app/views/repositories/commit_diff.html.erb b/app/views/repositories/commit_diff.html.erb
new file mode 100644
index 000000000..c0308fea3
--- /dev/null
+++ b/app/views/repositories/commit_diff.html.erb
@@ -0,0 +1,55 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<!--<script>-->
+<!--//    $(document).ready(function(){-->
+<!--//        $("#changed-files").click(function(){-->
+<!--//            $("#changed-files-detail").toggle();-->
+<!--//        });-->
+<!--//    });-->
+<!--</script>-->
+<div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3">
+  <%= @commit_details.id %></a><br />
+  <li class="commit js-toggle-container">
+    <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+  </li>
+</div>
+<div class="showing-changes-project f14"><%= @commit_details.message %></div>
+<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>-->
+  <!--<ol class="mt10" id="changed-files-detail">-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>-->
+  <!--</ol>-->
+<!--</div>-->
+
+<% @commit_diff.each do |cd| %>
+    <div class="showing-changes-row fontGrey2">
+      <a href="javascript:void()" class="linkGrey3" id="changed-files">
+        <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %>
+      </a>
+    </div>
+    <div class="autoscroll">
+      <table class="filecontent syntaxhl" >
+        <tbody>
+        <% line_num = diff_line_num(cd.diff) %>
+        <% diff_content = diff_content(cd.diff) %>
+        <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+            <tr>
+              <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+                <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
+              </th>
+              <% if line[0,1] == "-" %>
+                  <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% elsif line[0,1] == "+" %>
+                  <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% else%>
+                  <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% end %>
+            </tr>
+            <% line_num += 1 %>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index afe4740eb..76d5745df 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -36,12 +36,12 @@
         <% if @changesets && !@changesets.empty? %>
             <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
                 <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 rep_mail_name mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                 <span class="fl"><div class="fb fontGrey3 mr5 fl hidden maxwidth150"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
diff --git a/app/views/student_work/cancel_relate_project.js.erb b/app/views/student_work/cancel_relate_project.js.erb
index 3aa853a00..f5caf2e8f 100644
--- a/app/views/student_work/cancel_relate_project.js.erb
+++ b/app/views/student_work/cancel_relate_project.js.erb
@@ -1,7 +1,7 @@
 <% if @user_activity_id != -1 %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
 <% 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%");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%");
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb
index 47dfb4b51..d869cba58 100644
--- 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%", "<%=@homework.class.to_s%>");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@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%", "UserActivity");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/set_score_rule.js.erb b/app/views/student_work/set_score_rule.js.erb
index 52a13f632..fa1308873 100644
--- 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 != -1 %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
+    sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "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%", "<%=@homework.class.to_s%>");
+    sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>
diff --git a/app/views/student_work/student_work_project.js.erb b/app/views/student_work/student_work_project.js.erb
index 405dccca4..217a68422 100644
--- a/app/views/student_work/student_work_project.js.erb
+++ b/app/views/student_work/student_work_project.js.erb
@@ -1,8 +1,8 @@
 hideModal("#popbox02");
 <% if @user_activity_id != -1 %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
 <% 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%");
+    sd_create_editor_from_data(<%= @homework.id%>,"","100%");
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 23a469188..d508fe1af 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -326,8 +326,8 @@
           <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
               <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></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>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index affc4cf36..6b28fb568 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -94,8 +94,8 @@
               <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => activity.id %>
               <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_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>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 8487a44d9..7e8a24bb2 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -1,15 +1,23 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <% if activity.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
+          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+          <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <% end %>
     </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,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <% if activity.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% if activity.try(:author).try(:realname) == ' ' %>
+                <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% else %>
+                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% end %>
         <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
@@ -168,8 +176,8 @@
               <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
                   <input type="hidden" name="quote[quote]" value="">
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+                  <div nhname='toolbar_container_<%= user_activity_id%>'></div>
                   <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                  <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></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>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 672b2e2e9..15dd486ec 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -133,8 +133,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></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>
diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
index 668a26cec..c18e520ba 100644
--- a/app/views/users/_intro_content.html.erb
+++ b/app/views/users/_intro_content.html.erb
@@ -1,13 +1,18 @@
-<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
-  <div id="intro_content_<%= user_activity_id%>">
-    <%= content.to_s.html_safe%>
-  </div>
-</div>
-<script type="text/javascript">
-  $(function(){
-      var postContent = $("#intro_content_<%= user_activity_id%>").html();
-      postContent = postContent.replace(/&nbsp;/g," ");
-      $("#intro_content_<%= user_activity_id%>").html(postContent);
-      description_show_hide(<%=user_activity_id %>);
-  });
+<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</div>
+<script type="text/javascript">
+  $(function(){
+      $("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
+          var postContent = $(this).html();
+          postContent = postContent.replace(/&nbsp;/g," ");
+          postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+          postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+          postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+          $(this).html(postContent);
+      });
+      description_show_hide(<%=user_activity_id %>);
+  });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 0a84ba9c4..adebd74ad 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -74,8 +74,8 @@
       <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
         <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %>
             <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <div nhname='toolbar_container_<%= user_activity_id%>'></div>
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="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>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index ec36854cb..30183c4d1 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -152,8 +152,8 @@
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></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>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index d1db3416a..9e02c4cf4 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -130,8 +130,8 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></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>
diff --git a/app/views/users/_show_user_homework_form.html.erb b/app/views/users/_show_user_homework_form.html.erb
index 43d204508..004c8fec4 100644
--- a/app/views/users/_show_user_homework_form.html.erb
+++ b/app/views/users/_show_user_homework_form.html.erb
@@ -1,35 +1,35 @@
-<% homeworks.each do |homework| %>
-    <ul class="subjectRow">
-      <li class="subjectName fl hidden">
-        <label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id) %>')">
-          <input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
-          <span title="<%= homework.name%>"><%= homework.name%></span>
-        </label>
-      </li>
-      <li class="subjectType fl">
-        <% case homework.homework_type %>
-            <% when 1 %>
-                普通
-            <% when 2 %>
-                编程
-            <% when 3 %>
-                分组
-        <% end %>
-      </li>
-      <li class="subjectCount fl"><%= homework.quotes %></li>
-      <li class="subjectPublisher fl"><%= homework.user.show_name %></li>
-      <li class="fl subjectDate"><%=format_date homework.publish_time %></li>
-    </ul>
-<% end %>
-<script type="text/javascript">
-    function show_homework_detail(url){
-        $.get(
-                url,
-                {
-
-                },
-                function (data) {
-                }
-        );
-    }
+<% homeworks.each do |homework| %>
+    <ul class="subjectRow">
+      <li class="subjectName fl hidden">
+        <label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id) %>')">
+          <input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
+          <span title="<%= homework.name%>"><%= homework.name%></span>
+        </label>
+      </li>
+      <li class="subjectType fl">
+        <% case homework.homework_type %>
+            <% when 1 %>
+                普通
+            <% when 2 %>
+                编程
+            <% when 3 %>
+                分组
+        <% end %>
+      </li>
+      <li class="subjectCount fl"><%= homework.quotes %></li>
+      <li class="subjectPublisher fl hidden"><%= homework.user.show_name %></li>
+      <li class="fl subjectDate"><%=format_date homework.publish_time %></li>
+    </ul>
+<% end %>
+<script type="text/javascript">
+    function show_homework_detail(url){
+        $.get(
+                url,
+                {
+
+                },
+                function (data) {
+                }
+        );
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index 9f90a633f..d2b3f286d 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -1,4 +1,4 @@
-<div class="w985" style="padding:11px;"> <a href="javascript:void(0);" class="popupClose" onclick="hideModal()"></a>
+<div class="w985"> <a href="javascript:void(0);" class="popupClose" onclick="hideModal()"></a>
   <div class="f16 fb fontBlue mb10">选用题库中的题目</div>
   <div class="subjectList fl mr10">
     <a href="<%= user_homework_type_user_path(@user) %>" id="public_homeworks_choose" class="subjectChoose chooseActive fl" data-remote="true">公共题库</a>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index c8d599af4..59d605a09 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -16,6 +16,7 @@
             $(this).children(".userCard").css("display","none");
         })
         $(".userCard").mouseover(function(){
+
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
@@ -39,15 +40,15 @@
 </script>
 <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;}
+    /*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>
 <% user_activities.each do |user_activity|
   if user_activities %>
@@ -74,7 +75,7 @@
             }
 
             $(function() {
-                init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%", "<%=user_activity.class.to_s%>");
+                sd_create_editor_from_data(<%= user_activity.id %>, null, "100%", "<%= user_activity.class.to_s %>");
             });
         </script>
         <% unless user_activity.act_type == "ProjectCreateInfo" %>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 7658bc581..244951dfa 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -120,8 +120,8 @@
               <input type="hidden" name="blog_comment[locked]" value="0">
               <input type="hidden" name="blog_comment[title]" value="RE:<%= activity.title%>">
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="blog_comment[content]"></textarea>
-              <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>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 36b2be34f..01673d164 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -328,8 +328,8 @@
           <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => homework_common.id},:method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'homework_common_id',params[:homework_common_id],:value =>homework_common.id %>
               <%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
+              <div nhname='toolbar_container_<%= homework_common.id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= homework_common.id%>' name="homework_message"></textarea>
-              <div nhname='toolbar_container_<%= homework_common.id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
               <a id="new_message_submit_btn_<%= homework_common.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= homework_common.id%>'></p>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index cc7e4bb8e..0d542882a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -16,6 +16,7 @@
             $("#GroupPopupBox a.group_save_btn").click();
         <% end %>
       });
+      var homework_description_editor;
       function checked_val() {
           if ($("#anonymous_comment").is(":checked")) {
               $("#anonymous_comment").val(1);
@@ -23,6 +24,120 @@
               $("#anonymous_comment").val(0);
           }
       }
+      function nh_reset_homework_form(params){
+          if(params.textarea.html() != "") {
+              cancel_edit();
+          } else {
+              params.form[0].reset();
+              params.textarea.empty();
+              if(params.editor != undefined){
+                  params.editor.html(params.textarea.html());
+              }
+          }
+      }
+      function init_homework_form(params){
+          params.form.submit(function(){
+              var flag = false;
+              if(params.form.attr('data-remote') != undefined ){
+                  flag = true
+              }
+              var is_checked = false;
+              checked_val();
+              if(!regex_homework_name()){
+                  $("#homework_name").focus();
+              }
+              else if(!regex_homework_end_time()){
+                  $("#homework_end_time").focus();
+              }
+              else if(!regex_homework_end_publish_time()){
+                  $("#homework_end_time").focus();
+              }
+              else if(!regex_course_id()){
+                  $("#course_id").focus();
+              }
+              else{
+                  params.textarea.html(params.editor.html());
+                  params.editor.sync();
+                  is_checked = true;
+              }
+              /*var is_checked = nh_check_field({
+                  issubmit:true,
+                  content:params.editor,
+                  contentmsg:params.contentmsg,
+                  textarea:params.textarea
+              });*/
+              if(is_checked){
+                  if(flag){
+                      return true;
+                  }else{
+                      $(this)[0].submit();
+                      return false;
+                  }
+              }
+              return false;
+          });
+      }
+      function init_homework_editor(params){
+          params.textarea.removeAttr('placeholder');
+          var editor = params.kindutil.create(params.textarea, {
+              resizeType : 1,minWidth:"1px",width:"100%",minHeight:"30px",height:"30px",
+              items : ['code','emoticons','fontname',
+                  'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+                  'formatblock', 'fontsize', '|','indent', 'outdent',
+                  '|','imagedirectupload','table',   'media', 'preview',"more"
+              ],
+              afterChange:function(){//按键事件
+                  var edit = this.edit;
+                  var body = edit.doc.body;
+                  //paramsHeight = params.kindutil.removeUnit(this.height);
+                  edit.iframe.height(150);
+                  this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, 150));
+              },
+              afterCreate:function(){
+                  //init
+                  var edit = this.edit;
+                  var body = edit.doc.body;
+                  edit.iframe[0].scroll = 'no';
+                  body.style.overflowY = 'hidden';
+                  //reset height
+                  var edit = this.edit;
+                  var body = edit.doc.body;
+                  edit.html(params.textarea.innerHTML);
+                  //paramsHeight = params.kindutil.removeUnit(this.height);
+                  edit.iframe.height(150);
+                  this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150));
+
+              }
+          }).loadPlugin('paste');
+          return editor;
+      }
+      KindEditor.ready(function(K){
+          $("div[nhname='homework_common_form']").each(function(){
+              var params = {};
+              params.kindutil = K;
+              params.div_form = $(this);
+              params.form = $("form",params.div_form);
+              if(params.form==undefined || params.form.length==0){
+                  return;
+              }
+              params.textarea = $("textarea[nhname='homework_textarea']",params.div_form);
+              params.cancel_btn = $("#new_message_cancel_btn");
+              params.submit_btn = $("#new_message_submit_btn");
+              if(params.textarea.data('init') == undefined) {
+                  params.editor = init_homework_editor(params);
+                  homework_description_editor = params.editor;
+                  init_homework_form(params);
+                  params.submit_btn.click(function () {
+                      params.form.submit();
+                  });
+                  params.cancel_btn.click(function () {
+                      reset_homework();
+                      nh_reset_homework_form(params);
+                  });
+                  params.textarea.data('init', 1);
+              }
+          });
+      });
     </script>
 <% end %>
 
@@ -70,10 +185,12 @@
   <div id="homework_editor" style="display: <%= edit_mode ? 'block':'none'%>">
     <div class="mt10">
       <% if edit_mode %>
-          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, at_id: homework.id, at_type: homework.class.to_s %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"><%=homework.description.html_safe %></textarea>
+          <%#= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, at_id: homework.id, at_type: homework.class.to_s %>
       <% else %>
           <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
-          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px",at_id: homework.id, at_type: homework.class.to_s  %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='homework_textarea' name="homework_common[description]"></textarea>
+          <%#= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px",at_id: homework.id, at_type: homework.class.to_s  %>
       <% end %>
     </div>
     <div class="cl"></div>
@@ -89,17 +206,16 @@
       <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>!(edit_mode && homework.homework_type != 2), :has_group=>(!(edit_mode && homework.homework_type != 3))&& homework.student_works.empty?,:show_member => true} %>
     </div>
 
-
     <div class="mt5">
       <% if edit_mode %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
+          <a href="javascript:void(0);" id="new_message_submit_btn" class="BlueCirBtnMini fr">确定</a>
           <span class="fr mr10 mt3">或</span>
           <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
-          <a href="javascript:void(0);" class="fr mr10 mt3" onclick="cancel_edit();">取消</a>
+          <a href="javascript:void(0);" id="new_message_cancel_btn" class="fr mr10 mt3">取消</a>
     <% else %>
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="checked_val();submit_homework('new_homework_common');">发送</a>
+          <a href="javascript:void(0);" id="new_message_submit_btn" class="BlueCirBtnMini fr">发送</a>
           <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
+          <a href="javascript:void(0);" id="new_message_cancel_btn" class="fr mr10 mt3">取消</a>
       <% end %>
       <div class="cl"></div>
     </div>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 28544fbf3..34e975762 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -2,23 +2,11 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <div id="user_homework_list">
 <% homework_commons.each do |homework_common|%>
     <script type="text/javascript">
         $(function() {
-            init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%", "<%=homework_common.class.to_s%>");
+            sd_create_editor_from_data(<%= homework_common.id%>, null, "100%", "<%=homework_common.class.to_s%>");
         });
 
         function expand_reply(container,btnid){
@@ -49,4 +37,4 @@
         <%= link_to "点击展开更多",user_homeworks_user_path(User.current.id,:page => page,:is_in_course => is_in_course),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
     <% end%>
 <% end%>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index b377f445c..4b2fcb486 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -137,8 +137,8 @@
               <%= hidden_field_tag 'show_name',params[:show_name],:value =>true %>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
               <%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
+              <div nhname='toolbar_container_<%= user_activity_id%>'></div>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="user_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>
diff --git a/app/views/users/_user_jours_list.html.erb b/app/views/users/_user_jours_list.html.erb
index 5bc4af10a..779b98a75 100644
--- a/app/views/users/_user_jours_list.html.erb
+++ b/app/views/users/_user_jours_list.html.erb
@@ -4,15 +4,15 @@
 <% end %>
 <style type="text/css">
     /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
+    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
+    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
+    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
+    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
+    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
 </style>
 <%if jours %>
     <% jours.each do |jour|%>
@@ -35,7 +35,7 @@
                     }
                 }
                 $(function(){
-                    init_activity_KindEditor_data(<%= jour.id%>, null, "87%", "<%=jour.class.to_s%>");
+                    sd_create_editor_from_data(<%= jour.id%>, null, "100%", "<%=jour.class.to_s%>");
                 });
             </script>
             <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index eed7499d5..f4509987f 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -1,26 +1,26 @@
-//var screenWidth = $(window).width();
-//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
-//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
-//var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
-//var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
-//var popupHeight = $(".resourceSharePopup").outerHeight(true);
-//$(".resourceSharePopup").css("marginTop",-popupHeight/2);
-//
-//$("#upload_box").css('left','').css('top','');
-//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-//$("#upload_box").css('display','block');
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
-$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-var val =  $("#search_course_input").val();
-$("#search_course_input").val("").focus().val(val);
+//var screenWidth = $(window).width();
+//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+//var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
+//var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
+//var popupHeight = $(".resourceSharePopup").outerHeight(true);
+//$(".resourceSharePopup").css("marginTop",-popupHeight/2);
+//
+//$("#upload_box").css('left','').css('top','');
+//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+//$("#upload_box").css('display','block');
+<% if params[:send_type].present? && params[:send_type] == 'news' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% elsif params[:send_type] == 'file' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% elsif params[:send_type] == 'message' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% end %>
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+var val =  $("#search_course_input").val();
+$("#search_course_input").val("").focus().val(val);
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index 877629e34..ee12e9439 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,14 +1,14 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index f80be34f8..d58c56ca9 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,14 +1,14 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 7be803720..d0adb291f 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -5,7 +5,11 @@
       $("#homework_end_time").val("");
       $("#course_id").val($("#option_select").val());
       $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true })%>");
-      homework_description_editor.html("");
+      //homework_description_editor.html("");
+      $("#homework_name_span").text("");
+      $("#homework_end_time_span").text("");
+      $("#homework_end_time_span").text("");
+      $("#homework_course_id_span").text("");
       $("#homework_editor").toggle();
   }
 
@@ -29,7 +33,7 @@
 
 <% if @is_teacher%>
     <!-- 老师身份才可以发布作业 -->
-    <div class="HomeWork mb10">
+    <div class="HomeWork mb10" nhname='homework_common_form'>
       <% homework = HomeworkCommon.new %>
       <% homework.homework_detail_manual = HomeworkDetailManual.new%>
       <%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
diff --git a/app/views/users/user_import_homeworks.js.erb b/app/views/users/user_import_homeworks.js.erb
index 3be46e119..47e04f906 100644
--- a/app/views/users/user_import_homeworks.js.erb
+++ b/app/views/users/user_import_homeworks.js.erb
@@ -1,4 +1,7 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
 showModal('ajax-modal', '1040px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9");
\ No newline at end of file
+var mTop = ($(window).height()-646)/2;
+var mLeft = ($(window).width()-1054)/2;
+$('#ajax-modal').parent().css("border","3px solid #269ac9").css("top","mTop").css("left","mLeft").css("position","fixed");
+$('#ajax-modal').css("margin","15px");
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index e395604f4..5abadfb29 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -21,7 +21,7 @@
         showModal('ajax-modal', '452px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","46%");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%");
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
@@ -358,12 +358,14 @@
         if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
+                url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
             });
         }else{
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
+                url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
             });
 
         }
diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb
index 306374b84..21fd9db26 100644
--- a/app/views/users/user_select_homework.js.erb
+++ b/app/views/users/user_select_homework.js.erb
@@ -8,11 +8,13 @@ $("#homework_end_time").val("<%= @homework.end_time%>");
 $("#ref_homework_id").val("<%= @ref_homework.id%>");
 $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework,:has_program => true,:has_group => true,:show_member=>true})%>");
 homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>");
-<% if @homework_detail_group %>
+//$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
+<% if @homework_detail_programing %>
+    $("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+    $("#BluePopupBox a.BlueCirBtn").click();
+<% elsif @homework_detail_group %>
     $('span.group_detail_info').text('分组人数：<%=@homework_detail_group.min_num %>-<%=@homework_detail_group.max_num %> 人');
+    $("#GroupPopupBox").html("<%=escape_javascript( render :partial => 'users/user_group_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
+    $("#GroupPopupBox a.group_save_btn").click();
 <% end %>
-$("#BluePopupBox").html("<%=escape_javascript( render :partial => 'users/user_programing_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
-$("#GroupPopupBox").html("<%=escape_javascript( render :partial => 'users/user_group_attr', :locals => {:edit_mode => true, :homework => @homework})%>");
-//$("input[name='homework_type']").val("<%#= @homework.homework_type%>");
 $("#homework_editor").show();
-$("#BluePopupBox a.BlueCirBtn").click();
diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb
index d9e00a112..a5c572049 100644
--- a/app/views/words/create_reply.js.erb
+++ b/app/views/words/create_reply.js.erb
@@ -1,7 +1,12 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        <% if @reply_type == 'user' %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
+        <% else %>
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
+        <% end %>
+        #init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>
             $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>");
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index 6d0055718..819936f9f 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -25,10 +25,10 @@
       <% elsif @homework%>
         <% 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%");
+            sd_create_editor_from_data(<%= @homework.id%>,"","100%");
         <% 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%");
+            sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
         <% end %>
       <% end %>
       var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
diff --git a/app/views/words/leave_homework_message.js.erb b/app/views/words/leave_homework_message.js.erb
index 5eeb9ce64..acb16be50 100644
--- a/app/views/words/leave_homework_message.js.erb
+++ b/app/views/words/leave_homework_message.js.erb
@@ -1,7 +1,7 @@
 <% if @user_activity_id %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
+    sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% elsif @homework_common_id && @is_in_course %>
     $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
-    init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%", "HomeworkCommon");
+    sd_create_editor_from_data(<%= @homework_common_id%>,"","100%", "HomeworkCommon");
 <% end %>
diff --git a/config/initializers/elasticsearch_dev_patch.rb b/config/initializers/elasticsearch_dev_patch.rb
new file mode 100644
index 000000000..ac9b800ba
--- /dev/null
+++ b/config/initializers/elasticsearch_dev_patch.rb
@@ -0,0 +1,53 @@
+#coding=utf-8
+
+# elasticsearch 在开发环境下也要打开,很烦人的
+
+if Rails.env.development?
+
+  require 'elasticsearch/model'
+  module Elasticsearch
+    module Model
+      class NoObject
+
+        instance_methods.each do |m|
+          undef_method(m) unless [:object_id, :__send__, :undef_method, :method_missing].include?(m)
+        end
+
+        def method_missing(method, *args, &block)
+          puts "NoObject #{method} #{args}"
+        end
+
+        def NoObject.included(mod)
+          puts "#{self} included in #{mod}"
+        end
+
+        def self.extended(mod)
+          puts "#{self} extended in #{mod}"
+        end
+
+        def initialize
+          puts methods
+        end
+      end
+
+      def self.included(base)
+        base.instance_eval do
+          def settings(a)
+          end
+
+          def __elasticsearch__
+            @__elasticsearch__ ||= NoObject.new
+          end
+        end
+
+        base.class_eval do
+          def __elasticsearch__
+            @__elasticsearch__ ||= NoObject.new
+          end
+        end
+      end
+
+    end
+  end
+
+end
diff --git a/config/initializers/subdomain.rb b/config/initializers/subdomain.rb
index b868e7e0b..f813a24a0 100644
--- a/config/initializers/subdomain.rb
+++ b/config/initializers/subdomain.rb
@@ -1,9 +1,30 @@
 class Subdomain
 
+  def initialize(opt={})
+    @opt = {}.merge(opt)
+  end
+
   def matches?(request)
-    o = Organization.where(domain: request.subdomain).first
-    request.path_parameters[:id] = o.id if o
-    !o.nil?
+    puts request.path_parameters
+    o = ::Secdomain.where(subname: request.subdomain).first
+
+    if(@opt[:sub])
+      if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news'
+        request.path_parameters[:id] = o.pid
+        request.path_parameters[:controller] = 'org_subfields'
+        request.path_parameters[:action] = 'show'
+        return true
+      end
+    end
+
+
+    if o && o.controller
+      request.path_parameters[:id] = o.pid
+      request.path_parameters[:controller] = o.controller
+      request.path_parameters[:action] = o.action
+      return true
+    end
+    false
   end
 
 end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 18d8905db..310fe29dd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,15 @@ RedmineApp::Application.routes.draw do
   # Enable Grack support
   # mount Trustie::Grack.new, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post]
 
+  constraints(Subdomain.new) do
+    get '/', to: 'organizations#show'
+  end
+
+  constraints(Subdomain.new(sub: true)) do
+    get '/:sub_dir_name', to: 'fake#fake'
+  end
+
+
   resources :shield_activities do
     collection do
       delete 'show_acts'
@@ -76,16 +85,7 @@ RedmineApp::Application.routes.draw do
   end
 
 
-  constraints(Subdomain.new) do
-    get '/', to: 'organizations#show'
-  end
-  get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'}
-  get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}
-  get '/', to: 'organizations#show', defaults: { id: 1 }, constraints: {subdomain: 'team'}
 
-  get '/', to: 'users#show', defaults: {id: 7}, constraints: {subdomain: 'whm'}
-  get '/', to: 'users#show', defaults: {id: 5}, constraints: {subdomain: 'yg'}
-  get '/', to: 'users#show', defaults: {id:11}, constraints: {subdomain: 'wt'}
 
   resources :org_member do
     member do
@@ -831,7 +831,7 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
 
@@ -850,15 +850,15 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
   get 'projects/:id/repository/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
 
   get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
   get 'projects/:id/repository', :to => 'repositories#show', :path => nil
@@ -869,6 +869,7 @@ RedmineApp::Application.routes.draw do
   get 'attachments/attachment_versions/:id',:to=>'attachments#attachment_versions',:as=>'attachments_versions'
   post 'attachments/upload_attachment_version',:to=>'attachments#upload_attachment_version',:as=>'upload_attachment_version'
   get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
+  get 'attachments/download_history/:id/:filename', :to => 'attachments#download_history', :id => /\d+/, :filename => /.*/, :as => 'download_history_attachment'
   get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
   get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
   get 'attachments/autocomplete'
diff --git a/db/migrate/20160202034530_create_secdomains.rb b/db/migrate/20160202034530_create_secdomains.rb
new file mode 100644
index 000000000..49650d073
--- /dev/null
+++ b/db/migrate/20160202034530_create_secdomains.rb
@@ -0,0 +1,28 @@
+class CreateSecdomains < ActiveRecord::Migration
+  def change
+    create_table :secdomains do |t|
+      t.integer :sub_type     #1.系统预留  2.Organization  3.users
+      t.string :subname   #子域名
+      t.integer :pid, default: 0   #参数id
+      t.string :desc
+
+      t.timestamps
+    end
+
+    #系统保留
+    Secdomain.create(sub_type: 1,  subname: 'gitlab')
+    Secdomain.create(sub_type: 1,  subname: 'wechat')
+    Secdomain.create(sub_type: 1,  subname: 'judge')
+
+    #organization
+    Secdomain.create(sub_type: 2,  subname: 'micros', pid: 5)
+    Secdomain.create(sub_type: 2,  subname: 'nubot', pid: 23)
+    Secdomain.create(sub_type: 2,  subname: 'team', pid: 1)
+
+    #users
+    Secdomain.create(sub_type: 3,  subname: 'whm', pid: 7)
+    Secdomain.create(sub_type: 3,  subname: 'yg', pid: 5)
+    Secdomain.create(sub_type: 3,  subname: 'wt', pid: 11)
+
+  end
+end
diff --git a/db/migrate/20160220100507_update_course_term.rb b/db/migrate/20160220100507_update_course_term.rb
new file mode 100644
index 000000000..afd849779
--- /dev/null
+++ b/db/migrate/20160220100507_update_course_term.rb
@@ -0,0 +1,19 @@
+class UpdateCourseTerm < ActiveRecord::Migration
+  def up
+    count = Course.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+      Course.page(i).per(30).each do |course|
+        if course.end_time.nil? && course.end_term.nil?
+          course.end_time = course.time
+          course.end_term = course.term
+          course.save
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20160222064143_add_publish_to_attachments.rb b/db/migrate/20160222064143_add_publish_to_attachments.rb
new file mode 100644
index 000000000..5ca354396
--- /dev/null
+++ b/db/migrate/20160222064143_add_publish_to_attachments.rb
@@ -0,0 +1,21 @@
+class AddPublishToAttachments < ActiveRecord::Migration
+  def change
+    add_column :attachments, :is_publish, :integer, :default => 1
+    add_column :attachments, :publish_time, :date
+=begin
+    count = Attachment.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        Attachment.page(i).per(30).each do |atta|
+          begin
+            atta.publish_time = atta.created_on.strftime('%d-%b-%Y')
+            atta.save
+          ensure
+            logger.error("===================>>container_id is null")
+          end
+        end
+      end
+    end
+=end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ad9b97ff..c22b79790 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160128024452) do
+ActiveRecord::Schema.define(:version => 20160220100507) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1535,6 +1535,15 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
     t.string   "pinyin"
   end
 
+  create_table "secdomains", :force => true do |t|
+    t.integer  "sub_type"
+    t.string   "subname"
+    t.integer  "pid",        :default => 0
+    t.string   "desc"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+  end
+
   create_table "seems_rateable_cached_ratings", :force => true do |t|
     t.integer  "cacheable_id",   :limit => 8
     t.string   "cacheable_type"
@@ -1862,25 +1871,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
   add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
   add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
 
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "login",                           :default => "",    :null => false
     t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
@@ -1956,14 +1946,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
   create_table "wiki_content_versions", :force => true do |t|
     t.integer  "wiki_content_id",                                       :null => false
     t.integer  "page_id",                                               :null => false
diff --git a/lib/tasks/elasticsearch_batch_op.rake b/lib/tasks/elasticsearch_batch_op.rake
index 91c2ddff9..b9933cf75 100644
--- a/lib/tasks/elasticsearch_batch_op.rake
+++ b/lib/tasks/elasticsearch_batch_op.rake
@@ -1,38 +1,42 @@
 namespace :importer do
-  task :importuser do
+
+  task :importuser => :environment do
     ENV['CLASS']='User'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
-  task :importproject do
+  task :importproject => :environment do
 
     ENV['CLASS']='Project'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
-  task :importcourse do
+  task :importcourse => :environment do
     ENV['CLASS']='Course'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
-  task :importattachment do
+  task :importattachment => :environment do
     ENV['CLASS']='Attachment'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
-  task :importmemo do
+  task :importmemo => :environment do
     ENV['CLASS']='Memo'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
+
+  desc "Run all tasks"
+  task :all => [:importuser,:importproject,:importcourse,:importattachment,:importmemo]
 end
\ No newline at end of file
diff --git a/lib/tasks/import_fix.rake b/lib/tasks/import_fix.rake
new file mode 100644
index 000000000..e5bd1a796
--- /dev/null
+++ b/lib/tasks/import_fix.rake
@@ -0,0 +1,14 @@
+namespace :import do
+  desc "fix import name"
+  task :fix => :environment do
+    HomeworkCommon.find_each do |homework|
+      name = homework.name.sub("\n", " ").sub("\r\n", " ")
+      if name != homework.name
+        homework.name = name
+        homework.save!
+      end
+
+    end
+  end
+
+end
diff --git a/lib/tasks/resource_publish.rake b/lib/tasks/resource_publish.rake
new file mode 100644
index 000000000..2df0c6145
--- /dev/null
+++ b/lib/tasks/resource_publish.rake
@@ -0,0 +1,11 @@
+#coding=utf-8
+
+namespace :resource_publish do
+  desc "start publish resource"
+  task :publish => :environment do
+    attachments = Attachment.where("publish_time = '#{Date.today}'")
+    attachments.each do |attachment|
+      attachment.update_column('is_publish', 1)
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 61c1fbd17..9fb1f5735 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -3,6 +3,15 @@
 module Trustie
   module Gitlab
     module Helper
+      GUEST     = 10
+      REPORTER  = 20
+      DEVELOPER = 30
+      MASTER    = 40
+      OWNER     = 50
+      # 项目公开和私有
+      PUBLIC = 20
+      PRIVATE = 0
+
       def change_password(uid, en_pwd, salt)
         return unless uid
         options = {:encrypted_password=>en_pwd, :password_salt=>salt}
@@ -44,6 +53,21 @@ module Trustie
         self.g.delete_user(user.gid)
       end
 
+      def get_gitlab_role m
+        case m.roles.first.position
+          when 1,2
+            GUEST
+          when 5
+            REPORTER
+          when 4
+            DEVELOPER
+          when 3
+            MASTER
+          else
+            GUEST
+        end
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index d41b813e7..2f4f77c53 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -61,7 +61,7 @@ module Trustie
                 unless gid
                   gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -111,7 +111,7 @@ module Trustie
                 unless gid
                     gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -125,7 +125,7 @@ module Trustie
               unless gid
                 gid = sync_user(m.user).id
               end
-              self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER)
+              self.g.add_team_member(project.gpid, gid, get_gitlab_role(m))
             rescue => e
               puts e
             end
@@ -134,6 +134,8 @@ module Trustie
 
         def remove_project
         end
+
+
     end
 
   end
diff --git a/public/images/vlicon/file.png b/public/images/vlicon/file.png
new file mode 100644
index 000000000..bbfa6078d
Binary files /dev/null and b/public/images/vlicon/file.png differ
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index b60b6ad28..5ddadb373 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -91,7 +91,7 @@ function addFile_board(inputEl, file, eagerUpload, id,btnId) {
 function addFile(inputEl, file, eagerUpload,btnId) {
 
     var attachments_frame = '#attachments_fields';
-    if ($(attachments_frame).children().length < 30) {
+    if (true) {
         deleteallfiles = $(inputEl).data('deleteAllFiles');
         var attachmentId = addFile.nextAttachmentId++;
 
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index bc28aa2bd..fc2ac8938 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -19,7 +19,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            //this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();
diff --git a/public/javascripts/des_kindEditor.js b/public/javascripts/des_kindEditor.js
new file mode 100644
index 000000000..206448044
--- /dev/null
+++ b/public/javascripts/des_kindEditor.js
@@ -0,0 +1,137 @@
+function init_des_editor(params){
+    // var minHeight;  //最小高度
+    var paramsHeight = params.height; //设定的高度
+    var paramsWidth = params.width == undefined ? "100%" : params.width;
+
+    var editor = params.kindutil.create(params.textarea, {
+        resizeType : 1,minWidth:"1px",width:paramsWidth,
+        height:"30px",// paramsHeight == undefined ? "30px":paramsHeight+"px",
+        minHeight:"30px",// paramsHeight == undefined ? "30px":paramsHeight+"px",
+        items : ['code','emoticons','fontname',
+            'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|','indent', 'outdent',
+            '|','imagedirectupload','table',   'media', 'preview',"more"
+        ],
+        afterChange:function(){//按键事件
+            //nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+            var edit = this.edit;
+            var body = edit.doc.body;
+            edit.iframe.height(paramsHeight);
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) +  33, paramsHeight));
+        },
+        afterCreate:function(){
+            //init
+            var edit = this.edit;
+            var body = edit.doc.body;
+            edit.iframe[0].scroll = 'no';
+            body.style.overflowY = 'hidden';
+            //reset height
+            var edit = this.edit;
+            edit.html(params.textarea.innerHTML);
+            var body = edit.doc.body;
+            paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
+            edit.iframe.height(paramsHeight);
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight), paramsHeight));
+
+        }
+    }).loadPlugin('paste');
+    return editor;
+}
+
+function nh_check_field(params){
+    var result=true;
+    if(!check_org_title()) {
+        result=false;
+        return result;
+    }
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();
+
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            }
+    }
+    return result;
+}
+function init_form(params){
+    params.form.submit(function(){
+        var flag = false;
+        if(params.form.attr('data-remote') != undefined ){
+            flag = true
+        }
+        var is_checked = nh_check_field({
+            issubmit:true,
+            //title:params.texttitle,
+            content:params.editor,
+            //titlemsg:params.titlemsg,
+            contentmsg:params.contentmsg,
+            textarea:params.textarea
+        });
+        if(is_checked){
+            if(flag){
+                return true;
+            }else{
+                $(this)[0].submit();
+                return false;
+            }
+        }
+        return false;
+    });
+}
+function nh_reset_form(params){
+    params.form[0].reset();
+    params.texttitle.empty();
+    params.textarea.empty();
+    if(params.editor != undefined){
+        params.editor.html(params.textarea.html());
+    }
+    params.contentmsg.hide();
+    params.titlemsg.html("");
+}
+//第二个参数是高度，可以传，可以不传
+function init_des_data(){
+    var height = arguments[0] ? arguments[0] : undefined;
+    var width = arguments[1] ? arguments[1] : undefined;
+    KindEditor.ready(function (K) {
+        $("div[nhname='new_topic_form']").each(function () {
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.form = $("form", params.div_form);
+            if (params.form == undefined || params.form.length == 0) {
+                return;
+            }
+            //params.texttitle = $("#document_title", params.div_form);
+            params.textarea = $("textarea[nhname='description_textarea']", params.div_form);
+            //params.titlemsg = $("#doc_title_hint", params.div_form);
+            params.contentmsg = $("#homework_course_id_span", params.div_form);
+            params.cancel_btn = $("#new_topic_cancel_btn");
+            params.submit_btn = $("#new_topic_submit_btn");
+            params.height = height;
+            params.width = width;
+            if (params.textarea.data('init') == undefined) {
+                params.editor = init_des_editor(params);
+                init_form(params);
+                params.cancel_btn.click(function () {
+                    nh_reset_form(params);
+                });
+                params.submit_btn.click(function () {
+                    params.editor.sync();
+                    params.form[0].submit();
+                });
+                params.textarea.data('init', 1);
+                $(this).show();
+            }
+        });
+    });
+}
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index a0052b97a..9dfa32ccf 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1083,6 +1083,7 @@ a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 62987c167..b9e1b40f7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -694,6 +694,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:33px;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 330cd5dc3..06c8022c6 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -23,7 +23,7 @@ a.saveBtn:hover {background-color:#297fb8;}
 .orgListUser {width:85px; float:left;}
 .orgListRole {width:180px; float:left;}
 .orgMemContainer {width:228px;}
-.orgMemberAdd {float:right; width:240px;}
+.orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
 .undis {display:none;}
 .dis {display:inline-block;}
@@ -69,7 +69,7 @@ a.linkGrey8:hover {color:#585858;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
                    position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+#orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:55px; float:left;}
@@ -113,4 +113,6 @@ div.flash {margin-top :0px !important}
 .blueBtn:hover {background-color:#298fbd;}
 /*文本描述展开高度*/
 .maxh360 {max-height: 810px;}
-.lh18 { line-height: 18px;}
\ No newline at end of file
+.lh18 { line-height: 18px;}
+
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 29c099d3d..1a231b8a0 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -694,7 +694,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
-.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
 
 /*问题跟踪attachment显示*/
 div.attachments { margin-top: 12px; }
@@ -896,9 +896,9 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 /*end*/
 /***** Diff *****/
 .diff_out { background: #fcc; }
-.diff_out span { background: #faa; }
+/*.diff_out span { background: #faa; }*/
 .diff_in { background: #cfc; }
-.diff_in span { background: #afa; }
+/*.diff_in span { background: #afa; }*/
 
 .text-diff {
     padding: 1em;
@@ -1168,3 +1168,19 @@ div.disable_link {background-color: #c1c1c1 !important;}
 /*问题跟踪局部修改属性*/
 .proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
 .proInfoBox2 ul li{ height:24px; position:relative;}
+.maxwidth150{max-width: 150px;}
+
+/*版本库diff*/
+.showing-changes-info {width:650px; padding:10px; background-color:#ffffff; line-height:2;}
+.showing-changes-project {width:650px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.showing-changes-row {width:650px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+#changed-files-detail {display:none;}
+#changed-files-detail li {list-style-type:disc; margin-left:15px;}
+.showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.changes-detail-chart {width:100%; overflow:auto; border-collapse:collapse; margin:0px; padding:0px; background-color:#f1f1f1;}
+.diff-line-number {width:35px; min-width:35px; max-width:50px; border-right:1px solid #c1c1c1; padding:0px 5px; text-align:right; background-color:#f1f1f1;}
+.code-line-old {background-color:#ffecec;}
+.number-line-old {background-color:#ffdddd; border-color:#f1c0c0;}
+.code-line-new {background-color:#eaffea;}
+.number-line-new {background-color:#dbffdb; border-color:#c1e9c1;}
+.branch-label {padding-right: 5px; border-radius:2px; color:#888888; display:inline-block; background-color:#f8fafc;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 0eb1cf112..80c219350 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -255,6 +255,7 @@ a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
 a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 
 /* commonBtn */
 .grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;}
@@ -612,6 +613,8 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 /*a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}*/
 /*a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}*/
 .homepagePostReplyPortrait {float:left; width:45px;}