Merge branch 'szzh' into dev_hjq

2015-12-17 17:42:48 +08:00 · 2015-12-17 17:42:48 +08:00 · ef46191c80
parent de229c0f1c 72c475e8a2
commit ef46191c80
89 changed files with 1634 additions and 180 deletions
--- a/4
+++ b/4
@ -44,7 +44,9 @@ group :development do
  gem 'grape-swagger'
  gem 'better_errors', '~> 1.1.0'
  gem 'rack-mini-profiler', '~> 0.9.3'
-  gem  'win32console'
+  if RUBY_PLATFORM =~ /w32/
+    gem  'win32console'
+  end
 end

 group :development, :test do 
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@ -27,7 +27,7 @@ class ExerciseController < ApplicationController
    if @is_teacher || User.current.admin?
      exercises = @course.exercises.order("created_at asc")
    else
-      exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
+      exercises = @course.exercises.where("exercise_status <> 1").order("created_at asc")
    end
    @exercises = paginateHelper exercises,20 #分页
    respond_to do |format|
@ -54,41 +54,26 @@ class ExerciseController < ApplicationController
    end
    @exercise = Exercise.find params[:id]
    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    if @exercise.exercise_status != 2 && (!(User.current.allowed_to?(:as_teacher,@course) || User.current.admin?))
-      render_403
-      return
-    end
    exercise_end = @exercise.end_time > Time.now
    if @exercise.time == -1
      @can_edit_excercise = exercise_end
    else
-      @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end) || User.current.admin?
+      @can_edit_excercise = !has_commit_exercise?(@exercise.id,User.current.id)&& exercise_end
    end
-    @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
-      # 学生点击的时候即创建关联,自动保存
-      #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
-
-    # 已提交问卷的用户不能再访问该界面
-=begin
-    if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
-    else
-=end
-      if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
+    unless @is_teacher
+      @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
+      if @exercise_user.nil?
        eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
        @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
      end
-      # @percent = get_percent(@exercise,User.current)
-      exercise_questions = @exercise.exercise_questions
-      @exercise_questions = paginateHelper exercise_questions,5 #分页
      score = calculate_student_score(@exercise, User.current)
-      eu = get_exercise_user(@exercise.id, User.current.id)
-      eu.update_attributes(:score => score)
-      respond_to do |format|
-        format.html {render :layout => 'base_courses'}
-      end
+      @exercise_user.update_attributes(:score => score)
+    end
+    # @percent = get_percent(@exercise,User.current)
+    @exercise_questions = @exercise.exercise_questions
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
    #end
  end

@ -537,12 +522,9 @@ class ExerciseController < ApplicationController
      # @score = 100
      if @uncomplete_question.count < 1
        # 查看是否有已提交记录
-        eu = get_exercise_user(@exercise.id, User.current.id)
-        eu.user_id = User.current.id
-        eu.exercise_id = @exercise.id
-        eu.score = @score
-        if eu.save
-          #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
+        cur_exercise_user.score = @score
+        if cur_exercise_user.save
+        #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
          @status = 0 #提交成功
        else
          @status = 2 #未知错误
@ -550,6 +532,7 @@ class ExerciseController < ApplicationController
      else
        @status = 1 #有未做得必答题
      end
+      @save = params[:save].to_i if params[:save]
      respond_to do |format|
        format.js
      end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -142,6 +142,13 @@ class IssuesController < ApplicationController
    @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
    @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq

+    #id name email
+    #1. issues list persons
+    #2. project persons
+    @at_persons = @journals.map(&:user) + @issue.project.users
+    @at_persons = @at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
+    @at_persons = nil
+
    respond_to do |format|``
    format.html {
      retrieve_previous_and_next_issue_ids
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@ -223,7 +223,7 @@ class MyController < ApplicationController
    end
    flash.now[:error] = l(:notice_account_old_wrong_password)
  end
-  render :template => 'my/account',:layout=>'base_users_new'
+  render :template => 'my/account',:layout=>'new_base_user'
  end

  # Create a new feeds key
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -30,7 +30,7 @@ class ProjectsController < ApplicationController
  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
  before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
-  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
+  before_filter :require_admin, :only => [ :copy, :unarchive, :destroy, :calendar]
  before_filter :file, :statistics #:watcherlist
  # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
  # before_filter :memberAccess, only: :member
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -270,6 +270,9 @@ class StudentWorkController < ApplicationController
          user_activity.updated_at = Time.now
          user_activity.save
        end
+        course_message = CourseMessage.new(:user_id =>User.current.id,:content=>"new",:course_message_id=>student_work.id,:course_id => @course.id,:course_message_type=>"StudentWork", :status => 9) #作品提交记录
+        course_message.save
+
        @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
        respond_to do |format|
          format.js
@ -299,10 +302,11 @@ class StudentWorkController < ApplicationController
      @submit_result = true
      @work.name = params[:student_work][:name]
      @work.description = params[:student_work][:description]
-      @work.project_id = params[:student_work][:project]
      @work.save_attachments(params[:attachments])
      render_attachment_warning_if_needed(@work)
      if @work.save
+        course_message = CourseMessage.new(:user_id =>User.current.id,:content=>"edit",:course_message_id=>@work.id,:course_id => @course.id,:course_message_type=>"StudentWork", :status => 9) #作品提交记录
+        course_message.save
 =begin
        respond_to do |format|
          format.html {
@ -687,6 +691,7 @@ class StudentWorkController < ApplicationController
    end
    all_student_ids = "(" + @homework.course.student.map{|student| student.student_id}.join(",") + ")"
    all_students = User.where("id in #{all_student_ids}")
+    @commit_student_ids = @homework.student_work_projects.map{|student| student.user_id}
    @users = searchstudent_by_name all_students,name
    respond_to do |format|
      format.js
@ -918,7 +923,7 @@ class StudentWorkController < ApplicationController
  #成绩计算
  def set_final_score homework,student_work
    if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
        if homework.teacher_priority == 1 #教师优先
          if student_work.teacher_score
            student_work.final_score = student_work.teacher_score
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1936,6 +1936,8 @@ module ApplicationHelper
        candown = true
      elsif attachment.container.class.to_s=="StudentWork"
        candown = true
+      elsif attachment.container.class.to_s=="BlogComment"
+        candown = true
      elsif attachment.container.class.to_s == "User"
        candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
      elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
@ -2466,7 +2468,7 @@ module ApplicationHelper
            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
          elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
-          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
          else
            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
@ -2670,4 +2672,38 @@ int main(int argc, char** argv){
      true
    end
  end
+
+  def import_ke(default_opt={})
+    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    ss  = ''
+    if opt[:enable_at]
+      ss = '<script type="text/javascript">'
+      ss += 'window.atPersonLists = [];'
+
+      @at_persons && @at_persons.each_with_index do |person,index|
+        ss += "var o = {id: #{index}, name: '#{person.show_name}', login: '#{person.login}', searchKey: '#{person.get_at_show_name}'};"
+        ss += "atPersonLists.push(o);"
+      end
+
+      ss += "</script>"
+    end
+
+    ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
+    if opt[:enable_at]
+      ss += javascript_include_tag('/assets/kindeditor/at/jquery.caret.min.js', '/assets/kindeditor/at/jquery.atwho.js', '/assets/kindeditor/at/config.js')
+      ss += stylesheet_link_tag("/assets/kindeditor/at/jquery.atwho.css")
+    end
+
+    if opt[:prettify]
+      ss += javascript_include_tag 'prettify'
+      ss += stylesheet_link_tag 'prettify'
+    end
+
+    if opt[:init_activity]
+      ss += javascript_include_tag "init_activity_KindEditor"
+    end
+
+    ss.html_safe
+  end
+
 end
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@ -1,5 +1,5 @@
 class CourseMessage < ActiveRecord::Base
-  # status说明： status在课程不同的类型，区分不同的功能
+  # status说明： status在课程不同的类型，区分不同的功能 status = 9 作品的提交记录
  # HomeworkCommon：status：
  # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败
  attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed, :content, :status
@ -19,7 +19,7 @@ class CourseMessage < ActiveRecord::Base

  def add_user_message
    #unless self.course_message_type == 'JoinCourseRequest'
-      if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil? && self.status != 9
        self.message_alls << MessageAll.new(:user_id => self.user_id)
      end
    #end
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@ -18,10 +18,28 @@ class Memo < ActiveRecord::Base
  #elasticsearch kaminari init
  Kaminari::Hooks.init
  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
-  settings index: { number_of_shards: 5 } do
+  settings index: {
+      number_of_shards: 5 ,
+      analysis: {
+          char_filter: {
+              and_filter: {
+                type: "mapping",
+                mappings: [ "&=> and "]
+             }
+          },
+          analyzer: {
+              my_analyzer: {
+                  type: 'custom',
+                  tokenizer: 'standard',
+                  filter: ['classic'],
+                  char_filter: ['html_strip']
+              }
+          }
+      }
+  } do
    mappings dynamic: 'false' do
-      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :content, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'#, char_filter: 'html_strip'
+      indexes :content, analyzer:'my_analyzer',index_options: 'offsets',search_analyzer: 'smartcn'
      indexes :updated_at,index:"not_analyzed" ,type:'date'
    end
  end
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@ -46,7 +46,7 @@ class StudentWork < ActiveRecord::Base
  #成绩计算
  def set_final_score homework,student_work
    if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
        if homework.teacher_priority == 1 #教师优先
          if student_work.teacher_score
            student_work.final_score = student_work.teacher_score
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -410,11 +410,15 @@ class User < Principal
    else
      name = lastname+firstname
    end
-    name = name.empty? || name.nil? ? login : name
-    name
+    name.empty? || name.nil? ? login : name
  end
  ## end

+  def get_at_show_name
+    name = show_name
+    name = "#{name} #{self.login}" if name != self.login
+  end
+  
  #added by nie
  def count_new_journal_reply
    count = self.journal_reply.count
--- a/app/views/admin/messages.html.erb
+++ b/app/views/admin/messages.html.erb
@ -1,4 +1,6 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false) %>
+<% end %>
 <h3 style="float: left">
  <%=l(:label_system_message)%>
 </h3><br/>
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@ -1,8 +1,7 @@
 <% if @is_destroy%>
    $("#attachment_<%= @attachment.id%>").remove();
-    if(document.getElementById("uploadReviseBox")) {
-        $("#uploadReviseBox").removeClass('disable_link');
-        $("#choose_revise_attach").attr("onclick","_file.click();");
+    if(document.getElementById("revise_attachment_div_<%= @attachment.id%>")) {
+        $("#revise_attachment_div_<%= @attachment.id%>").remove();
    }
 <%else%>
    var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
--- a/app/views/bids/edit.html.erb
+++ b/app/views/bids/edit.html.erb
@ -1,5 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'prettify','/assets/kindeditor/pasteimg' %>
-<%= stylesheet_link_tag 'prettify'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: true) %>
+<% end %>
+
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
    <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
 <% end %>
--- a/app/views/blog_comments/_edit.html.erb
+++ b/app/views/blog_comments/_edit.html.erb
@ -1,9 +1,13 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
+
 <div class="resources mt10">
  <div id="new_course_topic">
    <div class="homepagePostBrief c_grey">
      <div>
-        <input  type="text" value="<%= article.title%>" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255"  onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " />
+        <input  type="text" value="<%= article.title%>" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255"  onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" />
        <p id="subjectmsg"></p>
      </div>
      <div id="topic_editor" style="display: block;">
--- a/app/views/blog_comments/_new.html.erb
+++ b/app/views/blog_comments/_new.html.erb
@ -1,9 +1,12 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
 <div class="resources mt10">
  <div id="new_course_topic">
    <div class="homepagePostBrief c_grey">
      <div>
-        <input  type="text" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" " >
+        <input  type="text" name="blog_comment[title]" id="message_subject" class="InputBox  w713" maxlength="255" onfocus="$('#topic_editor').show()" onkeyup="regexTopicSubject();" placeholder="发布文章，请先输入文章标题" >
        <p id="subjectmsg"></p>
      </div>
      <div id="topic_editor" style="display: none;">
--- a/app/views/blog_comments/_reply_form.html.erb
+++ b/app/views/blog_comments/_reply_form.html.erb
@ -1,4 +1,6 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
 <li>
  <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
      <div style="display: none;"><%= f.text_field :title, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge({ hidden: "hidden"}) %></div>
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor",'blog' %>
+<% end %>

 <script type="text/javascript">
    $(function(){
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@ -27,8 +27,7 @@
    else if (window.attachEvent)
        window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= import_ke(enable_at: false, prettify: false) %>


 <%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <div class="resources mt10">
  <div id="new_course_topic">
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@ -27,8 +27,9 @@
    else if (window.attachEvent)
        window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+<% end %>



--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg', "init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar {
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@ -12,7 +12,11 @@
  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: false, prettify: false, init_activity: true) %>
+<% end %>
+
+
 <script >
    init_KindEditor_data('',80);
 </script>
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@ -89,7 +89,7 @@
      <% end %>
    </ul>
    <% if @course.is_delete == 1 %>
-        <div class="mt30 fr"><img src="/images/pic_del.gif" class="mr5"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
+        <div class="mt30"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
    <% else %>
        <div class="mt30">
          <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@ -1,9 +1,14 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'blog' %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    span.ke-toolbar-icon-url{background-image:url("/images/public_icon.png")}
    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
@ -191,7 +196,7 @@
          <div class="homepagePostReplyInputContainer" style="margin-top: 8px">
            <div nhname='new_message_<%= @article.id%>' style="display:none;">
              <%= form_for 'blog_comment',:url =>  {:action => 'reply',:controller => 'blog_comments',:user_id=>@article.author.id,:blog_id=>@article.blog_id, :id => @article.id},:method => "post",:html => {:multipart => true, :id => 'message_form'} do |f|%>
-                  <input type="hidden" name="course_id" value="<%= @course.id%>"
+                  <input type="hidden" name="course_id" value="<%= @course.id%>">
                <input type="hidden" name="blog_comment[title]" value="RE:<%= @article.title%>">
                  <input type="hidden" name="blog_comment[sticky]" value="0">
                  <input type="hidden" name="quote[quote]" value="">
--- a/app/views/exercise/_commit_alert.html.erb
+++ b/app/views/exercise/_commit_alert.html.erb
@ -1,12 +1,15 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
-  <% if status == 0 && exercise.time != -1%>
+  <% if @save == 1 %>
+      <h3 style="font-weight: normal;color: green">保存成功，测验日期截止前您还可以继续答题。</h3>
+      <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
+  <% elsif status == 0 && exercise.time != -1%>
      <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
      <%= link_to "确定", exercise_path(),:class => 'commit'%>
  <% elsif status == 0 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S") %>
-      <h3 style="font-weight: normal;color: green">提交成功!</h3>
+      <h3 style="font-weight: normal;color: green">提交成功，测验日期截止前您还可以修改，祝您考高分。</h3>
      <%= link_to "确定", exercise_index_path(:course_id => @course.id),:class => 'commit'%>
  <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") > Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
-      <h3 style="font-weight: normal;color: red">保存成功!</h3>
+      <h3 style="font-weight: normal;color: red">提交成功，您还有未完成的题目，测验日期截止前您还可以继续答题，祝您考高分。</h3>
      <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => 'commit'%>
  <% elsif status == 1 && Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") <= Time.now.strftime("%Y-%m-%d %H:%M:%S")%>
      <h3 style="font-weight: normal;color: red">时间已到!</h3>
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@ -24,11 +24,11 @@
        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
    <%# end%>
    <% if exercise.exercise_status == 1 %>
-        <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_pu fr mr10 ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
    <% elsif exercise.exercise_status == 2%>
-        <li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
+        <li><a href="javascript:" class="pollsbtn btn_de fr mr10 ml5" onclick="republish_exercise(<%= exercise.id%>,<%=index.to_i %>);">取消发布</a></li>
    <% else%>
-        <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+        <li class="pollsbtn fr mr10 pollsbtn_grey ml5">发布试卷</li>
    <% end%>

    <% if exercise.exercise_status == 1%>
@ -42,18 +42,24 @@
    <% if exercise.exercise_status == 1 %>
        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <% else%>
+    <% elsif exercise.exercise_status == 2 %>
        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
        <li class="polls_date fr">已发布</li>
+    <% else %>
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已截止</li>
    <% end%>

 <% else%>
-    <% if exercise.exercise_status == 2%>
+    <% if exercise.exercise_status != 1%>
        <%# if has_commit%>
            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
            <li class="pollsbtn_tip fl ml5">已答</li-->
        <%#else%>
-            <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <% if exercise.end_time <= Time.now && has_commit_exercise?(exercise.id, User.current.id) %>
+            <li class="pollsbtn_tip fl ml5">已答</li>
+        <% end %>
        <%#end%>
    <% end%>
    <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@ -3,10 +3,6 @@
        $("#RSide").removeAttr("id");
        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
        $("#Container").css("width","1000px");
-        <%uncomplete_question =get_uncomplete_question(exercise, User.current) %>;
-        <% if (uncomplete_question.count < 1) %>
-            $("#exercise_submit_btn").html("提交");
-        <% end %>
        var end_time = <%=exercise.end_time.to_i%>;
        getTime(end_time);
        /*start_time = new Date();
@ -104,11 +100,6 @@
                                              {
                                                  obj.checked = false;
                                              }
-                                              if(dataObj.complete == 1) {
-                                                  $("#exercise_submit_btn").html("提交");
-                                              } else {
-                                                  $("#exercise_submit_btn").html("保存");
-                                              }
                                          }
                                      });
                                  }
@ -163,11 +154,6 @@
                                              {
                                                  obj.checked = false;
                                              }
-                                              if(dataObj.complete == 1) {
-                                                  $("#exercise_submit_btn").html("提交");
-                                              } else {
-                                                  $("#exercise_submit_btn").html("保存");
-                                              }
                                          }
                                      });
                                  }
@ -210,11 +196,6 @@
                              success: function (data) {
                                  var dataObj = eval(data);
                                  obj.value = dataObj.text;
-                                  if(dataObj.complete == 1) {
-                                      $("#exercise_submit_btn").html("提交");
-                                  } else {
-                                      $("#exercise_submit_btn").html("保存");
-                                  }
                              }
                          });

@ -228,7 +209,8 @@
      <% end %>
    </div>
    <div class="ur_buttons">
-      <%= link_to "保存",commit_exercise_exercise_path(exercise),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
+      <%= link_to "保存",commit_exercise_exercise_path(exercise,:save => 1),:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:format => 'js',:remote=>true %>
+      <%= link_to "提交",commit_exercise_exercise_path(exercise), :data => {:confirm => "您确定要提交吗？"},:id=>"exercise_submit_btn", :method => :post,:class => "ur_button_submit",:style => "margin-left:20px;",:format => 'js',:remote=>true %>
    </div>
    <div class="cl"></div>
    <!--contentbox end-->
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@ -78,7 +78,7 @@
                    <% else %>
                        ×
                    <% end %></span><br />
-                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                  标准答案：<%= convert_to_char(standard_answer.first.exercise_choice_id.to_s) if !standard_answer.empty? %>
                </div>
                <div class="cl"></div>
                <div class="ur_inputs">
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@ -33,6 +33,19 @@
        }).mouseleave(function(){
            $("#work_click_<%= exercise.id%>").hide();
        });
+        $(function(){
+            <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+                $("#show_student_result_div").on('click',show_result);
+            <% else %>
+                $("#show_student_result_div").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+                $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+            <% end %>
+        });
+        function show_result() {
+            window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+        }
    </script>
    <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
      <li class="hworkList340 width530">
@ -40,22 +53,16 @@
          <li class="hworkPortrait mt15 mr10">
            <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
          </li>
-          <div onclick="" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
+          <div id="show_student_result_div" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
            <li>
              <ul class="mt10 fl">
-                <li class="hworkStName mr15 mt16" title="姓名">
-                  <% name = exercise.user.show_name %>
-                  <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
-                    <%= link_to name,show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>
-                  <% else %>
-                    <span title="截止日期未到，暂不能查看学生答题结果。"><%=name%></span>
-                      <%#= link_to name,'',:title=>"截止日期未到，暂不能查看学生答题结果。" %>
-                  <% end %>
+                <li class="hworkStName mr15 mt16" title="姓名" id="student_name_<%= exercise.id%>">
+                  <%=exercise.user.show_name %>
                </li>
-                <li class="hworkStID mr10 mt16" title="学号">
+                <li class="hworkStID mr10 mt16" title="学号" id="student_id_<%= exercise.id%>">
                  <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
                </li>
-                <li class="hworkStID mt16" title="班级">
+                <li class="hworkStID mt16" title="班级"  id="student_class_<%= exercise.id%>">
                  --
                </li>
              </ul>
@ -63,7 +70,7 @@
          </div>
        </ul>
      </li>
-      <li class="hworkList130 c_grey student_work_<%= exercise.id%>" onclick="" style="cursor: pointer;">
+      <li class="hworkList130 c_grey student_work_<%= exercise.id%>">
        <% if exercise.created_at%>
            <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
        <% end %>
--- a/app/views/exercise/commit_exercise.js.erb
+++ b/app/views/exercise/commit_exercise.js.erb
@ -1,6 +1,5 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
 showModal('ajax-modal', '270px');
-$('#ajax-modal').css('height','110px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
        "<a href='javascript:' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
--- a/app/views/exercise/edit.html.erb
+++ b/app/views/exercise/edit.html.erb
@ -1 +1,9 @@
 <%= render :partial => 'exercise_form'%>
+<script type="text/javascript">
+  $(function() {
+      <% if @exercise.exercise_name != "" && @exercise.end_time != "" %>
+        $("#polls_head_show").show();
+        $("#polls_head_edit").hide();
+      <% end %>
+  });
+</script>
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@ -1,5 +1,8 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>

-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %>
 <script>


--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@ -5,7 +5,8 @@
 <% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
 <h1 style="margin-top: 2%; margin-left: 49%"><%= l :label_forum_new %></h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <%= render 'form_create_mode' %>

 <%#= link_to l(:button_back), forums_path %>
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>
+

 <div class="postRightContainer">
  <div id="create_memo_div" style="display: none">
@ -115,10 +119,7 @@
            $.ajax({
                url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
                type:'post',
-                data:{
-                    'memo[content]':$("#memo_content").val(),
-                    'memo[subject]':$("#memo_subject").val()
-                },
+                data:$("#new_memo").serialize(),
                success:function(data){

                },
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
    <%= error_messages_for 'issue', 'time_entry' %>
    <%= render :partial => 'conflict' if @conflict %>
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@ -8,7 +8,7 @@
          <% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
          <% unless issue.author.nil? || issue.author.name == "Anonymous" %>
              <span class ="<%= get_issue_type(column_content[1])[0] %>" title="<%= get_issue_type(column_content[1])[1] %>"></span>
-            <div class="problem_txt fl">
+            <div class="problem_txt fl w600">
                <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
              <div class="problem_tit_div fl break_word">
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
 <div class="project_r_h" xmlns="http://www.w3.org/1999/html">
  <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+<%= import_ke(enable_at: true) %>
+<% end %>
+
 <div class="project_r_h">
  <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -188,10 +188,10 @@
          <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
        </div>
        <% end %>
-        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
+        <% unless show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count) %>
        <div class="subNav">
          <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
-          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
+          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
          <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
        </div>
        <% end %>
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@ -10,7 +10,10 @@
 		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %>
+
+        <%= import_ke(enable_at: false, prettify: true, init_activity: false) %>
+
+
 		<%= heads_for_theme %>

 		<%= call_hook :view_layouts_base_html_head %>
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -14,6 +14,7 @@
  <%= heads_for_theme %>
  <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
+
  <%= call_hook :view_layouts_base_html_head %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@ -1,4 +1,9 @@
-<%= javascript_include_tag 'new_user','/assets/kindeditor/pasteimg','/assets/kindeditor/kindeditor'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag 'new_user' %>
+<% end %>
+
+
 <script>

  function check_and_submit(){
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@ -4,8 +4,12 @@
   @nav_dispaly_main_contest_label = 1 %>
 <% @nav_dispaly_forum_label = 1%>
 <!-- <h1>New memo</h1> -->
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-    <div class="top-content">
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+
+<div class="top-content">
        <table>
            <tr>
                <td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@ -1,4 +1,9 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor","forum" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag 'forum' %>
+<% end %>
+
+
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+

 <script type="text/javascript">
    $(function(){
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 <% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %>
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@ -30,7 +30,7 @@
          <li>&nbsp;&nbsp;</li>
        </ul>
        <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
          <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>

          <li>
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <li>
    <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
    <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="project_r_h">
  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
--- a/app/views/news/_project_form.html.erb
+++ b/app/views/news/_project_form.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <li>
  <label style="float: left"><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
  <input  type="text" name="news[title]" class="hwork_input_news fl" id="news_title" width="576px" onblur="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="project_r_h">
  <h2 class="project_h2"><%= l(:label_course_news) %></h2>
 </div>
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
    function check_org_title()
    {
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
    function check_org_title(title)
    {
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
--- a/app/views/org_document_comments/new.html.erb
+++ b/app/views/org_document_comments/new.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <script>
    function check_org_title()
    {
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<%= javascript_include_tag 'blog' %>
+<% end %>
+
 <script>
    $(function() {
        init_activity_KindEditor_data(<%= @document.id%>,null,"85%");
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@ -1,5 +1,9 @@
 <%= javascript_include_tag "jquery.infinitescroll.js" %>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@ -11,7 +11,10 @@
    div.recall_con{width:570px;}
    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
  <% reply_allow = JournalsForMessage.create_by_user? User.current %>
  <h4><%= l(:label_user_response) %></h4>
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@ -1,6 +1,6 @@
 <ul class="hworkUl">
  <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr140 ml50'%>">作品名称</span>
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr150 ml50'%>">作品名称</span>
    <% if @homework.homework_type != 3 %>
        <span class="c_dark f14 fb fl mr50">姓名</span>
        <span class="c_dark f14 fb fl">学号</span>
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -12,7 +12,7 @@
          <li class="hworkPortrait mt15 mr10">
            <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
          </li>
-          <li class="hworkName mt15 mr15 width285 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
            <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
            <div>
              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
@ -40,7 +40,7 @@
          <li class="hworkPortrait mt15 mr10">
            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
          </li>
-          <li class="hworkName mt15 mr15 width285 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
            <div>
              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
            </div>
--- a/app/views/student_work/_new_student_work_alert.html.erb
+++ b/app/views/student_work/_new_student_work_alert.html.erb
@ -2,7 +2,11 @@
  <div class="ni_con_work">
    <p>
      当前作业
-      <span class="c_pink">已开启匿评</span>
+      <% if @homework.homework_detail_manual.comment_status == 2 %>
+        <span class="c_pink">已开启匿评</span>
+      <% elsif @homework.homework_detail_manual.comment_status == 3 %>
+        <span class="c_pink">已关闭匿评</span>
+      <% end %>
      您提交作品后将
      <span class="c_pink">不会收到任何匿评作品</span>,
      您的作品也
--- a/app/views/student_work/_revise_attachment.html.erb
+++ b/app/views/student_work/_revise_attachment.html.erb
@ -4,7 +4,7 @@
        <div class="resubAtt mb15">
          <span class="resubTitle">追加修订附件</span>
        </div>
-        <div class="mb10">
+        <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
          <span class="tit_fb"> 追加附件：</span>
          <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)
@ -15,7 +15,7 @@
          <span class="resubTitle">追加修订附件</span>
        </div>
        <% if revise_attachment %>
-            <div class="mb10">
+            <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
              <span class="tit_fb"> 追加附件：</span>
              <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@ -46,7 +46,12 @@
        <% if @homework.homework_detail_group.base_on_project == 1 %>
            <li>
              <span class="tit_fb"> 关联项目：</span>
-              <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+              <% if work.project.is_public || User.current.member_of?(work.project) || User.current.admin? %>
+                  <%= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
+              <% else %>
+                  <span title ="该项目是私有的"><%=work.project.name %></span>
+              <% end %>
+              <%#= link_to( work.project.name, project_path(work.project.id), :class => "linkBlue" )%>
              <span class="ml5">(综合评分：<font class="c_red"><%=work.project.project_score.score.to_i %></font>)</span>
            </li>
        <% end %>
--- a/app/views/student_work/search_course_students.js.erb
+++ b/app/views/student_work/search_course_students.js.erb
@ -18,7 +18,7 @@ $("#all_students_list").empty();
        }
    }
 }
-    <% if user.id.to_i != User.current.id.to_i %>
+    <% if user.id.to_i != User.current.id.to_i && (@commit_student_ids.find{|e| e.to_i == user.id.to_i}).nil? %>
        if (str.indexOf(<%=user.id.to_s %>) < 0) {
            $("#student_<%=user.id %>").one("click",function choose_student() {
                var li = "<li id='choose_student_<%=user.id %>'";
@ -29,5 +29,9 @@ $("#all_students_list").empty();
                $("#choose_students_list").append(li);
            });
        }
+    <% else %>
+        if (str.indexOf(<%=user.id.to_s %>) < 0) {
+            $("#student_<%=user.id %>").attr("title","该学生已加入其它分组");
+        }
    <% end %>
 <% end %>
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@ -51,7 +51,7 @@
          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
      <% end %>
      <div class="homepagePostSubmitContainer">
-        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 %>
+        <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%>
            <% projects = cur_user_projects_for_homework activity %>
            <% works = cur_user_works_for_homework activity %>
            <% if works.nil? && projects.nil? %>
@ -105,8 +105,8 @@
        </div>
        <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
            <div class="mr10 mb10 fl">
-              <% project = Project.find pro.project_id || User.current.member_of?(project) || User.current.admin? %>
-              <% if project.is_public || project.user_id == User.current.id %>
+              <% project = Project.find pro.project_id %>
+              <% if project.is_public || User.current.member_of?(project) || User.current.admin?%>
                <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
              <% else %>
                <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@ -55,7 +55,7 @@
  <% end %>
  <div class="cl"></div>
  <span class="fl fontGrey2" id="relate_project_show">
-    <% if @homework %>
+    <% if @homework && @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
        <% unless @homework.student_work_projects.where("user_id = #{User.current.id}").empty? %>
            <% project = Project.find @homework.student_work_projects.where("user_id = #{User.current.id}").first.project_id %>
            关联项目：<%=project.name %>
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@ -49,7 +49,7 @@
          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
      <% end %>
      <div class="homepagePostSubmitContainer">
-        <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1%>
+        <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(homework_common.course) %>
            <% projects = cur_user_projects_for_homework homework_common %>
            <% works = cur_user_works_for_homework homework_common %>
            <% if works.nil? && projects.nil? %>
@ -108,8 +108,8 @@
            <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
                <div class="mr10 mb10 fl">
                  <% project = Project.find pro.project_id %>
-                  <% if project.is_public == 1 || User.current.member_of?(project) || User.current.admin? %>
-                      <%=link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name) %>
+                  <% if project.is_public || User.current.member_of?(project) || User.current.admin? %>
+                      <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:alt =>"项目头像" %>
                  <% else %>
                      <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius") %>
                  <% end %>
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@ -1,5 +1,6 @@
 <% content_for :header_tags do %>
-    <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+
    <%= javascript_include_tag 'homework','baiduTemplate' %>
    <script type="text/javascript">
      $(function(){
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@ -1,4 +1,7 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@ -11,7 +11,10 @@
  div.recall_con{width:570px;}
  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
 <div class="dis">
  <div class="msg_box" id='leave-message'>
    <% reply_allow = JournalsForMessage.create_by_user? User.current %>
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@ -180,7 +180,7 @@
          <div  style="display: none" class="message_title_red system_message_style">
            <p>
              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经被关闭了匿评。作业信息如下：
+              该作业已经关闭了匿评。作业信息如下：
            </p>
            <ul class="ul_grey">
              <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@ -1,4 +1,8 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= javascript_include_tag "user" %>
+<% end %>
+
 <style type="text/css">
    /*回复框*/
    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@ -1,5 +1,6 @@
 module RailsKindeditor
  module Helper
+    EVAL_STR = %Q|eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin("autoheight")})|

    def kindeditor_tag(name, content = nil, options = {})
      id = sanitize_to_id(name)
@ -9,7 +10,7 @@ module RailsKindeditor
      output << text_area_tag(name, content, input_html)
      output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                            :autoHeightMode=>true,
-                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                            afterCreate: EVAL_STR,
                                                            emotionsBasePath: 'http://' + Setting.host_name
                                                            )))
    end
@ -22,7 +23,7 @@ module RailsKindeditor
      output_buffer << build_text_area_tag(name, method, self, options, input_html)
      output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                 :autoHeightMode=>true,
-                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                                                afterCreate: EVAL_STR,
                                                                                emotionsBasePath: 'http://' + Setting.host_name
                                                                                )))
    end
--- a/public/assets/kindeditor/at/config.js
+++ b/public/assets/kindeditor/at/config.js
@ -0,0 +1,38 @@
+function enableAt(_editor) {
+    var editor = _editor;
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+
+    var ifr = editor.edit.iframe[0];
+    var doc = ifr.contentDocument || iframe.contentWindow.document;
+    var ifrBody = doc.body;
+    ifrBody.contentEditable = true;
+    console.log("enable at");
+
+    $.fn.atwho.debug = true;
+    if(!atPersonLists){
+        return;
+    }
+    var names = atPersonLists;
+
+    //var names = ["Jacob","Isabella","Ethan","Emma","Michael","Olivia","Alexander","Sophia","William","Ava","Joshua","Emily","Daniel","Madison","Jayden","Abigail","Noah","Chloe","你好","你你你", "가"];
+    //
+    //var names = $.map(names,function(value,i) {
+    //    return {'id':i,'name':value,'email':value+"@email.com"};
+    //});
+
+    var at_config = {
+        at: "@",
+        data: names,
+        insertTpl: '<span style="color:#269ac9">@${name}(${login})</span>',
+        displayTpl: "<li>${name} <small>${login}</small></li>",
+        searchKey: 'searchKey',
+        limit: 200
+    }
+
+    $inputor = $(ifrBody).atwho(at_config);
+    window.aaa= $inputor;
+    $inputor.caret('pos', 47);
+    $inputor.focus().atwho('run');
+};
--- a/public/assets/kindeditor/at/jquery.atwho.css
+++ b/public/assets/kindeditor/at/jquery.atwho.css
@ -0,0 +1,49 @@
+.atwho-view {
+    position:absolute;
+    top: 0;
+    left: 0;
+    display: none;
+    margin-top: 18px;
+    background: white;
+    color: black;
+    border: 1px solid #DDD;
+    border-radius: 3px;
+    box-shadow: 0 0 5px rgba(0,0,0,0.1);
+    min-width: 120px;
+    max-height: 200px;
+    overflow: auto;
+    z-index: 11110 !important;
+}
+
+.atwho-view .cur {
+    background: #3366FF;
+    color: white;
+}
+.atwho-view .cur small {
+    color: white;
+}
+.atwho-view strong {
+    color: #3366FF;
+}
+.atwho-view .cur strong {
+    color: white;
+    font:bold;
+}
+.atwho-view ul {
+    /* width: 100px; */
+    list-style:none;
+    padding:0;
+    margin:auto;
+}
+.atwho-view ul li {
+    display: block;
+    padding: 5px 10px;
+    border-bottom: 1px solid #DDD;
+    cursor: pointer;
+    /* border-top: 1px solid #C8C8C8; */
+}
+.atwho-view small {
+    font-size: smaller;
+    color: #777;
+    font-weight: normal;
+}
--- a/public/assets/kindeditor/at/jquery.atwho.js
+++ b/public/assets/kindeditor/at/jquery.atwho.js
--- a/public/assets/kindeditor/at/jquery.atwho.min.js
+++ b/public/assets/kindeditor/at/jquery.atwho.min.js
--- a/public/assets/kindeditor/at/jquery.caret.min.js
+++ b/public/assets/kindeditor/at/jquery.caret.min.js
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@ -598,11 +598,11 @@ function regex_evaluation_end(){
    }
    var evaluation_start_time = new Date(evaluation_start);
    var evaluation_end_time = new Date(evaluation_end);
-    if(evaluation_end_time > evaluation_start_time){
+    if(evaluation_end_time >= evaluation_start_time){
        $("#homework_evaluation_end_time").text("");
        return true;
    }else{
-        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能小于开启匿评日期");
        return false;
    }
 }
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){

    div_form = $("div[nhname='new_message_" + id + "']");
    $(".ke-edit", div_form).css("height","33px");
+    $(".ke-edit-iframe",div_form).css("height","33px");
 }
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@ -213,11 +213,11 @@ function regex_evaluation_end(){
    }
    var evaluation_start_time = new Date(evaluation_start);
    var evaluation_end_time = new Date(evaluation_end);
-    if(evaluation_end_time > evaluation_start_time){
+    if(evaluation_end_time >= evaluation_start_time){
        $("#homework_evaluation_end_time").text("");
        return true;
    }else{
-        $("#homework_evaluation_end_time").text("关闭匿评日期必须大于开启匿评日期");
+        $("#homework_evaluation_end_time").text("关闭匿评日期不能小于开启匿评日期");
        return false;
    }
 }
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@ -83,6 +83,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width180{width: 180px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
+.width255{width: 255px;}
 .width530{width: 530px;}
 .mr95{margin-right: 95px;}
 .mr140 {margin-right: 140px;}
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@ -145,7 +145,7 @@ a:hover.btn_pu{ background:#3cb761;}

 /*问卷提交时弹出框*/
 .alert_box{width:250px;height:180px;position:fixed !important;z-index:100;left:60%;top:65%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.commit{height: 28px;display: block;width: 80px;color: #fff !important;background: #15bccf;text-align: center;padding-top: 4px;margin-left: 60px;margin-top: 4px;margin-right: 10px;}
+.commit{font-size: 1.2em;height: 28px;display: block;width: 80px;color: #fff !important;background: #15bccf;text-align: center;padding-top: 4px;margin-left: 70px;margin-top: 4px;margin-right: 10px;}
 /******确定弹框***********/
 .poll_alert_form{width:140px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .polls_alert_btn_box{width: 100%;margin: 0 auto;padding-left: 45px;}
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -145,7 +145,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w583{ width:583px;}
 .w350{ width:350px;}
 .w610{ width:610px;}
-.w600{ width:600px;}
+.w600{ width:600px !important;}
 .h20{height: 20px;}
 .h22{ height:22px;}
 .h26{ height:26px;}