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

app/controllers/at_controller.rb

@@ -0,0 +1,152 @@
+#coding=utf-8
+
+class AtController < ApplicationController
+  respond_to :json
+
+  def show
+    @logger = Logger.new(Rails.root.join('log', 'at.log').to_s)
+    users = find_at_users(params[:type], params[:id])
+    @users = users
+    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id } if users
+  end
+
+  private
+  def find_at_users(type, id)
+    @logger.info("#{type}, #{id}")
+    case type
+      when "Issue"
+        find_issue(id)
+      when 'Project'
+        find_project(id)
+      when 'Course'
+        find_course(id)
+      when 'Activity', 'CourseActivity', 'ForgeActivity','UserActivity', 'OrgActivity','PrincipalActivity'
+        find_activity(id, type)
+      when 'Attachment'
+        find_attachment(id)
+      when 'Message'
+        find_message(id)
+      when 'HomeworkCommon'
+        find_homework(id)
+      when 'Topic'
+        find_topic(id)
+      else
+        nil
+    end
+  end
+
+  def find_topic(id)
+
+  end
+
+  def find_issue(id)
+    #1. issues list persons
+    #2. project persons
+    issue = Issue.find(id)
+    journals = issue.journals
+    at_persons = journals.map(&:user) + issue.project.users
+    at_persons.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_project(id)
+    at_persons = Project.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_course(id)
+    at_persons = Course.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_activity(id, type)
+
+    ## 基本上是本类型中的 加上所属类型的用户
+    case type
+      when 'Activity'
+        activity = Activity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) ||[]) +
+            (find_at_users(activity.activity_container_type, activity.activity_container_id) || [])
+      when 'CourseActivity'
+        activity = CourseActivity.find(id)
+        (find_at_users(activity.course_act_type, activity.course_act_id) || []) + (find_course(activity.course.id) || [])
+      when 'ForgeActivity'
+        activity = ForgeActivity.find(id)
+        (find_at_users(activity.forge_act_type, activity.forge_act_id) ||[]) +
+            (find_project(activity.project_id) || [])
+      when 'UserActivity'
+        activity = UserActivity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'OrgActivity'
+        activity = OrgActivity.find(id)
+        (find_at_users(activity.org_act_type, activity.org_act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'PrincipalActivity'
+        activity = PrincipalActivity.find(id)
+        find_at_users(activity.principal_act_type, activity.principal_act_id)
+      else
+        nil
+    end
+  end
+
+  #作业应该是关联课程,取课程的用户列表
+  def find_homework(id)
+    homework = HomeworkCommon.find(id)
+    find_course(homework.course_id)
+  end
+
+  def find_attachment(id)
+    attachment = Attachment.find(id)
+    find_at_users(attachment.container_type, attachment.container_id)
+  end
+
+  #Message
+  def find_message(id)
+    message = Message.find(id)
+    at_persons =  message.board.messages.map(&:author)
+    (at_persons || []) + (find_project(message.board.project_id)||[])
+  end
+
+  #News
+  def find_news(id)
+    find_project(News.find(id).project_id)
+  end
+
+  #JournalsForMessage
+  def find_journals_for_message(id)
+    jounrnal = JournalsForMessage.find(id)
+    find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+  end
+
+  #Poll
+  def find_poll(id)
+  end
+
+  #Journal
+  def find_journal(id)
+    journal = Journal.find(id)
+    find_at_users(journal.journalized_type, journal.journalized_id)
+  end
+
+  #Document
+  def find_document(id)
+    find_project(Document.find(id).project_id)
+  end
+
+  #ProjectCreateInfo
+  def find_project_create_info(id)
+
+  end
+
+  #Principal
+  def find_principal(id)
+
+  end
+
+  #BlogComment
+  def find_blog_comment(id)
+    blog = BlogComment.find(id).blog
+    blog.users
+  end
+
+end

app/controllers/boards_controller.rb

@@ -79,6 +79,13 @@ class BoardsController < ApplicationController
           end
         end
       end
+
+      @project.boards.each do |board|
+        board.messages.each do |m|
+          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+        end
+      end
+
     elsif @course
       query_course_messages = @board.messages
       query_course_messages.each do |query_course_message|

app/controllers/homework_common_controller.rb

@@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
+
+    #设置at已读
+    @homeworks.each do |homework|
+      homework.journals_for_messages.each do |j|
+        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+      end
+    end
+
     respond_to do |format|
       format.js
       format.html

app/controllers/issues_controller.rb

@@ -118,6 +118,14 @@ class IssuesController < ApplicationController
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
     query.update_attribute(:viewed, true) unless query.nil?
+
+    # issue 新建的at消息
+    User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
+    # 回复的at消息
+    @issue.journals.each do |j|
+      User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
+    end
+
     # 缺陷状态更新
     query_journals = @issue.journals
       query_journals.each do |query_journal|
@@ -145,24 +153,17 @@ class IssuesController < ApplicationController
     @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
 
-    #id name email
+    respond_to do |format|
-    #1. issues list persons
+      format.html {
-    #2. project persons
+        retrieve_previous_and_next_issue_ids
-    @at_persons = @journals.map(&:user) + @issue.project.users
+        render :template => 'issues/show', :layout => @project_base_tag#by young
-    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
+      }
-    @at_persons = nil
+      format.api
-
+      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-    respond_to do |format|``
+      format.pdf  {
-    format.html {
+        pdf = issue_to_pdf(@issue, :journals => @journals)
-      retrieve_previous_and_next_issue_ids
+        send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
-      render :template => 'issues/show', :layout => @project_base_tag#by young
+      }
-    }
-    format.api
-    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-    format.pdf  {
-      pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
-    }
     end
   end
 

app/helpers/application_helper.rb

@@ -1752,6 +1752,13 @@ module ApplicationHelper
   #
   def javascript_include_tag(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : {}
+
+    @sources ||= []
+    sources = sources.delete_if do|source|
+      @sources.include?(source)
+    end
+    @sources += sources
+
     if plugin = options.delete(:plugin)
       sources = sources.map do |source|
         if plugin
@@ -1761,7 +1768,12 @@ module ApplicationHelper
         end
       end
     end
-    super sources, options
+
+     if sources && !sources.empty?
+       super(sources, options)
+     else
+       ''
+     end
   end
 
   def content_for(name, content = nil, &block)
@@ -2712,19 +2724,8 @@ int main(int argc, char** argv){
   end
 
   def import_ke(default_opt={})
-    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    opt = {enable_at: false, prettify: false, init_activity: false}.merge default_opt
     ss  = ''
-    if opt[:enable_at]
-      ss = '<script type="text/javascript">'
-      ss += 'window.atPersonLists = [];'
-
-      @at_persons && @at_persons.each_with_index do |person,index|
-        ss += "var o = {id: #{index}, name: '#{person.show_name}', login: '#{person.login}', searchKey: '#{person.get_at_show_name}'};"
-        ss += "atPersonLists.push(o);"
-      end
-
-      ss += "</script>"
-    end
 
     ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
     if opt[:enable_at]

app/helpers/users_helper.rb

@@ -89,7 +89,8 @@ module UsersHelper
     forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
     user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+    at_count = user.at_messages.where(viewed: false).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
   end
 
   def user_mail_notification_options(user)

app/models/at_message.rb

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

app/models/issue.rb

@@ -52,6 +52,7 @@ class Issue < ActiveRecord::Base
   # ForgeMessage虚拟关联(多态)
   has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
 
+  has_many :at_messages, class_name: 'AtMessage', as: :at_message ,:dependent => :destroy
 
   acts_as_nested_set :scope => 'root_id', :dependent => :destroy
   acts_as_attachable :before_add => :attachment_added, :after_remove => :attachment_removed
@@ -82,7 +83,7 @@ class Issue < ActiveRecord::Base
   attr_reader :current_journal
   
   # fq
-  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
+  after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
   after_update :be_user_score
   after_destroy :down_user_score
   # after_create :be_user_score
@@ -156,6 +157,14 @@ class Issue < ActiveRecord::Base
     end
   end
 
+  # at 功能添加消息提醒
+  def act_as_at_message
+    users = self.description.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
+
   # 更新缺陷
   #def act_as_forge_message_update
   #  unless self.author_id == self.assigned_to_id

app/models/journal.rb

@@ -31,7 +31,9 @@ class Journal < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # 被ForgeMessage虚拟关联
   has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
-  # end
+
+  has_many :at_messages, as: :at_message, dependent: :destroy
+
   attr_accessor :indice
 
   acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
@@ -50,7 +52,7 @@ class Journal < ActiveRecord::Base
   before_create :split_private_notes
   
   # fq
-  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
+  after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -184,6 +186,13 @@ class Journal < ActiveRecord::Base
     end
   end
 
+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
+
   # 更新用户分数     -by zjc
   def be_user_score
       #新建了缺陷留言且留言不为空，不为空白

app/models/journals_for_message.rb

@@ -64,8 +64,10 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
   has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
+  has_many :at_messages, as: :at_message, dependent: :destroy
+
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -240,6 +242,12 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
+  def act_as_at_message
+    users = self.notes.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+    end
+  end
   # 用户留言消息通知
   def act_as_user_feedback_message
     # 主留言

app/models/message.rb

@@ -38,7 +38,7 @@ class Message < ActiveRecord::Base
   # 课程/项目 消息
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
-  #end
+  has_many :at_messages, as: :at_message, dependent: :destroy
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
 
@@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
   
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -96,6 +96,10 @@ class Message < ActiveRecord::Base
       end
     }
 
+  def topic?
+    parent_id.nil?
+  end
+
   def visible?(user=User.current)
     if project
       !user.nil? && user.allowed_to?(:view_messages, project)
@@ -237,6 +241,13 @@ class Message < ActiveRecord::Base
       end
     end
   end
+
+  def act_as_at_message
+    users = self.content.scan /<span class="at" data-user-id="(\d+?)">/m
+    users && users.flatten.uniq.each do |uid|
+      self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+    end
+  end
   
   #更新用户分数     -by zjc
   def be_user_score

app/models/user.rb

@@ -161,6 +161,7 @@ class User < Principal
   has_many :user_feedback_messages
   has_one :onclick_time
   has_many :system_messages
+  has_many :at_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@@ -400,16 +401,7 @@ class User < Principal
   end
   
   def show_name
-    name = ""
+    name = lastname + firstname
-    unless self.user_extensions.nil?
-      if self.user_extensions.identity == 2
-        name = firstname
-      else
-        name = lastname+firstname
-      end
-    else
-      name = lastname+firstname
-    end
     name.empty? || name.nil? ? login : name
   end
   ## end

app/views/at/show.json.erb

@@ -0,0 +1,6 @@
+[
+  <% @users && @users.each_with_index do |person,index| %>
+  {"id":<%=index%>, "userid": <%=person.id%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+  <%= index != @users.size-1 ? ',' : '' %>
+  <% end %>
+]

app/views/bids/_new_homework_form.html.erb

@@ -15,10 +15,10 @@
       <label class="fl" >&nbsp;&nbsp;<%= l(:field_quote)%>&nbsp;&nbsp;：</label>
       <!--<textarea  name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl"></textarea>-->
       <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0 %>
+        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0,act_id: @course.id, act_type: @course.class.to_s %>
       <% else %>
           <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0 %>
+          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0, act_id: @course.id, act_type: @course.class.to_s %>
       <% end %>
     </li>
     <div class="cl"></div>

app/views/blog_comments/_edit.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
     <%= javascript_include_tag 'blog' %>
 <% end %>
 
@@ -34,7 +34,9 @@
                            :class => 'talk_text fl',
                            :input_html => { :id => 'message_content',
                                             :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           act_id: article.id, act_type: article.class.to_s
+          %>
           <div class="cl"></div>
           <p id="message_content_span"></p>
         </div>

app/views/blog_comments/_reply_form.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 <li>
   <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
@@ -27,7 +27,9 @@
                        :minHeight=>100,
                        :input_html => { :id => 'message_content',
                                         :class => 'talk_text fl',
-                                        :maxlength => 5000 }%>
+                                        :maxlength => 5000 },
+                       at_id: article.id, at_type: article.class.to_s
+      %>
   <div class="cl"></div>
   <p id="message_content_span"></p>
 </li>

app/views/blog_comments/quote.js.erb

@@ -3,7 +3,7 @@ if($("#reply_message_<%= @blogComment.id%>").length > 0) {
     $(function(){
         $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
         $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%", "<%=@blogComment.class.to_s%>");
     });
 }else if($("#reply_to_message_<%= @blogComment.id%>").length >0) {
     $("#reply_to_message_<%= @blogComment.id%>").replaceWith("<p id='reply_message_<%= @blogComment.id%>'></p>");

app/views/blog_comments/reply.js.erb

@@ -1,7 +1,7 @@
 <% if @in_user_center%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% else%>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>

app/views/blog_comments/show.html.erb

@@ -27,7 +27,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>');
         showNormalImage('message_description_<%= @article.id %>');
     });
 </script>

app/views/blogs/_article_list.html.erb

@@ -74,7 +74,7 @@
               }
 
               $(function () {
-                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
                   showNormalImage('activity_description_<%= topic.id %>');
                   /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
                    if (description_images.length>0) {

app/views/boards/_course_new.html.erb

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

app/views/boards/_course_show.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
     <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>
 
@@ -74,7 +74,7 @@
           }
 
           $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+              init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
               showNormalImage('activity_description_<%= topic.id %>');
               /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
               if (description_images.length>0) {

app/views/boards/_project_show.html.erb

@@ -20,7 +20,7 @@
   <% end %>
   <div class="cl"></div>
   <div class=" talklist_box" >
-    <div class="talk_new ml15 mb10" nhname="about_talk" style="display:none;">
+    <div class="talk_new ml15 mb10" nhname="about_talk" data-at-id="<%= project.id %>" data-at-type="Project" style="display:none;">
       <ul>
         <%= render :partial => 'project_new_topic' %>
       </ul>
@@ -111,7 +111,7 @@
               <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
             <% end %>
             <div class="cl"></div>
-            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
+            <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
               <ul>
                 <%= render :partial => 'edit',locals:  {:topic => topic} %>
               </ul>
@@ -120,7 +120,7 @@
             <div class="talkWrapBox">
               <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
               <% if !topic.locked? && authorize_for('messages', 'reply') %>
-                  <div class="talkWrapMsg" nhname="about_talk_reply" style="display: none;">
+                  <div class="talkWrapMsg" nhname="about_talk_reply" data-at-id="<%= topic.id %>" data-at-type="<%= topic.class.name %>" style="display: none;">
                     <em class="talkWrapArrow"></em>
                     <div class="cl"></div>
                     <div class="talkConIpt ml15 mb10" style="margin-left:30px;" id="reply<%= topic.id %>">

app/views/boards/show.html.erb

@@ -28,7 +28,7 @@
         window.attachEvent("onload", buildsubmenus)
 </script>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 
 
@@ -102,6 +102,10 @@ function nh_init_board(params){
                   if(/trident/.test(userAgent)){
                     $("div.talk_new .ke-container").css({'margin-left':'0px'});
                   }
+
+                  if(typeof enableAt === 'function'){
+                    enableAt(this,params.about_talk.attr('data-at-id'), params.about_talk.attr('data-at-type'));
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

app/views/comments/create.js.erb

@@ -3,4 +3,4 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");