Merge branch 'develop' into cxt_course

2015-12-21 13:48:50 +08:00 · 2015-12-21 13:48:50 +08:00 · a1395d69ef
parent 7ce8e330c3 3de4c7129a
commit a1395d69ef
178 changed files with 2587 additions and 920 deletions
--- a/6
+++ b/6
@ -49,7 +49,7 @@ group :development do
  end
 end

-group :development, :test do 
+group :development, :test do
  unless RUBY_PLATFORM =~ /w32/
    gem 'pry-rails'
    if RUBY_VERSION >= '2.0.0'
@ -58,7 +58,7 @@ group :development, :test do
    gem 'pry-stack_explorer'
    if RUBY_PLATFORM =~ /darwin/
      gem 'puma'
-  end
+    end
  end

  gem 'rspec-rails', '~> 3.0'
@ -72,7 +72,7 @@ group :assets do
  gem 'coffee-rails', '~> 3.2.1'

  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-   gem 'therubyracer', :platforms => :ruby
+  gem 'therubyracer', :platforms => :ruby

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

+  def add_exist_file_to_org_subfield
+    file = Attachment.find(params[:file_id])
+    org_subfields = params[:org_subfields][:org_subfield]
+    @message = ""
+    org_subfields.each do |org_subfield|
+      s = OrgSubfield.find(org_subfield)
+      if s.attachments.include?file
+        if @message && @message == ""
+          @message += l(:label_resource_subfield_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        else
+          @message +=  "<br/>" + l(:label_resource_subfield_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        end
+      end
+      attach_copied_obj = file.copy
+      attach_copied_obj.tag_list.add(file.tag_list) # tag关联
+      attach_copied_obj.container = s
+      attach_copied_obj.created_on = Time.now
+      attach_copied_obj.author_id = User.current.id
+      attach_copied_obj.copy_from = file.copy_from.nil? ? file.id : file.copy_from
+      if attach_copied_obj.attachtype == nil
+        attach_copied_obj.attachtype = 4
+      end
+      @obj = s
+      @save_flag = attach_copied_obj.save
+      @save_message = attach_copied_obj.errors.full_messages
+      update_quotes attach_copied_obj
+    end
+    respond_to do |format|
+      format.js
+    end
+  rescue NoMethodError
+    @save_flag = false
+    @save_message = [] << l(:label_resource_subfield_empty_select)
+    respond_to do |format|
+      format.js
+    end
+  end
+
  def update_quotes attachment
    if attachment.copy_from
      attachments = Attachment.find_by_sql("select * from attachments where copy_from = #{attachment.copy_from} or id =  #{attachment.copy_from}")
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@ -118,6 +118,7 @@ class BlogCommentsController < ApplicationController
    @blogComment.content = @quote + @blogComment.content
    @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
    @article.children << @blogComment
+    @article.save
    @user_activity_id = params[:user_activity_id]
    user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
    if user_activity
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@ -79,6 +79,13 @@ class BoardsController < ApplicationController
          end
        end
      end
+
+      @project.boards.each do |board|
+        board.messages.each do |m|
+          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+        end
+      end
+
    elsif @course
      query_course_messages = @board.messages
      query_course_messages.each do |query_course_message|
@ -146,6 +153,7 @@ class BoardsController < ApplicationController
      end
    end

+    @page = params[:page] ? params[:page].to_i + 1 : 0
    @message = Message.new(:board => @board)
    #modify by nwb
    respond_to do |format|
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -36,17 +36,18 @@ class CoursesController < ApplicationController
    if !params[:name].nil?
      condition = "%#{params[:name].strip}%".gsub(" ","")
    end
+    limit = 15
    course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
    if course_org_ids.empty?
-      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
    else
      course_org_ids = "(" + course_org_ids.join(',') +  ")"
-      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
      @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
    end
    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
-    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @orgs_page = Paginator.new @org_count, limit,params[:page]
    @hint_flag = params[:hint_flag]
    #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
    respond_to do |format|
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@ -24,7 +24,7 @@ class FilesController < ApplicationController
  before_filter :auth_login1, :only => [:index]
  before_filter :logged_user_by_apptoken,:only => [:index]
  before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield]

  helper :sort
  include SortHelper
@ -131,6 +131,45 @@ class FilesController < ApplicationController
    end
  end

+    def search_files_in_subfield
+      sort = ""
+      @sort = ""
+      @order = ""
+      @is_remote = true
+      @q = params[:name].strip
+      if params[:sort]
+        order_by = params[:sort].split(":")
+        @sort = order_by[0]
+        if order_by.count > 1
+          @order = order_by[1]
+        end
+        sort = "#{@sort} #{@order}"
+      end
+      # show_attachments [@course]
+      begin
+        q = "%#{params[:name].strip}%"
+        #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+        if params[:insite]
+          if q == "%%"
+            @result = []
+            @searched_attach = paginateHelper @result,10
+          else
+            @result = find_public_attache q,sort
+            @result = visable_attachemnts_insite @result,@org_subfield
+            @searched_attach = paginateHelper @result,10
+          end
+        else
+          @result = find_org_subfield_attache q,@org_subfield,sort
+          @result = visable_attachemnts @result
+          @searched_attach = paginateHelper @result,10
+          @tag_list = attachment_tag_list @result
+        end
+        #rescue Exception => e
+        #  #render 'stores'
+        #  redirect_to search_course_files_url
+      end
+    end
+
  def find_course_attache keywords,course,sort = ""
    if sort == ""
      sort =  "created_on DESC"
@ -144,6 +183,19 @@ class FilesController < ApplicationController
    #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
  end

+  def find_org_subfield_attache keywords,org_subfield,sort = ""
+    if sort == ""
+      sort =  "created_on DESC"
+    end
+    if keywords != "%%"
+      resultSet = Attachment.where("attachments.container_type = 'OrgSubfield' And attachments.container_id = '#{org_subfield.id}' AND filename LIKE :like ", like: "%#{keywords}%").
+          reorder(sort)
+    else
+      resultSet = Attachment.where("attachments.container_type = 'OrgSubfield' And attachments.container_id = '#{org_subfield.id}' "). reorder(sort)
+    end
+    #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
+  end
+
  def find_project_attache keywords,project,sort = ""
    if sort == ""
      sort =  "created_on DESC"
@ -298,10 +350,52 @@ class FilesController < ApplicationController

      render :layout => 'base_courses'
    elsif params[:org_subfield_id]
+      if params[:sort]
+        params[:sort].split(",").each do |sort_type|
+          order_by = sort_type.split(":")
+
+          case order_by[0]
+            when "filename"
+              attribute = "filename"
+            when "size"
+              attribute = "filesize"
+            when "attach_type"
+              attribute = "attachtype"
+            when "content_type"
+              attribute = "created_on"
+            when "field_file_dense"
+              attribute = "is_public"
+            when "downloads"
+              attribute = "downloads"
+            when "created_on"
+              attribute = "created_on"
+            when "quotes"
+              attribute = "quotes"
+            else
+              attribute = "created_on"
+          end
+          @sort = order_by[0]
+          @order = order_by[1]
+          if order_by.count == 1 && attribute
+            sort += "#{Attachment.table_name}.#{attribute} asc "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          elsif order_by.count == 2 && order_by[1]
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          end
+        end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
+      end
      @container_type = 2
-      @organization = Organization.find(params[:organization_id])
      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+      @organization = Organization.find(@containers.first.organization_id)
      show_attachments @containers
+      @tag_list = attachment_tag_list @all_attachments
      render :layout => 'base_org'
      # @subfield = params[:org_subfield_id]
    end
@ -318,6 +412,12 @@ class FilesController < ApplicationController
    @can_quote = attachment_candown @file
  end

+  def quote_resource_show_org_subfield
+    @file = Attachment.find(params[:id])
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @can_quote = attachment_candown @file
+  end
+
  def new
    @versions = @project.versions.sort
    @course_tag = @project.project_type
@ -430,14 +530,29 @@ class FilesController < ApplicationController
       end
     elsif @org_subfield
       @addTag=false
-       # if params[:in_org_subfield_toolbar]
-       #   @in_org_subfield_toolbar = params[:in_org_subfield_toolbar]
-       # end
       attachments = Attachment.attach_filesex(@org_subfield, params[:attachments], params[:org_subfield_attachment_type])

-       # if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-       #   Mailer.run.attachments_added(attachments[:files])
-       # end
+       if params[:org_subfield_attachment_type] && params[:org_subfield_attachment_type].is_a?(Array)
+         params[:org_subfield_attachment_type].each do |type|
+           tag_name = get_tag_name_by_type_number  type
+           if !attachments.empty? && attachments[:files] && tag_name != ""
+             attachments[:files].each do |attachment|
+               attachment.tag_list.add(tag_name)
+               attachment.save
+             end
+           end
+         end
+       else
+         if params[:org_subfield_attachment_type] && params[:org_subfield_attachment_type] != "5"
+           tag_name = get_tag_name_by_type_number  params[:org_subfield_attachment_type]
+           if !attachments.empty? && attachments[:files] && tag_name != ""
+             attachments[:files].each do |attachment|
+               attachment.tag_list.add(tag_name)
+               attachment.save
+             end
+           end
+         end
+       end

       # TODO: 临时用 nyan
       sort_init 'created_on', 'desc'
@ -446,19 +561,18 @@ class FilesController < ApplicationController
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"

-       @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)] #modify by Long Jun
-       # @containers += @org_subfield.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+       @containers = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)]

       show_attachments @containers
-
+       @tag_list = attachment_tag_list @all_attachments
       @attachtype = 0
       @contenttype = 0

       respond_to do |format|
         format.js
-         format.html {
-           redirect_to org_subfield_files_url(@org_subfield)
-         }
+         # format.html {
+         #   redirect_to org_subfield_files_url(@org_subfield)
+         # }
       end
     end
   end
@ -640,4 +754,34 @@ class FilesController < ApplicationController
      # format.html
    end
  end
+
+  #搜索资源栏目的指定TAG的资源列表
+  def search_org_subfield_tag_attachment
+    @q,@tag_name,@order = params[:q],params[:tag_name]
+    @is_remote = true
+    if params[:sort]
+      order_by = params[:sort].split(":")
+      @sort = order_by[0]
+      if order_by.count > 1
+        @order = order_by[1]
+      end
+      sort = "#{@sort} #{@order}"
+    end
+
+    q = "%#{@q.strip}%"
+    @result = find_org_subfield_attache q,@org_subfield,sort
+    @result = visable_attachemnts @result
+    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    @searched_attach = paginateHelper @result,10
+    @tag_list = get_org_subfield_tag_list @org_subfield
+
+    respond_to do |format|
+      format.js
+      # format.html
+    end
+  end
+
+  def subfield_upload_file
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+  end
 end
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@ -147,8 +147,8 @@ class ForumsController < ApplicationController
     order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}"
     @order_str = "reorder_time="+params[:reorder_time]
    else
-      order = "last_replies_memos.created_at desc, #{Memo.table_name}.created_at desc"
-      @order_str = "reorder_complex=desc"
+      order = "#{Memo.table_name}.updated_at desc"
+      @order_str = "reorder_time=desc"
    end
    @memo = Memo.new(:forum => @forum)
    @topic_count = @forum.topics.count
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
    @is_new = params[:is_new]
+
+    #设置at已读
+    @homeworks.each do |homework|
+      homework.journals_for_messages.each do |j|
+        User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+      end
+    end
+
    respond_to do |format|
      format.js
      format.html
@ -167,6 +175,7 @@ class HomeworkCommonController < ApplicationController
          end
        end
        @homework_detail_manual.update_column('comment_status', 2)
+        @homework_detail_manual.update_column('evaluation_start', Date.today)
        @statue = 1
        # 匿评开启消息邮件通知
        send_message_anonymous_comment(@homework, m_status = 2)
@ -186,6 +195,7 @@ class HomeworkCommonController < ApplicationController
  #关闭匿评
  def stop_anonymous_comment
    @homework_detail_manual.update_column('comment_status', 3)
+    @homework_detail_manual.update_column('evaluation_end', Date.today)
    #计算缺评扣分
    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
    @homework.student_works.each do |student_work|
@ -266,7 +276,13 @@ class HomeworkCommonController < ApplicationController

  #启动匿评参数设置
  def start_evaluation_set
-
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course]
+    @course_activity = params[:course_activity].to_i
  end

  #设置匿评参数
@ -282,6 +298,9 @@ class HomeworkCommonController < ApplicationController

      @homework_detail_manual.evaluation_num = params[:evaluation_num]
      @homework_detail_manual.save
+      @user_activity_id = params[:user_activity_id].to_i
+      @is_in_course = params[:is_in_course].to_i
+      @course_activity = params[:course_activity].to_i
    end
  end

--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -24,7 +24,7 @@ class IssuesController < ApplicationController
  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
  before_filter :find_project, :only => [:new, :create, :update_form]
  #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org,:delete_journal,:reply,:add_reply]

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

-    #id name email
-    #1. issues list persons
-    #2. project persons
-    @at_persons = @journals.map(&:user) + @issue.project.users
-    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
-    @at_persons = nil
-
-    respond_to do |format|``
-    format.html {
-      retrieve_previous_and_next_issue_ids
-      render :template => 'issues/show', :layout => @project_base_tag#by young
-    }
-    format.api
-    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-    format.pdf  {
-      pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
-    }
+    respond_to do |format|
+      format.html {
+        retrieve_previous_and_next_issue_ids
+        render :template => 'issues/show', :layout => @project_base_tag#by young
+      }
+      format.api
+      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+      format.pdf  {
+        pdf = issue_to_pdf(@issue, :journals => @journals)
+        send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
+      }
    end
  end

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

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

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

  def find_project
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@ -159,7 +159,8 @@ class MemosController < ApplicationController
           @memo.update_column(:content, params[:memo][:content]) &&
           @memo.update_column(:sticky, params[:memo][:sticky]) &&
           @memo.update_column(:lock, params[:memo][:lock]) &&
-           @memo.update_column(:subject,params[:memo][:subject]))
+           @memo.update_column(:subject,params[:memo][:subject]) &&
+           @memo.update_column(:updated_at,Time.now))
        @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
        @flag = @memo.save
        # @memo.root.update_attribute(:updated_at, @memo.updated_at)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -75,17 +75,18 @@ class ProjectsController < ApplicationController
    if !params[:name].nil?
      condition = "%#{params[:name].strip}%".gsub(" ","")
    end
+    limit = 15
    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id)
    if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
    else
      project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
    end
   # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
-    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @orgs_page = Paginator.new @org_count, limit,params[:page]
    @no_roll_hint = params[:hint_flag]
    #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json
    respond_to do |format|
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -348,10 +348,6 @@ update
      #   end
      # end

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

  alias_method :browse, :show

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

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

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

    @commit = g.commit(@project.gpid,@rev)
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@ -120,15 +120,16 @@ class SchoolController < ApplicationController
    condition.scan(/./).each_with_index  do |char,index|
         if char =~ /[a-zA-Z0-9]/
           pinyin << char
+         elsif char =~ /\'/
         else
           chinese << char
         end
    end
    if(condition == '')
-      @school = School.page((params[:page].to_i || 1) - 1).per(100)
+      @school = School.reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100)
      @school_count = School.count
    else
-      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").page((params[:page].to_i || 1) - 1).per(100)
+      @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100)
      @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count
    end

--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@ -227,6 +227,12 @@ class TagsController < ApplicationController
        @tag_list = get_course_tag_list @course
        @select_tag_name = params[:select_tag_name]
      end
+
+      if @obj && @object_flag == '6' && @obj.container.kind_of?(OrgSubfield)
+        @org_subfield = @obj.container
+        @tag_list = get_org_subfield_tag_list @org_subfield
+        @select_tag_name = params[:select_tag_name]
+      end
      # end
    end
  end
@ -314,6 +320,86 @@ class TagsController < ApplicationController
    end
  end

+  def update_org_subfield_tag_name
+    @tag_name = params[:tagName]
+    @rename_tag_name = params[:renameName]
+    @taggable_id = params[:taggableId]
+    @taggable_type = numbers_to_object_type(params[:taggableType])
+    @rename_tag = (ActsAsTaggableOn::Tag.find_by_name(@rename_tag_name))  #查找重命名后的tag
+    @tag_id = (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).id  #重命名前的tag_id
+    @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type) unless @taggable_id.blank?
+    @obj = get_object(@taggable_id,params[:taggableType]) unless @taggable_id.blank?
+    if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
+      if params[:org_subfield_id]
+        org_subfield = OrgSubfield.find params[:org_subfield_id]
+        if org_subfield
+          org_subfield.attachments.each do |attachment|
+            taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,attachment.id,attachment.class)
+            if taggings
+              taggings.delete
+              attachment.tag_list.add(@rename_tag_name.split(","))
+              attachment.save
+            end
+          end
+        end
+      end
+    else
+      if(@rename_tag.nil?) #这次命名的是新的tag
+
+        # 是否还有其他记录 引用了 tag_id
+        @tagging = ActsAsTaggableOn::Tagging.where("tag_id = #{@tag_id}")
+        # 如果taggings表中记录为 1 ，那么改变@tag_id对应的tag的名字
+        if @tagging.count == 1
+          @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+          @tag.update_attributes({:name=>@rename_tag_name})
+        else #如果tagging表中的记录大于1，那么就要新增tag记录
+
+          unless @obj.nil?
+            @obj.tag_list.add(@rename_tag_name.split(","))
+            @obj.save
+          end
+          #删除原来的对应的taggings的记录
+          unless @taggings.nil?
+            @taggings.delete
+          end
+        end
+      else #这是已有的tag
+        # 更改taggings记录里的tag_id
+        unless @taggings.nil?
+          @taggings.update_attributes({:tag_id=>@rename_tag.id})
+        end
+      end
+    end
+
+    @obj_flag =  params[:taggableType]
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(OrgSubfield)
+      @org_subfield = @obj.container
+      @tag_list = @tag_list = get_org_subfield_tag_list @org_subfield
+    elsif params[:org_subfield_id]
+      @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+      @tag_list = get_org_subfield_tag_list @org_subfield
+
+      #这里要引用FilesController里的逻辑了。将资源库当前的文件列表刷新一遍。
+      @flag = params[:flag] || false
+      sort = ""
+      @sort = ""
+      @order = ""
+      @is_remote = false
+      @isproject = false
+
+      sort = "#{Attachment.table_name}.created_on desc"
+
+      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+
+      show_attachments @containers
+    elsif @obj &&  @obj_flag == '5'
+      @forum = @obj
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
  def show_attachments obj
    @attachments = []
    obj.each do |container|
@ -372,6 +458,10 @@ class TagsController < ApplicationController
      @course = @obj.container
      @tag_list = @tag_list = get_course_tag_list @course
    end
+    if @obj && @obj_flag == '6' && @obj.container.kind_of?(OrgSubfield)
+      @org_subfield = @obj.container
+      @tag_list = @tag_list = get_org_subfield_tag_list @org_subfield
+    end
    respond_to do |format|
      format.js
      format.html
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1441,7 +1441,8 @@ class UsersController < ApplicationController
  def search_user_course
    @user = User.current
    if !params[:search].nil?
-      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like '%#{params[:search.to_s]}%'")
+      search = "%#{params[:search].to_s.strip.downcase}%"
+      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search)
      .select { |course|  @user.allowed_to?(:as_teacher,course)}
    else
      @course = @user.courses
@ -1460,7 +1461,8 @@ class UsersController < ApplicationController
  def search_user_project
    @user = User.current
    if !params[:search].nil?
-      @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like '%#{params[:search.to_s]}%'")
+      search = "%#{params[:search].to_s.strip.downcase}%"
+      @projects = @user.projects.where(" #{Project.table_name}.id = #{params[:search].to_i } or #{Project.table_name}.name like :p",:p=>search)
    else
      @projects = @user.projects
    end
@ -1875,46 +1877,46 @@ class UsersController < ApplicationController

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

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

  def content_for(name, content = nil, &block)
@ -1924,6 +1972,8 @@ module ApplicationHelper
      elsif attachment.container.is_a?(Course)
        course = attachment.container
        candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+      elsif attachment.container.is_a?(OrgSubfield)
+        candown = true
      elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
          attachment.container.board.course
        course = attachment.container.board.course
@ -1934,7 +1984,9 @@ module ApplicationHelper
        candown = true
      elsif attachment.container.class.to_s=="StudentWork"
        candown = true
-      elsif attachment.container.class.to_s=="BlogComment"
+      elsif attachment.container.class.to_s=="BlogComment" #博客资源允许下载
+        candown = true
+      elsif attachment.container.class.to_s=="Memo" #论坛资源允许下载
        candown = true
      elsif attachment.container.class.to_s == "User"
        candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
@ -2378,6 +2430,15 @@ module ApplicationHelper
    tag_list
  end

+  def get_org_subfield_tag_list org_subfield
+    all_attachments = org_subfield.attachments.select{|attachment| attachment.is_public? ||
+        (attachment.container_type == "OrgSubfield" && User.current.member_of_org?(org_subfield.organization))||
+        attachment.author_id == User.current.id
+    }
+    tag_list = attachment_tag_list all_attachments
+    tag_list
+  end
+
  #获取匿评相关连接代码
  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
@ -2663,18 +2724,11 @@ 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>"
+    unless Setting.at_enabled?
+      opt[:enable_at] = false
    end

    ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@ -67,6 +67,17 @@ module FilesHelper
    s.html_safe
  end

+  #带勾选框的组织资源栏目列表
+  def org_subfields_check_box_tags(name,org_subfields,attachment)
+    s = ''
+    org_subfields.each do |org_subfield|
+      if !org_subfield.attachments.include?attachment
+        s << "<label>#{ check_box_tag name, org_subfield.id, false, :id => nil } #{h org_subfield.name}</label><br/>"
+      end
+    end
+    s.html_safe
+  end
+
  #判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
  def has_course? user,file
    result = false
@ -141,6 +152,12 @@ module FilesHelper
         result << attachment
       end
     end
+     elsif obj.is_a?(OrgSubfield)
+       attachments.each do |attachment|
+         if attachment.is_public? || (attachment.container_type == "OrgSubfield" && attachment.container_id == obj.id )|| attachment.author_id == User.current.id
+           result << attachment
+         end
+     end
    end
  end
  result
--- a/app/helpers/project_score_helper.rb
+++ b/app/helpers/project_score_helper.rb
@ -22,7 +22,10 @@ module ProjectScoreHelper

  #代码提交数量
  def changesets_num project
-    project.changesets.count
+    g = Gitlab.client
+    project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count
+    # # commits_total_count(project.gpid)
+    # project.changesets.count
  end

  #讨论区帖子数量
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@ -89,7 +89,8 @@ module UsersHelper
    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+    at_count = user.at_messages.where(viewed: false).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
  end

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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


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

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

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

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

            $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                showNormalImage('activity_description_<%= activity.id %>');
                if($("#intro_content_<%= activity.id %>").height() > 360) {
                    $("#intro_content_show_<%= activity.id %>").show();
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@ -12,7 +12,10 @@
    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
    /*.ke-container{height: 80px !important;}*/
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor"  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag "init_KindEditor"  %>
+<% end %>
 <script >
    init_KindEditor_data('',80);
 </script>
--- a/app/views/courses/search_public_orgs_not_in_course.js.erb
+++ b/app/views/courses/search_public_orgs_not_in_course.js.erb
@ -11,7 +11,7 @@ $("#search_orgs_result_list").append('<ul class="ml20">');
    $("#search_orgs_result_list").append(link );
 <%end %>
 $("#search_orgs_result_list").append('</ul>')
-<% if @org_count > 10 %>
+<% if @org_count > 15 %>
    $("#paginator").html(' <%=  pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>');
    $("#paginator").css("display", "block");
 <% else %>
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@ -1,6 +1,6 @@

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

@ -40,7 +40,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
        showNormalImage('message_description_<%= @article.id %>');
    });
 </script>
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@ -14,10 +14,9 @@
  </p>
 </div>
 <div class="cl"></div>
-
-<!--<div class="files_tag" id="files_tag">-->
-  <!--<%#= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>-->
-<!--</div>-->
+<div class="files_tag" id="files_tag">
+  <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
+</div>
 <div class="cl"></div>

 <div class="for_img_thumbnails">
@ -29,6 +28,11 @@
                          download_named_attachment_path(file.id, file.filename),
                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
              <% if User.current.logged? %>
+                  <% if !@org_subfield.attachments.all.include?file %>
+                    <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
+                  <% else %>
+                    <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
+                  <% end %>
                  <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>
              <% end %>
            </div>
@ -40,11 +44,10 @@
              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
            </div>
            <div class="cl"></div>
-            <!--<div class="tag_h">-->
-              <!--&lt;!&ndash; container_type = 1 代表是课程里的资源 &ndash;&gt;-->
-              <!--<%#= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
-              <!--<%#= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
-            <!--</div>-->
+            <div class="tag_h">
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+            </div>
            <div class="cl"></div>
          </div><!---re_con_box end-->
      <% end %>
--- a/app/views/files/_show_quote_resource_org_subfield.html.erb
+++ b/app/views/files/_show_quote_resource_org_subfield.html.erb
@ -0,0 +1,31 @@
+<div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
+  <div class="upload_con">
+    <h2>将此资源引入组织资源栏目</h2>
+    <% if error == '403' %>
+        <div class="upload_box">
+          <div style="color: red;">您没有权限引用此资源</div>
+        </div>
+    <% else %>
+        <div class="upload_box">
+          <div id="error_show" style="color: red;"></div>
+          <%= form_tag attachments_add_exist_file_to_org_subfield_path,
+                       method: :post,
+                       remote: true,
+                       id: "relation_file_form" do %>
+              <%= hidden_field_tag(:file_id, file.id) %>
+              <%= content_tag('div', org_subfields_check_box_tags('org_subfields[org_subfield][]',org_subfield.organization.org_subfields.where("field_type='Resource'"),file), :id => 'org_subfields')%>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+          <% end -%>
+        </div>
+    <% end %>
+
+
+  </div>
+</div>
+
+<script>
+    function submit_quote()
+    {
+        $('#submit_quote').parent().submit();
+    }
+</script>
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@ -15,9 +15,9 @@
    {
        switch(obj)
        {
-            case 1:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
-                break;
+//            case 1:
+//                $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+//                break;
            case 2:
                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>');
                break;
@ -27,9 +27,9 @@
            case 4:
                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>');
                break;
-            case 6:
-                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
-                break;
+//            case 6:
+//                $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
+//                break;
            default:
                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>');
        }
@ -68,27 +68,27 @@
 <div class="container">
  <div class="resources"><!--资源库内容开始--->
    <div class="re_top" style="width:710px;">
-      <%= form_tag( search_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+      <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
      <% end %>
      <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %>  <!-- show_window('light','fade','20%','35%')-->
          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
          <p class="c_grey fr mt10 mr5">
            上传：
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <!--<a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;-->
            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
-            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
+            <!--<a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;-->
            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
          </p>
      <%# end %>
    </div><!---re_top end-->
    <div class="cl"></div>

-    <div class="re_con" id="org_subfield_list">
+    <div class="reCon" id="org_subfield_list">
      <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
    </div><!---re_con end-->

--- a/app/views/files/_subfield_tags.html.erb
+++ b/app/views/files/_subfield_tags.html.erb
@ -0,0 +1,45 @@
+<% if org_subfield %>
+    <span class="files_tag_icon" >
+          <a  title=""
+              onclick="search_org_subfield_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','','<%= @q%>','<%= org_subfield.id%>');"
+          >全部</a></span>
+<% end %>
+<% unless tag_list.nil?%>
+    <% tag_list.each do |k,v|%>
+        <% if tag_name && tag_name == k%>
+            <!-- 鼠标不能移动是因为 href="javascript:void(0);"导致的 -->
+            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
+        <% else%>
+            <span class="files_tag_icon" >
+          <a  title="双击可编辑"
+              onclick="search_org_subfield_tag_attachment('<%= search_org_subfield_tag_attachment_org_subfield_files_path(org_subfield)%>','<%= k %>','<%= @q %>','<%= org_subfield.id %>');"
+              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
+        <% end%>
+    <% end%>
+<% end%>
+
+<script>
+    var clickFunction = null; //单击事件函数
+    var isdb = false; //是否双击
+    function search_org_subfield_tag_attachment(url,tag_name,q,org_subfield_id,sort) {
+        //alert("111");
+        //clearTimeout(clickFunction);
+        clickFunction = setTimeout(function () {
+            search_func();
+        }, 500);
+        function search_func() {
+            if (isdb != false) return;
+            $.get(
+                    url,
+                    {
+                        tag_name: tag_name,
+                        q: q,
+                        org_subfield_id: org_subfield_id
+                    },
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+</script>
--- a/app/views/files/_upload_subfield_file.html.erb
+++ b/app/views/files/_upload_subfield_file.html.erb
@ -6,11 +6,19 @@
      <%= error_messages_for 'attachment' %>
      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>

-      <%= form_tag(org_subfield_files_path(org_subfield), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
-          <!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">-->
-          <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">
-          <%= render :partial => 'files/attachement_list',:locals => {:org_subfield => org_subfield} %>
+      <%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <% if params[:in_org] %>
+              <div class="c_dark">
+                <input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+                <input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+                <input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span  class="c_grey">|</span>&nbsp;
+                <input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>
+              </div>
+          <% else %>
+              <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type %>">
+          <% end %>
+          <!--<input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">-->
+          <%= render :partial => 'files/attachement_list'%>
          <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>
@ -18,9 +26,7 @@
    </div>

  </div>
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
+
 </div>

 <script>
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@ -53,16 +53,18 @@ $('#upload_file_div').slideToggle('slow');
        <% end %>
    <%end%>
    <% elsif @org_subfield %>
-        hideModal();
-        $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
-//        $("#courses_files_count_info").html("<%#= @all_attachments.count%>");
-//        $("#courses_files_count_nav").html("(<%#= @all_attachments.count%>)")
-        //    添加文件上传成功提示,
-        <% unless params[:attachments].nil? %>
-            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-            $("#org_subfield_list").prepend(div);
-            setTimeout( function(){div.remove();},3000)
-        <% end %>
+       <% if params[:in_org] %>
+            window.location.href = '<%= org_subfield_files_path @org_subfield %>';
+       <%else %>
+            hideModal();
+            $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+            //    添加文件上传成功提示,
+            <% unless params[:attachments].nil? %>
+                var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+                $("#org_subfield_list").prepend(div);
+                setTimeout( function(){div.remove();},3000);
+            <% end %>
+       <% end %>
  <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@ -309,6 +309,65 @@
 //   });
   <%end %>

+    <% if @org_subfield %>
+    var tagNameHtml; //当前双击的链接的父节点的html
+    var tagName;  //标签的值
+    var parentCssBorder; //当前双击的链接的父节点
+    var ele;    //当前双击的链接
+    var tagId; //标签的id
+    var taggableType; //被标签的类型
+    //这里renameTag有两种情况，一种是改变某个资源的tag名称。如果其他资源也有这个tag。则新增一个改变后的tag名
+    //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
+    //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
+    function rename_tag(domEle,name,id,type){
+        if(1) {
+            isdb = true; //这是双击
+            //clearTimeout(clickFunction);
+            if (domEle.children().get(0) != undefined) { //已经是编辑框的情况下不要动
+                return;
+            }
+            tagNameHtml = domEle.parent().html()
+            tagName = name;
+            parentCssBorder = domEle.parent().css("border");
+            ele = domEle;
+            tagId = id;
+            taggableType = type;
+            width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100
+            domEle.html('<input name=""  id="renameTagName" maxlength="120" minlength="1" style="width:' + width + 'px;" value="' + name + '"/>');
+            domEle.parent().css("border", "1px solid #ffffff");
+            $("#renameTagName").focus();
+        }
+    }
+    //监听所有的单击事件
+    $(function(){
+        $("#renameTagName").live("blur",function(){
+            updateTagName();
+        }).live("keypress",function(e){
+            if (e.keyCode == '13') {
+                updateTagName();
+            }
+        });
+    });
+
+    //执行修改TAGName方法
+    function updateTagName(){
+        if(isdb){
+            isdb = false;
+            if($("#renameTagName").val() == tagName){ //如果值一样，则恢复原来的状态
+                ele.parent().css("border","");
+                ele.parent().html(tagNameHtml);
+
+            }
+            else{
+                $.post(
+                        '<%= tags_update_org_subfield_tag_name_path %>',
+                        {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"org_subfield_id":<%= @org_subfield.id %>}
+                );
+            }
+        }
+    }
+    <%end %>
+
 </script>


--- a/app/views/files/quote_resource_show_org_subfield.js.erb
+++ b/app/views/files/quote_resource_show_org_subfield.js.erb
@ -0,0 +1,11 @@
+<% if @can_quote %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => ''}) %>');
+<% else %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => '403'}) %>');
+<% end %>
+
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");
--- a/app/views/files/search_files_in_subfield.js.erb
+++ b/app/views/files/search_files_in_subfield.js.erb
@ -0,0 +1,2 @@
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
+    :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
--- a/app/views/files/search_org_subfield_tag_attachment.js.erb
+++ b/app/views/files/search_org_subfield_tag_attachment.js.erb
@ -0,0 +1,2 @@
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
+    :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
--- a/app/views/files/subfield_upload_file.js.erb
+++ b/app/views/files/subfield_upload_file.js.erb
@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@ -30,9 +30,11 @@
    <% end %>
  </div>
  <div class="postDetailBanner">
-    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class="sortArrowActiveD"></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class="sortArrowActiveD"></a></div>
    <div class="postSort" id="popu"><a href="javascript:void(0);" class="linkGrey2 fl">人气</a><a href="javascript:void(0);"  id="reorder_popu" class=""></a></div>
-    <div class="postSort" id="time"><a href="javascript:void(0);" class="linkGrey2 fl">时间</a><a href="javascript:void(0);" id="reorder_time" class=""></a></div>
+
+    <div class="postSort" id="complex"><a href="javascript:void(0);" class="linkGrey2 fl">综合</a><a href="javascript:void(0);" id="reorder_complex" class=""></a><!--<a href="javascript:void(0);" class="sortArrowActiveD"></a>--></div>
+
    <div class="creatPost" id="create_memo_btn"><a href="javascript:void(0);" class="c_white db creatPostIcon bBlue" onclick="$('#error').hide();$('#create_memo_div').slideToggle();$(this).parent().slideToggle();">发布新帖</a></div>
    <div class="cl"></div>
  </div>
--- a/app/views/homework_common/_set_evalutation_att.html.erb
+++ b/app/views/homework_common/_set_evalutation_att.html.erb
@ -1,5 +1,5 @@
 <div class="markPopup" id="popbox02">
-  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id},:method => "post",:remote => true) do |f|%>
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity},:method => "post",:remote => true) do |f|%>
      <span class="uploadText">匿评设置</span>
      <div class="cl"></div>

--- a/app/views/homework_common/set_evaluation_attr.js.erb
+++ b/app/views/homework_common/set_evaluation_attr.js.erb
@ -1 +1,8 @@
-clickCanel();
+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");
+<% 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%>");
+<% end %>
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@ -2,10 +2,12 @@
    alert('启动成功');
    <% if @user_activity_id == -1 %>
        $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-        init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+        $("#evaluation_start_time_<%=@homework.id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
    <% else %>
        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+        $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
    <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
--- a/app/views/homework_common/start_evaluation_set.js.erb
+++ b/app/views/homework_common/start_evaluation_set.js.erb
@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att',:locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
 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};
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@ -1,10 +1,12 @@
 alert('关闭成功');
 <% if @user_activity_id == -1 %>
 $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+$("#evaluation_end_time_<%=@homework.id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+$("#evaluation_end_time_<%=@user_activity_id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@ -2,5 +2,5 @@
 <%#= watcher_link_issue(@issue, User.current) %>
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
-<%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:button_edit), 'javascript:void(0);', :onclick => 'issueEditShow();', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
+<%#= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@ -1,7 +1,6 @@
 <%= labelled_fields_for :issue, @issue do |f| %>
    <div class="newpro_box">
-      <fieldset class="collapsible">
-        <legend onclick="toggleFieldset(this);"><strong><%= l(:label_change_properties) %></strong></legend>
+      <fieldset class="collapsible" style="border: none">
        <ul class="fl">
          <li>
            <label class="label"><span class="c_red f12">*</span><%= l(:field_status) %>：</label>
@ -54,7 +53,7 @@
          <div class="cl"></div>

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

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

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

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

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

-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
--- a/app/views/issues/delete_journal.js.erb
+++ b/app/views/issues/delete_journal.js.erb
@ -0,0 +1,3 @@
+$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+$(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@ -1,10 +1,28 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true,init_activity: true) %>
+<% end %>
+<style type="text/css">
+    /*回复框*/
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
+    div.ke-container{float:left;}
+</style>
 <script>
    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
        $("input[nhname='date_show']").change(function(){
            if($(this).val()=='创建日期起始' || $(this).val()=='创建日期结束')return;
            $("input[nhname='date_val']",$(this).parent('div')).val($(this).val());
            remote_function();
        });
+
    });
    function remote_function() {
        $("#issue_query_form").submit();
@ -39,144 +57,147 @@


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

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

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

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

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

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

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

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

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

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

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

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

    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户以及资源" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的课程、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
        <input type="hidden" name="search_type" id="type" value="all"/>
        <input type="text" style="display: none;"/>
        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@ -12,9 +12,9 @@
  <%= favicon %>
  <%= javascript_heads %>
  <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+  <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','courses','org' %>
  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
-
+  <%= javascript_include_tag 'attachments' %>
  <%= call_hook :view_layouts_base_html_head %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -247,6 +247,7 @@
      }
  </script>
 </div>
+
 <div id="fade" class="black_overlay">123</div>
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@ -34,7 +34,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @memo.id%>,null,"87%", "<%=@memo.class.to_s%>");
    });

    function del_confirm(){
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@ -27,7 +27,7 @@
        }
    }
    $(function() {
-        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @topic.id%>,null,"85%", "<%=@topic.class.to_s%>");
        showNormalImage('message_description_<%= @topic.id %>');
    });
 </script>
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@ -11,7 +11,7 @@ if($("#reply_message_<%= @message.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @message.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @message.id%>,null,"85%", "<%=@message.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @message.id%>").length >0) {
    $("#reply_to_message_<%= @message.id%>").replaceWith("<p id='reply_message_<%= @message.id%>'></p>");
--- a/app/views/messages/reply.js.erb
+++ b/app/views/messages/reply.js.erb
@ -3,4 +3,4 @@
 <%elsif @course%>
    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@ -642,45 +642,45 @@
              $("#hint").hide();
          }
      });
-//      $("input[name='province']").on('focus', function (e) {
-//          if($(e.target).val() == ''){  //
-//              return;
-//          }
-//          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
-//              return;
-//          }
-//
-//          $.ajax({
-//              url: '<%#= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
-//              type: 'post',
-//              success: function (data) {
-//                  if(data.length != undefined && data.length != 0) {
-//                      var i = 0;
-//                      $("#search_school_result_list").html('');
-//                      for (; i < data.length; i++) {
-//                          link = '<a onclick="window.changeValue(\'' + data[i].school.name.replace(/\s/g," ") + '\',\'' + data[i].school.id + '\')" href="javascript:void(0)">' + data[i].school.name + '</a><br/>';
-//                          $("#search_school_result_list").append(link);
-//                      }
-//                      $("#search_school_result_list").css('left', $(e.target).offset().left);
-//                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
-//                      $("#search_school_result_list").css("position", "absolute");
-//                      $("#search_school_result_list").show();
-//                      if ($(e.target).val().trim() != '') {
-//                          str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
-//                          $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
-//                          $("#hint").show();
-//                      } else {
-//                          $("#hint").hide();
-//                      }
-//                  }else {
-//                      $("#search_school_result_list").html('');
-//                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-//                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
-//                      $("#hint").show();
-//                  }
-//              }
-//          });
-//      });
+      $("input[name='province']").on('focus', function (e) {
+          if( $("input[name='occupation']").val() != ''){ //如果已经有id了。肯定存在，不用去找了。
+              return;
+          }
+
+          $.ajax({
+              url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value+'&page='+page,
+              type: 'post',
+              success: function (data) {
+                  schoolsResult = data.schools;
+                  count = data.count;
+                  maxPage = Math.ceil(count/100) //最大页码值
+                  if(schoolsResult.length != undefined && schoolsResult.length != 0) {
+                      var i = 0;
+                      $("#search_school_result_list").html('');
+                      for (; i < schoolsResult.length; i++) {
+                          link = '<a onclick="window.changeValue(\'' + schoolsResult[i].school.name.replace(/\s/g," ") + '\',\'' + schoolsResult[i].school.id + '\')" href="javascript:void(0)">' + schoolsResult[i].school.name + '</a><br/>';
+                          $("#search_school_result_list").append(link);
+                      }
+                      $("#search_school_result_list").css('left', $(e.target).offset().left);
+                      $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
+                      $("#search_school_result_list").css("position", "absolute");
+                      $("#search_school_result_list").show();
+                      if($(e.target).val().trim() != '') {
+                          str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
+                          $("#hint").show();
+                      }else{
+                          $("#hint").hide();
+                      }
+                  }else{
+                      $("#search_school_result_list").html('');
+                      str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
+                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+                      $("#hint").show();
+                  }
+              }
+          });
+      });

 //    $("#province").leanModal({top: 100, closeButton: ".modal_close"});

--- a/app/views/org_document_comments/_reply_form.html.erb
+++ b/app/views/org_document_comments/_reply_form.html.erb
@ -1,2 +1,2 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
--- a/app/views/org_document_comments/add_reply.js.erb
+++ b/app/views/org_document_comments/add_reply.js.erb
@ -1,3 +1,2 @@
-
 $("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
-init_activity_KindEditor_data(<%= @act.id %>,"","87%");
+init_activity_KindEditor_data(<%= @act.id %>,"","87%", "<%=@act.class.to_s%>");
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@ -15,7 +15,7 @@
        }
    }
 </script>
-<div class="homepageRightBanner mb5">
+<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
  <div class="NewsBannerName">编辑文章</div>
 </div>
 <div class="cl"></div>
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@ -19,7 +19,7 @@
    <% @documents.each do |document| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%");
+                init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first.id %>, null, "87%", "OrgActivity");
            });
        </script>
          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first, :flag => 0} %>
--- a/app/views/org_document_comments/quote.js.erb
+++ b/app/views/org_document_comments/quote.js.erb
@ -3,7 +3,7 @@ if($("#reply_message_<%= @org_comment.id%>").length > 0) {
    $(function(){
        $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
        $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @org_comment.id%>,null,"85%", "<%=@org_comment.class.to_s%>");
    });
 }else if($("#reply_to_message_<%= @org_comment.id %>").length >0) {
    $("#reply_to_message_<%= @org_comment.id%>").replaceWith("<p id='reply_message_<%= @org_comment.id %>'></p>");
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@ -1,7 +1,7 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
 <script>
    $(function() {
-        init_activity_KindEditor_data(<%= @document.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @document.id%>,null,"85%", "<%=@document.class.to_s%>");
        showNormalImage('message_description_<%= @document.id %>');
    });
 </script>
--- a/app/views/organizations/_join_course_menu.html.erb
+++ b/app/views/organizations/_join_course_menu.html.erb
@ -33,7 +33,7 @@
      <div class="courseSendSubmit">
        <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
      </div>
-      <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_courses();" class="sendSourceText">取消</a></div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
    <% end %>
  </div>

@ -87,10 +87,10 @@
            url: "/organizations/"+orgId + "/join_courses?" + $("#join_courses_form").serialize(),
            type: "post",
            success: function (data) {
-                $.ajax({
-                    url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(),
-                    type: "get"
-                });
+//                $.ajax({
+//                    url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(),
+//                    type: "get"
+//                });
            }
        });
    }
--- a/app/views/organizations/_join_project_menu.html.erb
+++ b/app/views/organizations/_join_project_menu.html.erb
@ -33,7 +33,7 @@
        <div class="courseSendSubmit">
          <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" onclick="cancel_join_projects();" class="sendSourceText">取消</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
    <% end %>
  </div>
  <div class="cl"></div>
@ -83,10 +83,10 @@
            url: "/organizations/"+orgId + "/join_projects?" + $("#join_projects_form").serialize(),
            type: "post",
            success: function (data) {
-                $.ajax({
-                    url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(),
-                    type: "get"
-                });
+//                $.ajax({
+//                    url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(),
+//                    type: "get"
+//                });
            }
        });
    }
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@ -2,7 +2,7 @@
    <% org_activities.each do |act| %>
        <script>
            $(function() {
-                init_activity_KindEditor_data(<%= act.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= act.id%>, null, "87%", "<%=act.class.to_s%>");
            });
        </script>
        <% if act.container_type == 'Organization' %>
--- a/Show More
+++ b/Show More