diff --git a/app/assets/javascripts/debates.js.coffee b/app/assets/javascripts/debates.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/debates.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/debates.css.scss b/app/assets/stylesheets/debates.css.scss
new file mode 100644
index 000000000..6c45b3be9
--- /dev/null
+++ b/app/assets/stylesheets/debates.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the debates controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index aef0170ff..375596075 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -132,6 +132,8 @@ class ChallengesController < ApplicationController
             end
         end
         @index = params[:position].to_i - 1
+        # 发起重置请求
+        shixun_modify_status_without_publish(@shixun, 1)
         respond_to do |format|
           format.js
         end
@@ -157,6 +159,8 @@ class ChallengesController < ApplicationController
           answer = params[:choice][:answer][index] == "0" ? false : true
           ChallengeQuestion.create(:option_name => test, :challenge_choose_id => @challenge_choose.id, :position => index, :right_key => answer)
         end
+        # 发起重置请求
+        shixun_modify_status_without_publish(@shixun, 1)
         @challenge_choose.challenge_tags.delete_all unless @challenge_choose.challenge_tags.blank?
         unless params[:knowledge].blank?
           params[:knowledge][:input].each do |input|
@@ -197,7 +201,8 @@ class ChallengesController < ApplicationController
   def destroy_challenge_choose
     @challenge_choose = ChallengeChoose.where(:id => params[:choose_id]).first
     @challenge_choose.destroy
-
+    # 发起重置请求
+    shixun_modify_status_without_publish(@shixun, 1)
     redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun)
   end
 
@@ -255,7 +260,7 @@ class ChallengesController < ApplicationController
             end
           end
           # 向jenkins端发送请求，构建公共测试用例
-          add_shixun_modify_status(@shixun, 1)
+          shixun_modify_status_publish(@shixun, 1)
         elsif params[:tab].to_i == 5
           @challenge_tags.delete_all unless @challenge_tags.blank?
           unless params[:knowledge].blank?
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 887b24d06..9eef2c48f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -36,8 +36,9 @@ class CoursesController < ApplicationController
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
   require 'bundler/setup'
-  require 'simple_xlsx_reader'
-
+  if RUBY_PLATFORM =~ /linux/
+    require 'simple_xlsx_reader'
+  end
   # params[:search] 搜索课程的名称
   # params[:select] "join" "create" "all" 参与的 创建的 所有的课程
   #
@@ -103,6 +104,17 @@ class CoursesController < ApplicationController
     @import_attachments = Attachment.where(:container_id => @course.id, :container_type => "ImportStudent")
   end
 
+  def shixun_statistics
+    @homeworks = @course.homework_commons.where("homework_type = 4").order("created_at asc")
+    filename="#{format_date(Time.now)}_#{@course.teacher.show_real_name.to_s}_#{@course.name}_实训数据报告";
+
+    respond_to do |format|
+      format.xls {
+        send_data(shixun_xls(@homeworks,@course), :type => 'application/octet-stream', :filename => filename_for_content_disposition("#{filename}.xls"))
+      }
+    end
+  end
+
   # REDO：性能需要优化，这块是管理员后台任务，不影响用户使用
   def sync_students
     school_id = User.find(@course.tea_id).try(:user_extensions).try(:school_id)
@@ -1988,6 +2000,87 @@ class CoursesController < ApplicationController
     @results = paginateHelper @results, @limit
   end
 
+  def shixun_xls homeworks, course
+    xls_report = StringIO.new
+    book = Spreadsheet::Workbook.new
+    blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
+    black = Spreadsheet::Format.new :color => :black, :weight => :bold, :size => 10
+    current_row = 0
+    homeworks.each_with_index do |homework, i|
+      sheet = book.create_worksheet :name => "第#{i+1}次作业"
+      sheet.row(0).default_format = blue
+      sheet[0,0] = "课堂编号"
+      sheet[0,1] = "主讲老师"
+      sheet[0,2] = "课堂名称"
+      sheet[0,3] = "作业编号"
+      sheet[0,4] = "作业/实训名称"
+      sheet[0,5] = "关卡"
+      sheet[0,6] = "学生id"
+      sheet[0,7] = "学生姓名"
+      sheet[0,8] = "经验值"
+      sheet[0,9] = "金币"
+      sheet[0,10] = "评测历史"
+      sheet[0,11] = "评测时间"
+      sheet[0,12] = "评测结果"
+      sheet[1,0] = course.id
+      sheet[1,1] = course.teacher.show_real_name
+      sheet[1,2] = course.name
+      sheet[1,3] = "# #{i + 1}"
+      sheet[1,4] = homework.name
+      current_row = 1
+      shixun = homework.homework_commons_shixuns.shixun if homework.homework_commons_shixuns
+      if shixun
+        shixun.challenges.each_with_index do |challenge, j|
+          sheet[current_row,5] = "第#{j+1}关"
+          games = Game.where(:challenge_id => challenge.id, :user_id => homework.student_works.where("work_status != 0").map(&:user_id))
+          count_exp_score = 0
+          count_gold_score = 0
+          count_test = 0
+          count_time = 0
+          if games.count > 0
+            games.each do |game|
+              user = game.user
+              sheet[current_row,6] = user.login
+              sheet[current_row,7] = user.show_real_name
+              sheet[current_row,8] = game.final_score ? "+#{game.final_score.to_s} 经验值" : "--"
+              count_exp_score = count_exp_score + (game.final_score ? game.final_score.to_i : 0)
+              sheet[current_row,9] = game.final_score ? (game.answer_open? ? "#{-challenge.score.to_i} 金币" : "+#{game.final_score.to_i} 金币") : "--"
+              count_gold_score = count_gold_score + (game.final_score ? (game.answer_open? ? -challenge.score.to_i : game.final_score.to_i) : 0)
+
+              count = game.outputs.count
+              if count > 0
+                outputs = game.outputs.where(:test_set_position => 1).order("created_at asc")
+                outputs.each_with_index do |output, k|
+                  count_test = count_test + 1
+                  sheet[current_row,10] = "第#{k+1}次评测"
+                  sheet[current_row,11] = k == 0 ? game_spend_time((output.created_at - game.created_at).to_i) : game_spend_time((output.created_at - outputs[k-1].created_at).to_i)
+                  count_time = count_time + (k == 0 ? (output.created_at - game.created_at).to_i : (output.created_at - outputs[k-1].created_at).to_i)
+                  sheet[current_row,12] = game.outputs.where(:query_index => output.query_index).select{|ou| ou.result == false}.count > 0 ? "失败" : "成功"
+                  current_row = current_row + 1
+                end
+              else
+                current_row = current_row + 1
+              end
+            end
+          else
+            current_row = current_row + 1
+          end
+
+          sheet[current_row,6] = "合计"
+          sheet[current_row,7] = games.count.to_s + "人"
+          sheet[current_row,8] = count_exp_score >= 0 ? "+#{count_exp_score} 经验值" : "-#{count_exp_score} 经验值"
+          sheet[current_row,9] = count_gold_score >= 0 ? "+#{count_gold_score} 金币" : "-#{count_gold_score} 金币"
+          sheet[current_row,10] = "共#{count_test}次评测"
+          sheet[current_row,11] = game_spend_time((count_time == 0 ? 0 : (count_time / count_test)).to_i)+"/次"
+          sheet.row(current_row).default_format = black
+          current_row = current_row + 1
+        end
+      end
+    end
+    book.write xls_report
+    xls_report.string
+  end
+
   def member_to_xls homeworks, course, members,groups
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
new file mode 100644
index 000000000..5e442e4bb
--- /dev/null
+++ b/app/controllers/debates_controller.rb
@@ -0,0 +1,2 @@
+class DebatesController < ApplicationController
+end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index ed646354c..337f951aa 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -119,8 +119,10 @@ class ForumsController < ApplicationController
   end
 
   def index
-    order = ""
+    order = "sticky desc, created_at desc"
     @order_str = ""
+    @user = User.current
+=begin
     if(params[:reorder_complex])
       order = "replies_count #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
       @order_str = "reorder_complex="+params[:reorder_complex]
@@ -134,6 +136,7 @@ class ForumsController < ApplicationController
       order = "#{Memo.table_name}.updated_at desc"
       @order_str = "reorder_time=desc"
     end
+=end
     @memo = Memo.new(:forum => @forum)
     @memos = Memo.where("parent_id is null")
     @topic_count = @memos.count
@@ -148,10 +151,13 @@ class ForumsController < ApplicationController
     @my_forums_count = Memo.where("author_id =? and parent_id is null", User.current.id).count
     @my_memos_count =  Memo.where("author_id =? and parent_id is not null", User.current.id).count
     @errors = params[:errors]
+    memos_id = Memo.where("author_id =?", User.current.id).map(&:id)
+    @memos_praise_count = PraiseTread.where(:praise_tread_object_id => memos_id, :praise_tread_object_type => "Memo").count
+
     respond_to do |format|
       format.js
       format.html {
-        render :layout => 'base_new_forum'
+        render :layout => 'base_edu'
       }# show.html.erb
       format.json { render json: @forum }
     end
@@ -181,13 +187,10 @@ class ForumsController < ApplicationController
     end
     @memo = Memo.new(:forum => @forum)
     @topic_count = @forum.topics.count
-    @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
-    @memos = @forum.topics.includes(:last_reply).
-                    limit(@topic_pages.per_page).
-                    offset(@topic_pages.offset).
-                    reorder(order).
-                    preload(:author, {:last_reply => :author}).
-                    all
+    @limit = 20
+    @is_remote = true
+    @topic_pages = Paginator.new @topic_count, @limit, params['page'] || 1
+    @memos =  paginateHelper @forum.topics.includes(:last_reply).reorder(order).preload(:author, {:last_reply => :author}), @limit
     @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and parent_id is null").count
     @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and parent_id is not null").count
     @errors = params[:errors]
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 69194f1f8..cc68070d3 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -316,9 +316,9 @@ class GamesController < ApplicationController
     answer_right = []
     @game_challenge.challenge_chooses.each_with_index do |choose, index|
       correct = (params[:answer][index] == choose.standard_answer) ? true : false
-      if choose.current_choose_outputs.blank?
-        ChooseOutputs.create(:challenge_choose_id => choose.id, :user_id => User.current.id, :answer => params[:answer][index], :correct => correct)
-      end
+      #choose.current_choose_outputs.delete if choose.current_choose_outputs.present?
+      #ChooseOutputs.create(:challenge_choose_id => choose.id, :user_id => User.current.id, :answer => params[:answer][index], :correct => correct)
+      Output.create(:game_id => @game.id, :test_set_position => choose.position, :actual_output =>  params[:answer][index], :result => correct, :query_index => @game.query_index)
       if @shixun.status > 1 && !@game.answer_open
         if correct
           score += choose.score
@@ -332,14 +332,15 @@ class GamesController < ApplicationController
       end
       answer_right << correct
     end
-    @game.update_attributes(:status => 2, :end_time => Time.now)
     @had_done = @game.had_done
-    reward_grade(@game.user, @game.id, 'Game', score)
-    reward_experience(@game.user, @game.id, 'Game', score)
-    @game.update_attribute(:final_score, score)
-
+    if @right
+      @game.update_attributes(:status => 2, :end_time => Time.now)
+      reward_grade(@game.user, @game.id, 'Game', score)
+      reward_experience(@game.user, @game.id, 'Game', score)
+      @game.update_attribute(:final_score, score)
+    end
     respond_to do |format|
-      format.js{redirect_to myshixun_game_path(@game, :myshixun_id => @myshixun, :choose => 1)}
+      format.js{redirect_to myshixun_game_path(@game, :myshixun_id => @myshixun, :choose => @right)}
     end
   end
 
@@ -407,7 +408,7 @@ class GamesController < ApplicationController
     if(params[:choose] == "true")
       challenge.challenge_chooses.each_with_index do |choose, index|
         @answer += "第"+ ((index + 1).to_s) +"题：<br />"
-        @answer += choose.answer
+        @answer += (choose.answer.blank? ? choose.standard_answer : choose.answer)
         @answer += "<br /><br /><br />"
       end
     else
@@ -434,11 +435,17 @@ class GamesController < ApplicationController
     user = User.current
     challenge_score = @game_challenge.score.to_i
     reward_grade(user, @game.id, 'Answer', -challenge_score)
-    @answer = @game_challenge.answer
-    @game.update_column(:answer_open, true)
-    respond_to do |format|
-      format.js
+    @answer = ""
+    if @game.challenge.st == 0
+      @answer = @game_challenge.answer
+    else
+      @game_challenge.challenge_chooses.each_with_index do |choose, index|
+        @answer += "第"+ ((index + 1).to_s) +"题：<br />"
+        @answer += (choose.answer.blank? ? choose.standard_answer : choose.answer)
+        @answer += "<br /><br /><br />"
+      end
     end
+    @game.update_column(:answer_open, true)
   end
 
   def refresh_game_list
diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 8a7630134..5d844b04a 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -850,36 +850,35 @@ end
   def classroom_classment
     @menu_type = 2
     @sub_type = 2
-    @sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order]
+    @sx_order  = params[:sx_order].blank? ? "desc" : params[:sx_order]
     @courses = Course.where(:is_delete => 0)
-    @timing = Course.where(:is_end=>false).count
-    @end = Course.where(:is_end=>true).count
+    @timing=Course.where(:is_end=>false).count
+    @end=Course.where(:is_end=>true).count
     @course_lists = CourseList.where(:id => Course.where(:is_delete => 0 ).map(&:course_list_id) )
     unless params[:school_id] || params[:search] || params[:keyword] || params[:status]
-       user_exs=UserExtensions.where(:school_id=> @courses.map(&:school_id))
-       @schools = School.where(:id =>user_exs.map(&:school_id))
+      user_exs=UserExtensions.where(:school_id=> @courses.map(&:school_id))
+      @schools = School.where(:id =>user_exs.map(&:school_id))
     end
     @search  = params[:search]                                 # 搜索字
     @keyword = params[:keyword].blank? ? "u_name" : params[:keyword]    # 根据姓名/课程名搜索
-    status  = params[:status].to_i
-    courselist = params[:course_list]
+    @status  = params[:status]
+    @courselist = params[:course_list]
+    @school_id = params[:school_id]
 
     if params[:school_id] && params[:school_id] != ''
-      @school_id = params[:school_id]
-      @courses = @courses.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
+      @courses = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}")
     end
 
     if params[:homepage_show]
       @courses = @courses.where(:homepage_show => params[:homepage_show].to_i)
     end
 
-    if courselist && courselist != ''
-      @courses = @courses.where(:course_list_id => courselist)
+    if params[:course_list] && params[:course_list] != ''
+      @courses = @courses.where(:course_list_id => @courselist)
     end
 
     if params[:status] && params[:status]!=''
-      @status = params[:status]
-      @courses =@courses.where(:is_end =>status)
+      @courses =@courses.where(:is_end => @status.to_i)
     end
     if "u_name" == @keyword
       if @search.blank?
@@ -892,6 +891,7 @@ end
       @courses= @courses.where("name like '%#{@search}%'")
     end
     @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").reorder("updatetime #{@sx_order}")
+    @export_courses = @courses
     @courses_count = @courses.count
     limit = 20
     @is_remote = true
@@ -901,6 +901,11 @@ end
     respond_to do |format|
       format.js
       format.html
+      format.xls{
+        @export_courses = @export_courses.all
+        filename = "#{l(:label_course_list_xls)}.xls"
+        send_data(course_list_xls(@export_courses), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename))
+      }
     end
   end
 
@@ -1622,28 +1627,29 @@ end
     render_404
   end
 
-  def course_list_xls course
+  def course_list_xls courses
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => "course"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:milestone),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)])
+    sheet1.row(0).concat(["ID","课堂名称","成员","资源","普通作业","	实训作业","试卷","私有","状态","创建者单位","创建者","动态时间"])
     count_row = 1
-    issues.each do |issue|
-      sheet1[count_row,0] = issue.id
-      sheet1[count_row,1] = issue_tracker_change(issue.tracker_id)
-      sheet1[count_row,2] = issue.subject
-      sheet1[count_row,3] = (issue.description.gsub(/<\/?.*?>/,"")).html_safe
-      sheet1[count_row,4] = issue_status_change(issue.status_id)
-      sheet1[count_row,5] = issue.assigned_to.try(:show_name)
-      sheet1[count_row,6] = issue_priority_change(issue.priority_id)
-      sheet1[count_row,7] = issue.author.show_name
-      sheet1[count_row,8] = issue.created_on.nil? ? issue.created_on : issue.created_on.strftime('%Y-%m-%d %H:%M:%S')
-      sheet1[count_row,9] = issue.fixed_version.try(:name)
-      sheet1[count_row,10] = issue.start_date.nil? ? issue.start_date :  issue.start_date.strftime('%Y-%m-%d')
-      sheet1[count_row,11] = issue.due_date.nil? ? issue.due_date : issue.due_date.strftime('%Y-%m-%d')
-      sheet1[count_row,12] = issue_ratio_change(issue.done_ratio, issue.status_id)
+    courses.each do |course|
+      school = course.teacher.try(:user_extensions).try(:school).try(:name).blank? ? "--" : course.teacher.school_name
+      teacher_name = course.teacher ? course.teacher.show_real_name : ""
+      sheet1[count_row,0] = course.id
+      sheet1[count_row,1] = course.name
+      sheet1[count_row,2] = course.members.count
+      sheet1[count_row,3] = course.attachments.count
+      sheet1[count_row,4] = course.homework_commons.where(:homework_type => 1).count
+      sheet1[count_row,5] = course.homework_commons.where(:homework_type => 4).count
+      sheet1[count_row,6] = course.exercises.count
+      sheet1[count_row,7] = course.is_public.to_i == 1 ? '否' : '是'
+      sheet1[count_row,8] = course.is_end ? "已结束" : "正在进行"
+      sheet1[count_row,9] = school
+      sheet1[count_row,10] = teacher_name
+      sheet1[count_row,11] = format_time(course.updatetime)
       count_row += 1
     end
     book.write xls_report
diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 7f4c1d48e..7e9662563 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -1,6 +1,6 @@
 class MemosController < ApplicationController
   default_search_scope :memos
-  before_filter :find_forum, :only => [:new, :create, :preview, :update]
+  before_filter :find_forum, :only => [:new, :create, :preview, :update, :reply]
   before_filter :find_attachments, :only => [:preview]
   before_filter :find_memo, :except => [:new, :create, :preview]
   before_filter :authenticate_user_edit, :only => [:edit, :update]
@@ -29,13 +29,14 @@ class MemosController < ApplicationController
 
   def new
     # 如何是问吧主页来的，导航不显示具体贴吧名
+    @user = User.current
     @memo = Memo.new
-    @my_forums_count = Memo.where("author_id =? and parent_id is null", User.current.id).count
-    @my_memos_count =  Memo.where("author_id =? and parent_id is not null", User.current.id).count
+    @my_forums_count = Memo.where("author_id =? and parent_id is null",@user.id).count
+    @my_memos_count =  Memo.where("author_id =? and parent_id is not null", @user.id).count
     @forums = Forum.reorder("topic_count desc,updated_at desc")
     respond_to do |format|
       format.js
-      format.html {render layout: 'base_new_forum'}
+      format.html {render layout: 'base_edu'}
       format.json { render json: @memo }
     end
   end
@@ -88,6 +89,7 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
+    @user = User.current
     # 更新贴吧帖子留言对应的memo_messages的viewed字段
     unless @memo.children.blank?
       @memo.children.each do |child|
@@ -141,19 +143,20 @@ class MemosController < ApplicationController
     
     respond_to do |format|
       format.js
-      format.html {render :layout => 'base_new_forum'}
+      format.html {render :layout => 'base_edu'}
       format.json { render json: @memo }
       format.xml { render xml: @memo }
     end
   end
 
   def edit
-    @my_topic_count = 0
-    @my_replies_count =  Memo.where(:parent_id => @memo.id).count
-    @forums = Forum.reorder("topic_count desc,updated_at desc")
-    @replying = false
+    #@my_topic_count = 0
+    #@my_replies_count =  Memo.where(:parent_id => @memo.id).count
+    #@forums = Forum.reorder("topic_count desc,updated_at desc")
+    #@replying = false
+    @user = User.current
     respond_to do |format|
-      format.html {render :layout => 'base_new_forum'}
+      format.html {render :layout => 'base_edu'}
     end
   end
 
@@ -173,7 +176,7 @@ class MemosController < ApplicationController
         @flag = @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
         format.js
-        format.html {redirect_to back_memo_url, notice: "#{l :label_memo_update_succ}"}
+        format.html {redirect_to back_memo_url}
       else
         format.js
         format.html { render action: "edit" }
@@ -182,12 +185,64 @@ class MemosController < ApplicationController
     end
   end
 
+  def reply
+    if params[:memo].present? && params[:memo][:parent_id].present?
+      parent = Memo.find params[:memo][:parent_id]
+      @memo = params[:activity_id].blank? ? parent : Memo.find(params[:activity_id].to_i)
+      @reply = Memo.new
+      @reply.author = User.current
+      @reply.forum_id = parent.forum_id
+      @reply.content = params[:content]
+      @reply.subject = "RE: #{@memo.subject}"
+      #@reply.reply_id = params[:id]
+      @reply.root_id = parent.root_id.nil? ? parent.id : parent.root_id
+      # @reply.reply_id = params[:id]
+      parent.children << @reply
+    else
+      @reply = Memo.new()
+      @reply.content = params[:content]
+      @reply.subject = @memo.subject
+      @reply.author = User.current
+      @reply.forum_id = @forum.id
+      #@reply.content = @quote + @reply.content
+      #@reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+      @reply.root_id = @memo.id
+      @reply.safe_attributes = params[:reply]
+      @memo.children << @reply
+      # @reply.reply_id = params[:id]
+    end
+
+    redirect_to message_replies_forum_memo_path(@memo.forum, @memo, :user_activity_id => params[:user_activity_id])
+  end
+
+  def message_replies
+    @replies = Memo.where(:root_id => @memo.id).order("created_at desc")
+    @reply_count = @replies.count
+    @replies = get_no_children_comments_all @replies
+    #@limit_count = @replies.count
+    #@page = params[:page] ? params[:page].to_i + 1 : 0
+    #@limit = 10
+    #@replies = @replies[@page * @limit..@page * @limit + 9]
+    @reply = Message.new()
+    @user_activity_id = params[:user_activity_id].blank? ? @memo.id : params[:user_activity_id].to_i
+    respond_to do |format|
+      format.js
+    end
+
+  end
+
   def destroy
     @memo.destroy
-
     respond_to do |format|
-      # format.html { redirect_to @back_url }
-      format.html { redirect_to back_memo_or_forum_url }
+      #format.html { redirect_to @back_url }
+      format.html { redirect_to forums_path }
+      format.js{
+        @memo = Memo.find(params[:user_activity_id].to_i)
+        @replies = Memo.where(:root_id => @memo.id).order("created_at desc")
+        @reply_count = @replies.count
+        @replies = get_no_children_comments_all @replies
+        #redirect_to message_replies_forum_memo_path(@memo.forum, @memo, :user_activity_id => params[:user_activity_id])
+      }
       format.json { head :no_content }
     end
   end
@@ -196,7 +251,13 @@ class MemosController < ApplicationController
   def change_sticky
     @memo.sticky ? @memo.update_attribute(:sticky, false) : @memo.update_attribute(:sticky, true)
     respond_to do |format|
-      format.html { redirect_to forum_memo_path(@memo.forum, @memo) }
+      format.html {
+        if params[:index]
+          redirect_to forums_path
+        else
+          redirect_to forum_memo_path(@memo.forum, @memo)
+        end
+      }
     end
   end
 
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 813c790b4..a2aadf706 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -127,7 +127,6 @@ class MyshixunsController < ApplicationController
     compile_success  = jsonTestDetails['compileSuccess']
     # message = Base64.decode64(params[:msg]) unless params[:msg].blank?
     logger.info(outPut)
-    logger.info("##################"+ compile_success)
     game = Game.find(game_id)
     challenge = game.challenge
     unless jenkins_testsets.blank?
@@ -135,7 +134,6 @@ class MyshixunsController < ApplicationController
         actual_output = tran_base64_decode64(j_test_set['output'])
         game_outputs = Output.create(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
                                       :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => game.query_index, :compile_success => compile_success.to_i)
-        logger.info("compile_success:"+ compile_success)
         # output = Output.where(:game_id => game.id, :test_set_position => j_test_set['caseId'].to_i).first
         # logger.info("#############{outPut}")
         # if output.nil?
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 2776a3a72..6ce0e4c63 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -24,6 +24,7 @@ class ShixunsController < ApplicationController
     @offset ||=  @statistic_pages.offset
     @statistics = paginateHelper @statistics, @limit
 
+
   end
 
   # push代码的时候会触发gitlab hook
@@ -114,9 +115,9 @@ class ShixunsController < ApplicationController
     @rev = params[:rev]
     @content = params[:content]
     code_file = g.edit_file(@shixun.gpid, :content => params[:content], :file_path => @path, :branch_name => @rev, :commit_message => "shixun entry")
-    if @shixun.try(:status).to_i < 2
+    # if @shixun.try(:status).to_i < 2
       shixun_modify_status_without_publish(@shixun, 1)
-    end
+    # end
     respond_to do |format|
       format.js
     end
@@ -254,9 +255,9 @@ class ShixunsController < ApplicationController
     # 确定 sort 1升序 2 降序
     @order = params[:order] || "myshixun_count"
     bsort = params[:sort] || "desc"
-    @sort = bsort == "desc" ? "asc" : "desc"
+    @sort = bsort == "asc" ? "desc" : "asc"
     if @order == "updated_at"
-      order_str = "#{Shixun.table_name}.updated_at #{bsort}"
+      order_str = "#{Shixun.table_name}.updated_at #{@sort}"
     else
       order_str = "myshixun_count #{bsort}, #{Shixun.table_name}.updated_at #{bsort}"
     end
@@ -546,6 +547,10 @@ class ShixunsController < ApplicationController
   end
 
   def copy
+    unless (@shixun.can_copy && User.current.user_extensions.try(:identity) == 0 && User.current.professional_certification)
+      render_403
+      return
+    end
     ActiveRecord::Base.transaction do
       begin
         new_shixun = Shixun.new
@@ -574,10 +579,13 @@ class ShixunsController < ApplicationController
         gshixun = g.fork(@shixun.gpid, user_gid)
         raise "版本库创建失败" if gshixun.try(:id).blank?
         gshixun = g.edit_project(gshixun.id, new_shixun.identifier, new_shixun.identifier)
-        raise "版本库创建失败" if (gshixun.try(:name) != new_shixun.identifier || gshixun.try(:path) != new_shixun.identifier)
+        raise "实训复制失败" if (gshixun.try(:name) != new_shixun.identifier || gshixun.try(:path) != new_shixun.identifier)
         new_shixun.update_column(:gpid, gshixun.id)
 
         # 同步复制合作者,合作者加入到gitlab
+        unless User.current.manager_of_shixun?(@shixun)
+          ShixunMember.create!(:user_id => User.current.id, :shixun_id => new_shixun.try(:id), :role => 1)
+        end
         @shixun.shixun_members.each do |shixun_member|
           if ShixunMember.where(:shixun_id => new_shixun.try(:id), :user_id => shixun_member.user_id).blank?
             ShixunMember.create!(:user_id => shixun_member.try(:user_id), :shixun_id => new_shixun.try(:id),
@@ -718,7 +726,7 @@ class ShixunsController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         @shixun.save!
-        if language != params[:language]
+        if language != params[:language] && @shixun.status != 2 # 已发布不触发重置
           add_shixun_modify_status(@shixun, 1)
         end
       rescue
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3e5a0c0a3..1f545fd9e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -321,6 +321,11 @@ class UsersController < ApplicationController
       when 'Syllabus'
         @reply = JournalsForMessage.find params[:reply_id]
         @type = 'Syllabus'
+      when 'Memo'
+        @reply = Memo.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'Memo'
     end
     respond_to do |format|
       format.js
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e13cf05b8..122d74478 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -101,6 +101,17 @@ module ApplicationHelper
     shixun_modify_status_without_publish shixun, type
   end
 
+  def shixun_modify_status_publish shixun, type
+    shixun_tomcat = Redmine::Configuration['shixun_tomcat']
+    gameInfo = shixun.gameInfo
+    uri ="#{shixun_tomcat}/bridge/game/publishGame"
+    params = {gameInfo:gameInfo}
+    res = uri_exec uri, params
+    if res && res['code'].to_i != 0
+      raise("实训云平台繁忙（繁忙等级：90）")
+    end
+  end
+
   # 仅仅产生记录，用于已执行publish的方法
   # ShixunModify中status 1：表示有更改，开启实训的时候需要重置，0：表示不需要重置或已重置完成
   def shixun_modify_status_without_publish shixun, type
@@ -503,7 +514,7 @@ module ApplicationHelper
   def new_homework_common_status status
      case status
        when 0
-         "挂起"
+         "未发布"
        when 1
          "提交中"
        when 2
@@ -523,7 +534,7 @@ module ApplicationHelper
   def homework_status_color status
     style = ""
     case status
-      when '挂起'
+      when '未发布'
         style = 'edu-filter-btn-yellow'
       when '提交中'
         style = 'edu-filter-btn-blue'
@@ -571,7 +582,7 @@ module ApplicationHelper
     if ho_detail_manual
       case ho_detail_manual.comment_status
         when 0
-          status = "挂起"
+          status = "未发布"
         when 1
           if homework_common.end_time && homework_common.end_time >= Time.now
             status = "提交中"
@@ -830,7 +841,7 @@ module ApplicationHelper
   end
 
   # 项目issue列表导出Excel功能
-  def issue_list_xls issues
+  def  issue_list_xls issues
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => "issues"
@@ -4775,7 +4786,7 @@ def get_hw_status homework_common
   str = ""
   if homework_common.homework_detail_manual
     if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil?
-      str += '<span class="grey_homework_btn_cir ml5">挂起</span>'
+      str += '<span class="grey_homework_btn_cir ml5">未发布</span>'
     elsif homework_common.homework_detail_manual.comment_status == 0
       str += '<span class="grey_homework_btn_cir ml5">未发布</span>'
     elsif homework_common.homework_detail_manual.comment_status == 1
diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
new file mode 100644
index 000000000..f551d98d1
--- /dev/null
+++ b/app/helpers/debates_helper.rb
@@ -0,0 +1,2 @@
+module DebatesHelper
+end
diff --git a/app/models/challenge_choose.rb b/app/models/challenge_choose.rb
index c14a0c02d..38b7d8685 100644
--- a/app/models/challenge_choose.rb
+++ b/app/models/challenge_choose.rb
@@ -7,6 +7,7 @@ class ChallengeChoose < ActiveRecord::Base
   has_many :challenge_tags, :dependent => :destroy
   has_many :challenge_questions, :dependent => :destroy
   has_one  :choose_outputs, :dependent => :destroy
+  #has_many :outputs, :dependent => :destroy
 
   validates_presence_of :subject
 
diff --git a/app/models/game.rb b/app/models/game.rb
index 7c0e913ae..e278690c4 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -66,4 +66,18 @@ class Game < ActiveRecord::Base
     challenge = self.challenge
     challenge.try(:position).to_i == challenge.shixun.challenges.count ? true : false
   end
+
+  def choose_correct_num
+    num = 0
+    outputs = self.outputs.where(:query_index => (self.query_index - 1))
+    if outputs.blank?
+      num = nil
+    else
+      outputs.each do |output|
+        num += output.result ? 1 : 0
+      end
+    end
+    return num
+  end
+
 end
diff --git a/app/models/myshixun.rb b/app/models/myshixun.rb
index 9e7e2a0aa..ace51c51f 100644
--- a/app/models/myshixun.rb
+++ b/app/models/myshixun.rb
@@ -48,7 +48,7 @@ class Myshixun < ActiveRecord::Base
     score = 0
     self.games.each do |game|
       if game.status == 2
-        score += game.final_score
+        score += game.final_score.to_i
       end
     end
     score
diff --git a/app/models/output.rb b/app/models/output.rb
index 4ce462eff..8f1547cfe 100644
--- a/app/models/output.rb
+++ b/app/models/output.rb
@@ -4,5 +4,5 @@ class Output < ActiveRecord::Base
   # compile_success 1 表示程序未报错，有正常输出， 0.表示程序抛异常了，报错！
   default_scope :order => 'query_index desc'
   belongs_to :game
-
+  #belongs_to :challenge_choose
 end
diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb
index 1947a3760..a47d921f9 100644
--- a/app/views/challenges/_choose_type.html.erb
+++ b/app/views/challenges/_choose_type.html.erb
@@ -4,8 +4,10 @@
       <%= render :partial => "challenges/choose_tab" %>
     </div>
     <div class="fr option_item_con">
-      <a href="javascript:void(0)" class="mr10 white-btn green-btn white_bg addoption-btn mt5">+&nbsp;单选题</a>
-      <a href="javascript:void(0)" class="white-btn green-btn white_bg addoption-btn mt5">+&nbsp;多选题</a>
+      <% if  @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
+          <a href="javascript:void(0)" class="mr10 white-btn green-btn white_bg addoption-btn mt5">+&nbsp;单选题</a>
+          <a href="javascript:void(0)" class="white-btn green-btn white_bg addoption-btn mt5">+&nbsp;多选题</a>
+      <% end %>
     </div>
   </ul>
   <div id="task_content" class="task-pm-box mh550 user_bg_shadow">
@@ -79,8 +81,6 @@
             }
         }
 
-
-
         $(".stage-part-2").find(".nav_option li").eq(length-1).after(html);
 
         $.ajax({
diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb
index 71fb21030..cda61ccd4 100644
--- a/app/views/challenges/_content_list.html.erb
+++ b/app/views/challenges/_content_list.html.erb
@@ -5,8 +5,8 @@
           <span class="btn-cir btn-cir-grey ml10 mt12 fl"><%= @challenges.count %></span>
       <% end %>
     <% if User.current.manager_of_shixun?(@shixun) && @shixun.status == 0 %>
-        <a href="<%= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mt5">+实践任务</a>
-        <a href="<%= new_shixun_challenge_path(@shixun, :st => 1) %>" class="shixun-task-btn task-btn-green fr mr10 mt5">+选择题任务</a>
+        <a href="<%= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mt5" data-tip-down="新增代码编辑类型任务">+实践任务</a>
+        <a href="<%= new_shixun_challenge_path(@shixun, :st => 1) %>" class="shixun-task-btn task-btn-green fr mr10 mt5" data-tip-down="新增选择题类型的任务">+选择题任务</a>
       <!--  <a href="<%#= new_shixun_challenge_path(@shixun, :st => 2) %>" class="shixun-task-btn task-btn-green fr mr10 mt5">+单选任务</a>-->
         <!--<a href="<%#= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr mr5" style="margin: 5px 0;">新建阶段</a>-->
     <% end %>
@@ -19,7 +19,7 @@
               <% if challenge.st == 0 %>
                 <i class="fa fa-code font-16 color_white" data-tip-down="实践任务"></i>
               <% else %>
-                <i class="fa fa-th-list color_white" data-tip-down="多选任务"></i>
+                <i class="fa fa-th-list color_white" data-tip-down="选择题任务"></i>
               <% end%>
             </span>
            <!-- <i class="fa fa-dot-circle-o font-18 color-green mr10"></i>-->
diff --git a/app/views/challenges/_edit_evaluating.html.erb b/app/views/challenges/_edit_evaluating.html.erb
index 891458a70..bb589188c 100644
--- a/app/views/challenges/_edit_evaluating.html.erb
+++ b/app/views/challenges/_edit_evaluating.html.erb
@@ -3,7 +3,7 @@
   <div id="evaluating_show" class="<%= @challenge.evaluation_way == 0 ? "undis" : "" %>">
     <div class="clearfix mb20">
       <p class="fr">
-        <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
+        <% if User.current.manager_of_shixun?(@shixun) %>
             <a href="javascript:void(0);" class="shixun-task-btn task-btn-green fr" id="edit_task_pass">编辑</a>
         <% end %>
       </p>
@@ -49,8 +49,8 @@
                           <i class="fa fa-lock font-grey ml5" ></i>
                       <% end %>
                     </p>
-                    <div class="clearfix"><span class="fl fb">输入：</span><p class="fl"><%= match_specific_symbol test.input unless test.input.blank? %></p></div>
-                    <div class="clearfix"><span class="fl fb">输出：</span><p class="fl"><%= match_specific_symbol test.output unless test.output.blank? %></div>
+                    <div class="clearfix"><span class="fl fb">输入：</span><p class="fl break_word with95"><%= match_specific_symbol test.input unless test.input.blank? %></p></div>
+                    <div class="clearfix"><span class="fl fb">输出：</span><p class="fl break_word with95"><%= match_specific_symbol test.output unless test.output.blank? %></div>
                   </li>
               <% end %>
           <% else %>
diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb
index d93673911..7a2503bb1 100644
--- a/app/views/challenges/_single_or_multiple_question_show.html.erb
+++ b/app/views/challenges/_single_or_multiple_question_show.html.erb
@@ -3,8 +3,11 @@
 <div class="white_bg">
     <div class="panel-form">
       <li class="clearfix pr30">
-        <a href="<%= edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id, :index => @index) %>" data-remote="true" class="task-btn task-btn-green fr">编辑</a>
-        <a href="<%= destroy_challenge_choose_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>" data-method="delete" class="task-btn fr mr10 deloption-btn">删除</a>
+        <% if  @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
+            <a href="<%= edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id, :index => @index) %>" data-remote="true" class="task-btn task-btn-green fr">编辑</a>
+            <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= destroy_challenge_choose_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>', '您是否确定删除？')" class="task-btn fr mr10 deloption-btn">删除</a>
+
+        <% end %>
       </li>
       <li class="clearfix">
         <label class="panel-form-label fl">题干：&nbsp;&nbsp;</label>
diff --git a/app/views/challenges/_task_pass_form.html.erb b/app/views/challenges/_task_pass_form.html.erb
index 215f085d5..394bb633f 100644
--- a/app/views/challenges/_task_pass_form.html.erb
+++ b/app/views/challenges/_task_pass_form.html.erb
@@ -46,6 +46,28 @@
 
 <script type="text/javascript">
     $(function() {
+        document.onkeydown = function(event) {
+            var target, code, tag;
+            if (!event) {
+                event = window.event; //针对ie浏览器
+                target = event.srcElement;
+                code = event.keyCode;
+                if (code == 13) {
+                    tag = target.tagName;
+                    if (tag == "INPUT") { return true; }
+                    else { return false; }
+                }
+            }
+            else {
+                target = event.target; //针对遵循w3c标准的浏览器，如Firefox
+                code = event.keyCode;
+                if (code == 13) {
+                    tag = target.tagName;
+                    if (tag == "INPUT") { return false; }
+                    else { return true; }
+                }
+            }
+        };
         taskpass_editormd =  editormd("challenge_task_pass", {
             width   : "89.6%",
             height  : 600,
diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb
index 342c17084..4fe82812e 100644
--- a/app/views/challenges/edit.html.erb
+++ b/app/views/challenges/edit.html.erb
@@ -56,9 +56,11 @@
           <li class="fl <%= @tab == 3 ? "check_nav" : "" %>">
             <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 3) %>" class="color-black">参考答案</a>
           </li>
-          <li class="fl <%= @tab == 6 ? "check_nav" : "" %>">
-            <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 6) %>" class="color-black">预备知识</a>
-          </li>
+          <% unless @challenge.ready_knowledge.blank? %>
+              <li class="fl <%= @tab == 6 ? "check_nav" : "" %>">
+                <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 6) %>" class="color-black">背景知识</a>
+              </li>
+          <% end %>
           <li class="fl <%= @tab == 4 ? "check_nav" : "" %>">
             <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 4) %>" class="color-black">评分设置</a>
           </li>
@@ -83,7 +85,7 @@
         </div>
       </div>
   <% else %>
-      <%= render :partial => "choose_type" %>
+    <%= render :partial => "choose_type" %>
   <% end %>
 </div>
 <div class="save-tip">
diff --git a/app/views/challenges/index.html.erb b/app/views/challenges/index.html.erb
index d877ea5bf..1dc205b89 100644
--- a/app/views/challenges/index.html.erb
+++ b/app/views/challenges/index.html.erb
@@ -8,7 +8,7 @@
 </style>
 <div class="task-pm-content">
   <% if @shixun.status == 1 && (User.current.manager_of_shixun?(@shixun) || User.current.admin?) %>
-    <div class="alert alert-orange mb15 mt15">正在等待管理员的审核。如果需要重新编辑评测设置，请先撤销发布 </div>
+    <div class="alert alert-orange mb15 mt15">正在等待管理员的审核。在审核通过前，可以随时撤销发布 </div>
   <% end %>
   <div class="task-pm-box mt30 box_bg_shandow">
     <div class="panel-header">
diff --git a/app/views/courses/_course_index_search.html.erb b/app/views/courses/_course_index_search.html.erb
index c30e47177..5d4827952 100644
--- a/app/views/courses/_course_index_search.html.erb
+++ b/app/views/courses/_course_index_search.html.erb
@@ -2,7 +2,8 @@
   <div class="searchFor fr" style="margin-top: -3px">
     <div class="searchCon">
       <input type="text" class="searchinput" name="search" value="<%= @search %>" placeholder="请输入课堂名称的关键字进行搜索" style="background: none;"/>
-      <i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" title="搜索"></i>
+      <!--<i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" title="搜索"></i>-->
+      <span class="search_close" onclick="colse_searchbox();" data-tip-down="清除">×</span>
     </div>
     <i class="fa fa-search mr5 color-dark-grey search_icon" onclick="$('#search_syllabuses_name').submit();" style="margin:10px" data-tip-down="搜索"></i>
   </div>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 4f72975ec..fe69cbbd1 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -152,4 +152,16 @@
         timepicker:false,
         validateOnBlur:false
     });
+    function addtip(){
+        console.log("<%= @course.course_groups%>");
+        <% unless @course.course_groups.empty? %>
+        <% @course.course_groups.each do |group| %>
+        if($(".setting_group_<%= group.id %> span").width() == 115){
+            $(".setting_group_<%= group.id %>").attr("data-tip-left","<%= group.name %>");
+        }
+        <% end %>
+        <% end %>
+
+    }
+
 </script>
\ No newline at end of file
diff --git a/app/views/courses/settings/_add_students.html.erb b/app/views/courses/settings/_add_students.html.erb
index 9937847e4..b2364003d 100644
--- a/app/views/courses/settings/_add_students.html.erb
+++ b/app/views/courses/settings/_add_students.html.erb
@@ -26,9 +26,9 @@
               </div>
               <input id="choose_student_ids" name="choose_student_ids" type="hidden" value="">
 
-              <p style="width:520px;" class="ml10">
+              <p style="width:520px;background: #f7f9fd;height: 25px">
                 <input id="all_student_select" type="checkbox" name="all_student_select" class="fl mt7 mr5 magic-checkbox" value="">
-                <label for="all_student_select">
+                <label for="all_student_select" class="ml10">
                   <span class="span1 edu-name-dark edu-txt-w140 task-hide font-bd" style="text-align: center">姓名</span>
                   <span class="span2 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">学号</span>
                   <span class="span3 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">用户ID</span>
diff --git a/app/views/courses/settings/_add_teachers.html.erb b/app/views/courses/settings/_add_teachers.html.erb
index 54bdedb36..86fc7b18f 100644
--- a/app/views/courses/settings/_add_teachers.html.erb
+++ b/app/views/courses/settings/_add_teachers.html.erb
@@ -20,9 +20,9 @@
         </div>
         <input id="choose_student_ids" name="choose_student_ids" type="hidden" value="">
 
-        <p style="width:520px;" class="ml10">
+        <p style="width:520px;background: #f7f9fd;height: 25px">
           <input id="all_student_select" type="checkbox" name="all_student_select" class="fl mt7 mr5 magic-checkbox" value="">
-          <label for="all_student_select">
+          <label for="all_student_select" class="ml10">
             <span class="span1 edu-name-dark edu-txt-w140 task-hide font-bd" style="text-align: center">姓名</span>
             <span class="span2 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">学号</span>
             <span class="span3 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">用户ID</span>
@@ -35,7 +35,7 @@
       </div>
 
       <div class="right fl">
-        <h4 class="font-16 mt95">角色：</h4>
+        <h4 class="font-16 mt100">角色：</h4>
         <ul class="pl20 pb20">
           <li>
             <label>
@@ -51,8 +51,8 @@
           </li>
         </ul>
 
-        <a href="javascript:void(0);" class="pop_close task-btn mb10" style="margin-top: 164px;">取消</a>
-        <a href="javascript:void(0);" class="task-btn task-btn-blue" style="margin-top: 164px;" onclick="submit_add_teacher_form()">确定</a>
+        <a href="javascript:void(0);" class="pop_close task-btn" style="margin-top: 197px;">取消</a>
+        <a href="javascript:void(0);" class="task-btn task-btn-blue" style="margin-top: 197px;" onclick="submit_add_teacher_form()">确定</a>
       </div>
       <% end %>
     </div>
diff --git a/app/views/courses/settings/_all_student_list.html.erb b/app/views/courses/settings/_all_student_list.html.erb
index 5c2fd729e..ad54ce938 100644
--- a/app/views/courses/settings/_all_student_list.html.erb
+++ b/app/views/courses/settings/_all_student_list.html.erb
@@ -16,7 +16,7 @@
           <% @course.course_groups.each do |group| %>
               <li data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>">
                 <p class="p1">
-                  <span data-tip-left="<%= group.name %>"><%= group.name %></span>
+                  <span><%= group.name %></span>
                   <em><%= group.members.count %></em>
                   <!--<i class="fa fa-bars" aria-hidden="true"></i>-->
                 </p>
@@ -27,3 +27,13 @@
   </div>
   <%= render :partial => "courses/settings/all_student_list_block" %>
 </div>
+
+<script>
+    <% unless @course.course_groups.empty? %>
+    <% @course.course_groups.each do |group| %>
+    if($(".setting_group_<%= group.id %> span").width() == 115){
+        $(".setting_group_<%= group.id %> p").attr("data-tip-left","<%= group.name %>");
+    }
+    <% end %>
+    <% end %>
+</script>
\ No newline at end of file
diff --git a/app/views/courses/settings/_all_student_list_block.html.erb b/app/views/courses/settings/_all_student_list_block.html.erb
index 91792b86d..24e52571e 100644
--- a/app/views/courses/settings/_all_student_list_block.html.erb
+++ b/app/views/courses/settings/_all_student_list_block.html.erb
@@ -40,8 +40,9 @@
       <% end %>
       <div class="edu-find fr mr40 with30 pr">
         <div class="edu-find-input">
-          <input type="text" class="task-form-100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="all_student_list_search"/>
-          <i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>
+          <input type="text" class="with100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="all_student_list_search"/>
+          <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+          <span class="edu-close" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
         </div>
         <a href="javascript:void(0);" onclick="submit_all_student_list_search('<%= @course.id %>');" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
       </div>
diff --git a/app/views/courses/settings/_all_teacher_list_ul.erb b/app/views/courses/settings/_all_teacher_list_ul.erb
index db3e22090..9886dbec3 100644
--- a/app/views/courses/settings/_all_teacher_list_ul.erb
+++ b/app/views/courses/settings/_all_teacher_list_ul.erb
@@ -12,11 +12,20 @@
 <% unless @course.course_groups.empty? %>
     <% @course.course_groups.each do |group| %>
         <li data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>">
-          <p class="p1" data-tip-left="<%= group.name.length > 6 ? group.name : ''%>">
+          <p class="p1">
             <span><%= group.name %></span>
             <em><%= group.members.count %></em>
-            <!--<i class="fa fa-bars" aria-hidden="true"></i>-->
           </p>
         </li>
     <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<script>
+    <% unless @course.course_groups.empty? %>
+    <% @course.course_groups.each do |group| %>
+    if($(".setting_group_<%= group.id %> span").width() == 115){
+        $(".setting_group_<%= group.id %> p").attr("data-tip-left","<%= group.name %>");
+    }
+    <% end %>
+    <% end %>
+</script>
\ No newline at end of file
diff --git a/app/views/courses/settings/_has_group_student_list.html.erb b/app/views/courses/settings/_has_group_student_list.html.erb
index 465e05525..5116e46e2 100644
--- a/app/views/courses/settings/_has_group_student_list.html.erb
+++ b/app/views/courses/settings/_has_group_student_list.html.erb
@@ -14,8 +14,8 @@
       <% end %>
       <% unless @course.course_groups.empty? %>
           <% @course.course_groups.each do |group| %>
-              <li class="<%= @group.id == group.id ? 'sheet' : '' %>" data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>">
-                <p class="p1" data-tip-left="<%= group.name %>">
+              <li class="<%= @group.id == group.id ? 'sheet' : '' %>" data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>" id = "setting_group_<%= group.id %>" >
+                <p class="p1">
                   <span><%= group.name %></span>
                   <em><%= group.members.count %></em>
                   <!--<i class="fa fa-bars" aria-hidden="true"></i>-->
@@ -26,4 +26,14 @@
     </ul>
   </div>
   <%= render :partial => "courses/settings/has_group_student_list_block" %>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    <% unless @course.course_groups.empty? %>
+    <% @course.course_groups.each do |group| %>
+    if($("#setting_group_<%= group.id %> span").width() == 115){
+        $("#setting_group_<%= group.id %> p").attr("data-tip-left","<%= group.name %>");
+    }
+    <% end %>
+    <% end %>
+</script>
\ No newline at end of file
diff --git a/app/views/courses/settings/_has_group_student_list_block.html.erb b/app/views/courses/settings/_has_group_student_list_block.html.erb
index 44178da15..5bf490f8c 100644
--- a/app/views/courses/settings/_has_group_student_list_block.html.erb
+++ b/app/views/courses/settings/_has_group_student_list_block.html.erb
@@ -34,8 +34,9 @@
       <% end %>
       <div class="edu-find fr mr40 with30 pr">
         <div class="edu-find-input">
-          <input type="text" class="task-form-100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="has_group_student_list_search"/>
-          <i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>
+          <input type="text" class="with100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="has_group_student_list_search"/>
+          <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+          <span class="edu-close" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
         </div>
         <a href="javascript:void(0);" onclick="submit_has_group_student_search('<%= @course.id %>', '<%= @group.id %>');" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
       </div>
diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index 1c1806e00..cdb8e9d0b 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -46,20 +46,22 @@
                 </td>
               </tr>
           <% end %>
-          <% @apply_users.each_with_index do |apply, index| %>
-              <% user = User.find(apply.course_message_id) %>
-              <tr id="setting_member_<%= user.id %>">
-                <td><%= @teacher_count + index + 1 %></td>
-                <td>
-                  <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %>
-                </td>
-                <td><span class="edu-txt-w140 task-hide mt5"><%= user.try(:login) %></span></td>
-                <td><%= apply.content && apply.content.include?('9') ? "教师" : "助教" %></td>
-                <td>
-                  <%= link_to '同意', dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>apply.id), :class=>'color-red mr5'%>
-                  <%= link_to '拒绝', dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>apply.id), :class=>'color-red'%>
-                </td>
-              </tr>
+          <% if is_teacher %>
+              <% @apply_users.each_with_index do |apply, index| %>
+                  <% user = User.find(apply.course_message_id) %>
+                  <tr id="setting_member_<%= user.id %>">
+                    <td><%= @teacher_count + index + 1 %></td>
+                    <td>
+                      <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %>
+                    </td>
+                    <td><span class="edu-txt-w140 task-hide mt5"><%= user.try(:login) %></span></td>
+                    <td><%= apply.content && apply.content.include?('9') ? "教师" : "助教" %></td>
+                    <td>
+                      <%= link_to '同意', dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>apply.id), :class=>'color-red mr5'%>
+                      <%= link_to '拒绝', dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>apply.id), :class=>'color-red'%>
+                    </td>
+                  </tr>
+              <% end %>
           <% end %>
           </tbody>
         </table>
diff --git a/app/views/courses/settings/_no_group_student_list.html.erb b/app/views/courses/settings/_no_group_student_list.html.erb
index 42eae5fb0..96cf02f3f 100644
--- a/app/views/courses/settings/_no_group_student_list.html.erb
+++ b/app/views/courses/settings/_no_group_student_list.html.erb
@@ -14,7 +14,7 @@
       <% unless @course.course_groups.empty? %>
           <% @course.course_groups.each do |group| %>
               <li data-option="hasclass" data-group-id="<%= group.id %>" data-course-id="<%= @course.id %>" class="setting_group_<%= group.id %>">
-                <p class="p1" data-tip-left="<%= group.name %>">
+                <p class="p1">
                   <span><%= group.name %></span>
                   <em><%= group.members.count %></em>
                   <!--<i class="fa fa-bars" aria-hidden="true"></i>-->
@@ -26,3 +26,14 @@
   </div>
   <%= render :partial => "courses/settings/no_group_student_list_block" %>
 </div>
+
+
+<script>
+    <% unless @course.course_groups.empty? %>
+    <% @course.course_groups.each do |group| %>
+    if($(".setting_group_<%= group.id %> span").width() == 115){
+        $(".setting_group_<%= group.id %> p").attr("data-tip-left","<%= group.name %>");
+    }
+    <% end %>
+    <% end %>
+</script>
\ No newline at end of file
diff --git a/app/views/courses/settings/_no_group_student_list_block.html.erb b/app/views/courses/settings/_no_group_student_list_block.html.erb
index 2cb30a5a5..86b6ec0ff 100644
--- a/app/views/courses/settings/_no_group_student_list_block.html.erb
+++ b/app/views/courses/settings/_no_group_student_list_block.html.erb
@@ -20,8 +20,9 @@
       <% end %>
       <div class="edu-find fr mr40 with30 pr">
         <div class="edu-find-input">
-          <input type="text" class="task-form-100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="no_group_student_list_search"/>
-          <i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>
+          <input type="text" class="with100 panel-box-sizing" placeholder="输入姓名、学号进行搜索" value="<%= @search %>" id="no_group_student_list_search"/>
+          <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+          <span class="edu-close" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
         </div>
         <a href="javascript:void(0);" onclick="submit_no_group_student_search('<%= @course.id %>');" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
       </div>
diff --git a/app/views/courses/settings/_search_not_students_list.html.erb b/app/views/courses/settings/_search_not_students_list.html.erb
index d0ad45ea1..882b28edc 100644
--- a/app/views/courses/settings/_search_not_students_list.html.erb
+++ b/app/views/courses/settings/_search_not_students_list.html.erb
@@ -7,7 +7,8 @@
                 <!--<i class="fa fa-check-square-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
                 <input id="add_student_<%= user.id %>" type="checkbox" class="fl mt7 mr5 magic-checkbox" name="membership[user_ids][]" value="<%= user.id %>">
                 <label for="add_student_<%= user.id %>" style="top:0px">
-                  <a href="<%= user_path(user) %>" target="_blank" class="task-hide span1 edu-name-dark edu-txt-w140"><%= user.show_real_name %>(<%= user.login %>)</a>
+                  <!--(<%#= user.login %>)-->
+                  <a href="<%= user_path(user) %>" target="_blank" class="task-hide span1 edu-name-dark edu-txt-w140" style="text-align: center"><%= user.show_real_name %></a>
                   <span class="span2 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.user_extensions.try(:student_id) %></span>
                   <span class="span3 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.login %></span>
                 </label>
diff --git a/app/views/courses/settings/_search_not_teachers_list.html.erb b/app/views/courses/settings/_search_not_teachers_list.html.erb
index ae3b96c78..30f71c656 100644
--- a/app/views/courses/settings/_search_not_teachers_list.html.erb
+++ b/app/views/courses/settings/_search_not_teachers_list.html.erb
@@ -7,7 +7,8 @@
                 <!--<i class="fa fa-check-square-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
                 <input id="add_student_<%= user.id %>" type="checkbox" class="fl mt7 mr5 magic-checkbox" name="membership[user_ids][]" value="<%= user.id %>">
                 <label for="add_student_<%= user.id %>" style="top:0px">
-                  <a href="<%= user_path(user) %>" target="_blank" class="task-hide span1 edu-name-dark edu-txt-w140"><%= user.show_real_name %>(<%= user.login %>)</a>
+                  <!--(<%#= user.login %>)-->
+                  <a href="<%= user_path(user) %>" target="_blank" class="task-hide span1 edu-name-dark edu-txt-w140" style="text-align: center"><%= user.show_real_name %></a>
                   <span class="span2 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.user_extensions.try(:student_id) %></span>
                   <span class="span3 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.login %></span>
                 </label>
diff --git a/app/views/exercise/examination_setting.html b/app/views/exercise/examination_setting.html
new file mode 100644
index 000000000..4f2e60585
--- /dev/null
+++ b/app/views/exercise/examination_setting.html
@@ -0,0 +1,392 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		
+		<title></title>
+		<style>
+			.magic-radio + label:after{left: 5px;top: 11px;}
+		</style>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt; <a href="javascript:void(0)">试卷列表</a>&gt; #22
+					</p>
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+					  <p class="ml15 fl color-grey3">
+					    <i class="fa fa-lock mr5 color-grey"></i>
+					    实验四 多周期CPU与存储器实验
+					  </p>
+					  <a href="/homework_common?course=791&amp;homework_type=1" class="fr font-12 mr15 mt3 color-grey">返回</a>
+					</div>
+					
+					<div class="user_bg_shadow bor-grey-e clearfix">
+						<div id="homework_publish_setting">
+					        <!--发布设置-->
+					        <div class="bor-bottom-greyE pt10 pb10 pr10">
+						        <div class="none" id="show_publish_setting">
+						          	<div class="clearfix mb15">
+							  			<p class="ml15 fl font-16 mt5">发布设置</p>
+							    		<a href="javascript:void(0);" class="white-btn orange-btn fr mr15 mt15" title="编辑" onclick="show_edit_setting();">编辑</a>
+									</div>
+									<div class="ml30 mr30">
+									  <div class="clearfix">
+									    <ul>
+									      <li class="clearfix mb15 edu-position pl30">
+									        <label class="panel-form-label fl mr10">发布时间</label>
+									        <input type="text" class="disabled-bg fl task-form-15 task-height-40 panel-box-sizing" value="2016-10-30 00:00" disabled="">
+									        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px; width:405px;">
+									          <em></em>
+									          <span></span>
+									          <p>发布之前，学生不会收到试卷</p>
+									        </div>
+									      </li>
+									      <li class="clearfix mb15 edu-position pl30">
+									        <label class=" panel-form-label fl mr10">截止时间</label>
+									        <input type="text" class="disabled-bg fl task-form-15 task-height-40 panel-box-sizing" id="show_end_time" value="2016-11-16 23:59" disabled="">
+									        <div class="cl"></div>
+									      </li>
+									      <li class="clearfix mb15 edu-position pl30">
+									        <label class=" panel-form-label fl mr10">结束时间</label>
+									        <input type="text" class="disabled-bg fl task-form-15 task-height-40 panel-box-sizing" id="show_archive_time" value="" disabled="">
+									        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+									          <em></em>
+									          <span></span>
+									          <p>结束之后，系统自动归档试卷</p>
+									        </div>
+									      </li>
+									    </ul>
+									  </div>
+									</div>
+			        			</div>
+						        <div class="" id="edit_publish_setting">
+						            <div class="clearfix mb15">
+						  				<p class="ml15 fl font-16 mt5">发布设置</p>
+									</div>
+									<div class="ml30 mr30">
+									  	<div class="clearfix">
+										    <ul>
+										      	<li class="clearfix mb15 edu-position pl30">
+											        <label class="panel-form-label fl mr10">发布时间</label>
+											        <input type="text" name="homework_publish_time" readonly="" value="2016-10-30 00:00" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="请选择发布时间">
+											        <span class="color-orange fl ml20 mt5 none" id="homework_publish_time_notice"><i class="fa fa-exclamation-circle mr5 color-orange"></i></span>
+													<div class="popup_tip_box fontGrey2" style="right:-15px; top:0px; width:405px;">
+											           <em></em>
+											           <span></span>												
+											           <p>发布之前，学生不会收到试卷</p>
+											        </div>
+											    </li>
+											    <li class="clearfix mb15 edu-position pl30">
+											        <label class="panel-form-label fl mr10">截止时间</label>
+											        <input type="text" name="homework_end_time" readonly="" value="2016-11-16 23:59" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="请选择截止时间">
+											 		<span class="color-orange fl ml20 mt5 none" id="homework_end_time_notice">
+											          	<i class="fa fa-exclamation-circle mr5 color-orange"></i>
+											        </span>
+											        <span class="color-orange fl mt5 none">不能早于发布时间</span>
+											    </li>
+											    <li class="clearfix mb15 edu-position pl30">
+											        <label class=" panel-form-label fl mr10">结束时间</label>
+											        <input type="text" name="homework_archive_time" readonly="" value="" class=" fl task-form-15 task-height-40 panel-box-sizing" placeholder="请选择结束时间">
+											        <span class="color-orange fl ml20 mt5 none" id="homework_archive_time_notice"><i class="fa fa-exclamation-circle mr5 color-orange"></i></span>
+													<div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+											            <em></em>
+											            <span></span>												
+											            <p>结束之后，系统自动归档试卷</p>
+											        </div>
+											    </li>
+										    </ul>
+									  	</div>
+									</div>
+				        		</div>
+				    		</div>
+						    <!--答题设置-->
+						    <div class="bor-bottom-greyE pt10 pb10 pr10">
+						        <div class="none" id="show_late_setting">
+						            <div class="clearfix mb15">
+									    <p class="ml15 fl font-16 mt10">答题设置</p>
+									</div>
+									<div class="ml30 mr30" style="padding-bottom:20px;">
+									  <div class="clearfix">
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">答题时长</label>
+										        <input type="text" value="10" disabled="" class="fl task-form-15 task-height-40 panel-box-sizing disabled-bg" placeholder="5">
+										        <label class="fl mt8 ml5">分钟</label>
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>答题时长不填写，则表示不限时长</p>
+										            <p>学生答题时间即使没有超过答题时长的限制</p>
+										            <p>但是已到截止时间点，则系统自动为正在答题的学生提交试卷</p>
+										        </div>
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">答题显示</label>
+									        	<input class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_1" disabled=""  type="checkbox" checked="">
+    											<label class="fl" for="dt_1">题目顺序随机打乱</label>
+    											<span class="fl color-grey mt5">（选中则学生答题时，题目顺序按照题型随机显示）</span>
+    											<div class="cl"></div>
+									        	<input class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_2" disabled=""   type="checkbox" checked="">
+    											<label class="fl" for="dt_2" style="margin-left: 11%;">选项顺序随机打乱</label>
+    											<span class="fl color-grey mt5">（选中则学生答题时，选项顺序随机显示）</span>
+									        </li>
+									    </ul>
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">补交答题</label>
+										        <input id="edit_allow_late_1" disabled="" class="magic-radio fl" type="radio" name="homework_allow_late" value="1">
+										        <label for="edit_allow_late_1" class="fl mr30">允许</label>
+										        <input id="edit_allow_late_0" disabled="" class="magic-radio fl" type="radio" name="homework_allow_late" value="0" checked="">
+										        <label for="edit_allow_late_0" class="fl">禁止</label>
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>允许补交，则在补交截止日期之前，未答题的学生可以补交答题</p>
+										            <p>但是在发布截止日期~补交截止时间内才答题的学生，将被扣迟交分</p>
+										        </div>
+									        </li>									        
+									         <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">截止时间</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing disabled-bg" disabled="" placeholder="5">
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">迟交扣分</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing disabled-bg" disabled="" placeholder="5">
+									        </li>
+									    </ul>
+									  </div>
+									</div>
+						        </div>
+						        <div class="" id="edit_late_setting">
+						            <div class="clearfix mb15">
+									    <p class="ml15 fl font-16 mt10">答题设置</p>
+									</div>
+									<div class="ml30 mr30" style="padding-bottom:20px;">
+									  <div class="clearfix">
+									    <ul>
+									    	<li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">答题时长</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="5">
+										        <label class="fl mt8 ml5">分钟</label>
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>答题时长不填写，则表示不限时长</p>
+										            <p>学生答题时间即使没有超过答题时长的限制</p>
+										            <p>但是已到截止时间点，则系统自动为正在答题的学生提交试卷</p>
+										        </div>
+									        </li>
+									      	<li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">答题显示</label>
+									        	<input class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_3" type="checkbox" checked="">
+    											<label class="fl" for="dt_3">题目顺序随机打乱</label>
+    											<span class="fl color-grey mt5">（选中则学生答题时，题目顺序按照题型随机显示）</span>
+    											<div class="cl"></div>
+									        	<input class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_4" type="checkbox" checked="">
+    											<label class="fl" for="dt_4" style="margin-left: 11%;">选项顺序随机打乱</label>
+    											<span class="fl color-grey mt5">（选中则学生答题时，选项顺序随机显示）</span>
+									        </li>
+									    </ul>
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">补交答题</label>
+										        <input id="edit_allow_late_2" class="magic-radio fl" type="radio" name="homework_allow_late_1" value="1">
+										        <label for="edit_allow_late_2" class="fl mr30 mt3">允许</label>
+										        <input id="edit_allow_late_3" class="magic-radio fl" type="radio" name="homework_allow_late_1" value="0" checked="">
+										        <label for="edit_allow_late_3" class="fl mt3">禁止</label>
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>允许补交，则在补交截止日期之前，未答题的学生可以补交答题</p>
+										            <p>但是在发布截止日期~补交截止时间内才答题的学生，将被扣迟交分</p>
+										        </div>
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">截止时间</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="5">
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">迟交扣分</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="5">
+									        </li>
+									    </ul>
+									  </div>
+									</div>
+						        </div>
+						    </div>
+						    <!--主观题评分设置-->
+						    <div class="bor-bottom-greyE pt10 pb10 pr10">
+						        <div class="none" id="show_late_setting">
+						            <div class="clearfix mb15">
+									    <p class="ml15 fl font-16 mt10">主观题评分设置</p>
+									</div>
+									<div class="ml30 mr30" style="padding-bottom:20px;">
+									  <div class="clearfix">
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">助教评分</label>
+									        	<input class="magic-radio fl mt5 magic-checkbox_show" id="zg_1" name="zg[]_1" disabled="" type="radio" checked="">
+    											<label class="fl" for="zg_1">普通模式</label>
+    											<span class="fl color-grey mt5">（选中则取各助教最终评分的平均分）</span>
+    											<div class="cl"></div>
+									        	<input class="magic-radio fl mt5 magic-checkbox_show" id="zg_2" name="zg[]_1" disabled="" type="radio">
+    											<label class="fl" for="zg_2" style="margin-left: 11%;">复审模式</label>
+    											<span class="fl color-grey mt5">（选中则只取最终次的助教评分）</span>
+									        </li>
+									    </ul>
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">最终成绩</label>
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>计算说明</p>
+										            <p class="mb10">教师评分*其百分比+助教评分+其百分比+迟交扣分</p>
+										            <p>注意</p>
+										            <p>非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外</p><p>的评分选项上。例如教师评分60% + 助教评分40% ，学生A没有得到</p><p>教师评分，则最终成绩将按照助教评分100% 进行计算 </p>
+										        </div>
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">教师评分</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing disabled-bg" disabled="" placeholder="5">
+											        
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">&nbsp;</label>
+									        	<label class="mt8 fl mr10">助教评分</label>
+											    <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing disabled-bg" disabled="" placeholder="5">
+									        </li>
+									    </ul>
+									  </div>
+									</div>
+						        </div>
+						        <div class="" id="edit_late_setting">
+						            <div class="clearfix mb15">
+									    <p class="ml15 fl font-16 mt10">主观题评分设置</p>
+									</div>
+									<div class="ml30 mr30" style="padding-bottom:20px;">
+									  <div class="clearfix">
+									    <ul>
+									      	<li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">助教评分</label>
+									        	<input class="magic-radio fl mt5 magic-checkbox_show" id="zg_3" name="zg[]_2" type="radio" checked="">
+    											<label class="fl" for="zg_3">普通模式</label>
+    											<span class="fl color-grey mt5">（选中则取各助教最终评分的平均分）</span>
+    											<div class="cl"></div>
+									        	<input class="magic-radio fl mt5 magic-checkbox_show" id="zg_4" name="zg[]_2"  type="radio" checked="">
+    											<label class="fl" for="zg_4" style="margin-left: 11%;">复审模式</label>
+    											<span class="fl color-grey mt5">（选中则只取最终次的助教评分）</span>
+									        </li>
+									    </ul>
+									    <ul>
+									        <li class="clearfix mb20 edu-position pl30">
+										        <label class="panel-form-label fl mr10">最终成绩</label>
+											        
+										        <div class="popup_tip_box fontGrey2" style="right:-15px; top:0px;width:405px;">
+										            <em></em>
+										            <span></span>
+										            <p>计算说明</p>
+										            <p class="mb10">教师评分*其百分比+助教评分+其百分比+迟交扣分</p>
+										            <p>注意</p>
+										            <p>非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外</p><p>的评分选项上。例如教师评分60% + 助教评分40% ，学生A没有得到</p><p>教师评分，则最终成绩将按照助教评分100% 进行计算 </p>
+										        </div>
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">&nbsp;</label>
+										        <label class="mt8 fl mr10">教师评分</label>
+										        <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="5">
+									        </li>
+									        <li class="clearfix mb20 edu-position pl30">
+									        	<label class="panel-form-label fl mr10">&nbsp;</label>
+									        	<label class="mt8 fl mr10">助教评分</label>
+											    <input type="text" value="10" class="fl task-form-15 task-height-40 panel-box-sizing" placeholder="5">
+									        </li>
+									    </ul>
+									  </div>
+									</div>
+						        </div>
+						    </div>	
+						    <!--公开设置-->
+				      		<div class="pt10 pr10">
+				        		<div class="none" id="show_public_setting">
+								    <style>
+								    .magic-radio + label:before, .magic-checkbox_show + label:before{
+								        width: 16px;
+								        height: 16px;
+								    }
+									</style>
+									<div class="clearfix mb15">
+									  <p class="ml15 fl font-16 mt10">公开设置</p>
+									</div>
+									<div class="ml30 mr30 mb15">
+									  <div class="clearfix">
+									    <ul>
+									      <li class="clearfix">
+									        <label class="panel-form-label fl mr10">&nbsp;</label>
+									        <input class="magic-checkbox fl mt5 magic-checkbox_show" type="checkbox" disabled="" checked="">
+									        <label class="fl">公开成绩</label>
+									        <span class="fl color-grey">（选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开）</span>
+									      </li>
+									      <li class="clearfix">
+									        <label class="panel-form-label fl mr10">&nbsp;</label>
+									        <input class="magic-checkbox fl mt5 magic-checkbox_show" type="checkbox" disabled="" checked="">
+									        <label class="fl">公开答案</label>
+									        <span class="fl color-grey">（选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开）</span>
+									      </li>
+									    </ul>
+									  </div>
+									</div>
+				        		</div>
+						        <div class="" id="edit_public_setting">
+									<div class="clearfix mb15">
+									  <p class="ml15 fl font-16 mt10">公开设置</p>
+									</div>
+									<div class="ml30 mr30">
+									  <div class="clearfix">
+									    <ul>
+									        <li class="clearfix">
+									        <label class="panel-form-label fl mr10">&nbsp;</label>
+									        <input class="magic-checkbox fl magic-checkbox_show" type="checkbox" id="public_scroe" checked="">
+									        <label class="fl" for="public_scroe" style="top:0px">公开成绩</label>
+									        <span class="fl color-grey">（选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开）</span>
+									      </li>
+									      <li class="clearfix">
+									        <label class="panel-form-label fl mr10">&nbsp;</label>
+									        <input class="magic-checkbox fl magic-checkbox_show" type="checkbox" id="public_answer" checked="">
+									        <label class="fl" for="public_answer" style="top:0px">公开答案</label>
+									        <span class="fl color-grey">（选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开）</span>
+									      </li>
+									    </ul>
+									  </div>
+									</div>
+						        </div>
+						    </div>
+							<div class="clearfix mt15 mb15 mr15 pr10" id="exam_setting_submit_block">
+							    <a href="javascript:void(0);" class="task-btn task-btn-blue fr">保存</a>
+							    <a href="javascript:void(0);" class="task-btn fr mr10">取消</a>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/app/views/exercise/student_look_fortime.html b/app/views/exercise/student_look_fortime.html
new file mode 100644
index 000000000..391b3d7fb
--- /dev/null
+++ b/app/views/exercise/student_look_fortime.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/stylesheets/jquery/jquery-ui-1.9.2.css" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/course.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt;<a href="javascript:void(0)"> 试卷列表</a>&gt; #22&gt;胡莎莎
+				    </p>
+				    <div class="edu-con-top clearfix user_bg_shadow bor-grey-e mb20">
+					  <p class="ml15 fl color-grey3"><i class="fa fa-lock mr5"></i>软件测试小测</p>
+					  <span class="post_status_btn post_btn_green ml5 mt6">按时</span>
+					  <!--<span class="post_status_btn post_btn_red ml5 mt6">延时提交</span>-->
+					  <a href="/student_work?homework=4368&amp;tab=2" class="fr font-12 mr15  mt3 color-grey">返回</a>
+					</div>
+					
+					<div class="edu-con-top font-14 color-grey clearfix user_bg_shadow bor-grey-e">
+					 	<p class="ml20">试卷须知：</br>
+					 	<span class="ml40">共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。</span></br>
+					 	<span class="ml40">请大家认真答题，本次作业成绩将计入期末成绩。</span></p>
+					</div>
+					<div class="clearfix mt10 mb10 pl5 pr5">
+						<p class="fl">
+						  	<span class="mr20">单选题<span>&nbsp;3&nbsp;</span>题，共<span>&nbsp;15&nbsp;</span>分</span>
+						  	<span class="mr20">多选题<span>&nbsp;5&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span class="mr20">填空题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span>简答题&nbsp;10&nbsp;题，共&nbsp;25&nbsp;分</span>
+						</p>
+						<p class="fr">合计 <span class="color-orange03">18</span> 题，共  <span class="color-orange03">100</span> 分</p>
+					</div>
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<!--学生查看作品，截止日期后 -->
+						<div class="clearfix pl15">
+							<span class="checkstatus_box_small post_btn_green mt10"></span><span class="fl mr20 font-12 mt3">满分</span>
+							<span class="checkstatus_box_small post_btn_red mt10"></span><span class="fl mr20 font-12 mt3">零分</span>
+							<span class="checkstatus_box_small post_btn_green_q mt10"></span><span class="fl font-12 mt3">其它</span>
+							<p class="mr15 mt3 fr color-grey font-14">总分：<span class="color-light-green">89</span>分</p><!--<span class="color-red">95</span>-->
+						</div>
+						<div class="clearfix ml15 mt10 mb15">
+							<span class="checkstatus_box_big post_btn_red">1</span>
+							<span class="checkstatus_box_big post_btn_green">2</span>
+							<span class="checkstatus_box_big post_btn_green">3</span>
+							<span class="checkstatus_box_big post_btn_green">4</span>
+							<span class="checkstatus_box_big post_btn_red">5</span>
+							<span class="checkstatus_box_big post_btn_green">6</span>
+							<span class="checkstatus_box_big post_btn_green">7</span>
+							<span class="checkstatus_box_big post_btn_green">8</span>
+							<span class="checkstatus_box_big post_btn_green">9</span>
+							<span class="checkstatus_box_big post_btn_green_q">10</span>
+							<span class="checkstatus_box_big post_btn_green_q">11</span>
+						</div>
+						<!--学生查看作品，截止日期前 -->
+						<div class="clearfix pl15">
+							<span class="checkstatus_box_small post_btn_white mt10" style="border: 1px solid #CCCCCC;"></span><span class="fl mr20 font-12 mt3">已答</span>
+							<span class="checkstatus_box_small post_btn_grey mt10"></span><span class="fl mr20 font-12 mt3">未答</span>
+						</div>
+						<div class="clearfix ml15 mt10 mb15">
+							<span class="checkstatus_box_big post_btn_grey">1</span>
+							<span class="checkstatus_box_big post_btn_white">2</span>
+							<span class="checkstatus_box_big post_btn_white">3</span>
+							<span class="checkstatus_box_big post_btn_white">4</span>
+							<span class="checkstatus_box_big post_btn_grey">5</span>
+							<span class="checkstatus_box_big post_btn_white">6</span>
+							<span class="checkstatus_box_big post_btn_white">7</span>
+							<span class="checkstatus_box_big post_btn_white">8</span>
+							<span class="checkstatus_box_big post_btn_white">9</span>
+							<span class="checkstatus_box_big post_btn_grey">10</span>
+							<span class="checkstatus_box_big post_btn_grey">11</span>
+						</div>
+					</div>
+					<div class="clearfix">
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第1题:<span class="color-orange03 ml10">[多选题]</span><span class="ml10">10</span>分</p>
+								<!--截止日期前不显示-->
+								<p class="fr"><span class="color-light-green mr3"><i class="mr5 fa fa-check font-14"></i>10</span>分</p>
+								<!---->
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_0" type="checkbox" disabled=""><label class="fl color-grey3" for="dx_0">没区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_1" type="checkbox" disabled="" checked=""><label class="fl color-grey3" for="dx_1">有区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_2" type="checkbox" disabled=""><label class="fl color-grey3" for="dx_2">有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_4" type="checkbox" disabled="" checked=""><label class="fl color-grey3" for="dx_4">有很多区别</label></li>
+							</div>
+							<!--截止日期前不显示-->
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：ABCD
+							</div>
+							<!---->
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第2题:<span class="color-orange03 ml10">[单选题]</span><span class="ml10">5</span>分</p>
+								<p class="fr"><span class="color-red mr3"><i class="mr5 fa fa-close font-14"></i>0</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_1" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_1">没区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_2" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_2">有区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_3" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_3">有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_4" name="sx" type="radio" disabled="" checked=""><label class="fl color-grey3" for="sx_4">有很多区别</label></li>
+							</div>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：A
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第3题:<span class="color-orange03 ml10">[填空题]</span><span class="ml10">5</span>分</p>
+								<p class="fr"><span class="color-red mr3"><i class="mr5 fa fa-close font-14"></i>0</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试（<span class="color-light-green">没有</span>）区别</p>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								<p>候选答案1：哈哈哈哈</p>
+								<p>候选答案1：呵呵呵呵</p>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第4题:<span class="color-orange03 ml10">[简答题]</span><span class="ml10">10</span>分</p>
+								<p class="fr"><span class="color-light-green mr3">9</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="break-word write_answer">学生所填答案收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试.验收测试验收测.</div>
+							<div class="clearfix bor-top-greyE padding15 answer_con">
+								<p>参考答案</p>
+								<p style="text-align:justify;">黑盒测试也称功能测试或数据驱动测试，它是在已知产品所应具有的功能，通过测试来检测每个功能是否都能正常使用，在测试时，把程序看作一个不能打开的黑盆子，在完全不考虑程序内部结构和内部特性的情况下， </p>
+							</div>
+							<div>
+								<!--<p class="clearfix padding15 font-16 bor-top-greyE">
+									<span class="fl">全部评阅（10）</span>
+									<a class="fr white-btn orange-btn undis">下一题</a>
+								</p>-->
+								<div class="clearfix padding15 bor-top-greyE">
+									<div class="with85 fl">
+										<label class="fl color-grey mt5"> 评分&nbsp;&nbsp;</label>
+                    					<input type="number" class="fl task-form-10 task-height-40 panel-box-sizing" name="score" id="score_" value="0" min="-1" max="100" size="4" data-units="dollars" />
+                    					<span class="ml5 fl mt5">分</span>
+                  						<span id="score_notice_span_" class="ml5 fl mt5 color-red" style="display: none;">未评分</span>
+									</div>
+									<div class="with15 fr mt5">
+										<a href="javascript:void(0);" class="task-btn task-btn-orange fr">保存</a>
+										<a href="javascript:void(0);" class="task-btn mr10 fr">取消</a>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>	
+			</div>
+		</div>
+		<script>
+			$(function(){
+				$('#score_').peSlider({range: 'min'});
+				
+			})
+		</script>
+	</body>
+</html>
diff --git a/app/views/exercise/student_write_answer.html b/app/views/exercise/student_write_answer.html
new file mode 100644
index 000000000..2f4822b59
--- /dev/null
+++ b/app/views/exercise/student_write_answer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/stylesheets/jquery/jquery-ui-1.9.2.css" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/course.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt;<a href="javascript:void(0)"> 试卷列表</a>&gt; #22&gt;胡莎莎
+				    </p>
+				    <div class="edu-con-top clearfix user_bg_shadow bor-grey-e mb20">
+					  <p class="ml15 fl color-grey3"><i class="fa fa-lock mr5"></i>软件测试小测</p>
+					  <!--<span class="post_status_btn post_btn_green ml5 mt7">按时</span>-->
+					  <!--<span class="post_status_btn post_btn_red ml5 mt7">延时提交</span>-->
+					  <a href="/student_work?homework=4368&amp;tab=2" class="fr font-12 mr15  mt3 color-grey">返回</a>
+					</div>
+					
+					<div class="edu-con-top font-14 color-grey clearfix user_bg_shadow bor-grey-e">
+					 	<p class="ml20">试卷须知：</br>
+					 	<span class="ml40">共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。</span></br>
+					 	<span class="ml40">请大家认真答题，本次作业成绩将计入期末成绩。</span></p>
+					</div>
+					<div class="clearfix mt10 mb10 pl5 pr5">
+						<p class="fl">
+						  	<span class="mr20">单选题<span>&nbsp;3&nbsp;</span>题，共<span>&nbsp;15&nbsp;</span>分</span>
+						  	<span class="mr20">多选题<span>&nbsp;5&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span class="mr20">填空题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span>简答题&nbsp;10&nbsp;题，共&nbsp;25&nbsp;分</span>
+						</p>
+						<p class="fr">合计 <span class="color-orange03">18</span> 题，共  <span class="color-orange03">100</span> 分</p>
+					</div>
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<div class="clearfix pl15">
+							<span class="checkstatus_box_small post_btn_white mt10" style="border: 1px solid #CCCCCC;"></span><span class="fl mr20 font-12 mt3">已答</span>
+							<span class="checkstatus_box_small post_btn_grey mt10"></span><span class="fl mr20 font-12 mt3">未答</span>
+							<p class="fr mr15"><a href="javascript:void(0)" style="width: 50px;" class="task-btn task-btn-orange">交卷</a></p>
+						</div>
+						<div class="clearfix ml15 mt10 mb15">
+							<span class="checkstatus_box_big post_btn_grey">1</span>
+							<span class="checkstatus_box_big post_btn_white">2</span>
+							<span class="checkstatus_box_big post_btn_white">3</span>
+							<span class="checkstatus_box_big post_btn_white">4</span>
+							<span class="checkstatus_box_big post_btn_grey">5</span>
+							<span class="checkstatus_box_big post_btn_white">6</span>
+							<span class="checkstatus_box_big post_btn_white">7</span>
+							<span class="checkstatus_box_big post_btn_white">8</span>
+							<span class="checkstatus_box_big post_btn_white">9</span>
+							<span class="checkstatus_box_big post_btn_grey">10</span>
+							<span class="checkstatus_box_big post_btn_grey">11</span>
+						</div>
+					</div>
+					<div class="clearfix">
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第1题:<span class="color-orange03 ml10">[多选题]</span><span class="ml10">10</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb15">
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_0" type="checkbox"><label class="fl color-grey3" for="dx_0">没区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_1" type="checkbox"><label class="fl color-grey3" for="dx_1">有区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_2" type="checkbox"><label class="fl color-grey3" for="dx_2">有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_4" type="checkbox"checked=""><label class="fl color-grey3" for="dx_4">有很多区别</label></li>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第2题:<span class="color-orange03 ml10">[单选题]</span><span class="ml10">5</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb15">
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_1" name="sx" type="radio"><label class="fl color-grey3" for="sx_1">没区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_2" name="sx" type="radio"><label class="fl color-grey3" for="sx_2">有区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_3" name="sx" type="radio"><label class="fl color-grey3" for="sx_3">有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_4" name="sx" type="radio"><label class="fl color-grey3" for="sx_4">有很多区别</label></li>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第3题:<span class="color-orange03 ml10">[填空题]</span><span class="ml10">5</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试（）区别</p>
+							<div class="ml15 mr15 mb15 mt10">
+								<textarea class="task-height-40 with100"></textarea>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第4题:<span class="color-orange03 ml10">[简答题]</span><span class="ml10">10</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="ml15 mr15 mb15 mt10">
+								<textarea class="task-height-150 with100"></textarea>
+							</div>
+						</div>
+					</div>
+				</div>	
+			</div>
+		</div>
+		<script>
+			$(function(){
+				$('#score_').peSlider({range: 'min'});
+				
+			})
+		</script>
+	</body>
+</html>
diff --git a/app/views/exercise/teacher_check_exam.html b/app/views/exercise/teacher_check_exam.html
new file mode 100644
index 000000000..c5f04c08a
--- /dev/null
+++ b/app/views/exercise/teacher_check_exam.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/stylesheets/jquery/jquery-ui-1.9.2.css" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/course.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt;<a href="javascript:void(0)"> 试卷列表</a>&gt; #22&gt;胡莎莎
+				    </p>
+				    <div class="edu-con-top clearfix user_bg_shadow bor-grey-e mb20">
+					  <p class="ml15 fl color-grey3"><i class="fa fa-lock mr5"></i>软件测试小测</p>
+					  <span class="post_status_btn post_btn_green ml5 mt6">按时</span>
+					  <!--<span class="post_status_btn post_btn_red ml5 mt6">延时提交</span>-->
+					  <a href="/student_work?homework=4368&amp;tab=2" class="fr font-12 mr15  mt3 color-grey">返回</a>
+					</div>
+					
+					<div class="edu-con-top font-14 color-grey clearfix user_bg_shadow bor-grey-e">
+					 	<p class="ml20">试卷须知：</br>
+					 	<span class="ml40">共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。</span></br>
+					 	<span class="ml40">请大家认真答题，本次作业成绩将计入期末成绩。</span></p>
+					</div>
+					<div class="clearfix mt10 mb10 pl5 pr5">
+						<p class="fl">
+						  	<span class="mr20">单选题<span>&nbsp;3&nbsp;</span>题，共<span>&nbsp;15&nbsp;</span>分</span>
+						  	<span class="mr20">多选题<span>&nbsp;5&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span class="mr20">填空题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span>简答题&nbsp;10&nbsp;题，共&nbsp;25&nbsp;分</span>
+						</p>
+						<p class="fr">合计 <span class="color-orange03">18</span> 题，共  <span class="color-orange03">100</span> 分</p>
+					</div>
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<div class="clearfix">
+							<span class="fl ml15 mr20 font-15">主观题</span>
+							<span class="checkstatus_box_small post_btn_white mt10" style="border: 1px solid #CCCCCC;"></span><span class="fl mr20 font-12 mt3">已评</span>
+							<span class="checkstatus_box_small post_btn_grey mt10"></span><span class="fl font-12 mt3">未评</span>
+						</div>
+						<div class="clearfix ml80 mt10 mb15">
+							<span class="checkstatus_box_big post_btn_grey">1</span>
+							<span class="checkstatus_box_big post_btn_white">2</span>
+							<span class="checkstatus_box_big post_btn_white">3</span>
+							<span class="checkstatus_box_big post_btn_white">4</span>
+							<span class="checkstatus_box_big post_btn_grey">5</span>
+						</div>
+						<div class="clearfix">
+							<span class="fl ml15 mr20 font-15">客观题</span>
+							<span class="checkstatus_box_small post_btn_green mt10"></span><span class="fl mr20 font-12 mt3">正确</span>
+							<span class="checkstatus_box_small post_btn_red mt10"></span><span class="fl font-12 mt3">错误</span>
+						</div>
+						<div class="clearfix ml80 mt10 mb5">
+							<span class="checkstatus_box_big post_btn_green">1</span>
+							<span class="checkstatus_box_big post_btn_green">2</span>
+							<span class="checkstatus_box_big post_btn_green">3</span>
+							<span class="checkstatus_box_big post_btn_green">4</span>
+							<span class="checkstatus_box_big post_btn_red">5</span>
+						</div>
+					</div>
+					<div class="clearfix">
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第1题:<span class="color-orange03 ml10">[多选题]</span><span class="ml10">10</span>分</p>
+								<p class="fr"><span class="color-light-green mr3"><i class="mr5 fa fa-check font-14"></i>10</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_0" type="checkbox" disabled=""><label class="fl color-grey3" for="dx_0">A.没区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_1" type="checkbox" disabled="" checked=""><label class="fl color-grey3" for="dx_1">B.有区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_2" type="checkbox" disabled=""><label class="fl color-grey3" for="dx_2">C.有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_4" type="checkbox" disabled="" checked=""><label class="fl color-grey3" for="dx_4">D.有很多区别</label></li>
+							</div>
+							<div class="pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：ABCD
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第2题:<span class="color-orange03 ml10">[单选题]</span><span class="ml10">5</span>分</p>
+								<p class="fr"><span class="color-red mr3"><i class="mr5 fa fa-close font-14"></i>0</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_1" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_1">A.没区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_2" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_2">B.有区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_3" name="sx" type="radio" disabled=""><label class="fl color-grey3" for="sx_3">C.有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_4" name="sx" type="radio" disabled="" checked=""><label class="fl color-grey3" for="sx_4">D.有很多区别</label></li>
+							</div>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：A
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第3题:<span class="color-orange03 ml10">[填空题]</span><span class="ml10">5</span>分</p>
+								<p class="fr"><span class="color-red mr3"><i class="mr5 fa fa-close font-14"></i>0</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试（<span class="color-light-green">没有</span>）区别</p>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								<p>候选答案1：哈哈哈哈</p>
+								<p>候选答案1：呵呵呵呵</p>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第4题:<span class="color-orange03 ml10">[简答题]</span><span class="ml10">10</span>分</p>
+								<p class="fr"><span class="color-light-green mr3">9</span>分</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="break-word write_answer">学生所填答案收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试.验收测试验收测.</div>
+							<a href="javascript:void(0)" class="fr color-orange05 mb5 mr15 hide_answer">隐藏参考答案</a>
+							<div class="clearfix bor-top-greyE padding15 answer_con">
+								<p>参考答案</p>
+								<p style="text-align:justify;">黑盒测试也称功能测试或数据驱动测试，它是在已知产品所应具有的功能，通过测试来检测每个功能是否都能正常使用，在测试时，把程序看作一个不能打开的黑盆子，在完全不考虑程序内部结构和内部特性的情况下， </p>
+							</div>
+							<div>
+								<!--<p class="clearfix padding15 font-16 bor-top-greyE">
+									<span class="fl">全部评阅（10）</span>
+									<a class="fr white-btn orange-btn undis">下一题</a>
+								</p>-->
+								<div class="clearfix padding15 bor-top-greyE">
+									<div class="with85 fl">
+										<label class="fl color-grey mt5"> 评分&nbsp;&nbsp;</label>
+                    					<input type="number" class="fl task-form-10 task-height-40 panel-box-sizing" name="score" id="score_" value="0" min="-1" max="100" size="4" data-units="dollars" />
+                    					<span class="ml5 fl mt5">分</span>
+                  						<span id="score_notice_span_" class="ml5 fl mt5 color-red" style="display: none;">未评分</span>
+									</div>
+									<div class="with15 fr mt10">
+										<a href="javascript:void(0);" class="task-btn task-btn-orange fr">保存</a>
+										<a href="javascript:void(0);" class="task-btn mr10 fr">取消</a>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>	
+			</div>
+		</div>
+		<script>
+			$(function(){
+				$(".hide_answer").live("click",function(){
+					$(this).siblings(".answer_con").slideToggle(500);
+				})
+				
+				$('#score_').peSlider({range: 'min'});
+				
+			})
+		</script>
+	</body>
+</html>
diff --git a/app/views/exercise/teacher_edit_exam.html b/app/views/exercise/teacher_edit_exam.html
new file mode 100644
index 000000000..5d6d59945
--- /dev/null
+++ b/app/views/exercise/teacher_edit_exam.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/jquery/jquery-ui-1.9.2.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/course.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt;<a href="javascript:void(0)"> 试卷列表</a>&gt; #22&gt;胡莎莎
+				    </p>
+				    <div class="edu-con-top clearfix user_bg_shadow bor-grey-e mb20">
+					  <p class="ml15 fl color-grey3"><i class="fa fa-lock mr5"></i>软件测试小测</p>
+					  <span class="post_status_btn post_btn_green ml5 mt7">按时</span>
+					  <!--<span class="post_status_btn post_btn_red ml5 mt7">延时提交</span>-->
+					  <a href="/student_work?homework=4368&amp;tab=2" class="fr font-12 mr15  mt3 color-grey">返回</a>
+					</div>
+					
+					<div class="edu-con-top font-14 color-grey clearfix user_bg_shadow bor-grey-e">
+					 	<p class="ml20">试卷须知：</br>
+					 	<span class="ml40">共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。</span></br>
+					 	<span class="ml40">请大家认真答题，本次作业成绩将计入期末成绩。</span></p>
+					</div>
+					<div class="clearfix mt10 mb10 pl5 pr5">
+						<p class="fl">
+						  	<span class="mr20">单选题<span>&nbsp;3&nbsp;</span>题，共<span>&nbsp;15&nbsp;</span>分</span>
+						  	<span class="mr20">多选题<span>&nbsp;5&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span class="mr20">填空题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+						  	<span>简答题&nbsp;10&nbsp;题，共&nbsp;25&nbsp;分</span>
+						</p>
+						<p class="fr">合计 <span class="color-orange03">18</span> 题，共  <span class="color-orange03">100</span> 分</p>
+					</div>
+					<div class="clearfix sortable pr" id="sortable">
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第1题:<span class="color-orange03 ml10">[多选题]</span><span class="ml10">10</span>分</p>
+								<p class="fr exam_operator font-18">
+									<a href="javascript:void(0)" class="down_question"><i class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="up_question"><i class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="add_question"><i class="fa fa-plus-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-times-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-pencil color-orange05"></i></a>
+								</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_0" type="checkbox"><label class="fl color-grey3" for="dx_0">A.没区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_1" type="checkbox"><label class="fl color-grey3" for="dx_1">B.有区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_2" type="checkbox"><label class="fl color-grey3" for="dx_2">C.有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-checkbox fl mt5 magic-checkbox_show" id="dx_4" type="checkbox"><label class="fl color-grey3" for="dx_4">D.有很多区别</label></li>
+							</div>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：ABCD
+							</div>
+						</div>
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第2题:<span class="color-orange03 ml10">[单选题]</span><span class="ml10">5</span>分</p>
+								<p class="fr exam_operator font-18">
+									<a href="javascript:void(0)" class="down_question"><i class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="up_question"><i class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="add_question"><i class="fa fa-plus-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-times-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-pencil color-orange05"></i></a>
+								</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试的区别</p>
+							<div class="pl15 pr15 mb10">
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_0" name="sx" type="radio"><label class="fl color-grey3" for="sx_0">A.没区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_1" name="sx" type="radio"><label class="fl color-grey3" for="sx_1">B.有区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_2" name="sx" type="radio"><label class="fl color-grey3" for="sx_2">C.有一点点区别</label></li>
+								<li class="clearfix"><input class="magic-radio fl mt5 magic-checkbox_show" id="sx_4" name="sx" type="radio"><label class="fl color-grey3" for="sx_4">D.有很多区别</label></li>
+							</div>
+							<div class=" pl15 pr15 pt10 pb10 bor-top-greyE">
+								标准答案：A
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第3题:<span class="color-orange03 ml10">[填空题]</span><span class="ml10">5</span>分</p>
+								<p class="fr exam_operator font-18">
+									<a href="javascript:void(0)" class="down_question"><i class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="up_question"><i class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="add_question"><i class="fa fa-plus-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-times-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-pencil color-orange05"></i></a>
+								</p>
+							</div>
+							<p class="break-word pl15 pr15">黑盒测试和白盒测试（ ）区别</p>
+							<div class="pl15 pr15 pt10 pb10 bor-top-greyE">
+								<p>候选答案1：哈哈哈哈</p>
+								<p>候选答案1：呵呵呵呵</p>
+							</div>
+						</div>
+						
+						<div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
+							<div class="clearfix pl15 pr15">
+								<p class="fl font-15">第4题:<span class="color-orange03 ml10">[简答题]</span><span class="ml10">10</span>分</p>
+								<p class="fr exam_operator font-18">
+									<a href="javascript:void(0)" class="down_question"><i class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="up_question"><i class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)" class="add_question"><i class="fa fa-plus-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-times-circle mr10 color-orange05"></i></a>
+									<a href="javascript:void(0)"><i class="fa fa-pencil color-orange05"></i></a>
+								</p>
+							</div>
+							<p class="break-word pl15 pr15 mb10">黑盒测试和白盒测试的区别</p>
+							<div class="clearfix bor-top-greyE padding15 answer_con">
+								<p>参考答案</p>
+								<p style="text-align:justify;">黑盒测试也称功能测试或数据驱动测试，它是在已知产品所应具有的功能，通过测试来检测每个功能是否都能正常使用，在测试时，把程序看作一个不能打开的黑盆子，在完全不考虑程序内部结构和内部特性的情况下， </p>
+							</div>
+						</div>
+					</div>
+					<div class="question_item_con edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<div class="fl mr20 add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>单选题</div>
+						<div class="fl mr20 add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>多选题</div>
+						<div class="fl mr20 add_item_part" class="add_question"><i class="fa fa-plus-circle color-light-green mr5"></i>填空题</div>
+						<div class="fl add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>简答题</div>
+					</div>
+				</div>	
+			</div>
+		</div>
+		<script>
+			$(function(){
+				
+				//上移下移
+				$(".down_question").live("click",function(){
+					var count=$("#sortable").find(".question_item_con").length;
+					var thishtml=$(this).parents(".question_item_con");
+					if(thishtml.index()<count-1){
+						var html="<div class=\"question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15\">"+thishtml.html()+"</div>";
+						thishtml.next().after(html);
+						thishtml.remove();
+					}					
+				})
+				
+				$(".up_question").live("click",function(){
+					var thishtml=$(this).parents(".question_item_con");
+					if(thishtml.index()>0){
+						var html="<div class=\"question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15\">"+thishtml.html()+"</div>";
+						thishtml.prev().before(html);
+						thishtml.remove();
+					}					
+				})
+			})
+		</script>
+	</body>
+</html>
diff --git a/app/views/exercise/teacher_examination_list.html b/app/views/exercise/teacher_examination_list.html
new file mode 100644
index 000000000..104d04c57
--- /dev/null
+++ b/app/views/exercise/teacher_examination_list.html
@@ -0,0 +1,316 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">胡莎莎</a>  &gt; 智能课堂&gt; 计算机基础&gt; 计算机基础学院工程专业
+				   </p>
+				   <div class="edu-class-top clearfix mb30 pr user_bg_shadow bor-grey-e df">
+					    <ul class="fl edu-class-top-info" style="flex: 1;">
+					      <li class="mb10 font-16 clearfix mr30">
+					        <span class="fl" style="width:80%;">
+					          <span class="fl">计算概论-2016计算机科学与技术/软件工程/网络工程</span>
+					        </span>
+					        <span class="fl font-14 fr">邀请码：<span class="color-orange">CZPU8</span>
+					        </span>
+					      </li>
+					      <li class="color-grey clearfix font-14">
+					        <span class="javascript:void(0);"><a href="/users/ouyjq" class="edu-info-dark color-grey3 task-hide fl">欧阳建权</a></span>
+					        <span class="ml30 edu-info-dark task-hide fl">湘潭大学</span>
+					        <span class="ml30" id="teacher_number">教师<a href="/courses/792/members" class="ml5 edu-cir-grey-q color-orange05" id="teacher_number">1</a></span>
+					        <span class="ml30" id="student_number">学生<a href="/courses/792/members?role=as" class="ml5 edu-cir-grey-q color-orange05" id="student_number">260</a></span>
+					        <span class="ml30" id="teacher_number">分班<a href="/courses/792/members" class="ml5 edu-cir-grey-q color-orange05" id="teacher_number">1</a></span>
+					        <span class="ml30" id="student_number">学分<a href="/courses/792/members?role=as" class="ml5 edu-cir-grey-q color-orange05" id="student_number">260</a></span>
+					       <span class="ml30">结束<span class="ml5 edu-cir-grey-q color-grey3">97&nbsp;天后</span></span>
+					      </li>
+					   </ul>
+					    <div class="fr edu-position edu-position-hidebox" style="margin-top:-3px;position: absolute;right: 22px">
+				          <a href="javascript:void(0);" class="font-16"><i class="fa fa-bars"></i></a>
+				          <ul class="edu-position-hide undis">
+				            <li><a href="javascript:void(0);" onclick="delete_confirm_box('/courses/792/private_or_public', '您确定要设置为私有吗？');">设为私有</a></li>
+				            <li><a href="javascript:void(0);" onclick="delete_confirm_box('/courses/792/set_invite_code_halt', '邀请码停用后，用户不能主动加入该课堂了<br/>您是否确认停用');">停用邀请码</a></li>
+				            <li><a href="/courses/792/settings">设置</a></li>
+				            <li><a href="javascript:void(0);" onclick="delete_confirm_box_3('/courses/792', '课堂删除后数据将无法恢复，是否确定删除？')">删除</a></li>
+				          </ul>
+					    </div>
+					</div>
+					
+					<div class="news">
+				        <div class="edu-class-inner container mb20 clearfix">
+				        	<div class="member for-content-0 for-content">
+					            <div class="people clearfix">
+					                <div class="with15 fl ">
+					                	<div class="mb10 user_bg_shadow bor-grey-e">
+						                	<ul class="edu-class-leftnav">
+							                  <li class="clearfix" id="sy_01">
+							                    <a href="javascript:void(0)" class="fl ml15">动态</a>
+							                  </li>
+							                  <li class="clearfix" id="sy_03_1">
+							                    <a href="javascript:void(0)" class="fl ml15 ">讨论</a>
+							                    <span class="edu-cir-grey fl ml10 mt15">2</span>
+							                  </li>
+							                  <li class="clearfix" id="sy_03_4">
+							                    <a href="javascript:void(0)" class="fl ml15 ">资源</a>
+							                    <span class="edu-cir-grey fl ml10 mt15">1</span>
+							                  </li>
+							                  <li class="clearfix" id="sy_05">
+							                    <a href="javascript:void(0)" class="fl ml15 ">作业</a>
+							                    <span class="edu-cir-grey fl ml10 mt15">2</span>
+							                  </li>
+							                  <li class="clearfix active" id="sy_02">
+							                    <a href="javascript:void(0)" class="fl ml15">试卷</a>
+							                    <span class="edu-cir-grey fl ml10 mt15">12</span>
+							                  </li>
+						                	</ul>
+					                	</div>
+				                	</div>
+				                	<div class="with85 fl">
+				                		<div class="ml15 user_bg_shadow bor-grey-e">
+				                			<div class="edu-con-top clearfix">
+										      <p class="ml15 color-grey3 fl">试卷列表</p>
+										      <a href="javascript:void(0)" class="white-btn orange-btn fr mr20 mt3" data-remote="true" title="新建">+&nbsp;新建</a>
+										      <a href="javascript:void(0)" class="white-btn orange-btn fr mr20 mt3" data-remote="true" title="题库选用">+&nbsp;题库选用</a>
+										      <a href="javascript:void(0)" class="white-btn orange-btn fr mr20 mt3" data-remote="true" title="导出成绩">导出成绩</a>
+										    </div>
+										    <div class="edu-class-innner-conbox">
+											    <div class="edu-con-top clearfix">
+											        <p class="fl task-form-60 mt3 ml15" id="homework_index_tab">
+											          	<a href="javascript:void(0)" class="active edu-filter-cir-grey mr5 font-12 fl" data-remote="true">全部</a>
+														<a href="javascript:void(0)" class=" edu-filter-cir-grey mr5 font-12 fl" data-remote="true">挂起</a>
+														<a href="javascript:void(0)" class=" edu-filter-cir-grey mr5 font-12 fl" data-remote="true">提交中</a>
+														<a href="javascript:void(0)" class=" edu-filter-cir-grey mr5 font-12 fl" data-remote="true">补交中</a>
+														<a href="javascript:void(0)" class=" edu-filter-cir-grey mr5 font-12 fl" data-remote="true">评阅中</a>
+														<a href="javascript:void(0)" class=" edu-filter-cir-grey mr5 font-12 fl" data-remote="true">已结束</a>
+													</p>
+											        <div id="search_div" class="edu-position fr task-form-30 mr15" style="padding: 0px">
+													    <div class="edu-find fr with95 mr20 pr">
+													      <div class="edu-find-input">
+													        <input type="text" class="task-form-100 panel-box-sizing" name="search" placeholder="输入试卷名称进行搜索" value="" id="homework_name_search">
+													        <i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>
+													      </div>
+													      <a href="javascript:void(0);" onclick="$('#resource_search_form').submit();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
+													    </div>			
+											       </div>											
+											    </div>
+											    <div id="homework_index_list" class="mh550 clearfix">
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-yellow ml10 fl mt3">挂起</span>
+					  									<span class="post_status_btn post_btn_orange ml5 mt6">未答</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-green ml10 fl mt3">评阅中</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <!--<ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>-->
+										                <!--学生查看列表时显示的悬浮菜单-->
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">开始答题</a></li>
+										                    <li><a href="javascript:void(0)">答题统计</a></li>
+										                    <li><a href="javascript:void(0);">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">查看设置</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-blue ml10 fl mt3">提交中</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-green ml10 fl mt3">评阅中</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-orange ml10 fl mt3">补交中</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        <div class="clearfix edu-class-con-list pr">
+											          <div class="fl ml15 task-form-90 ">
+											            <span class="fl mr10 mt3 color-grey3"># 1</span>
+											            <a href="/student_work?homework=4842" class="edu-class-inner-list fl color-grey3">实训样式</a>
+											            <i class="fa fa-lock color-grey fl mt8 ml15 font-18"></i>
+											            <span class="edu-filter-btn edu-filter-btn-no-late ml10 fl mt3">已结束</span>
+											            <div class="cl"></div>
+											            <p class="color-grey font-12 mt20">											
+											              <span>创建于21天前</span>
+											              <span class="ml25">更新于1天前</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>已答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">2</a>未答</span>
+											              <span class="ml50"><a href="javascript:void(0)" class="color-orange05 mr3">60</a>未评</span>
+											              <span class="ml50"><span class="color-orange03">10&nbsp;</span>天<span class="color-orange03">&nbsp;5&nbsp;</span>小时<span class="color-orange03">&nbsp;10&nbsp;</span>分</span>
+											            </p>
+											          </div>
+										              <div class="fr edu-position edu-position-hidebox mr20 mt5">
+										                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+										                <ul class="edu-position-hide undis">
+										                    <li><a href="javascript:void(0)">预览</a></li>
+										                    <li><a href="javascript:void(0)">设置</a></li>
+										                    <li><a href="javascript:void(0);">答题统计</a></li>
+									                      	<li><a href="javascript:void(0)">导出成绩</a></li>
+									                      	<li><a href="javascript:void(0)">设为公开</a></li>
+									                      	<li><a href="javascript:void(0)">加入题库</a></li>
+										                    <li><a href="javascript:void(0)">删除</a></li>
+										                </ul>
+										              </div>
+											        </div>
+											        
+											        <div class="fr pages_right_min mt10 mb10">
+													  <ul>
+													    <li><a href="javascript:void(0);" class="pages-big" data-remote="true">上一页</a></li>
+													    <li><a class="active">1</a></li>
+													    <li><a href="javascript:void(0);" class="page c_blue" data-remote="true">2</a></li>
+													    <li><a href="javascript:void(0);" class="page c_blue" data-remote="true">3</a></li>
+													    <li><a href="javascript:void(0);" class="pages-big pages-border-right" data-remote="true">下一页</a></li> 
+													  </ul>
+													  <div class="cl"></div>
+													</div>
+											    </div>
+    										</div>
+				                		</div>
+				                	</div>
+				                </div>
+				            </div>
+				        </div>
+				   </div>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/app/views/exercise/teacher_score_list.html b/app/views/exercise/teacher_score_list.html
new file mode 100644
index 000000000..d306ecdb0
--- /dev/null
+++ b/app/views/exercise/teacher_score_list.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/magic-check.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/course.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt;<a href="javascript:void(0)"> 试卷列表</a>&gt; #22
+				    </p>
+				    <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<p class="ml15 fl color-grey3"><i class="fa fa-lock mr5 color-grey"></i>
+						    实验四 多周期CPU与存储器实验
+						</p>
+						<a href="javascript:void(0)" class="fr font-12 mr15 mt3 color-grey">返回</a>
+						<a href="javascript:void(0)" class="fr font-12 mr15 mt3 color-grey">设置</a>
+						<!--学生查看时显示-->
+						<a href="javascript:void(0)" class="fr font-12 mr15 mt3 color-grey">查看设置</a>
+					</div>
+					<div class="edu-tab clearfix mb20">
+						<ul id="edu-tab-nav" class="border-bottom-orange">
+							<li id="edu-tab-nav-2" class="new-tab-nav background-orange" onclick="HoverLi(2);">
+							    <a href="javascript:void(0);" class="tab_type">答题统计</a>
+							</li>
+						</ul>
+						<div id="list_count" class="user_bg_shadow bor-grey-e padding15">
+							<!--老师显示部分-->
+							<li class="clearfix mb5">
+								<a class="fr white-btn orange-btn ml10 mt8">导出成绩</a>
+				                <div class="edu-find fr mr40 with20 pr">
+				                  <div class="edu-find-input">
+				                    <input type="text" class="task-form-100 panel-box-sizing" placeholder="姓名、学号关键字检索" value="" id="course_student_name">
+				                    <i class="fa fa-close mr5 color-grey edu-close" onclick="$('#course_student_name').val('');SearchByName_1();"></i>
+				                  </div>
+				                  <a href="javascript:void(0);" onclick="SearchByName_1();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
+				                </div>
+				            </li>
+				            <li class="clearfix mb5">
+				                <span class="ml33 fl mr10 color-grey">你的评阅：</span>
+				                <span class="fl mr25">
+				                  <a href="javascript:void(0);" id="py_no_limit" class="color-orange03">不限</a>
+				                </span>
+				                <input id="py_1" class="magic-checkbox fl" type="checkbox" value="0" name="comment[]">
+				                <label for="py_1" class="fl mr25" style="top: 0px;">未评<span>(242)</span></label>
+				                <input id="py_2" class="magic-checkbox fl" type="checkbox" value="1" name="comment[]">
+				                <label for="py_2" class="fl mr25" style="top: 0px;">已评<span>(0)</span></label>
+				            </li>
+				            <li class="clearfix mb5">
+				                <span class="ml33 fl mr10 color-grey">作品状态：</span>
+				                <span class="fl mr25">
+				                  <a href="javascript:void(0);" id="zt_no_limit" class="color-orange03">不限</a>
+				                </span>
+				                <input id="zt_1" class="magic-checkbox fl" type="checkbox" value="0" name="comment[]">
+				                <label for="zt_1" class="fl mr25" style="top: 0px;">未评<span>(242)</span></label>
+				                <input id="zt_2" class="magic-checkbox fl" type="checkbox" value="1" name="comment[]">
+				                <label for="zt_2" class="fl mr25" style="top: 0px;">已评<span>(0)</span></label>
+				            </li>
+				            <li class="clearfix mb5">
+				                <span class="ml33 fl mr10 color-grey">分班情况：</span>
+				                <span class="fl mr25">
+				                  <a href="javascript:void(0);" id="fb_no_limit" class="color-orange03">不限</a>
+				                </span>
+				                <label class="fl mr25">1班</label>
+				                <label class="fl mr25">2班</label>
+				            </li>
+							<div class="panel-bg-grey clearfix mb15">
+								<a href="javascript:void(0)" class="color-orange03 fl ml15" data-remote="true">提交时间排序</a>
+								<span class="mr5 ml5 fl">|</span>
+								<a href="javascript:void(0)" class=" fl" data-remote="true">最终成绩排序</a>
+								<p class="fr"> <span class="color-orange03">242</span> 个检索结果（学生：108人）</p>	
+							</div>
+							<!--学生显示部分-->
+							<!--<p class="clearfix">
+								<span class="edu-filter-btn edu-filter-btn-orange mb15">你已提交</span>
+				            	<span class="edu-filter-btn edu-filter-btn-orange mb15">你未提交</span>
+				            	<a class="white-btn orange-btn fr">查看答题</a>
+							</p>
+				            <p class="clearfix font-12">
+				            	<span class="fr color-grey ml10">（10人已交）</span>							
+				            	<span class="fr color-grey">答题剩余时间：<span class="color-orange03">1</span>天<span class="color-orange03">3</span>小时<span class="color-orange03">20</span>分</span>
+				            </p>
+				            -->
+							<table class="edu-pop-table edu-txt-center hover-td" cellspacing="0" cellpadding="0">
+								<thead>
+									<tr>
+									  <th>序号</th>
+									  <th>姓名</th>
+									  <th>学号</th>
+									  <th>提交状态</th>
+									  <th>提交时间</th>
+									  <th>客观题得分</th>
+									  <th>主观题教师评分</th>
+									  <th>主观题助教评分</th>
+									  <th>最终成绩</th>
+									  <th>操作</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr id="student_work_113619">
+									  <td id="work_num_113619">48</td>
+									  <td><a href="javascript:void(0)" class="color-grey3">李航</a></td>
+									  <td title="2015551337">2015551337</td>
+									  <td><span class="color-light-green">按时提交</span></td>
+									  <td>2016-11-24 17:53</td>
+									  <td class="color-grey">--</td>
+									  <td class="color-grey">--</td>
+									  <td class="color-red-light edu-position student_score_info">91.0
+								        <div class="popup_tip_box-black" style="left: 120px; ">
+								          <em></em>
+								          <span></span>
+								          <p>5名助教进行了评分<br>平均分：91.0 分
+								          </p>
+								        </div>
+									  </td>
+									  <!-- 成绩 -->
+									  <td class="color-red-light edu-position student_score_info">91.0
+								        <div class="popup_tip_box-black" style="left: 100px; ">
+								          <em></em>
+								          <span></span>
+								          <p>胡莎莎（ruanjianlihang）<br>
+									            最终评分：91.0 分<br>
+									            迟交扣分：0 分<br>
+									            最终成绩：91.0 分<br>
+								          </p>
+								        </div>
+									  </td>
+									  <td><a href="javascript:void(0)" target="_blank">评阅</a></td>
+									</tr>
+									<tr id="student_work_113619">
+									  <td id="work_num_113619">48</td>
+									  <td><a href="javascript:void(0)" class="color-grey3">胡莎莎</a></td>
+									  <td title="2015551337">2015551337</td>
+									  <td><span class="color-orange">延时提交</span></td>
+									  <td>2016-11-24 17:53</td>
+									  <td class="color-red-light">95</td>
+									  <td class="color-grey">--</td>
+									  <td class="color-red-light edu-position student_score_info">91.0
+								        <div class="popup_tip_box-black" style="left: 120px;">
+								          <em></em>
+								          <span></span>
+								          <p>1名助教进行了评分<br>复审分：91.0 分
+								          </p>
+								        </div>
+									  </td>
+									  <!-- 成绩 -->
+									  <td class="color-grey edu-position student_score_info">52.0
+								        <div class="popup_tip_box-black" style="left: 100px;">
+								          <em></em>
+								          <span></span>
+								          <p>李航（ruanjianlihang）<br>
+									            最终评分：91.0 分<br>
+									            迟交扣分：0 分<br>
+									            最终成绩：91.0 分<br>
+								          </p>
+								        </div>
+									  </td>
+									  <td><a href="javascript:void(0)" target="_blank">评阅</a></td>
+									</tr>
+									<tr id="student_work_113619">
+									  <td id="work_num_113619">48</td>
+									  <td><a href="javascript:void(0)" class="color-grey3">李航</a></td>
+									  <td title="2015551337">2015551337</td>
+									  <td><span class="color-grey">未提交</span></td>
+									  <td>2016-11-24 17:53</td>
+									  <td class="color-grey">--</td>
+									  <td class="color-light-green">65.0</td>
+									  <td class="color-light-green edu-position student_score_info">65.0
+								        <div class="popup_tip_box-black" style="left: 120px;">
+								          <em></em>
+								          <span></span>
+								          <p>1名助教进行了评分<br>复审分：91.0 分
+								          </p>
+								        </div>
+									  </td>
+									  <!-- 成绩 -->
+									  <td class="color-red-light edu-position student_score_info">91.0
+								        <div class="popup_tip_box-black" style="left: 100px;">
+								          <em></em>
+								          <span></span>
+								          <p>李航（ruanjianlihang）<br>
+									            最终评分：91.0 分<br>
+									            迟交扣分：0 分<br>
+									            最终成绩：91.0 分<br>
+								          </p>
+								        </div>
+									  </td>
+									  <td>
+									  	<a href="javascript:void(0)" target="_blank">评阅</a>
+									  	<!--学生显示查看-->
+									  	<!--<a href="javascript:void(0)" target="_blank">查看</a>-->
+									  </td>
+									</tr>
+								</tbody>
+							</table>
+							<div style="text-align:center;" class="new_expand">
+							  	<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
+								    <ul>
+								      <li><a href="javascript:void(0)" class="pages-big" data-remote="true">上一页</a></li>
+								      <li><a class="active">1</a></li> 
+								      <li><a href="javascript:void(0)" class="page c_blue" data-remote="true">2</a></li>
+								      <li><a href="javascript:void(0)" class="page c_blue" data-remote="true">3</a></li>
+								      <li><a class="c_blue">...</a></li> 
+								      <li><a href="javascript:void(0)" class="page c_blue" data-remote="true">5</a></li>
+								      <li><a href="javascript:void(0)" class="pages-big pages-border-right" data-remote="true">下一页</a></li> 
+								    </ul>
+							    <div class="cl"></div>
+							  	</div>
+							</div>
+						</div>
+					</div>
+				</div>	
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/app/views/exercise/teacher_send_examination.html b/app/views/exercise/teacher_send_examination.html
new file mode 100644
index 000000000..e75a489d8
--- /dev/null
+++ b/app/views/exercise/teacher_send_examination.html
@@ -0,0 +1,358 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<link href="../../../public/stylesheets/css/edu-common.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-public.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/edu-class.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/taskstyle.css"  rel="stylesheet" type="text/css"/>
+		<link href="../../../public/stylesheets/css/font-awesome.css"  rel="stylesheet" type="text/css"/>
+		<script src="../../../public/javascripts/jquery-1.8.3.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/edu/application.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../../public/javascripts/baiduTemplate.js" type="text/javascript" charset="utf-8"></script>
+		<title></title>
+		<style>
+			
+			#mustBe::-webkit-input-placeholder::after {
+			    display:block;
+			    content:"Line 2\A Line 3";
+			}		
+
+			#mustBe::-moz-placeholder:after{
+			    display:block;
+			    content:"试卷须知：共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题 \A 您可以在此处填写本次试卷答题的相关说明";
+			};
+
+		</style>
+	</head>
+	<body style="height: 100%; background: #fff;">
+		<div class="newContainer">
+			<div class="newMain clearfix">
+				<div class="edu-class-container edu-position">
+					<p class="mb10 font-14">
+				        <i class="fa fa-map-marker mr5 color-grey"></i>
+				        <a href="javascript:void(0)">班级首页</a>  &gt; 试卷
+				    </p>
+				    <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+					  <p class="ml15 color-grey3 fl">新建试卷</p>
+					  <a class="fr font-12 color-grey mr15 mt5" style="cursor: pointer;">返回</a>
+					</div>
+					
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<div class="ml15 mr15 mb15">
+							<input class="panel-box-sizing panel-form-width-100" placeholder="试卷标题" style="text-align: center;"/>
+						</div>						
+						<div class="ml15 mr15">
+							<textarea id="mustBe" class="panel-box-sizing panel-form-width-100" placeholder="试卷须知：共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题;您可以在此处填写本次试卷答题的相关说明"></textarea>
+						</div>
+					</div>
+					
+					<div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+						<div class="fl mr20 add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>单选题</div>
+						<div class="fl mr20 add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>多选题</div>
+						<div class="fl mr20 add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>填空题</div>
+						<div class="fl add_item_part"><i class="fa fa-plus-circle color-light-green mr5"></i>简答题</div>
+					</div>
+					
+					<script id="t:set-option-list" type="text/html">
+					  <li class="clearfix pr mb20">
+					    <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice" name="option_span" data-tip-down="点击设置答案">A</span></label>
+					    <input type="hidden" name="choice[answer][]">
+					    <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+					    <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+					  </li>
+					</script>
+					<div class="user_bg_shadow bor-grey-e pl15 pr30 mb20 single_Temp" id="single_Temp">
+						<div class="clearfix">
+							<p class="fl mt15 font-16 mb10">单选题</p>
+							<label class="fr mt15">标准答案：<span class="color-orange current-option">请点击正确选项</span></label>
+						</div>
+						<li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_span" data-tip-down="点击设置答案">A</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_span" data-tip-down="点击设置答案">B</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_span" data-tip-down="点击设置答案">C</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix mb20">
+				            <label class="panel-form-label fl"><span class="add-option-item fr mr10 color-grey border-dash-orange" name="option_span">D</span></label>
+				            <div class="fl panel-box-sizing add-option-input border-dash-orange"><a title="新增" href="javascript:void(0)" class="option_icon_add">新增选项</a></div>
+				        </li>
+				        <li class="clearfix mb20">
+				        	<label class="panel-form-label fl"><span class="mr10">分值</span></label>
+				        	<input class="with10 mr5 fl panel-box-sizing task-height-40" /><label class="fl" style="line-height: 40px;">分</label>				        	
+				        	<p class="fr">
+				        		<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[单选题]属于客观题将由系统自动评分，请设置标准答案</span>
+				        		<a href="javascript:void(0)" class="fr task-btn task-btn-blue">保存</a>
+        						<a href="javascript:void(0)" class="fr task-btn mr10">取消</a>
+				        	</p>				        	
+				        </li>
+					</div>
+					
+					<script id="t:set-option-lists" type="text/html">
+					  <li class="clearfix pr mb20">
+					    <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice" name="option_spans" data-tip-down="点击设置答案">A</span></label>
+					    <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+					    <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+					  </li>
+					</script>
+					<div class="user_bg_shadow bor-grey-e pl15 pr30 mb20 multiple_Temp" id="multiple_Temp">
+						<div class="clearfix">
+							<p class="fl mt15 font-16 mb10">多选题</p>
+							<label class="fr mt15">标准答案：<span class="color-orange current-option">请点击正确选项</span></label>
+						</div>
+						<li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_spans" data-tip-down="点击设置答案">A</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_spans" data-tip-down="点击设置答案">B</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="option-item fr mr10 color-grey select-choice " name="option_spans" data-tip-down="点击设置答案">C</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入选项内容"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix mb20">
+				            <label class="panel-form-label fl"><span class="add-option-item fr mr10 color-grey border-dash-orange" name="option_spans">D</span></label>
+				            <div class="fl panel-box-sizing add-option-input border-dash-orange"><a title="新增" href="javascript:void(0)" class="option_icon_add">新增选项</a></div>
+				        </li>
+				        <li class="clearfix mb20">
+				        	<label class="panel-form-label fl"><span class="mr10">分值</span></label>
+				        	<input class="with10 mr5 fl panel-box-sizing task-height-40" /><label class="fl" style="line-height: 40px;">分</label>				        	
+				        	<p class="fr">
+				        		<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[多选题]属于客观题将由系统自动评分，请设置标准答案</span>
+				        		<a href="javascript:void(0)" class="fr task-btn task-btn-blue">保存</a>
+        						<a href="javascript:void(0)" class="fr task-btn mr10">取消</a>
+				        	</p>				        	
+				        </li>
+					</div>
+					
+					<script id="t:set-fillin-lists" type="text/html">
+					  	<li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="fr mr10 color-grey" name="fill_span">答案 2</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" name="fill[cnt][]" placeholder="请输入参考答案（可选）"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+					</script>
+					<div class="user_bg_shadow bor-grey-e pl15 pr30 mb20 fillin_Temp" id="fillin_Temp">
+						<p class="fl mt15 font-16 mb10">填空题</p>
+						<li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="mr10">题目</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入填空题的题干（注意：目前仅支持一个空）"></textarea>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="fr mr10 color-grey" name="fill_span">答案 1</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" name="fill[cnt][]" placeholder="请输入参考答案"></textarea>
+		                  <!--<a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>-->
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="fr mr10 color-grey" name="fill_span">答案 2</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" name="fill[cnt][]" placeholder="请输入参考答案（可选）"></textarea>
+		                  <a title="移除" href="javascript:void(0)" class="position-delete option_icon_remove"><i class="fa fa-times-circle color-orange font-16 fl"></i></a>
+		                </li>
+		                <li class="clearfix mb20">
+				            <label class="panel-form-label fl"><span>&nbsp;</span></label>
+				            <div class="fl panel-box-sizing add-option-input border-dash-orange"><a title="新增" href="javascript:void(0)" class="option_fillin_add">新增参考答案</a></div>
+				        </li>
+				        <li class="clearfix mb20">
+				        	<label class="panel-form-label fl"><span class="mr10">分值</span></label>
+				        	<input class="with10 mr5 fl panel-box-sizing task-height-40"/><label class="fl" style="line-height: 40px;">分</label>				        	
+				        	<p class="fr">
+				        		<span class="font-12 color-grey mb10" style="display: block;">温馨提示：[填空题]属于客观题将由系统自动评分，请设置标准答案</span>
+				        		<a href="javascript:void(0)" class="fr task-btn task-btn-blue">保存</a>
+        						<a href="javascript:void(0)" class="fr task-btn mr10">取消</a>
+				        	</p>				        	
+				        </li>
+					</div>
+					
+					<div class="user_bg_shadow bor-grey-e pl15 pr30 mb20 answer_Temp" id="answer_Temp">
+						<p class="fl mt15 font-16 mb10">简答题</p>
+						<li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="mr10">题目</span></label>
+		                  <textarea class="panel-form-width2-690 fl panel-box-sizing" placeholder="请输入简答题的题干（注意：目前仅支持一个空）"></textarea>
+		                </li>
+		                <li class="clearfix pr mb20">
+		                  <label class="panel-form-label fl"><span class="fr mr10 color-grey" name="option_spans">参考答案</span></label>
+		                  <textarea class="fl panel-box-sizing with90 task-height-150 pl5 pt5" placeholder="如有参考答案，请输入参考答案"></textarea>
+		                </li>
+				        <li class="clearfix mb20">
+				        	<label class="panel-form-label fl"><span class="mr10">分值</span></label>
+				        	<input class="with10 mr5 fl panel-box-sizing task-height-40" /><label class="fl" style="line-height: 40px;">分</label>				        	
+				        	<p class="fr">
+				        		<span class="font-12 color-grey" style="display: block;">温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分</span>
+				        		<span class="font-12 color-grey mb10 ml50" style="display: block;">&nbsp;&nbsp;参考答案仅作为人工评分的参考</span>
+				        		<a href="javascript:void(0)" class="fr task-btn task-btn-blue">保存</a>
+        						<a href="javascript:void(0)" class="fr task-btn mr10">取消</a>
+				        	</p>				        	
+				        </li>
+					</div>
+					
+					<div class="edu-con-top user_bg_shadow bor-grey-e color-grey clearfix mb20 font-12">
+					  <p class="ml15 fl">
+					  	<span class="mr20">单选题<span>&nbsp;3&nbsp;</span>题，共<span>&nbsp;15&nbsp;</span>分</span>
+					  	<span class="mr20">多选题<span>&nbsp;5&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+					  	<span class="mr20">填空题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+					  	<span>简答题<span>&nbsp;10&nbsp;</span>题，共<span>&nbsp;25&nbsp;</span>分</span>
+					  </p>
+					  <a class="fr mr15">
+					  	<span>合计<span class="color-orange03">&nbsp;10&nbsp;</span>题，共<span class="color-orange03">&nbsp;100&nbsp;</span>分</span>
+					  </a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<script>
+			$(function(){
+				var bt = baidu.template;
+		        bt.LEFT_DELIMITER = '<!';
+		        bt.RIGHT_DELIMITER = '!>';
+		        /*新建单选题选项*/
+		        $(".single_Temp").on('click',"a.option_icon_add", function () {
+		            var html = bt('t:set-option-list', null);
+		            $(this).parent().parent('.clearfix').before(html);
+		            var inputs = document.getElementsByName("question[cnt][]");
+		            var inputs_spans = document.getElementsByName("option_span");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                if(j >= 0 && j <= 26){
+		                    $(inputs_spans[j]).html(String.fromCharCode(65 + j));
+		                }
+		            }
+		            for (var i = 0; i < inputs.length; i++) {
+		                autoTextarea(inputs[i], 0, 140);
+		            }
+		            $(inputs[inputs.length - 1]).focus();
+		        });
+		        $(".single_Temp").on('click',"a.option_icon_remove", function () {
+		            var temp=$(this).parents("li").siblings("div").find(".current-option");
+		            var singl=$(this).parents(".single_Temp").find(".check-option-bg");
+		            temp.html("");
+		            
+		            $(this).parents('li').remove();
+		            var inputs_spans = document.getElementsByName("option_span");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                if(j >= 0 && j <= 26){
+		                    if(j >= 0 && j <= 26){
+		                        $(inputs_spans[j]).html(String.fromCharCode(65 + j));
+		                    }
+		                }
+		            }
+		            
+		            if(singl.length>0){
+		                for(var i=0;i<singl.length;i++){
+		                    temp.html(temp.html()+singl.eq(i).html());
+		                }
+		            }else{
+		                temp.html("请点击正确选项");
+		            }
+		        });
+	        	$(".single_Temp").find("li label").live("click",function(){
+	        		var temp=$(this).parents(".single_Temp");
+	        		if($(this).index()!=temp.find("li").length){
+	        			temp.find("li span").removeClass("check-option-bg");
+	        			$(this).find("span").toggleClass("check-option-bg");
+	        		}
+	        		temp.find(".current-option").html("");
+		            if(temp.find(".check-option-bg").length>0){
+		                for(var i=0;i<temp.find(".check-option-bg").length;i++){
+		                    temp.find(".current-option").html(temp.find(".current-option").html()+temp.find(".check-option-bg").eq(i).html());
+		                }
+		            }else{
+		                temp.find(".current-option").html("请点击正确选项");
+		            }
+	        	})
+	        	/*新建多选题选项*/
+	        	$(".multiple_Temp").on('click',"a.option_icon_add", function () {
+		            var html = bt('t:set-option-lists', null);
+		            $(this).parent().parent('.clearfix').before(html);
+		            var inputs = document.getElementsByName("question[cnt][]");
+		            var inputs_spans = document.getElementsByName("option_spans");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                if(j >= 0 && j <= 26){
+		                    $(inputs_spans[j]).html(String.fromCharCode(65 + j));
+		                }
+		            }
+		            for (var i = 0; i < inputs.length; i++) {
+		                autoTextarea(inputs[i], 0, 140);
+		            }
+		            $(inputs[inputs.length - 1]).focus();
+		        });
+		        $(".multiple_Temp").on('click',"a.option_icon_remove", function () {
+		        	var temp=$(this).parents("li").siblings("div").find(".current-option");
+		            var muil=$(this).parents(".multiple_Temp").find(".check-option-bg");
+		            var count=0;
+		            if($(this).parents("li").find(".check-option-bg").length>0){
+		            	alert($(this).parents("li").find("label span").html());
+		            	count++;
+		            }
+		            temp.html("");
+		            
+		            $(this).parents('li').remove();
+		            var inputs_spans = document.getElementsByName("option_spans");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                if(j >= 0 && j <= 26){
+		                    if(j >= 0 && j <= 26){
+		                        $(inputs_spans[j]).html(String.fromCharCode(65 + j));
+		                    }
+		                }
+		            }
+		            
+		            if(parseInt(muil.length)-count>0){
+		                for(var i=0;i<parseInt(muil.length)-count;i++){
+		                    temp.html(temp.html()+muil.eq(i).html());
+		                }
+		            }else{
+		                temp.html("请点击正确选项");
+		            }
+		        });
+	        	$("#multiple_Temp").find("li label").live("click",function(){
+	        		if($(this).index()!=$("#multiple_Temp").find("li").length){
+	        			$(this).find("span").toggleClass("check-option-bg");
+	        		}
+	        		$("#multiple_Temp").find(".current-option").html("");
+		            if($("#multiple_Temp").find(".check-option-bg").length>0){
+		                for(var i=0;i<$("#multiple_Temp").find(".check-option-bg").length;i++){
+		                    $("#multiple_Temp").find(".current-option").html($("#multiple_Temp").find(".current-option").html()+$("#multiple_Temp").find(".check-option-bg").eq(i).html());
+		                }
+		            }else{
+		                $("#multiple_Temp").find(".current-option").html("请点击正确选项");
+		            }
+	        	})
+	        	
+	        	
+	        	/*新建填空题答案项*/
+		        $(".fillin_Temp").on('click',"a.option_fillin_add", function () {
+		            var html = bt('t:set-fillin-lists', null);
+		            $(this).parent().parent('.clearfix').before(html);
+		            var inputs = document.getElementsByName("fill[cnt][]");
+		            var inputs_spans = document.getElementsByName("fill_span");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                    $(inputs_spans[j]).html("答案 "+(j+1));
+		            }
+		            for (var i = 0; i < inputs.length; i++) {
+		                autoTextarea(inputs[i], 0, 140);
+		            }
+		            $(inputs[inputs.length - 1]).focus();
+		        });
+		        $(".fillin_Temp").on('click',"a.option_icon_remove", function () {
+		            $(this).parents('li').remove();
+		            var inputs_spans = document.getElementsByName("fill_span");
+		            for (var j = 0; j < inputs_spans.length; j++) {
+		                    $(inputs_spans[j]).html("答案 "+(j+1));
+		            }
+		        });
+			})
+		</script>
+	</body>
+</html>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 78c46541f..a3bdfbb10 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -94,9 +94,10 @@
         <div class="edu-find fr mr40 with30 pr">
           <div class="edu-find-input">
             <input type="text" class="task-form-100 panel-box-sizing" name="search" placeholder="输入资源名称、描述的关键字进行搜索" value="<%= @q %>" id="all_resource_search"/>
-            <i class="fa fa-close mr5 color-grey edu-close" onclick="clear_search();"></i>
+            <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+            <span class="edu-close" style="top:1px;" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
           </div>
-          <a href="javascript:void(0);" onclick="submit_resource_search();" class="edu-open font-16 color-grey" style="right:-25px"><i class="fa fa-search"></i></a>
+          <a href="javascript:void(0);" style="top:3px;" onclick="submit_resource_search();" class="edu-open font-16 color-grey" style="right:-25px"><i class="fa fa-search"></i></a>
         </div>
         <p style="color: #808080" class="clearfix mt5" id="course_filter_order">
           <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index c1836895b..67c6a458d 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -1,3 +1,10 @@
+<style>
+    .wlist_select a {
+        background-color:#FC7033;
+        color: #fff!important;
+        border: 1px solid #FC7033;
+    }
+</style>
 <% if curse_attachments.count != 0 %>
     <% curse_attachments.each do |file| %>
         <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
@@ -8,10 +15,15 @@
             <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
         <% end %>
     <% end %>
+    <div style="text-align:center;margin-top:20px;margin-bottom:20px;" >
+      <div class="pages_right_min" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
 
-    <ul class="wlist">
-      <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
-    </ul>
 <% else %>
     <div class="mt10 user_bg_shadow" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
       <%= render :partial => "welcome/no_data" %>
diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb
index cbb53c2cc..b8b0f5ff7 100644
--- a/app/views/forums/_file_form.html.erb
+++ b/app/views/forums/_file_form.html.erb
@@ -3,7 +3,7 @@
     input.is_public_checkbox{margin-left:4px;margin-right:4px;}
 </style>
 <div class="fl">
-<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
@@ -47,7 +47,14 @@
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
     <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
-  <%= button_tag "上传附件", :id => "upload_attachments", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+  <%#= button_tag "上传附件", :id => "upload_attachments", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+
+    <label class="panel-form-label fl">&nbsp;</label>
+    <a href="javascript:void(0);" class="fl" onclick="$('#_file').click();" title="请选择文件上传">
+      <i class="fa fa-upload mr5"></i>
+      <span>上传附件</span>
+    </a>
+
     <!--<a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>-->
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 5b9f374f8..d583728d1 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -1,3 +1,87 @@
+<div class="edu-class-container edu-position">
+  <p class="mb10 font-14">
+    <i class="fa fa-map-marker mr5 color-grey"></i>
+    <a href="<%= user_path(@user) %>"><%= @user.show_name %></a>  &gt; 讨论
+  </p>
+  <div class="edu-class-top clearfix mb30 pr user_bg_shadow bor-grey-e">
+    <div class="clearfix">
+      <div class="fl with60 mt5">
+        <a href="javascript:void(0)" class="fl">
+          <%= image_tag(url_to_avatar(User.current), :width => 60, :height => 60,:alt=>'贴吧图像', :class=>"bor-radius-all" ) %>
+        </a>
+        <div class="fl ml15">
+          <li class="font-16"><%= @user.show_name %></li>
+          <li class="mt5 color-grey"><%= @user.login %></li>
+        </div>
+      </div>
+      <ul class="task-index-head-info fr with30" style="padding: 10px 0px;">
+        <li><span class="color-orange font-bd" id="all_syllabuses"><%= @memos_praise_count %></span><br><span>被赞</span></li>
+        <li><span class="color-orange font-bd" id="all_syllabuses"><%= @my_memos_count %></span><br><span>回复/评论</span></li>
+        <li><span class="color-orange font-bd" id="all_syllabuses"><%= @my_forums_count %></span><br><span>主题</span></li>
+      </ul>
+    </div>
+  </div>
+  <div class="clearfix user_bg_shadow bor-grey-e">
+    <div class="clearfix pt10 pb10 pl15 pr15 bor-bottom-greyE">
+      <p class="color-grey3 fl font-16">问吧</p>
+      <a href="<%= new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true) %>" class="mt3 white-btn orange-btn fr">+&nbsp;新话题</a>
+    </div>
+    <div id="forum_list" class="forum_table mh650">
+      <% @memos.each_with_index do |memo, index| %>
+      <div class="forum_table_item">
+        <a class="fr mr15">
+          <%= image_tag(url_to_avatar(memo.author), :width => 50, :height => 50,:alt=>'用户头像', :class=>"bor-radius-all mt3" ) %>
+        </a>
+        <div class="fl color-grey pr" style="flex: 1;">
+          <a href="<%= user_path(memo.author_id) %>" ><%= User.find(memo.author_id).try(:show_name) %></a>
+          <p class="font-16">
+            <a href="<%= forum_memo_path(memo.forum, memo) %>" class="clearfix item_name" target="_blank">
+              <%= memo.subject %>
+              <% if memo.sticky %>
+                  <span class="btn-top btn-cir-red mt5 ml5">顶</span>
+              <% end %>
+            </a>
+          </p>
+          <p style="width: 1103px;" class="overellipsis"><%= memo.content %></p>
+          <p class="clearfix font-12 mt5">
+            <span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i><%= memo.viewed_count %></span>
+            <span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i><%= get_praise_num(memo) %></span>
+            <span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i><%= Memo.where(:root_id => memo.id).count %></span>
+            <!--<span class="fl">类别：分享</span>-->
+            <span class="fr mr5">最后更新：<%= time_from_now memo.updated_at %></span>
+          </p>
+          <% if @user.admin? || @user == memo.author %>
+              <div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
+                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+                <ul class="edu-position-hide undis">
+                  <% if @user.admin? %>
+                      <% if memo.sticky %>
+                          <li><a href="<%= change_sticky_forum_memo_path(memo.forum,memo, :index => 1) %>">取消置顶</a></li>
+                      <% else %>
+                          <li><a href="<%= change_sticky_forum_memo_path(memo.forum,memo, :index => 1) %>">置&nbsp;&nbsp;顶</a></li>
+                      <% end %>
+                  <% end %>
+                  <li><a href="<%= edit_forum_memo_path(memo.forum, memo)%>">编&nbsp;&nbsp;辑</a></li>
+                  <li><a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= forum_memo_path(memo.forum, memo) %>', '您确定要删除吗？')">删&nbsp;&nbsp;除</a></li>
+                </ul>
+              </div>
+          <% end %>
+        </div>
+      </div>
+      <% end %>
+    </div>
+    <div style="text-align:center;" class="new_expand">
+      <div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
+        <ul id="homework_pository_ref_pages">
+          <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% if false %>
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
@@ -107,34 +191,34 @@
     });
 
     var first_click = true;
-//    function check_and_submit(){
-//        if(!check_memo_name()){
-//            return;
-//        }
-//        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
-//            first_click = false;
-//            memo_content.sync();
-//            $.ajax({
-//                url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos',
-//                type:'post',
-//                data:$("#new_memo").serialize(),
-//                success:function(data){
-//
-//                },
-//                error:function(){
-//                    alert('请检查当前网络连接')
-//                }
-//            });
-//            //$("#new_memo").submit();
-//        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
-//            $("#error").html("主题和内容不能为空").show();
-//        }
-//        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
-//            $("#error").html("主题不能为空").show();
-//        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
-//            $("#error").html("内容不能为空").show();
-//        }
-//    }
+    //    function check_and_submit(){
+    //        if(!check_memo_name()){
+    //            return;
+    //        }
+    //        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
+    //            first_click = false;
+    //            memo_content.sync();
+    //            $.ajax({
+    //                url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos',
+    //                type:'post',
+    //                data:$("#new_memo").serialize(),
+    //                success:function(data){
+    //
+    //                },
+    //                error:function(){
+    //                    alert('请检查当前网络连接')
+    //                }
+    //            });
+    //            //$("#new_memo").submit();
+    //        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
+    //            $("#error").html("主题和内容不能为空").show();
+    //        }
+    //        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
+    //            $("#error").html("主题不能为空").show();
+    //        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
+    //            $("#error").html("内容不能为空").show();
+    //        }
+    //    }
 
     function check_memo_name(){
         if($("#memo_subject").val().trim().length > 50){
@@ -156,4 +240,5 @@
         memo_content.html('')
         $('#error').html('').hide();
     }
-</script>
\ No newline at end of file
+</script>
+<% end %>
diff --git a/app/views/games/_choice_question.html.erb b/app/views/games/_choice_question.html.erb
index 8330ad846..0cddf1cf0 100644
--- a/app/views/games/_choice_question.html.erb
+++ b/app/views/games/_choice_question.html.erb
@@ -13,6 +13,7 @@
     <div id="codotab_con_1" class="white_bg" style="overflow-y: auto;height: 100%">
         <div class="panel-header clearfix" id="top_repository" style="border-bottom:0;padding:15px;">
           <% @game_challenge.challenge_chooses.each_with_index do |choose, index| %>
+              <% output = @game.outputs.where(:test_set_position => choose.position).first %>
               <p class="font-bd font-18 color-grey3"><%= (index + 1).to_s + "." + (choose.category == 1 ? "单选题" : "多选题") %></p>
               <div class="font-15 color-grey3 mb10 new_li read_only" unselectable="on" id="choose_subject_<%= index + 1 %>" style="padding: 10px 0px 10px 10px">
                 <textarea style="display:none;"><%= choose.subject %></textarea>
@@ -22,16 +23,16 @@
                     <p class="ml10 mb10 ">
                       <span>
                           <% if choose.category == 1 %>
-                             <input type="radio" <%= (choose.current_choose_outputs.try(:answer) == (i + 65).chr) ? "checked" : "" %> name="answer[<%= index + 1 %>]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-radio ml5">
+                             <input type="radio" <%= (output.try(:actual_output)== (i + 65).chr) ? "checked" : "" %> name="answer[<%= index + 1 %>]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-radio ml5">
                           <% else %>
                           <!--多选-->
-                            <input type="checkbox"  <%= (choose.current_choose_outputs.try(:answer).present? && (choose.current_choose_outputs.try(:answer).include? ((i + 65).chr))) ? "checked" : "" %> name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5">
+                            <input type="checkbox"  <%= (output.try(:actual_output).present? && (output.try(:actual_output).include? ((i + 65).chr))) ? "checked" : "" %> name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5">
                           <% end  %>
-                        <label class="break-word <%=(!choose.current_choose_outputs.try(:answer).nil? && (choose.current_choose_outputs.try(:answer).include? ((i + 65).chr))) ? "color-orange05" : "" %>" for="result_<%= index %>_<%= i %>" style="top: 0px"><span><%= (question.position + 65).chr %></span>.<%= question.option_name %></label>
+                        <label class="break-word <%=(output.try(:actual_output).present? && (output.try(:actual_output).include? ((i + 65).chr))) ? "color-orange05" : "" %>" for="result_<%= index %>_<%= i %>" style="top: 0px"><span><%= (question.position + 65).chr %></span>.<%= question.option_name %></label>
                       </span>
                     </p>
                 <% end %>
-                <input type="hidden" name="user_answer">
+                <input type="hidden" name="user_answer" value="<%= output.try(:actual_output) %>">
               </div>
           <% end %>
           <!--<div class="pl5 pr5 pt10 pb10 bor-grey-e">
@@ -90,16 +91,16 @@
                 //alert($(this).siblings("label").find("span").html());
                 if($(this).attr("checked")=="checked"){
                     value=$(this).siblings("label").find("span").html();
-                    $(this).parents(".problem_single").find("label").removeClass("color-orange05");
-                    $(this).siblings("label").addClass("color-orange05");
+                    $(this).parents(".problem_single").find("label").removeClass("color-orange03");
+                    $(this).siblings("label").addClass("color-orange03");
                 }
             }else{
                 var p=$(this).parents(".problem_single").find("p");
                 value="";
                 if($(this).attr("checked")=="checked"){
-                    $(this).siblings("label").addClass("color-orange05");
+                    $(this).siblings("label").addClass("color-orange03");
                 }else{
-                    $(this).siblings("label").removeClass("color-orange05");
+                    $(this).siblings("label").removeClass("color-orange03");
                 }
                 for(var i=0;i< p.length;i++){
                     if(p.eq(i).find("input").attr("checked")=="checked"){
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb
index 239fa8d8d..5dbeb1731 100644
--- a/app/views/games/_code_actions.html.erb
+++ b/app/views/games/_code_actions.html.erb
@@ -14,7 +14,7 @@
 <div id="code_test">
   <% if @st == 0 %>
       <a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="training_task_submmit();">评测</a>
-  <% elsif @game.status != 2 %>
+  <% else %>
       <a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="choice_submmit();">评测</a>
   <% end %>
 </div>
diff --git a/app/views/games/_game_choose_results.html.erb b/app/views/games/_game_choose_results.html.erb
index 67afd3dc4..f212f1f3f 100644
--- a/app/views/games/_game_choose_results.html.erb
+++ b/app/views/games/_game_choose_results.html.erb
@@ -11,10 +11,10 @@
     <div class="fit -scroll">
       <div class="-layout-v -fit">
         <div  class="-flex -scroll task-padding16">
-          <% unless game_challenge.choose_correct_num == nil %>
-              <% if game_challenge.choose_correct_num != game_challenge.challenge_chooses.count %>
+          <% unless @game.choose_correct_num == nil %>
+              <% if @game.choose_correct_num != game_challenge.challenge_chooses.count %>
                   <p class="-text-danger mb10">
-                    <i class="fa fa-exclamation-circle font-16" ></i><span class="ml5 mr5 -text-danger"><%= game_challenge.choose_correct_num %>/<%= game_challenge.challenge_chooses.count %></span>共有<%= game_challenge.challenge_chooses.count %>组测试集，其中有<%= game_challenge.challenge_chooses.count  - game_challenge.choose_correct_num %>组测试结果不匹配。详情如下：
+                    <i class="fa fa-exclamation-circle font-16" ></i><span class="ml5 mr5 -text-danger"><%= @game.choose_correct_num %>/<%= game_challenge.challenge_chooses.count %></span>共有<%= game_challenge.challenge_chooses.count %>题，其中有<%= game_challenge.challenge_chooses.count - @game.choose_correct_num %>题结果不匹配。详情如下：
                   </p>
               <% else %>
                   <p class="color-light-green mb10">
@@ -23,14 +23,15 @@
               <% end %>
           <% end %>
           <% game_challenge.challenge_chooses.each_with_index do |choose, index| %>
+              <% output = @game.outputs.where(:test_set_position => choose.position).first %>
               <div class="-task-ces-box mb15 clearfix">
                 <div class="-task-ces-top" onclick="toggle_test_case('0', '<%= index %>')" style="cursor:pointer">
                   <i class="fa fa-caret-right mr5 font-16" ></i>
                   <span class="font-14">题目<%= index + 1 %></span>
                   <%# outputs = ChooseOutputs.where(:challenge_choose_id => choose.id).first %>
-                  <% unless choose.current_choose_outputs.blank? %>
+                  <% if output.present? %>
                       <%# if choose.choose_outputs.try(:answer) != choose.standard_answer %>
-                      <% if choose.current_choose_outputs.try(:answer) == choose.standard_answer %>
+                      <% if output.result %>
                           <i class="fa fa-check-circle color-light-green fr mt8 ml5 f14" ></i>
                       <% else %>
                           <i class="fa fa-exclamation-circle -text-danger fr mt8 ml5" ></i>
@@ -41,11 +42,15 @@
                 </div>
                 <div class="-task-ces-info undis" id="test_case_<%= index %>">
                 <ul class=" font-14">
-                  <% if choose.choose_outputs.blank? %>
+                  <% if output.try(:actual_output).blank? %>
                       <li><span class="ml30">尚未提交，暂不支持查看</span></li>
                   <% else %>
-                      <li><span class="-task-ces-info-left color-blue">正确选项：</span><span><%= choose.standard_answer %></span></li>
-                      <li><span class="-task-ces-info-left color-blue">你的选项：</span><span class="color-orange"><%= choose.current_choose_outputs.try(:answer).nil? ? "无" : choose.current_choose_outputs.try(:answer) %></span></li>
+                      <% if output.result || @game.status == 2  %>
+                        <li><span class="-task-ces-info-left color-blue">正确选项：</span><span><%= choose.standard_answer %></span></li>
+                        <li><span class="-task-ces-info-left color-blue">你的选项：</span><span class="color-orange"><%= output.try(:actual_output) %></span></li>
+                      <% else %>
+                        <li><span class="-text-danger ml30">错误，不支持查看</span></li>
+                      <% end %>
                   <% end %>
                 </ul>
               </div>
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index c30f163b9..68416f8a9 100644
--- a/app/views/games/_game_show.html.erb
+++ b/app/views/games/_game_show.html.erb
@@ -43,7 +43,6 @@
         <% else %>
             <span class="btn-cir-big fr mt8 mr15" >经验值：<%= @game_challenge.choose_score.to_i %></span>
         <%  end %>
-
       </ul>
       <div class="cl"></div>
       <div  class="-flex -relative greytab-inner">
@@ -82,12 +81,12 @@
     <div class="-layout-h -padding-h-16 -horizontal -footer-left" id="bottom_points" style = "position:relative;">
       <ul class="-task-ml80 -layout" style="overflow:hidden;align-items:flex-end;flex-wrap:wrap;">
         <%= render :partial => "games/shixun_comment_block" %>
-        <li class="fl mt10 ml20 " style="width:54px;margin-bottom:10px;"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
+        <li class="fl mt10 ml20 " style="width:54px;margin-bottom:10px;"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white" id = "sendNews">发送</a></li>
         <li class="fl ml20 mt15" style="width:85px;margin-bottom:10px;">
-            <span data-tip-left="<%= @praise.nil? ? "点赞" : "取消点赞" %>" onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')" id="game_praise_tread" class="pt5 color-grey mr20">
+            <span data-tip-top="<%= @praise.nil? ? "点赞" : "取消点赞" %>" onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')" id="game_praise_tread" class="pt5 color-grey mr20">
               <i class="fa fa-thumbs-up font-20 mr3 <%= @praise.nil? ? "" : "color-light-green" %>" alt="赞" ></i><span class="font-12 font-bd" id="game_praise_count"><%= @praise_count %></span>
             </span>
-            <span data-tip-right="<%= @tread.nil? ? "踩" : "取消踩" %>" onclick="game_tread('<%=  @game_challenge.id %>')" id="game_tread" class="color-grey" style="padding-top:7px;">
+            <span data-tip-top="<%= @tread.nil? ? "踩" : "取消踩" %>" onclick="game_tread('<%=  @game_challenge.id %>')" id="game_tread" class="color-grey" style="padding-top:7px;">
               <i class="fa fa-thumbs-down font-20 mr3 <%= @tread.nil? ? "" : "color-orange" %>" ></i><span class="font-12 font-bd" id="game_tread_count"><%= @tread_count %></span>
             </span>
         </li>
diff --git a/app/views/games/_pass_game_show.html.erb b/app/views/games/_pass_game_show.html.erb
index ef086eb99..5b1329923 100644
--- a/app/views/games/_pass_game_show.html.erb
+++ b/app/views/games/_pass_game_show.html.erb
@@ -1,53 +1,25 @@
 <%= stylesheet_link_tag 'css/edu-common', 'css/edu-popup' %>
 
-<% if game.challenge.st != 0 %>
-<div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);top: 0px;left: 0px;">
+<div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);">
   <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
     <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
-    <% if had_done == 0 %>
-        <div class="task-su-con">
+    <div class="task-su-con">
+      <% if had_done == 0 %>
           <p class="task-su-p">恭喜您通过本关</p>
-          <p class="mt8"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;<%= game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
-          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;<%= game.challenge.challenge_chooses.count  - game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
-        </div>
-    <% else %>
-        <div class="task-su-con" style="position: absolute;width: 100%;z-index:3;padding-top: 63px;">
-          <img src="/images/task/task-success02.png"/>
-          <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt30" onclick="hideModal();" data-remote="true">查看光辉历史</a>
-        </div>
-        <div style="text-align:center;background-color: #fff;border-radius: 0px 0px 8px 8px;width: 200px;position:absolute;z-index:2;height:100px;bottom:-30px;left:50%;margin-left:-100px;">
-          <p class="mt25"><i class="fa fa-check-circle color-light-green mr5"></i>本题正确：<span class="color-orange03">&nbsp;<%= game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
-          <p><i class="fa fa-exclamation-circle color-orange mr5"></i>本题错误：<span class="color-orange03">&nbsp;<%= game.challenge.challenge_chooses.count  - game.challenge.choose_correct_num.to_i %>&nbsp;</span>道</p>
-        </div>
-    <% end %>
-  </div>
-  <% if had_done == 0 %>
-    <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
-  <% end %>
-</div>
-<% else %>
-    <div class="task-popup-warp" style="background-color: rgba(0,0,0,0.7);">
-      <div class="task-popup-box <%= had_done == 0 ? "task-box1" : "task-box2" %>">
-        <a href="javascript:void(0)" class="task-popup-close" onclick="refresh_game_list();"></a>
-        <div class="task-su-con">
-          <% if had_done == 0 %>
-              <p class="task-su-p">恭喜您通过本关</p>
-              <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
-          <% else %>
-              <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt50" onclick="hideModal();" data-remote="true">查看光辉历史</a>
-          <% end %>
-        </div>
-      </div>
+          <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %>
+      <% else %>
+          <a href="<%= myshixun_game_path(myshixun, :index => 1) %>" class="task-su-btn-white mt50" onclick="hideModal();" data-remote="true">查看光辉历史</a>
+      <% end %>
     </div>
-<% end %>
-
+  </div>
+</div>
 <script>
-  function refresh_game_list(){
-      $.ajax({
-          url: "<%= refresh_game_list_myshixun_game_path(game, :myshixun_id => myshixun) %>",
-          dataType: "script"
-      });
+    function refresh_game_list(){
+        $.ajax({
+            url: "<%= refresh_game_list_myshixun_game_path(game, :myshixun_id => myshixun) %>",
+            dataType: "script"
+        });
 
-      //$("#all_task_show").css("display","none");
-  }
+        //$("#all_task_show").css("display","none");
+    }
 </script>
\ No newline at end of file
diff --git a/app/views/games/_shixun_comment_list.html.erb b/app/views/games/_shixun_comment_list.html.erb
index 2707561a3..d4a50066d 100644
--- a/app/views/games/_shixun_comment_list.html.erb
+++ b/app/views/games/_shixun_comment_list.html.erb
@@ -13,7 +13,7 @@
                       <%= link_to dis.user.show_name, user_path(dis.user), :class => "fl link-color-grey mr20" ,:style => "display: block" %>
                       <span class="fl color-grey font-12 mt3 mr20"><%= time_from_now dis.created_at %></span>
                       <% if dis.try(:challenge_id).present? %>
-                        <span class="fl color-grey font-12 mt3">[第<%= Challenge.find(dis.try(:challenge_id)).try(:position) %>关]</span>
+                        <span class="fl color-light-green font-12 mt3">[第<%= Challenge.find(dis.try(:challenge_id)).try(:position) %>关]</span>
                       <% end %>
                       <span class="fr color-grey font-12 color_Purple_grey" id="dis_praise_<%= dis.id %>">
                         <%= render :partial => "discusses/dis_praise", :locals => {:discuss => dis} %>
@@ -80,12 +80,15 @@
 <script>
   //二次回复的提示结构
   var $points = $("<div class = \"points-data-tip-top\">"+
-                    "<div class = \"data-tip-top\">请在此输入回复</div>"+
+                    "<div class = \"data-tip-top1 \">请在此输入回复</div>"+
                     "</div>").appendTo("#bottom_points");
     $("#reversion").click(function(){
         $points.show();
     });
-    $("#comment_news").blur(function(){
-        $points.hide();
+    $("#comment_news").bind("input propertychange",function(){
+        console.log(1);
+       if($("#comment_news").val() != ''){
+           $points.hide();
+       }
     });
 </script>
\ No newline at end of file
diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb
index 2419d5fec..25f057ced 100644
--- a/app/views/games/show.js.erb
+++ b/app/views/games/show.js.erb
@@ -2,6 +2,10 @@
     clearInterval(cm); // tpi关闭耗时
     <% if !@type.blank? || !params[:path].nil? %>
         $("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>');
+    <% elsif params[:choose].present? %>
+        $("#games_valuation_contents").html("<%= j(render :partial => 'games/game_choose_results', :locals => { :game_challenge => @game_challenge}) %>");
+        $("#all_task_show").html("<%= j(render :partial => "games_list") %>");
+        $("#game_operate_action").html("<%= j(render :partial => "games/code_actions") %>");
     <% else %>
         $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>');
     <% end %>
@@ -11,7 +15,7 @@
     $("#all_task_show").hide();
     fadein = 0;
     // 选择题
-    <% if params[:choose] == "1" %>
+    <% if params[:choose] == "true" %>
         <% if @had_done == 0 %>
             $("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a>");
             var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>";
diff --git a/app/views/homework_common/_homework_index_tab.html.erb b/app/views/homework_common/_homework_index_tab.html.erb
index c28992cc8..55336d0b4 100644
--- a/app/views/homework_common/_homework_index_tab.html.erb
+++ b/app/views/homework_common/_homework_index_tab.html.erb
@@ -1,6 +1,6 @@
 <a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework_type) %>" class="<%= @order.nil? ? "active" : "" %> edu-filter-cir-grey mr5 font-12 fl" data-remote="true">全部</a>
 <% if @is_teacher %>
-<a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework_type, :order => 0, :search => @search) %>" class="<%= @order == "0" ? "active" : "" %> edu-filter-cir-grey mr5 font-12 fl" data-remote="true">挂起</a>
+<a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework_type, :order => 0, :search => @search) %>" class="<%= @order == "0" ? "active" : "" %> edu-filter-cir-grey mr5 font-12 fl" data-remote="true">未发布</a>
 <% end %>
 <a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework_type, :order => 1, :search => @search) %>" class="<%= @order == "1" ? "active" : "" %> edu-filter-cir-grey mr5 font-12 fl" data-remote="true">提交中</a>
 <a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework_type, :order => 3, :search => @search) %>" class="<%= @order == "3" ? "active" : "" %> edu-filter-cir-grey mr5 font-12 fl" data-remote="true">匿评中</a>
diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index cf354cd21..c2f03570a 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -4,8 +4,9 @@
 
     <div class="edu-find fr with95 mr20 pr">
       <div class="edu-find-input">
-        <input type="text" class="task-form-100 panel-box-sizing" name="search" placeholder="输入作业名称进行搜索" value="<%= @search %>" id="homework_name_search"/>
-        <i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>
+        <input type="text" class="with100 panel-box-sizing" name="search" placeholder="输入作业名称进行搜索" value="<%= @search %>" id="homework_name_search"/>
+        <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+        <span class="edu-close" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
       </div>
       <a href="javascript:void(0);" onclick="$('#resource_search_form').submit();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
     </div>
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index e7fca0de0..9e77b7116 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -8,6 +8,9 @@
               <%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id, :homework_type =>@homework_type), :class => "white-btn orange-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
           <% else %>
               <%= link_to '选用实训', shixuns_homework_common_index_path(:course => @course.id), :remote => true, :class => "white-btn orange-btn fr mr20", :title => "新建作业" %>
+              <% if User.current.admin? %>
+                  <%= link_to("实训统计", shixun_statistics_course_path(@course, :format => "xls"), :class => "white-btn orange-btn fr mr10",:title=>"实训作业统计") %>
+              <% end %>
           <% end %>
       <% end %>
       <!--<a href="<%#= export_course_member_excel_course_path(@course) %>" class="edu-btn fr mr10">导出成绩</a>-->
diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index a275be916..893fb84cf 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -74,11 +74,11 @@
         <% is_TE = get_user_member_roles_course @course, User.current, 9 %>
         <% is_ST = get_user_member_roles_course @course, User.current, 10 %>
         <% if !is_teacher && (is_TE || is_AD) %>
-            <%= link_to '切换为教师', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TE ? 9 : 3)), :class => "white-btn orange-btn font-14 fr", :title => "由学生身份切换至教师身份" %>
+            <div class="fr" data-tip-down = "由学生身份切换至教师身份"><%= link_to '切换为教师', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TE ? 9 : 3)), :class => "white-btn orange-btn font-14 " %></div>
         <% elsif !is_teacher && is_TA %>
-            <%= link_to '切换为助教', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => 7), :class => "white-btn orange-btn font-14 fr", :title => "由学生身份切换至助教身份" %>
+            <div class="fr" data-tip-down = "由学生身份切换至助教身份"><%= link_to '切换为助教', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => 7), :class => "white-btn orange-btn font-14 " %></div>
         <% elsif is_teacher && is_ST %>
-            <%= link_to '切换为学生', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : (is_TE ? 9 : 3)), :tar_role => 10), :class => "white-btn orange-btn font-14 fr", :title => "由教师身份切换至学生身份" %>
+            <div class="fr" data-tip-down = "由教师身份切换至学生身份"><%= link_to '切换为学生', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : (is_TE ? 9 : 3)), :tar_role => 10), :class => "white-btn orange-btn font-14 " %></div>
         <% end %>
 
         <% unless (is_teacher || is_TA || is_TE || is_ST) %>
diff --git a/app/views/layouts/_group_children_list.html.erb b/app/views/layouts/_group_children_list.html.erb
index 486e0aa76..417226ba8 100644
--- a/app/views/layouts/_group_children_list.html.erb
+++ b/app/views/layouts/_group_children_list.html.erb
@@ -13,9 +13,19 @@
       <% @course.course_groups.each do |group| %>
           <li id="course_group_<%=group.id %>" class="clearfix">
             <% count = group.members.count %>
-            <a href="<%= has_group_student_list_course_path(@course, :group_id => group.id) %>" class="fl ml35 edu-break-outshort"><%=group.name %></a>
-            <span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
+            <a href="<%= has_group_student_list_course_path(@course, :group_id => group.id) %>" class="fl mr5 ml35 edu-break-outshort"><%=group.name %></a>
+            <span class="edu-cir-grey fl mt15"><%= count %></span>
           </li>
       <% end %>
     </ul>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<script>
+    <% unless @course.course_groups.empty? %>
+    <% @course.course_groups.each do |group| %>
+    if($("#course_group_<%=group.id %> a").width() == 96){
+        $("#course_group_<%=group.id %> a").attr("data-tip-left","<%= group.name %>");
+    }
+    <% end %>
+    <% end %>
+</script>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 73acfb0e7..2085a3c5d 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -18,6 +18,7 @@
     <li><%= link_to "全部实训", shixuns_path, :class => "new-nav-a font-16" %></li>
     <li><%= link_to "实训路径", subjects_path, :class => "new-nav-a font-16" %></li>
     <li><%= link_to "在线课堂", courses_path, :class => "new-nav-a font-16" %></li>
+    <li><%= link_to "讨论", forums_path, :class => "new-nav-a font-16" %></li>
 
 <!--    <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>-->
 <!--    <li><%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>-->
diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb
index 8c9fa67de..345153daf 100644
--- a/app/views/layouts/base_shixun.html.erb
+++ b/app/views/layouts/base_shixun.html.erb
@@ -39,7 +39,9 @@
             </li>
         <% end %>
         <li><a href="<%= collaborators_shixun_path(@shixun) %>" class="<%= params[:action] == "collaborators" ? "active" : "" %>">合作者</a></li>
-        <li><a href="<%= statistics_students_shixun_path(@shixun) %>"class="<%= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>
+        <% if @shixun.shixun_status == "已发布" %>
+            <li><a href="<%= statistics_students_shixun_path(@shixun) %>"class="<%= params[:action] == "statistics_students" ? "active" : "" %>">学员统计</a></li>
+        <% end %>
         <% if User.current.manager_of_shixun?(@shixun) %>
                 <li><a href="<%= settings_shixun_path(@shixun) %>"  class="<%= params[:action] == "settings" ? "active" : "" %>">配置</a></li>
         <% end %>
diff --git a/app/views/memos/_common_reply_box.html.erb b/app/views/memos/_common_reply_box.html.erb
new file mode 100644
index 000000000..def25d106
--- /dev/null
+++ b/app/views/memos/_common_reply_box.html.erb
@@ -0,0 +1,113 @@
+<div class="panel-mes-head clearfix">
+  <h4 class="fl">全部回复<span class="ml5">(<%= count %>)</span></h4>
+  <p class="fr mr15">
+    <a href="javascript:void(0);" class="mr15 white-btn orange-btn" onclick="editor_focus(<%= memo.id %>);"><i class="fa fa-comments-o mr5"></i>回复<!--<span class="ml5"><%#= count %></span>--></a>
+    <!--<span class="mr10 color-grey"><i class="fa fa-eye color-grey mr5"></i><%#= @topic.visits %></span>-->
+    <!--<span id="praise_count_<%#=activity.id %>">
+        <%#= render :partial => 'praise_tread/edu_praise', :locals => {:activity=>activity, :user_activity_id=>activity.id,:type=>"activity"} %>
+    </span>-->
+    <span id="praise_count_<%= memo.id %>" class="fr mr10">
+      <%= render :partial => 'praise_tread/activity_praise', :locals => {:activity => memo, :user_activity_id => memo.id, :type => "Memo"} %>
+    </span>
+  </p>
+</div>
+<div class="panel-comment_item">
+  <% no_children_comments.each do |comment| %>
+      <% unless comment.nil? %>
+          <script type="text/javascript">
+              $(function(){
+                  showNormalImage('reply_content_<%= comment.id %>');
+                  autoUrl('reply_content_<%= comment.id %>');
+              });
+          </script>
+          <div class="comment_item_cont clearfix">
+            <div class="J_Comment_Face fl">
+              <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 50, :height => 50, :alt => "用户头像"), user_url_in_org(comment.creator_user), :target => '_blank' %>
+            </div>
+            <div class="t_content fl">
+              <div class="J_Comment_Reply">
+                <div class="comment_orig_content" style="margin:0px">
+                  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+                      <% parents_rely = [] %>
+                      <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+                      <% length = parents_rely.length %>
+                      <div id="comment_reply_<%= comment.id %>">
+                        <% if length <= 5 %>
+                            <%#=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent, :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                            <%=render :partial => 'messages/message_reply', :locals => {:comment => comment.parent, :parent_id => comment.id, :user_activity_id => memo.id, :type => memo.class.to_s} %>
+                        <% else %>
+                            <div class="orig_cont clearfix">
+                              <div class="orig_cont clearfix">
+                                <div class="orig_cont clearfix">
+                                  <div class="orig_cont clearfix">
+                                    <div class="orig_cont clearfix">
+                                      <%=render :partial => 'student_work/homework_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                                    </div>
+                                    <div class="orig_cont_hide clearfix">
+                                      <i class="fa fa-long-arrow-down mr5"></i>
+                                      <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => memo.id, :parent_id => comment.id),:remote=>true, :class => '' %>
+                                    </div>
+                                    <%=render :partial => 'student_work/homework_reply_detail', :locals => {:comment => parents_rely[3], :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                                  </div>
+                                  <%=render :partial => 'student_work/homework_reply_detail', :locals => {:comment => parents_rely[2], :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                                </div>
+                                <%=render :partial => 'student_work/homework_reply_detail', :locals => {:comment => parents_rely[1], :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                              </div>
+                              <%=render :partial => 'student_work/homework_reply_detail', :locals => {:comment => parents_rely[0], :type => memo.class.to_s, :user_activity_id => memo.id, :parent_id => comment.id} %>
+                            </div>
+                        <% end %>
+                      </div>
+                  <% end %>
+                  <!--onmouseover="$('#delete_reply_<%#=activity.id %>_<%#=comment.id %>').show();" onmouseout="$('#delete_reply_<%#=activity.id %>_<%#=comment.id %>').hide();"-->
+                  <div class="comment_content clearfix" >
+                    <div class="color-grey3"><%= comment.content_detail.html_safe %></div>
+                    <div class="">
+                      <div class="cl"></div>
+                      <div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>
+                    </div>
+                  </div>
+                  <!--回复end-->
+                </div>
+              </div>
+
+              <div class="J_Comment_Info clearfix">
+                <div class="t_info fl">
+                  <%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %>
+                  <span class="t_area fl"><%= time_from_now(comment.created_at) %></span>
+                </div>
+                <p class="fr mr10 orig_reply">
+                  <% if comment.creator_user == User.current %>
+                      <a href="javascript:void(0);" class="color-grey" id="delete_reply_<%= memo.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= forum_memo_path(comment.forum, comment, :user_activity_id => memo.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
+                  <% end %>
+                  <span class="ml5 mr5 color-grey">|</span>
+                  <%= link_to(
+                              '<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
+                              {:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => memo.class.to_s, :user_activity_id => memo.id},
+                              :remote => true,
+                              :method => 'get',
+                              :title => l(:button_reply),:class => "color-grey") %>
+                  <span class="ml5 mr5 color-grey">|</span>
+                  <span class="reply_praise_count_<%= comment.id %>">
+                            <%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                        </span>
+                </p>
+              </div>
+            </div>
+            <div class="cl"></div>
+          </div>
+      <% end %>
+  <% end %>
+</div>
+<script>
+    function ThumbUp(item){
+        $(item).toggleClass("orange-btn");
+        $(item).toggleClass("orange-bg-btn");
+        if($(item).attr("attr-thumb")=="0"){
+            $(item).find("span").html(parseInt($(item).find("span").html())+1);
+            $(item).attr("attr-thumb","1");
+        }else{
+            $(item).find("span").html(parseInt($(item).find("span").html())-1);
+            $(item).attr("attr-thumb","0");
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb
index 57caae6fe..5ce666b75 100644
--- a/app/views/memos/_form.html.erb
+++ b/app/views/memos/_form.html.erb
@@ -1,6 +1,98 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
+<ul>
+  <!--<li class="clearfix mb15 pl30 pr30">
+      <label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>类别&nbsp;&nbsp;&nbsp;</label>
+      <div class="with30 fl pr" select-for>
+          <input type="hidden" name="major_level" id="major_level" value="0">
+          <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择话题类别"/>
+          <div class="down-select bor-grey-e user_bg_shadow" id="major_level_option">
+             <p data-major="3">通 告</p>
+             <p data-major="2">智能课堂</p>
+             <p data-major="1">实训项目</p>
+          </div>
+      </div>
+  </li>-->
+  <li class="clearfix mb15 pl30 pr30">
+    <label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>标题&nbsp;&nbsp;&nbsp;</label>
+    <input type="text" name="memo[subject]" id="memo_subject" value="<%= @memo.try(:subject) %>" class="panel-form-width-690 panel-form-height-30 fl panel-box-sizing" maxlength="60" id="memo_subject" placeholder="最多60个字符">
+    <p class="color-orange undis" style="margin-left: 10%;" id="memo_notice"><i class="fa fa-exclamation-circle mr5"></i>标题不能超过60个字符</p>
+  </li>
+  <% if User.current.admin? %>
+      <li class="clearfix">
+        <label class="fl panel-form-label" style="width: 12%;">&nbsp;</label>
+                <span class="fl mr20">
+                    <input type="checkbox" name="memo[sticky]" <%= @memo.sticky == 1 ? 'checked' : '' %> value="1" id="to_top" class="ml-3 mr5 magic-checkbox">
+                    <label for="to_top">置顶</label>
+                </span>
+      </li>
+  <% end %>
+  <li class="clearfix mb5 pl30 pr30">
+    <label class="panel-form-label fl color-dark-grey"><span class="color-orange mr5">*</span>内容&nbsp;&nbsp;&nbsp;</label>
+    <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+    <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing" style="display: none"></textarea>
+    <%= f.kindeditor :content, :editor_id => 'memo_content_editor',
+                     :owner_id => @memo.nil? ? 0: @memo.id,
+                     :owner_type => OwnerTypeHelper::MESSAGE,
+                     :width => '89.8%',
+                     :height => 300,
+                     :minHeight=>300,
+                     :class => 'talk_text fl',
+                     :input_html => { :id => 'memo_content',
+                                      :class => 'talk_text fl',
+                                      :maxlength => 5000 }
+    %>
+   <!-- <input id="asset_id" name="asset_id" style="display:none" type="hidden">
+    <textarea class="panel-form-width-690 panel-form-height-150 fl panel-box-sizing"></textarea>-->
+    <p class="color-orange undis" style="margin-left: 10%;" id="new_memo_content_notice"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p>
+  </li>
+  <li class="clearfix mb5 pl30 pr30 ml25">
+      <%= render :partial => 'forums/file_form', :locals => {:container => @memo} %>
+  </li>
+  <li class="clearfix mt10 pl30 pr30">
+    <a href="javascript:void(0);" class="task-btn task-btn-blue fr" onclick="submitCoursesBoard()">保存</a>
+    <a href="<%= forums_path %>" class="task-btn fr mr10">取消</a>
+  </li>
+</ul>
+<script>
+    function regexSubject() {
+        var content = $.trim($("#memo_subject").val());
+        if (content.length == 0) {
+            $("#memo_notice").show();
+            return  false;
+        }
+        else {
+            $("#memo_notice").hide();
+            return true;
+        }
+        return false;
+    }
+    function regexContent() {
+        if(memo_content_editor.isEmpty()){
+            $("#new_memo_content_notice").show();
+            return  false;
+        }
+        else {
+            $("#new_memo_content_notice").hide();
+            return true;
+        }
+        return false;
+    }
+    function submitCoursesBoard(){
+        if(regexSubject() && regexContent()){
+            memo_content_editor.sync();
+            $("#memo-form").submit();
+        }
+    }
+</script>
+
+
+
+<% if false %>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
 
 <div class="wenba-tiwenbox fl mr10 mb10">
   <div class="wenba-tiwen-con">
@@ -118,4 +210,5 @@
           $("#memo_classify_tips").attr('style','color: #F00;');
       }
   }
-</script>
\ No newline at end of file
+</script>
+<% end %>
\ No newline at end of file
diff --git a/app/views/memos/_memo_all_replies.html.erb b/app/views/memos/_memo_all_replies.html.erb
index 3e5e69938..3b9a6ffe1 100644
--- a/app/views/memos/_memo_all_replies.html.erb
+++ b/app/views/memos/_memo_all_replies.html.erb
@@ -1,40 +1,77 @@
-<% @replies.each  do |reply| %>
-    <script type="text/javascript">
-        $(function(){
-            $("#activity_description_<%= reply.id %> p,#activity_description_<%= reply.id %> span,#activity_description_<%= reply.id %> em").each(function(){
-                var postContent = $(this).html();
-                postContent = postContent.replace(/&nbsp;/g," ");
-                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-                postContent = postContent.replace(/<script>*/g, "<script>");
-                postContent = postContent.replace(/<html>*/g, "<html>");
-                $(this).html(postContent);
+<%#= render :partial => "messages/common_reply_box", :locals => {:count => @reply_count, :activity => @topic, :no_children_comments => @replies, :is_teacher => is_teacher} %>
+<%= render :partial => "memos/common_reply_box", :locals => {:count => @reply_count, :memo => @memo, :no_children_comments => @replies} %>
+<div class="comment_item_cont clearfix">
+  <div class="comment_reply_box">
+    <div class="J_Comment_Face fl">
+      <%= link_to image_tag(url_to_avatar(User.current), :width => "50", :height => "50"), :target => "_blank", :alt => "用户头像" %>
+    </div>
+    <div nhname='new_message_<%= @memo.id%>' class="fr ml20 mr20" style="display:none; width: 92%;">
+      <%= form_for('memo', :as => :reply, :url => reply_forum_memo_path(@memo.forum, @memo), :method => "post", :remote => true) do |f|%>
+      <%#= form_for @memo, :as => :reply, :url => {:action => 'reply', :id => @topic}, :remote => true, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+          <%#= f.hidden_field :subject, :required => true, value: @memo.subject %>
+          <%#= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
+          <%#= f.hidden_field :parent_id, :required => true, value: @memo.parent_id %>
+          <div nhname='toolbar_container_<%= @memo.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id %>' name="content"></textarea>
+          <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="mt10 task-btn task-btn-blue fr">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= @memo.id%>'></p>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<% if false %>
+    <% @replies.each  do |reply| %>
+        <script type="text/javascript">
+            $(function(){
+                $("#activity_description_<%= reply.id %> p,#activity_description_<%= reply.id %> span,#activity_description_<%= reply.id %> em").each(function(){
+                    var postContent = $(this).html();
+                    postContent = postContent.replace(/&nbsp;/g," ");
+                    postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                    postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                    postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                    postContent = postContent.replace(/<script>*/g, "<script>");
+                    postContent = postContent.replace(/<html>*/g, "<html>");
+                    $(this).html(postContent);
+                });
+                autoUrl('activity_description_<%= reply.id %>');
+                description_show_hide(<%= reply.id %>);
             });
-            autoUrl('activity_description_<%= reply.id %>');
-            description_show_hide(<%= reply.id %>);
-        });
 
-        $(".homepagePostReplyDes").mouseover(function(){
-            $(this).find("a[id*='delete_memo_reply']").show();
-        }).mouseout(function(){
-            $(this).find("a[id*='delete_memo_reply']").hide();
-        });
-    </script>
+            $(".homepagePostReplyDes").mouseover(function(){
+                $(this).find("a[id*='delete_memo_reply']").show();
+            }).mouseout(function(){
+                $(this).find("a[id*='delete_memo_reply']").hide();
+            });
+        </script>
 
-    <div class="homepagePostReplyContainer" >
-      <div class="homepagePostReplyPortrait">
-        <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-      </div>
-      <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=reply.id %>').show();" onmouseout="$('#delete_reply_<%=reply.id %>').hide();">
-        <div class="homepagePostReplyPublisher">
-          <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Memo', :user_activity_id => @memo.id}%>
-        </div>
-        <div class="homepagePostReplyContent break_word" style="margin-bottom:15px;"  id="activity_description_<%= reply.id %>">
-          <p><%= reply.content.gsub(/\/script/, "script").gsub(/script/, "&nbsp;script").html_safe %></p>
-        </div>
-        <div class="orig_reply mb10 mt-10">
-          <div class="reply">
+        <div class="homepagePostReplyContainer" >
+          <div class="homepagePostReplyPortrait">
+            <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+          </div>
+          <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=reply.id %>').show();" onmouseout="$('#delete_reply_<%=reply.id %>').hide();">
+            <div class="homepagePostReplyPublisher">
+              <%= render :partial => 'users/message_contents', :locals => {:comment => reply, :type => 'Memo', :user_activity_id => @memo.id}%>
+            </div>
+            <div class="homepagePostReplyContent break_word" style="margin-bottom:15px;"  id="activity_description_<%= reply.id %>">
+              <p><%= reply.content.gsub(/\/script/, "script").gsub(/script/, "&nbsp;script").html_safe %></p>
+            </div>
+            <div class="orig_reply mb10 mt-10">
+              <div class="reply">
                 <span class="reply-right">
                 <span class="reply_praise_count_<%= reply.id %>">
                   <%= render :partial => "praise_tread/praise", :locals => {:activity => reply, :user_activity_id => reply.id, :type => "reply"} %>
@@ -58,20 +95,21 @@
                               :title => l(:button_delete)
                       ) if @memo.author.id == User.current.id || User.current.admin? || User.current == @forum.creator %>
                 </span>
-            <div class="cl"></div>
+                <div class="cl"></div>
+              </div>
+            </div>
+            <div id="reply_message_<%= comment.id%>" class="reply_to_message"></div>
+          </div>
+          <div class="cl"></div>
+        </div>
+    <% end %>
+    <% if @limit_count > @page * @limit + 10 %>
+        <div id="more_memo_replies">
+          <div class="detail_cont_hide clearfix">
+            <span class="orig_icon" >&darr; </span>
+            <span class="orig_icon" style="display:none;" > &uarr;</span>
+            <%= link_to '点击展开更多回复', forum_memo_path(@memo.forum_id, @memo, :page => @page),:remote=>true %>
           </div>
         </div>
-        <div id="reply_message_<%= reply.id%>" class="reply_to_message"></div>
-      </div>
-      <div class="cl"></div>
-    </div>
-<% end %>
-<% if @limit_count > @page * @limit + 10 %>
-    <div id="more_memo_replies">
-      <div class="detail_cont_hide clearfix">
-        <span class="orig_icon" >&darr; </span>
-        <span class="orig_icon" style="display:none;" > &uarr;</span>
-        <%= link_to '点击展开更多回复', forum_memo_path(@memo.forum_id, @memo, :page => @page),:remote=>true %>
-      </div>
-    </div>
+    <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/memos/create.js.erb b/app/views/memos/create.js.erb
index 410c82d79..d6405143a 100644
--- a/app/views/memos/create.js.erb
+++ b/app/views/memos/create.js.erb
@@ -1 +1 @@
-window.location.href='<%= forum_memo_path(:forum_id=>@memo.forum_id,:id=>@memo.id ) %>'
\ No newline at end of file
+window.location.href='<%= forum_memo_path(:forum_id => @memo.forum_id, :id => @memo.id ) %>';
\ No newline at end of file
diff --git a/app/views/memos/destroy.js.erb b/app/views/memos/destroy.js.erb
new file mode 100644
index 000000000..29a97f44b
--- /dev/null
+++ b/app/views/memos/destroy.js.erb
@@ -0,0 +1,2 @@
+$("#message_replies_box").html("<%= escape_javascript(render :partial =>  'memos/memo_all_replies') %>");
+sd_create_editor_from_data(<%= @memo.id %>,"","100%", "<%= @memo.class.to_s %>");
\ No newline at end of file
diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index ed705579b..2799abec4 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -1,60 +1,15 @@
-<%= 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(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
-          if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
-              $("#error").html('主题不能超过50个字符').show();
-              return;
-          }
-          if(memo_content.html().length > 20000){
-              $("#error").html("内容 过长（最长为 20000 个字符）").show();
-              $("html,body").animate({scrollTop:$("#error").offset().top},1000)
-              return false;
-          }
-          memo_content.sync();
-          $.ajax({
-              url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>',
-              type:'put',
-              data:$("#edit_memo").serialize(),
-              success:function(data){
-
-              },
-              error:function(){
-                  alert('请检查当前网络连接')
-              }
-          });
-          //$("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
-          $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
-          $("#error").html("内容不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
-          $("#error").html("主题和内容不能为空").show();
-      }
-  }
-</script>
-<div class="banner-big f16 fontGrey3 mb10">
-  <%= link_to "问吧", forums_path, :class => "c_blue" %> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> >
-  <%= @memo.subject %>
-</div>
-
-<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo),:html=>{:id => 'new_memo'}) do |f|  %>
-    <%= render :partial => "memos/form", :locals => {:f => f} %>
-<% end %>
-
-<div class="fl">
-  <%= render :partial => "memos/my_show_count_message" %>
-</div>
-
-<script>
-    $(function(){
-        limitStrsize('memo_subject',50);
-        limitStrsize('memo_content',5000);
-    });
-</script>
\ No newline at end of file
+<div class="edu-class-container edu-position">
+  <p class="mb10 font-14">
+    <i class="fa fa-map-marker mr5 color-grey"></i>
+    <a href="<%= user_path(@user) %>"><%= @user.show_name %></a>  &gt; <a href="<%= forums_path %>">讨论 </a> &gt; 编辑
+  </p>
+  <div class="edu-con-top user_bg_shadow bor-grey-e">
+    <p class="ml15 color-grey3">编辑话题</p>
+  </div>
+  <div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e pt30 pb30">
+    <%#= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <%= form_for @memo, :url => forum_memo_path(@memo.forum_id, @memo), :html => {:multipart => true, :id => 'memo-form'} do |f| %>
+        <%= render :partial => "memos/form", :locals => {:f => f} %>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/memos/message_replies.js.erb b/app/views/memos/message_replies.js.erb
new file mode 100644
index 000000000..a4683ca59
--- /dev/null
+++ b/app/views/memos/message_replies.js.erb
@@ -0,0 +1,9 @@
+<%# if @user_activity_id != @memo.id %>
+/*    $("#activity_post_reply_<%#= @user_activity_id %>").html("<%#= escape_javascript(render :partial => 'users/course_message_post_reply',
+                                                                                          :locals => { :activity => @memo,
+                                                                                                       :user_activity_id => @user_activity_id}) %>");
+    sd_create_editor_from_data(<%#= @user_activity_id%>,"","100%", "UserActivity");*/
+<%# else %>
+    $("#message_replies_box").html("<%= escape_javascript(render :partial =>  'memos/memo_all_replies') %>");
+    sd_create_editor_from_data(<%= @memo.id %>,"","100%", "<%= @memo.class.to_s %>");
+<%# end %>
\ No newline at end of file
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index 1d14935ca..be251e67f 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -1,6 +1,29 @@
-<div class="banner-big f16 fontGrey3 mb10"><%= link_to "问吧", forums_path, :class => "c_blue" %> <% if params[:forum_index] != 'true'%> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> <% end %> > 我要提问</div>
-<%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
-    <%= render :partial => "memos/form", :locals => {:f => f} %>
-<% end %>
+<div class="edu-class-container edu-position">
+  <p class="mb10 font-14">
+    <i class="fa fa-map-marker mr5 color-grey"></i>
+    <a href="<%= user_path(@user) %>"><%= @user.show_name %></a>  &gt; <a href="<%= forums_path %>">讨论 </a> &gt; 新建
+  </p>
+  <div class="edu-con-top user_bg_shadow bor-grey-e">
+    <p class="ml15 color-grey3">新建话题</p>
+  </div>
+  <div class="edu-con-bg01 mt15 user_bg_shadow bor-grey-e pt30 pb30">
+    <%#= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+    <%= form_for @memo, :url =>  forum_memos_path(@forum), :html => {:multipart => true, :id => 'memo-form'} do |f| %>
+        <%= render :partial => "memos/form", :locals => {:f => f} %>
+    <% end %>
+  </div>
+</div>
 
-<%= render :partial => "forums/my_count_message" %>
\ No newline at end of file
+
+
+
+
+<% if false %>
+    <div class="banner-big f16 fontGrey3 mb10">
+      <%= link_to "问吧", forums_path, :class => "c_blue" %>
+    </div>
+    <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
+        <%= render :partial => "memos/form", :locals => {:f => f} %>
+    <% end %>
+<%#= render :partial => "forums/my_count_message" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index c5cf514a3..afa9a1eff 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,131 +1,224 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
-    <%= javascript_include_tag 'forum' %>
 <% end %>
-
-<div class="banner-big f16 fontGrey3 mb10">
-  <%= link_to "问吧", forums_path, :class => "c_blue" %> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> > <%=h @memo.subject %>
+<div class="newMain clearfix">
+  <div class="edu-class-container edu-position">
+    <p class="mb10 font-14">
+      <i class="fa fa-map-marker mr5 color-grey"></i>
+      <a href="javascript:void(0)"><%= @user.show_name %></a>  &gt; <a href="<%= forums_path %>">讨论 </a>
+    </p>
+    <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
+      <p class="ml15 color-grey3 fl">
+       讨论详情
+      </p>
+     <!-- <p class="color-grey fr font-12 mr15 mt5"><a href="javascript:void(0)">返回</a></p>-->
+    </div>
+    <div class="edu-tab clearfix mb20 user_bg_shadow bor-grey-e">
+      <div class="panel-inner-fourm nobg">
+        <div class="clearfix pr">
+          <a href="/users/innov" class="fl">
+            <%= image_tag(url_to_avatar(@memo.author), :width => 60, :height => 60, :alt=>'用户头像', :class=>"panel-list-img mr15" ) %>
+          </a>
+          <div class="panel-list-infobox fl" style="margin:0;margin-left: 9px">
+            <div class="clearfix mb20">
+              <p class="color-grey3 fl" style="font-size: 16px;">
+                <%= h @memo.subject %>
+                <% if @memo.sticky %>
+                    <span class="btn-top btn-cir-red mt5 ml5">顶</span>
+                <% end %>
+              </p>
+              <!-- <p class="color-grey fr font-12 mr15 mt5"><a href="javascript:void(0)">返回</a></p>-->
+            </div>
+            <p><a href="<%= user_path(@memo.author) %>" class="font-14 mr15 color-grey" target="_blank"><%= @memo.author.show_name %></a><span class="font-14 mr15 color-grey">发表于<%= time_from_now @memo.updated_at %></span></p>
+            <!--<p class="color-grey panel-lightgrey fl mt3">-->
+              <!--<span class="fl mr10 mt2">类别：分享</span>-->
+           <!-- </p>-->
+          </div>
+          <% if @user.admin? || @user == @memo.author %>
+              <div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
+                <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
+                <ul class="edu-position-hide undis">
+                  <% if @user.admin? %>
+                      <% if @memo.sticky %>
+                          <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>">取消置顶</a></li>
+                      <% else %>
+                          <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>">置&nbsp;&nbsp;顶</a></li>
+                      <% end %>
+                  <% end %>
+                  <li><a href="<%= edit_forum_memo_path(@memo.forum, @memo)%>">编&nbsp;&nbsp;辑</a></li>
+                  <li><a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= forum_memo_path(@memo.forum, @memo) %>', '您确定要删除吗？')">删&nbsp;&nbsp;除</a></li>
+                </ul>
+              </div>
+          <% end %>
+        </div>
+        <div class="panel-inner-info clearfix">
+          <!--帖子内容-->
+          <%= @memo.content.html_safe %>
+        </div>
+        <ul class="panel-inner-info mt10 clearfix">
+          <!--上传的文件内容-->
+          <% if @memo.attachments.any?%>
+              <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
+              <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
+          <% end %>
+        </ul>
+      </div>
+      <div class="panel-mesbox" id="message_replies_box">
+        <%= render :partial => "memo_all_replies" %>
+      </div>
+    </div>
+  </div>
 </div>
 
 <script>
-    $(function() {
-        sd_create_editor_from_data(<%= @memo.id%>,null,"100%", "<%=@memo.class.to_s%>");
-    });
-
-    function del_confirm(){
-        if(confirm('确认删除么?')){
-            $("#del_memo_link").click();
+    function ThumbUp(item){
+        $(item).toggleClass("orange-btn");
+        $(item).toggleClass("orange-bg-btn");
+        if($(item).attr("attr-thumb")=="0"){
+            $(item).find("span").html(parseInt($(item).find("span").html())+1);
+            $(item).attr("attr-thumb","1");
         }else{
-
+            $(item).find("span").html(parseInt($(item).find("span").html())-1);
+            $(item).attr("attr-thumb","0");
         }
     }
+    $(function(){
+        sd_create_editor_from_data(<%= @memo.id %>, null, "100%", "<%= @memo.class.to_s %>");
+    });
 </script>
-<div class="postRightContainer mr10">
-  <div class="postThemeContainer">
-    <div class="postDetailPortrait">
-      <%= link_to image_tag(url_to_avatar(@memo.author),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path(@memo.author) %>
-    </div>
-    <div class="postThemeWrap">
-      <% if @memo.author.id == User.current.id || User.current.admin? || User.current == @forum.creator %>
-          <div class="homepagePostSetting">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <% if @memo.author.id == User.current.id || User.current.admin? %>
-                      <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
-                  <% end %>
-                  <% if  User.current.admin? || User.current == @forum.creator %>
-                      <% if @memo.sticky %>
-                          <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>" class="postOptionLink">取消置顶</a></li>
-                      <% else %>
-                          <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>" class="postOptionLink">置顶</a></li>
-                      <% end %>
-                  <% end %>
-                  <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
-                  <li style="display: none"><a href="<%= forum_memo_path(@memo.forum, @memo) %>" data-method="delete" id="del_memo_link" ></a></li>
-                </ul>
-              </li>
-            </ul>
-          </div>
-      <% end %>
-      <div class="postDetailTitle fl">
-        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @memo.subject%></a>
-      </div>
-      <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
-      <div class="cl"></div>
 
-      <div class="postDetailCreater">
-        <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
-      <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
-      <div class="cl"></div>
-      <div class="homepagePostIntro memo-content ke-block" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
-        <%= @memo.content.html_safe%>
-      </div>
-      <div class="cl"></div>
-      <div class=" fl" style="width: 600px">
-        <% if @memo.attachments.any?%>
-            <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
-            <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-      <span class=" fr" style="color: #888888; font-size: 12px;">更新时间：<%= format_date(@memo.updated_at)%></span>
+
+
+<% if false %>
+    <%= content_for(:header_tags) do %>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+        <%= javascript_include_tag 'forum' %>
+    <% end %>
+
+    <div class="banner-big f16 fontGrey3 mb10">
+      <%= link_to "问吧", forums_path, :class => "c_blue" %> > <%= link_to @forum.name, forum_path(@forum), :class => "c_blue" %> > <%=h @memo.subject %>
     </div>
-    <div class="cl"></div>
-  </div>
-  <div class="cl"></div>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复（<%= @reply_count %>）</div>
-      <div class="homepagePostReplyBannerTime"></div>
-    </div>
-    <div class="" id="reply_div_<%= @memo.id %>">
-      <%= render :partial => 'memos/memo_all_replies' %>
-    </div>
-    <div class="cl"></div>
-    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @memo.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer mb10">
-        <% if User.current.logged? %>
-            <div nhname='new_message_<%= @memo.id%>' style="display:none;">
-              <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
-                  <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
-                  <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
-                  <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
-                  <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
-                  <div nhname='toolbar_container_<%= @memo.id%>' class="kindeditor"></div>
-                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id %>' name="memo[content]"></textarea>
-                  <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-                  <div class="cl"></div>
-                  <p nhname='contentmsg_<%= @memo.id%>'></p>
-              <% end%>
-            </div>
-        <% else %>
-            <%= render :partial => "users/show_unlogged" %>
-        <% end %>
+
+    <script>
+        $(function() {
+            sd_create_editor_from_data(<%= @memo.id%>,null,"100%", "<%=@memo.class.to_s%>");
+        });
+
+        function del_confirm(){
+            if(confirm('确认删除么?')){
+                $("#del_memo_link").click();
+            }else{
+
+            }
+        }
+    </script>
+    <div class="postRightContainer mr10">
+      <div class="postThemeContainer">
+        <div class="postDetailPortrait">
+          <%= link_to image_tag(url_to_avatar(@memo.author),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path(@memo.author) %>
+        </div>
+        <div class="postThemeWrap">
+          <% if @memo.author.id == User.current.id || User.current.admin? || User.current == @forum.creator %>
+              <div class="homepagePostSetting">
+                <ul>
+                  <li class="homepagePostSettingIcon">
+                    <ul class="homepagePostSettiongText">
+                      <% if @memo.author.id == User.current.id || User.current.admin? %>
+                          <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
+                      <% end %>
+                      <% if  User.current.admin? || User.current == @forum.creator %>
+                          <% if @memo.sticky %>
+                              <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>" class="postOptionLink">取消置顶</a></li>
+                          <% else %>
+                              <li><a href="<%= change_sticky_forum_memo_path(@memo.forum,@memo) %>" class="postOptionLink">置顶</a></li>
+                          <% end %>
+                      <% end %>
+                      <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
+                      <li style="display: none"><a href="<%= forum_memo_path(@memo.forum, @memo) %>" data-method="delete" id="del_memo_link" ></a></li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+          <% end %>
+          <div class="postDetailTitle fl">
+            <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">主题: <%= @memo.subject%></a>
+          </div>
+          <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+          <div class="cl"></div>
+
+          <div class="postDetailCreater">
+            <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
+          <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
+          <div class="cl"></div>
+          <div class="homepagePostIntro memo-content ke-block" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+            <%= @memo.content.html_safe%>
+          </div>
+          <div class="cl"></div>
+          <div class=" fl" style="width: 600px">
+            <% if @memo.attachments.any?%>
+                <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
+                <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
+            <% end %>
+          </div>
+          <div class="cl"></div>
+          <span class=" fr" style="color: #888888; font-size: 12px;">更新时间：<%= format_date(@memo.updated_at)%></span>
+        </div>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
+      <div class="homepagePostReply">
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%= @reply_count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%= @memo.id %>">
+          <%= render :partial => 'memos/memo_all_replies' %>
+        </div>
+        <div class="cl"></div>
+        <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @memo.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+          <div class="homepagePostReplyInputContainer mb10">
+            <% if User.current.logged? %>
+                <div nhname='new_message_<%= @memo.id%>' style="display:none;">
+                  <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%>
+                      <%= f.hidden_field :subject, :required => true, value: @memo.subject %>
+                      <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
+                      <%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
+                      <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
+                      <div nhname='toolbar_container_<%= @memo.id%>' class="kindeditor"></div>
+                      <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @memo.id %>' name="memo[content]"></textarea>
+                      <a id="new_message_submit_btn_<%= @memo.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                      <div class="cl"></div>
+                      <p nhname='contentmsg_<%= @memo.id%>'></p>
+                  <% end%>
+                </div>
+            <% else %>
+                <%= render :partial => "users/show_unlogged" %>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+          <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+    <div class="fl">
+      <%= render :partial => "memos/my_show_count_message" %>
     </div>
-  </div>
-</div>
-<div class="fl">
-  <%= render :partial => "memos/my_show_count_message" %>
-</div>
 
 
 
-<script type="text/javascript">
-    $(function(){
-        $("#activity_description_<%= @memo.id %> p,#activity_description__<%= @memo.id %> span,#activity_description_<%= @memo.id %> em").each(function(){
-            var postContent = $(this).html();
-            postContent = postContent.replace(/&nbsp;/g," ");
-            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-            $(this).html(postContent);
+    <script type="text/javascript">
+        $(function(){
+            $("#activity_description_<%= @memo.id %> p,#activity_description__<%= @memo.id %> span,#activity_description_<%= @memo.id %> em").each(function(){
+                var postContent = $(this).html();
+                postContent = postContent.replace(/&nbsp;/g," ");
+                postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                $(this).html(postContent);
+            });
+            autoUrl('activity_description_<%= @memo.id %>');
+            description_show_hide(<%= @memo.id %>);
         });
-        autoUrl('activity_description_<%= @memo.id %>');
-        description_show_hide(<%= @memo.id %>);
-    });
-</script>
\ No newline at end of file
+    </script>
+<% end %>
\ No newline at end of file
diff --git a/app/views/messages/_common_reply_box.html.erb b/app/views/messages/_common_reply_box.html.erb
index c2313c569..afd027cea 100644
--- a/app/views/messages/_common_reply_box.html.erb
+++ b/app/views/messages/_common_reply_box.html.erb
@@ -38,6 +38,28 @@
               <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 50, :height => 50, :alt => "用户头像"), user_url_in_org(comment.creator_user), :target => '_blank' %>
             </div>
             <div class="t_content fl">
+              <div class="J_Comment_Info clearfix">
+                <div class="t_info fl">
+                  <%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %>
+                  <span class="t_area fl"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
+                </div>
+                <p class="fr mr10 orig_reply">
+                  <% if is_teacher || comment.creator_user == User.current%>
+                      <a href="javascript:void(0);" class="color-grey" id="delete_reply_<%=activity.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= delete_board_message_path(:id => comment, :user_activity_id => activity.id, :activity_id => activity.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
+                  <% end %>
+                  <span class="ml5 mr5 color-grey">|</span>
+                  <%= link_to(
+                              '<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
+                              {:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
+                              :remote => true,
+                              :method => 'get',
+                              :title => l(:button_reply),:class => "color-grey") %>
+                  <span class="ml5 mr5 color-grey">|</span>
+                  <span class="reply_praise_count_<%= comment.id %>">
+                            <%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                        </span>
+                </p>
+              </div>
               <div class="J_Comment_Reply">
                 <div class="comment_orig_content" style="margin:0px">
                   <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
@@ -82,28 +104,7 @@
                 </div>
               </div>
 
-              <div class="J_Comment_Info clearfix">
-                <div class="t_info fl">
-                  <%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %>
-                  <span class="t_area fl"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-                </div>
-                <p class="fr mr10 orig_reply">
-                  <% if is_teacher || comment.creator_user == User.current%>
-                      <a href="javascript:void(0);" class="color-grey" id="delete_reply_<%=activity.id %>_<%=comment.id %>" onclick="delete_confirm_box_2('<%= delete_board_message_path(:id => comment, :user_activity_id => activity.id, :activity_id => activity.id) %>', '确定要删除该条回复吗？')"><i class="fa fa-trash-o mr5"></i>删除</a>
-                  <% end %>
-                  <span class="ml5 mr5 color-grey">|</span>
-                  <%= link_to(
-                              '<i class="fa fa-mail-reply mr5"></i>回复'.html_safe,
-                              {:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
-                              :remote => true,
-                              :method => 'get',
-                              :title => l(:button_reply),:class => "color-grey") %>
-                  <span class="ml5 mr5 color-grey">|</span>
-                  <span class="reply_praise_count_<%= comment.id %>">
-                            <%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
-                        </span>
-                </p>
-              </div>
+
             </div>
             <div class="cl"></div>
           </div>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 2dda26d3b..43e0cd963 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -36,7 +36,7 @@
             <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) || User.current == @topic.author %>
                 <a href="javascript:void(0);" onclick="delete_confirm_box_3('<%= delete_board_message_path(@topic.board_id, @topic) %>', '确定要删除该帖子吗？')" class="mr10" data-tip-down="删除"><i class="fa fa-trash-o"></i></a>
             <% end %>
-            <a href="javascript:void(0);" class="mr10" title="发送" onclick="show_send(<%= @topic.id %>, <%= User.current.id %>, 'message');"><i class="fa fa-send-o"></i></a>
+            <a href="javascript:void(0);" class="mr10" data-tip-down="发送" onclick="show_send(<%= @topic.id %>, <%= User.current.id %>, 'message');"><i class="fa fa-send-o"></i></a>
             <% if User.current.admin? || User.current.allowed_to?(:as_teacher, @course) || User.current == @topic.author %>
               <a href="<%= edit_board_message_path(@topic.board_id, @topic) %>" class="mr10" data-tip-down="编辑"><i class="fa fa-pencil"></i></a>
             <% end %>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 3ce62e7ff..c6d984662 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -20,11 +20,11 @@
         <%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %>
       </p>
 
-      <div class="edu-con-top">
+      <div class="edu-con-top box_bg_shandow bor-grey-e">
         <p class="ml15 color-grey">编辑帖子</p>
       </div>
 
-      <div class="panel-content-box clearfix mt15">
+      <div class="panel-content-box clearfix mt15 box_bg_shandow bor-grey-e">
         <%= form_for @message, :url => update_board_message_path(@message.board_id, @message), :html => {:id => 'message-form'} do |f| %>
             <%= render :partial => "form_course", :locals => {:f => f} %>
         <% end %>
diff --git a/app/views/praise_tread/_activity_praise.html.erb b/app/views/praise_tread/_activity_praise.html.erb
index 8f57ec0b6..8bbb6b6b8 100644
--- a/app/views/praise_tread/_activity_praise.html.erb
+++ b/app/views/praise_tread/_activity_praise.html.erb
@@ -4,8 +4,9 @@
                                                 :user_activity_id => user_activity_id,
                                                 :type => type }) %>' data-remote="true" class="white-btn orange-btn" title="点赞">
       <i class="fa fa-thumbs-up mr5"></i>赞
-      <% num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
-      <span><%= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>
+      <%# num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
+      <!--<span><%#= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>-->
+      <span><%= get_praise_num(activity) %></span>
     </a>
 <% else %>
     <a href='<%= praise_tread_praise_minus_path({:obj_id => activity.id,
@@ -13,7 +14,8 @@
                                                  :user_activity_id => user_activity_id,
                                                  :type => type }) %>' data-remote="true" class="white-btn orange-bg-btn" title="取消点赞" >
       <i class="fa fa-thumbs-up mr5"></i>赞
-      <% num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
-      <span><%= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>
+      <span><%= get_praise_num(activity) %></span>
+      <%# num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
+      <!--<span><%#= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>-->
     </a>
 <% end %>
\ No newline at end of file
diff --git a/app/views/praise_tread/_edu_praise.html.erb b/app/views/praise_tread/_edu_praise.html.erb
index afe83633d..0704eebad 100644
--- a/app/views/praise_tread/_edu_praise.html.erb
+++ b/app/views/praise_tread/_edu_praise.html.erb
@@ -4,8 +4,9 @@
                                                 :user_activity_id => user_activity_id,
                                                 :type => type }) %>' data-remote="true" class="fr mr5 color-grey" title="点赞">
       <i class="fa fa-thumbs-up mr5"></i>赞
-      <% num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
-      <span class="ml5"><%= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>
+      <%# num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
+    <!--  <span class="ml5"><%#= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>-->
+      <span class="ml5"><%= get_praise_num(activity) %></span>
     </a>
 <% else %>
     <a href='<%= praise_tread_praise_minus_path({:obj_id => activity.id,
@@ -13,7 +14,8 @@
                                                  :user_activity_id => user_activity_id,
                                                  :type => type }) %>' data-remote="true" class="fr mr5 color-orange03" title="取消点赞" >
       <i class="fa fa-thumbs-up mr5"></i>赞
-      <% num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
-      <span class="ml5"><%= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>
+      <span class="ml5"><%= get_praise_num(activity) %></span>
+      <%# num = activity.praise_tread_cache ? activity.praise_tread_cache.praise_num : 0 %>
+      <!--<span class="ml5"><%#= (num.nil? ? 0 : num) > 0 ? num : 0 %></span>-->
     </a>
 <% end %>
\ No newline at end of file
diff --git a/app/views/praise_tread/praise_minus.js.erb b/app/views/praise_tread/praise_minus.js.erb
index b187d75dc..3b974fe5c 100644
--- a/app/views/praise_tread/praise_minus.js.erb
+++ b/app/views/praise_tread/praise_minus.js.erb
@@ -5,6 +5,8 @@
         <% else %>
             $('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
         <% end %>
+    <% elsif @type.to_s == 'Memo' %>
+        $('#praise_count_<%= @obj.id %>').html('<%= j(render :partial => 'praise_tread/activity_praise', :locals => {:activity => @obj, :user_activity_id => @obj.id, :type => "Memo"})%>');
     <% else @type.to_s == 'reply' %>
         <% if ((@obj_type == 'JournalsForMessage' && @obj.jour_type == 'HomeworkCommon') || @obj_type == 'Message') && @obj_id == @user_activity_id %>
             $('.reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/edu_praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
diff --git a/app/views/praise_tread/praise_plus.js.erb b/app/views/praise_tread/praise_plus.js.erb
index beea6afae..fe1c72c29 100644
--- a/app/views/praise_tread/praise_plus.js.erb
+++ b/app/views/praise_tread/praise_plus.js.erb
@@ -5,16 +5,20 @@
         <% else %>
             $('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>');
         <% end %>
+    <% elsif @type.to_s == 'Memo' %>
+        $('#praise_count_<%= @obj.id %>').html('<%= j(render :partial => 'praise_tread/activity_praise', :locals => {:activity => @obj, :user_activity_id => @obj.id, :type => "Memo"})%>');
     <% else @type.to_s == 'reply' %>
         <% if ((@obj_type == 'JournalsForMessage' && @obj.jour_type == 'HomeworkCommon') || @obj_type == 'Message') && @obj_id == @user_activity_id %>
             $('.reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/edu_praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
+        <% elsif @obj_type == 'Memo' %>
+            $('.reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/edu_praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
         <% else %>
             $('.reply_praise_count_<%=@obj_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>');
         <% end %>
     <% end %>
 <% elsif @obj_type == 'Memo'%>
-    $('#praise_tread_<%= @obj.id %>').html('<%= j(
-        render :partial => "/memos/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}
+    $('#praise_count__<%= @obj.id %>').html('<%= j(
+        render :partial => 'praise_tread/activity_praise', :locals => {:activity => @obj, :user_activity_id => @obj.id, :type => "Memo"}
     )%>');
 <% elsif @obj_type == 'Discuss'%>
     $('#dis_praise_<%= @obj.id %>').html('<%= j(
diff --git a/app/views/repositories/_shixun_dir_list.html.erb b/app/views/repositories/_shixun_dir_list.html.erb
index 037d6afec..ab20701ce 100644
--- a/app/views/repositories/_shixun_dir_list.html.erb
+++ b/app/views/repositories/_shixun_dir_list.html.erb
@@ -1,5 +1,5 @@
 <div class="autoscroll">
-  <table class="list entries mt5 box_bg_shandow" id="browser" style="table-layout: fixed;">
+  <table class="list entries mt5 box_bg_shandow" id="browser" style="table-layout: fixed;margin-bottom:0">
     <% unless @path.blank? %>
         <tbody>
         <tr style="border: 1px solid #DDD; border-bottom:none;">
diff --git a/app/views/shixuns/_add_collaborators.html.erb b/app/views/shixuns/_add_collaborators.html.erb
index 84ae4b521..03a01b843 100644
--- a/app/views/shixuns/_add_collaborators.html.erb
+++ b/app/views/shixuns/_add_collaborators.html.erb
@@ -7,14 +7,14 @@
   <div class="task_popup_con">
     <div class="newupload_conbox clearfix">
       <%= form_tag url_for(shixun_members_added_shixun_path(@shixun)), :remote => true, :method => :post, :id => 'add_collaborators_form' do |f| %>
-          <div class="left fl" style="width:530px;">
-            <div class="mb10 edu-position" style="width:530px;">
+          <div class="left fl" style="width:560px;">
+            <div class="mb10 edu-position" style="width:560px;">
               <input type="hidden" value="<%= @shixun.identifier %>" id="shixun_collaborators_id">
               <input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_collaborators" placeholder="输入用户的真实姓名进行搜索" type="text">
               <a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
             </div>
             <div class="clearfix mb15">
-              <ul class="upload_select_box fl" style="overflow-y:auto;width:510px;" id="search_not_teachers_list">
+              <ul class="upload_select_box fl" style="overflow-y:auto;width:540px;" id="search_not_teachers_list">
                 <%#= render :partial => 'courses/settings/search_not_teachers_list' %>
               </ul>
             </div>
diff --git a/app/views/shixuns/_add_collaborators_list.html.erb b/app/views/shixuns/_add_collaborators_list.html.erb
new file mode 100644
index 000000000..d50ea2a2a
--- /dev/null
+++ b/app/views/shixuns/_add_collaborators_list.html.erb
@@ -0,0 +1,16 @@
+<% unless @users.empty? %>
+    <% @users.each do |user| %>
+        <% if user && user.user_extensions %>
+            <li class="clearfix">
+              <!--<i class="fa fa-square-o grey fl" aria-hidden="true"></i>-->
+              <!--<i class="fa fa-check-square-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
+              <input id="choose_course_teacher_<%= user.id %>" type="checkbox" class="fl mt7 mr5 magic-checkbox" style="top:0px" name="membership[user_ids][]" value="<%= user.id %>">
+              <label for="choose_course_teacher_<%= user.id %>" style="top:0px">
+                <a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1 edu-txt-w100"><%= user.show_real_name %>(<%= user.login %>)</a>
+                <span class="fl color-grey span2 ml10"><%= user.identity %></span>
+                <span class="span3 fl ml10 edu-txt-w140 task-hide" style="width: 189px"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
+              </label>
+            </li>
+        <% end %>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 6deb9b5b6..e3ec54edd 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -106,7 +106,7 @@
               <label class="panel-form-label fl">复制&nbsp;&nbsp;&nbsp;</label>
               <span class="fl mr20">
                 <input type="checkbox" <%= @shixun.can_copy ? 'checked' : "" %> name="can_copy" value="1" id="can_copy" class="ml5 mr5 magic-checkbox" >
-                <label style="top:6px" class="color-grey" for="can_copy">(勾选则给实训合作者提供复制实训功能，否则不提供)</label>
+                <label style="top:6px" class="color-grey" for="can_copy">(勾选，则平台所有已职业认证的教师可以复制)</label>
               </span>
             </li>
             <li class="clearfix">
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 1e8dadbac..70e1f9768 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -54,7 +54,7 @@
           <label class="panel-form-label fl">复制&nbsp;&nbsp;&nbsp;</label>
               <span class="fl mr20">
                 <input type="checkbox" <%= @shixun.can_copy ? 'checked' : "" %> name="can_copy" value="<%= @shixun.can_copy ? 1 : 0 %>" id="can_copy" class="ml5 mr5 magic-checkbox" >
-                <label style="top:6px" class="color-grey" for="can_copy">(勾选则给实训合作者提供复制实训功能，否则不提供)</label>
+                <label style="top:6px" class="color-grey" for="can_copy">(勾选，则平台所有已职业认证的教师可以复制)</label>
               </span>
         </li>
         <li class="clearfix">
@@ -77,6 +77,10 @@
             $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
         });
 
+        $("#can_copy").on("click", function(){
+            $(this).val() == '0' ? $(this).val('1') : $(this).val("0");
+        });
+
         $("#new_course_list").on('input', function(e){
             throttle(search_course_list, window, e);
         });
diff --git a/app/views/shixuns/_settings_show.html.erb b/app/views/shixuns/_settings_show.html.erb
index 1c7b6a309..05d29c7ba 100644
--- a/app/views/shixuns/_settings_show.html.erb
+++ b/app/views/shixuns/_settings_show.html.erb
@@ -62,7 +62,7 @@
           <label class="panel-form-label fl">复制&nbsp;&nbsp;&nbsp;</label>
               <span class="fl mr20">
                 <input type="checkbox" <%= @shixun.can_copy ? 'checked' : "" %> name="can_copy" value="<%= @shixun.can_copy ? 1 : 0 %>" id="can_copy" disabled="disabled" class="ml5 mr5 magic-checkbox" >
-                <label style="top:6px" class="color-grey" for="can_copy">(勾选则给实训合作者提供复制实训功能，否则不提供)</label>
+                <label style="top:6px" class="color-grey" for="can_copy">(勾选，则平台所有已职业认证的教师可以复制)</label>
               </span>
         </li>
       </ul>
diff --git a/app/views/shixuns/_statistics_student_list.html.erb b/app/views/shixuns/_statistics_student_list.html.erb
index 02340d7f0..2bad02525 100644
--- a/app/views/shixuns/_statistics_student_list.html.erb
+++ b/app/views/shixuns/_statistics_student_list.html.erb
@@ -16,27 +16,29 @@
           <% @statistics.each do |statistics| %>
               <tr>
                 <td class="" style="display: flex;align-items: center;justify-content: center;">
-                  <!--<img class="picture" src="/images/../images/bigdata/bigdata-logo.png" alt="头像" style="width:36px;height:36px;border-radius:18px;">-->
-                  <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36",  :alt => "头像"), user_path(statistics.owner), :target => '_blank', :class => "", :style => "border-radius:18px;"%>
+                  <!--<img src = "/images/../images/bigdata/bigdata-logo.png" alt = "头像" style = "width:36px;height:36px;border-radius:18px;margin-left:10px;"/>-->
+                  <%= link_to image_tag(url_to_avatar(statistics.owner), :width => "36", :height => "36",  :alt => "头像", :style => "border-radius:18px;margin:15px 0 0 10px;"), user_path(statistics.owner), :target => '_blank', :class => ""%>
                 </td>
-                <td >
-                  <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-grey" %>
+                <td>
+                  <%= link_to statistics.owner.try(:show_name), user_path(statistics.owner), :class => "panel-table-name hide fl color-black" %>
                 </td>
                 <td><%= format_time(statistics.created_at) %> 开启</td>
-                <td>
-                  <div style="padding:10px 0;background:#fff;" class="fl mt5">
+                <td style = "width:500px;">
+                  <div style="padding:10px 0;" class="fl mt5">
                     <div class="panel-slider-bg  ">
                       <span class="panel-slider-inner03 " style = "width:<%= statistics.current_stage*100.to_f / statistics.games.count %>%"></span>
                     </div>
                   </div>
-                  <span class="panel-slider-txt fl ml30">挑战至第<%= statistics.current_stage %>关/共<%= statistics.games.count %>关</span>
+                  <span class="panel-slider-txt fl ml30">
+                    挑战至第<%= statistics.current_stage %>关/共<%= statistics.games.count %>关
+                  </span>
                 </td>
                 <td>
                   <span class=" mr20">
-                    <% if statistics.total_score == 0 %>
+                    <% if statistics.total_score == 0 || statistics.total_score.nil? %>
                         --
                     <% else %>
-                      <span style="color:#29bd8b;font-weight:bold;" class="font-14"> + <%= statistics.total_score %></span> 经验值
+                      <span style="color:#29bd8b;font-weight:bold;" class="font-14">+ <%= statistics.total_score.to_i %></span> 经验值
                     <% end %>
                   </span>
                 </td>
diff --git a/app/views/shixuns/add_collaborators.js.erb b/app/views/shixuns/add_collaborators.js.erb
index 36fbc2af7..1bdd537e4 100644
--- a/app/views/shixuns/add_collaborators.js.erb
+++ b/app/views/shixuns/add_collaborators.js.erb
@@ -1,5 +1,5 @@
 <% if params[:is_observe] %>
-$("#search_not_teachers_list").html("<%= j(render :partial => 'courses/settings/search_not_teachers_list') %>");
+$("#search_not_teachers_list").html("<%= j(render :partial => 'shixuns/add_collaborators_list') %>");
 <% else %>
 var htmlvalue = "<%= j(render :partial => 'shixuns/add_collaborators') %>";
 pop_box_new(htmlvalue, 600, 420);
diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb
index 284f439ac..fc6235d62 100644
--- a/app/views/shixuns/index.html.erb
+++ b/app/views/shixuns/index.html.erb
@@ -171,7 +171,8 @@
       <div class="searchFor fr">
         <div class="searchCon">
           <input type="text" class="searchinput" name="search" placeholder="请输入实训名称的关键字进行搜索"/>
-          <i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" data-tip-down="关闭"></i>
+          <span class="search_close" onclick="colse_searchbox();" data-tip-down="清除">×</span>
+          <!--<i class="fa fa-close mr5 color-dark-grey" onclick="colse_searchbox();" data-tip-down="关闭"></i>-->
         </div>
         <i class="fa fa-search mr5 color-dark-grey search_icon" onclick="search_shixun()" style="margin:10px" data-tip-down="搜索"></i>
       </div>
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index 7d6e745e2..303a5e531 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -10,7 +10,7 @@
     <%= student_work.group_id == 0 ? '--' : '分组'+student_work.group_id.to_s %>
   </td>
   <td>
-    <%= list_work_status student_work.work_status %>
+    <%= (list_work_status student_work.work_status).html_safe %>
   </td>
   <td>
     <%= student_work.work_status == 0 ? '--' : format_time(student_work.updated_at) %>
diff --git a/app/views/student_work/_evaluation_un_pro_work.html.erb b/app/views/student_work/_evaluation_un_pro_work.html.erb
index e94418851..952b9345e 100644
--- a/app/views/student_work/_evaluation_un_pro_work.html.erb
+++ b/app/views/student_work/_evaluation_un_pro_work.html.erb
@@ -7,7 +7,7 @@
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
   </td>
   <td>
-    <%= list_work_status student_work.work_status %>
+    <%= (list_work_status student_work.work_status).html_safe %>
   </td>
   <td>
     <%= student_work.work_status == 0 ? '--' : format_time(student_work.updated_at) %>
diff --git a/app/views/student_work/_evaluation_un_shixun_work.html.erb b/app/views/student_work/_evaluation_un_shixun_work.html.erb
index bb033a5d2..d30e1d436 100644
--- a/app/views/student_work/_evaluation_un_shixun_work.html.erb
+++ b/app/views/student_work/_evaluation_un_shixun_work.html.erb
@@ -7,7 +7,7 @@
     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %>
   </td>
   <td>
-    <%= list_work_status student_work.work_status %>
+    <%= (list_work_status student_work.work_status).html_safe %>
   </td>
   <td>
     <%= student_work.work_status == 0 ? '--' : format_time(student_work.updated_at) %>
diff --git a/app/views/student_work/_score_appeal_box.html.erb b/app/views/student_work/_score_appeal_box.html.erb
index 255c693e5..b10a17e35 100644
--- a/app/views/student_work/_score_appeal_box.html.erb
+++ b/app/views/student_work/_score_appeal_box.html.erb
@@ -18,7 +18,7 @@
           <div class="cl"></div>
         </div>
 
-        <div class="task-popup-submit02 clearfix" style="width:120px;">
+        <div class="task-popup-submit02 clearfix" style="width:92%;">
           <a href="javascript:void(0);"  onclick="score_appeal_submit();" class="task-btn task-btn-blue fr sure">确定</a>
           <a href="javascript:void(0);" class="pop_close task-btn fr mr10 cancel">取消</a>
         </div>
diff --git a/app/views/student_work/_shixun_work_show.html.erb b/app/views/student_work/_shixun_work_show.html.erb
index 0f99ab2b8..588a489c9 100644
--- a/app/views/student_work/_shixun_work_show.html.erb
+++ b/app/views/student_work/_shixun_work_show.html.erb
@@ -4,13 +4,13 @@
     <a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
   </div>
   <div class="task_popup_con">
-    <div class="clearfix mb10 edu-class-con-list">
-      <p class="fl">
+    <div class="clearfix mb10 bor-bottom-greyE pb10">
+      <p class="fl mt5">
         <%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "link-name-dark fl", :target => "_blank" %>
-        <span class="fl mr5 ml5">/</span>
+        <span class="fl mr5 ml3">/</span>
         <%= link_to @shixun.name, shixun_path(@shixun), :class => "edu-info-dark fl", :target => "_blank" %>
       </p>
-      <span class="edu-cir-grey fr mt5" style="padding:5px; background:#ddd;" data-tip-down = "<%= @myshixun.total_score %>">经验值：<%= @myshixun.total_score %> </span>
+      <span class="edu-filter-cir-grey mr5 active fr" style="padding:2px 10px;" data-tip-down = "<%= @myshixun.total_score %>">经验值：<%= @myshixun.total_score %> </span>
     </div>
     <div class="clearfix mb20 color-grey">
       <%= link_to image_tag(url_to_avatar(@work.user), :width =>"50", :height => "50", :alt=>"头像", :style => "width:50px; height:50px;"), user_path(@work.user), :class => "fl edu-work-user-img", :target => "_blank" %>
diff --git a/app/views/student_work/_student_work_score.html.erb b/app/views/student_work/_student_work_score.html.erb
index 096e8371b..265952a84 100644
--- a/app/views/student_work/_student_work_score.html.erb
+++ b/app/views/student_work/_student_work_score.html.erb
@@ -31,7 +31,7 @@
         <% end %>
         <% if @homework.anonymous_appeal == 1 %>
             <% if @homework.homework_detail_manual.comment_status == 4 && score.student_work.user == User.current && score.reviewer_role == 3 && score.appeal_status == 0 %>
-                <a href="<%=alert_appeal_box_student_work_index_path(:score_id => score.id,:is_last => is_last) %>" data-remote="true" class="fr link-color-grey">申诉</a>
+                <a href="<%=alert_appeal_box_student_work_index_path(:score_id => score.id,:is_last => is_last) %>" data-remote="true" class="fr white-btn orange-btn">+&nbsp;申诉</a>
             <% elsif score.reviewer_role == 3 && score.appeal_status == 1 %>
                 <span class="color-orange fr mr10">申诉中</span>
             <% elsif score.reviewer_role == 3 && score.appeal_status == 2 %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 64b5e823d..bbac8bc48 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -32,9 +32,7 @@
     <%= @homework.name %>
   </p>
   <%= link_to '返回', homework_common_index_path(:course => @homework.course_id, :homework_type => @homework.homework_type), :class => 'fr font-12 mr15 mt3 color-grey' %>
-  <% if @homework.homework_type == 4 && @is_teacher && @homework.homework_commons_shixuns && @homework.homework_commons_shixuns.shixun %>
-      <%= link_to '查看实训', shixun_path(@homework.homework_commons_shixuns.shixun), :target => "_blank", :class => 'fr font-12 mr15 mt3 color-orange03' %>
-  <% end %>
+
 </div>
 <div class="edu-con-bg01 mt30">
 <div class="">
@@ -58,45 +56,50 @@
   </li>
   <% if @is_teacher %>
       <div class="fr edu-position edu-position-hidebox mr10 mt8">
-        <a href="javascript:void(0);" class="font-16"><i class="fa fa-bars mr10"></i></a>
-        <ul class="edu-position-hide undis" style="left:-85px;">
-          <% if @homework.homework_type != 4 %>
+        <% if @homework.homework_type == 4 && @is_teacher && @homework.homework_commons_shixuns && @homework.homework_commons_shixuns.shixun %>
+            <%= link_to '查看实训', shixun_path(@homework.homework_commons_shixuns.shixun), :target => "_blank", :class => 'fr mt5 mr5 white-btn orange-btn' %>
+        <% end %>
+        <%= link_to "导出成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :group => @group, :comment => @comment, :status => @status, :format => 'xls'),:class=>'fl mt5 mr10 white-btn orange-btn', :id => "export_student_work"%>
+
+        <!--<a href="javascript:void(0);" class="font-16"><i class="fa fa-bars mr10"></i></a>-->
+        <!--<ul class="edu-position-hide undis" style="left:-85px;">
+          <%# if @homework.homework_type != 4 %>
               <li>
-                <%= link_to l(:button_edit), edit_homework_common_path(@homework) %>
+                <%#= link_to l(:button_edit), edit_homework_common_path(@homework) %>
               </li>
-          <% end %>
-          <!--<li>-->
-            <!--<%#= link_to "设置", setting_homework_common_path(@homework) %>-->
-          <!--</li>-->
-          <% if @homework.homework_type == 4 %>
+          <%# end %>
+          &lt;!&ndash;<li>&ndash;&gt;
+            &lt;!&ndash;<%#= link_to "设置", setting_homework_common_path(@homework) %>&ndash;&gt;
+          &lt;!&ndash;</li>&ndash;&gt;
+          <%# if @homework.homework_type == 4 %>
               <li>
-                <%= link_to '进入实训', shixun_path(@homework.homework_commons_shixuns.shixun), :target => "_blank" %>
+                <%#= link_to '进入实训', shixun_path(@homework.homework_commons_shixuns.shixun), :target => "_blank" %>
               </li>
-          <% end %>
-          <% unless @homework.is_public %>
-              <li id="set_homework_public_<%= @homework.id %>">
-                <a href="javascript:void(0);" onclick="s_op_confirm_box('<%= set_public_homework_common_path(@homework) %>', '您确定要公开吗？<br/>公开后不能重设为私有')">设为公开</a>
+          <%# end %>
+          <%# unless @homework.is_public %>
+              <li id="set_homework_public_<%#= @homework.id %>">
+                <a href="javascript:void(0);" onclick="s_op_confirm_box('<%#= set_public_homework_common_path(@homework) %>', '您确定要公开吗？<br/>公开后不能重设为私有')">设为公开</a>
               </li>
-          <% end %>
-          <% if (User.current.teacher_of_course(@homework.course) || @homework.user == User.current) && User.current.homework_banks.where(:homework_common_id => @homework.id).empty? %>
-              <li class="add_to_homework_bank_<%= @homework.id %>">
-                <%= link_to "加入题库", add_to_homework_bank_homework_common_path(@homework, :type => 1), :remote => true %>
+          <%# end %>
+          <%# if (User.current.teacher_of_course(@homework.course) || @homework.user == User.current) && User.current.homework_banks.where(:homework_common_id => @homework.id).empty? %>
+              <li class="add_to_homework_bank_<%#= @homework.id %>">
+                <%#= link_to "加入题库", add_to_homework_bank_homework_common_path(@homework, :type => 1), :remote => true %>
               </li>
-          <% end %>
-          <% if @homework.user == User.current %>
-              <% if @homework.is_update && !User.current.homework_banks.where(:homework_common_id => @homework.id).blank? %>
-                  <li class="add_to_homework_bank_<%= @homework.id %>">
-                    <%= link_to "同步到题库", add_to_homework_bank_homework_common_path(@homework, :type => 2), :remote => true %>
+          <%# end %>
+          <%# if @homework.user == User.current %>
+              <%# if @homework.is_update && !User.current.homework_banks.where(:homework_common_id => @homework.id).blank? %>
+                  <li class="add_to_homework_bank_<%#= @homework.id %>">
+                    <%#= link_to "同步到题库", add_to_homework_bank_homework_common_path(@homework, :type => 2), :remote => true %>
                   </li>
-                  <li class="add_to_homework_bank_<%= @homework.id %>">
-                    <%= link_to "另存到题库", add_to_homework_bank_homework_common_path(@homework, :type => 3), :remote => true %>
+                  <li class="add_to_homework_bank_<%#= @homework.id %>">
+                    <%#= link_to "另存到题库", add_to_homework_bank_homework_common_path(@homework, :type => 3), :remote => true %>
                   </li>
-              <% end %>
-          <% end %>
+              <%# end %>
+          <%# end %>
           <li>
-            <a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= homework_common_path(@homework) %>', '您确定要删除吗？<br/>已提交作品将全部被删除，不可恢复')">删除</a>
+            <a href="javascript:void(0)" onclick="delete_confirm_box_3('<%#= homework_common_path(@homework) %>', '您确定要删除吗？<br/>已提交作品将全部被删除，不可恢复')">删除</a>
           </li>
-        </ul>
+        </ul>-->
       </div>
   <% else %>
       <%= user_work_status @homework %>
@@ -210,7 +213,7 @@
               <li class="clearfix">
                 <% if @is_teacher %>
                     <div class="fr">
-                      <%= link_to "导出成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :group => @group, :comment => @comment, :status => @status, :format => 'xls'),:class=>'fl mt8 mr5 white-btn orange-btn', :id => "export_student_work"%>
+
                       <% if @homework.homework_type == 1 || @homework.homework_type == 3 %>
                           <% if @stundet_works.empty?%>
                               <%= link_to "导出作品附件", "javascript:void(0)", class: "fl mt8 mr5 white-btn orange-btn", :onclick => "notice_box('该检索条件下没有作品，无法下载附件')" %>
@@ -224,9 +227,10 @@
                 <div class="edu-find fr mr40 with20 pr">
                   <div class="edu-find-input">
                     <input type="text" class="task-form-100 panel-box-sizing" placeholder="姓名、学号关键字检索" value="<%= @name %>" id="course_student_name"/>
-                    <i class="fa fa-close mr5 color-grey edu-close" onclick="$('#course_student_name').val('');SearchByName_1();"></i>
+                    <span class="edu-close" style="top:1px;" onclick="$('#course_student_name').val('');SearchByName_1();" data-tip-down="关闭">×</span>
+                    <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="$('#course_student_name').val('');SearchByName_1();"></i>-->
                   </div>
-                  <a href="javascript:void(0);" onclick="SearchByName_1();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
+                  <a href="javascript:void(0);" style="top:3px;" onclick="SearchByName_1();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
                 </div>
               </li>
               <input id="homework_id" type="hidden" value="<%= @homework.id %>">
diff --git a/app/views/student_work/show.html.erb b/app/views/student_work/show.html.erb
index b5e9958a7..90ca59999 100644
--- a/app/views/student_work/show.html.erb
+++ b/app/views/student_work/show.html.erb
@@ -3,7 +3,7 @@
 <div class="edu-class-container">
 <p class="mb10"><i class="fa fa-map-marker mr5 color-grey"></i><a href="<%= course_path(@course) %>"><%= @course.name %></a> > <a href="<%= homework_common_index_path(:course => @course.id, :homework_type => @homework.homework_type) %>"><%= @homework.homework_type_ch %>作业</a> >
   <%#= link_to get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1, student_work_index_path(:homework => @homework.id) %>
-  <a href="<%= student_work_index_path(:homework => @homework.id) %>">#<%= get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1 %></a>
+  <a href="<%= student_work_index_path(:homework => @homework.id) %>">#<%= get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1 %></a> >
   <% if @is_teacher || @work.user == User.current || (@homework.homework_detail_manual.comment_status != 3 && @homework.homework_detail_manual.comment_status != 4) %>
       <%= link_to @work.user.try(:show_real_name), user_path(@work.user) %>
   <% else %>
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index 6a4adae39..10208015c 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -8,8 +8,8 @@
               <a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce"data-tip-down="编辑"></i></a>
           <% end %>
         </p>
-        <div class="color-dark-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %> justify">
-          <pre class="pre_word font-15" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description.html_safe) %></pre>
+        <div class="color-grey3 <%= @subject.description.blank? ? 'color-light-grey' : '' %> justify">
+          <pre class="pre_word font-15" style="font-family: '微软雅黑','宋体';"><%= @subject.description.blank? ? "暂未填写" : (@subject.description.html_safe) %></pre>
         </div>
       </div>
   <% end %>
@@ -142,7 +142,7 @@
           <a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil mt10 mr5 color-grey-c edit-produce font-12"data-tip-down="编辑" style="position: relative;top:-3px"></i></a>
       <% end %>
     </p>
-    <div class="mt10 mb10 color-dark-grey justify"><pre class="pre_word font-15" style="color: #666;font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes.html_safe %></pre></div>
+    <div class="mt10 mb10 color-grey justify"><pre class="pre_word font-15" style="font-family: '微软雅黑','宋体';"><%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes.html_safe %></pre></div>
   </div>
   <div class="edu-class-right-box ml15 bor-radius4 bor-grey01 pt20 mb40">
     <p class="font-18 mb20" style="text-align: center">教学团队
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index 50c7d7a4e..898058197 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,5 +1,5 @@
 <div class="orig_user fl">
-<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
+<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33",:class => "bor-radius-all"), user_path(comment.creator_user), :alt => "用户头像" %>
 </div>
 <script type="text/javascript">
     $(function(){
diff --git a/app/views/users/_course_attachment.html.erb b/app/views/users/_course_attachment.html.erb
index 834514c9a..3fcd856bb 100644
--- a/app/views/users/_course_attachment.html.erb
+++ b/app/views/users/_course_attachment.html.erb
@@ -1,7 +1,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index d63d958ad..de0f417ed 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -40,9 +40,10 @@
 <div class="edu-find fr mr40 with30 pr">
   <div class="edu-find-input">
     <input type="text" class="task-form-100 panel-box-sizing" maxlength="30" name="search" placeholder="输入帖子标题的关键字进行搜索" value="<%= @q %>" id="all_message_search"/>
-    <i class="fa fa-close mr5 color-grey edu-close" onclick="clear_search();"></i>
+    <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+    <span class="edu-close" style="top:1px;" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
   </div>
-  <a href="javascript:void(0);" onclick="submit_message_search();" class="edu-open font-16 color-grey" style="right:-25px"><i class="fa fa-search"></i></a>
+  <a href="javascript:void(0);" style="top:3px;" onclick="submit_message_search();" class="edu-open font-16 color-grey" style="right:-25px"><i class="fa fa-search"></i></a>
 </div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb
index 32ff0bb3f..cbf2f9bcc 100644
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@@ -1,7 +1,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.teacher), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.teacher), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 52c77e5bc..872ec8aad 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -2,7 +2,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.user), :alt => "用户头像" %>
       <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 5529c4b4d..3370f62b0 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -1,7 +1,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index f426ec105..6a00131b2 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -1,7 +1,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author, :host => Setting.host_user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.author, :host => Setting.host_user), :alt => "用户头像" %>
       <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index a4682c79f..34af69227 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -1,7 +1,7 @@
 <div class="resources mt10 user_bg_shadow bor-grey-e" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.author), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 8b7e495d1..bcdc6c732 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -5,7 +5,7 @@
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
-      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb
index 9e3606c92..b6847b3a8 100644
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@@ -43,7 +43,7 @@
           <div class="fl mr10 w100" style="text-align:center;">
             <a href="javascript:void(0);" class="linkBlue">
               <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
-                  <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_url_in_org(activity.id, 2, '', sw.id), :alt => "学生头像" %>
+                  <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40",:class => "bor-radius-all"), student_work_index_url_in_org(activity.id, 2, '', sw.id), :alt => "学生头像" %>
                   <p class="w100 hidden">
                     <%= link_to sw.user.show_real_name,student_work_index_url_in_org(activity.id, 2, '', sw.id)%>
                   </p>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index b4ed1fd8b..3ac3050dc 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -96,6 +96,19 @@
                       <div class="cl"></div>
                       <p nhname='contentmsg_<%= reply.id%>'></p>
                   <% end%>
+          <% elsif @type == 'Memo' %>
+              <%= form_for('memo',:url => reply_forum_memo_path(reply.forum, reply), :method => "post", :remote => true) do |f|%>
+                  <%= f.hidden_field :subject, :required => true, value: reply.subject %>
+                  <%= f.hidden_field :forum_id, :required => true, value: reply.forum_id %>
+                  <%= f.hidden_field :parent_id, :required => true, value: reply.id %>
+                  <%= hidden_field_tag 'activity_id',params[:activity_id],:value =>@user_activity_id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>' class="kindeditor"></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="task-btn task-btn-blue fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>'></p>
+              <% end%>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index edc5bb134..45d3a81a4 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -13,7 +13,7 @@
           <a href="<%= user_fanslist_user_path(@user) %>" class="font-16 tab_type" id="user_fans_count"><%= str %>的粉丝 <%= @user_fanlist_count %></a>
         </li>
       </ul>
-      <div id="edu-tab-con-1" class="box_bg_shandow">
+      <div id="edu-tab-con-1" class="box_bg_shandow" style = "padding-top:18px;">
         <div class="clearfix " id="user_fans_list">
           <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_fanlist, :user_count => @user_fanlist_count, :user_pages => @fans_pages} %>
         </div>
diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index 26ddf5bab..64cfeecef 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -13,7 +13,7 @@
           <a href="<%= user_fanslist_user_path(@user) %>" class="font-16 tab_type" id="user_fans_count"><%= str %>的粉丝 <%= @user_fanlist_count %></a>
         </li>
       </ul>
-      <div id="edu-tab-con-1" class="box_bg_shandow  mh650">
+      <div id="edu-tab-con-1" class="box_bg_shandow  mh650" style = "padding-top:18px;">
         <div class="clearfix" id="user_watch_list">
           <%= render :partial => "user_watcher_or_fans_list", :locals => {:users => @user_watchlist, :user_count => @user_watchlist_count, :user_pages => @watchlist_pages} %>
         </div>
diff --git a/config/routes.rb b/config/routes.rb
index 7caf84aac..c9b5be898 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -738,10 +738,16 @@ RedmineApp::Application.routes.draw do
       end
       member do
         get "change_sticky"
+        post "reply"
+        match "message_replies", :via => [:get, :post]
       end
     end
   end
 
+  resources :debates do
+
+  end
+
   resources :cooperation do
     collection do
 
@@ -1771,6 +1777,7 @@ RedmineApp::Application.routes.draw do
       post 'choose_course_group'
       match 'update_position', :via => [:get, :post]
       post 'delete_course_students'
+      get 'shixun_statistics'
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index 20a16e4b3..fb7f18587 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -38,6 +38,7 @@ $(function(){
                 "<div class=\"data-tip-down\"></div>"+
                 "<div class=\"data-tip-left\"></div>"+
                 "<div class=\"data-tip-right\"></div>"+
+                "<div class=\"data-tip-top\"></div>"+
                 "</div>").appendTo("body");
     //Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
     function  LeaveTitle(Dom,ChangeDom){
@@ -48,9 +49,21 @@ $(function(){
                 }).hide();
             })
     }
+    LeaveTitle($("[data-tip-top]"),$(".data-tip-top"));
     LeaveTitle($("[data-tip-down]"),$(".data-tip-down"));
     LeaveTitle($("[data-tip-right]"),$(".data-tip-left"));
     LeaveTitle($("[data-tip-left]"),$(".data-tip-right"));
+    $("[data-tip-top]").live("mouseenter",function(){
+        var $tool = $(this).attr("data-tip-top");
+        if($tool != ""){
+            $(".data-tip-top").show().html($tool);
+            $desc.show().css({
+                left:$(this).offset().left -($desc.width()-$(this).width())/2,
+                opacity:0.7,
+                top:$(this).offset().top - 30
+            });
+        }
+    });
         $("[data-tip-down]").live("mouseenter",function(){
             var $tool = $(this).attr("data-tip-down");
             if($tool != ""){
@@ -252,14 +265,14 @@ function pop_box_new(value, Width, Height){
 
 // 两个按钮 点击确认跳转, 提示信息有两行
 function op_confirm_box(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 578, 205);
 }
 
 function op_confirm_box_loading(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr" onclick="hideModal();$(\'.loading_all\').show();">确定</a></div></div>';
     pop_box_new(htmlvalue, 578, 205);
@@ -267,7 +280,7 @@ function op_confirm_box_loading(url, str){
 
 // 两个按钮 点击确认跳转, 提示信息有两行
 function s_op_confirm_box(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 205);
@@ -275,7 +288,7 @@ function s_op_confirm_box(url, str){
 
 //点击删除时的确认弹框: 不走destroy方法
 function delete_confirm_box(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr pop_close" data-remote="true" id="task_popup_confirm">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -283,7 +296,7 @@ function delete_confirm_box(url, str){
 
 //点击删除时的确认弹框: 走destroy方法,remote为true
 function delete_confirm_box_2(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr pop_close" data-method="delete" data-remote="true">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -291,7 +304,7 @@ function delete_confirm_box_2(url, str){
 
 //点击删除时的确认弹框: 走destroy方法
 function delete_confirm_box_3(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr pop_close" data-method="delete" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -299,7 +312,7 @@ function delete_confirm_box_3(url, str){
 
 // 点击删除时的确认弹框: 走destroy方法  有“载入中”的提示
 function delete_confirm_box_4(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-blue fr" data-method="delete" onclick="hideModal(); $(\'#ajax-indicator\').show();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -307,7 +320,7 @@ function delete_confirm_box_4(url, str){
 
 //提示框：只有一个按钮，点击关闭弹框
 function notice_sure_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">知道啦</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -315,7 +328,7 @@ function notice_sure_box(str){
 
 //提示框：只有一个确定按钮，点击关闭弹框
 function notice_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -324,7 +337,7 @@ function notice_box(str){
 
 // 长提示框：只有一个确定按钮，点击关闭弹框
 function long_notice_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 575, 140);
@@ -332,7 +345,7 @@ function long_notice_box(str){
 
 // 长提示框：只有一个“知道啦”按钮，点击关闭弹框
 function yes_notice_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-blue" onclick="hideModal();">知道啦</a></div></div>';
     pop_box_new(htmlvalue, 575, 200);
@@ -340,7 +353,7 @@ function yes_notice_box(str){
 
 //提示框：只有一个知道啦按钮，点击打开新窗口
 function sure_box_redirect(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();" target="_blank">知道啦</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -348,7 +361,7 @@ function sure_box_redirect(url, str){
 
 //提示框：只有一个知道啦按钮，点击打开新窗口
 function sure_box_redirect_without_newtab(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();" >知道啦</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -356,7 +369,7 @@ function sure_box_redirect_without_newtab(url, str){
 
 //提示框：只有一个确定按钮，点击跳转
 function notice_box_redirect(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-blue" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -364,7 +377,7 @@ function notice_box_redirect(url, str){
 
 //提示框：只有一个确定按钮，点击跳转（局部刷新）
 function notice_box_redirect_remote(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-blue" data-remote="true">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
@@ -372,7 +385,7 @@ function notice_box_redirect_remote(url, str){
 
 //重新登录
 function re_entry(url){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16 mt10 mb10"><i class="fa fa-exclamation-circle color-orange04 mr10"></i>您的会话已退出，请重新登录^_^</p></div><div class="task-popup-right-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-blue" data-remote="true">重新登录</a></div></div>';
     pop_box_new(htmlvalue, 480, 140);
diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js
index 24ec6f918..3940298d0 100644
--- a/public/javascripts/edu/edu_tpi.js
+++ b/public/javascripts/edu/edu_tpi.js
@@ -288,12 +288,12 @@ function game_praise(obj_id, obj_type){
                 praiseStatus = true; //已赞
                 praise_count.html(data.praise_tread_count);
                 $("#game_praise_tread").children("i").addClass("color-light-green");
-                $("#game_praise_tread").attr("data-tip-left", "取消点赞")
+                $("#game_praise_tread").attr("data-tip-top", "取消点赞")
             }else{
                 praiseStatus = false; //取消赞
                 praise_count.html(data.praise_tread_count);
                 $("#game_praise_tread").children("i").removeClass("color-light-green");
-                $("#game_praise_tread").attr("data-tip-left", "点赞")
+                $("#game_praise_tread").attr("data-tip-top", "点赞")
             }
         }
     });
@@ -314,12 +314,12 @@ function game_tread(obj_id){
                 treadStatus = true; // 取消踩
                 tread_count.html(data.praise_tread_count);
                 $("#game_tread").children("i").addClass("color-orange");
-                $("#game_tread").attr("data-tip-right", "取消踩")
+                $("#game_tread").attr("data-tip-top", "取消踩")
             }else{
                 treadStatus = false; // 已踩
                 tread_count.html(data.praise_tread_count);
                 $("#game_tread").children("i").removeClass("color-orange");
-                $("#game_tread").attr("data-tip-right", "踩");
+                $("#game_tread").attr("data-tip-top", "踩");
             }
         }
     });
@@ -439,19 +439,19 @@ function code_evaluation(test_sets,
                 "<li class=\"clearfix\">" +
                 "<div class=\"clearfix\">" +
                 "<span class=\"-task-ces-info-left color-blue fl fb\">测试输入：</span>" +
-                "<p class=\"fl\">" + ( test_sets[i].input == null ? "空" : test_sets[i].input.replace(/\r\n/g, "<br>") ) + " </p>" +
+                "<p class=\"fl with90\">" + ( test_sets[i].input == null ? "空" : test_sets[i].input.replace(/\r\n/g, "<br>") ) + " </p>" +
                 "</div>" +
                 "</li>" +
                 "<li class=\"clearfix\">" +
                 "<div class=\"clearfix\">" +
                 " <span class=\"-task-ces-info-left color-blue fl fb\">预期输出：</span>" +
-                "<p class=\"fl\">" + ( test_sets[i].output == null ? "空" : match_specific_symbol(test_sets[i].output)) + "</p>" +
+                "<p class=\"fl with90\">" + ( test_sets[i].output == null ? "空" : match_specific_symbol(test_sets[i].output)) + "</p>" +
                 "</div>" +
                 "</li>" +
                 "<li class=\"clearfix\">" +
                 "<div class=\"clearfix\">" +
                 "<span class=\"-task-ces-info-left color-blue fl fb\">实际输出：</span>" +
-                "<p class=\"fl color-orange\">" + (test_sets[i].actual_output == null ? "空" : (test_sets[i].compile_success == "1" ? match_specific_symbol(test_sets[i].actual_output) : test_sets[i].actual_output.replace(/\r\n/g, "<br>"))) + "</p>" +
+                "<p class=\"fl with90 color-orange\">" + (test_sets[i].actual_output == null ? "空" : (test_sets[i].compile_success == "1" ? match_specific_symbol(test_sets[i].actual_output) : test_sets[i].actual_output.replace(/\r\n/g, "<br>"))) + "</p>" +
                 "</div>" +
                 "</li>" +
                 "</ul>" +
@@ -523,7 +523,7 @@ function code_evaluation(test_sets,
         "</li>" +
         "<li>" +
         "<span class=\"-task-ces-info-left\">金币：</span>" +
-        "<span class=\""+ (gold >= 0 ? "color-light-green" : "-text-danger") + "\"" +"id=\"grade_value\"> " + (gold >= 0 ? ("+" + gold) : gold) + "</span>" +
+        "<span class=\""+ (gold >= 0 ? "color-light-green" : "-text-danger") + "\"" +"id=\"grade_value\">" + (gold >= 0 ? ("+ " + gold) : gold) + "</span>" +
         "</li>" +
         "</ul>" +
         "</div>" +
diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css
index b4ab73fce..851953c89 100644
--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@@ -192,7 +192,7 @@ em{font-style:normal;}
 .stud-class-set .news  .container .member .people .left li .p1{position:relative;}
 .stud-class-set .news  .container .member .people .left li .p1 span{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .edu-break-out{max-width:115px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
-.edu-break-outshort{max-width:105px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
+.edu-break-outshort{max-width:96px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display:inline-block;float:left}
 .stud-class-set .news  .container .member .people .left li .p1 em{margin-left:10px;font-size:12px;background:#e9e9e9;border-radius:8px;padding:2px 5px;}
 .stud-class-set .news  .container .member .people .left li .p1 i{color:#ddd;cursor: pointer;position:absolute;right:10px;top:17px;}
 .stud-class-set .news  .container .member .people .left li .p1 i:hover{color:#FF7500;}
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 8c4585858..7da2194fd 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -99,9 +99,9 @@ a:hover.link-color-grey03{color:#3498db!important;}
 .font-28{ font-size: 28px!important;}
 .font-30{ font-size: 30px!important;}
 /*通用内外边距*/
-.mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt9{margin-top:9px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}.mt95{ margin-top:95px;}
+.mt-10{ margin-top:-10px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt5{ margin-top:5px;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt15{ margin-top:15px;}.mt20{ margin-top:20px;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px;}.mt50{ margin-top:50px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}
 .mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px;}.mb40{ margin-bottom: 40px;}.mb50{ margin-bottom: 50px;}
-.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
+.ml-3{ margin-left: -3px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml50{ margin-left: 50px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml230{ margin-left: 230px;}
 .mr3{margin-right: 3px}.mr5{ margin-right: 5px;}.mr10{ margin-right: 10px;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr40{margin-right:40px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}
 .pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}.pt40{ padding-top:40px;}
 .pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}
@@ -133,6 +133,7 @@ a:hover.task-btn-green{background: #19b17e;}
 a.task-btn-orange{ background:#fc8675; color:#fff !important;}
 a:hover.task-btn-orange{ background:#fc8675;}
 a.task-btn-blue{background: #3498db; color:#fff!important;}
+a.task-btn-orange{background: #FF7500; color:#fff!important;}
 a:hover.task-btn-blue{background: #5faee3;color:#fff;}
 a.task-btn-grey{background-color: #d4d6d8; color: #4d555d!important;}
 a:hover.task-btn-grey{background-color: #d4d6d8; color: #4d555d;}
@@ -158,7 +159,7 @@ a:hover.task-btn-ver{background:#5f7cab;}
 .new_login_submit:hover{background: #19b17e;}
 a.task-btn-email{display: inline-block;font-weight: bold;border: none; width:185px;color: #666;background: #e1e1e1;letter-spacing: 1px;text-align: center;font-size: 14px;height: 40px;line-height: 40px;border-radius: 3px;}
 a:hover.task-btn-email {background: #c3c3c3; color: #666;}
-.white-btn{cursor: pointer;display: inline-block;padding: 0 8px;border: 1px solid #ccc;color: #666;letter-spacing: 1px;font-size: 14px;height: 26px;line-height: 26px;border-radius: 3px;}
+.white-btn{text-align:center;cursor: pointer;display: inline-block;padding: 0 8px;border: 1px solid #ccc;color: #666;letter-spacing: 1px;font-size: 14px;height: 26px;line-height: 26px;border-radius: 3px;}
 a.white-btn.green-btn{color:#29bd8b;border:1px solid #29bd8b; }
 a.white-btn.orange-btn{color: #FF7500;border: 1px solid #FF7500}
 a.white-btn.orange-btn:hover{color: #FFFFFF;border: 1px solid #FF7500;background: #ff7500}
@@ -314,7 +315,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
     font-weight:bold;
     text-align:center;
     padding:0.6em;
-    z-index:100;
+    z-index:100000;
     opacity: 0.5;
 }
 
@@ -328,7 +329,7 @@ html>body #ajax-indicator { position: fixed; }
     background-image: url(/images/loading.gif);
     padding-left: 26px;
     vertical-align: bottom;
-    z-index:999;
+    z-index:100000;
 }
 
 
@@ -377,15 +378,15 @@ html>body #ajax-indicator { position: fixed; }
 
 .edu-find .edu-find-input{border-bottom: 1px solid #EEEEEE;}
 .edu-find .edu-find-input input{border: none;outline: none}
-.edu-find .edu-close{position: absolute;top: 10px;right: 5px}
-.edu-find .edu-open{position: absolute;top: 2px;right: -18px}
+.edu-find .edu-close{position: absolute;top: -1px;right: 7px;font-size: 18px;cursor: pointer;}
+.edu-find .edu-open{position: absolute;top: 1px;right: -18px}
 
 
 /*最新和最热导航条的公用样式*/
 
 .nav_check_item{margin-bottom:13px;border-bottom: 2px solid #FC7033;}
 .nav_check_item li{width:auto;width: 80px;text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius:5px;border-top-left-radius:5px;}
-.nav_check_item li a{display: block;}
+.nav_check_item li a{display: block;width: 100%;}
 
 .check_nav{background: #FC7033;color: #ffffff;}
 .check_nav a{color: #ffffff !important;}
@@ -447,14 +448,12 @@ input::-ms-clear{display:none;}
 .bor-blue{border:1px solid #5faee3;}
 /*
     tip公共样式的设置：
-    tip整体的背景色的设置在 2、7、10、13行。要统一修改
-    tip整体的border的设置在3、8、11、14行。要统一修改
-    tip字体的颜色和阴影的设置在第2行。
+
 */
 .-task-title{opacity:0;position:absolute;left:0;top:0;display:none;z-index:9999;}       /*1*/
-.data-tip-down,.data-tip-left,.data-tip-right{  position:relative;  box-shadow:0px 0px 8px #000;  background:#000;  color:#fff;  max-width:300px;/*2*/
+.data-tip-down,.data-tip-left,.data-tip-right,.data-tip-top{  position:relative;  box-shadow:0px 0px 8px #000;  background:#000;  color:#fff;  max-width:300px;/*2*/
     word-wrap: break-word;  text-align:center;  border-radius:4px;  padding:0 10px;  border:1px solid #000; display:none; }/*3*/
-.data-tip-down:after,.data-tip-down:before,.data-tip-left:before,.data-tip-right:before,.data-tip-left:after,.data-tip-right:after{/*4*/
+.data-tip-down:after,.data-tip-down:before,.data-tip-left:before,.data-tip-right:before,.data-tip-left:after,.data-tip-right:after,.data-tip-top:after,.data-tip-top:before{/*4*/
     position: absolute;content:''; width:0; height:0;}/*5*/
 .data-tip-down:after,.data-tip-down:before{left: 45%;top:-10px;/*6*/
     border-left: 5px solid transparent;  border-right: 5px solid transparent;  border-bottom: 10px solid #000;  }/*7*/
@@ -465,8 +464,9 @@ input::-ms-clear{display:none;}
 .data-tip-right:after,.data-tip-right:before{right: -10px;  top:50%; margin-top:-5px;/*12*/
     border-top: 5px solid transparent;border-bottom: 5px solid transparent;  border-left: 10px solid #000;  }/*13*/
 .data-tip-right:before{ right: -12px;border-left: 10px solid #000;  }/*14*/
-
-
+.data-tip-top:after,.data-tip-top:before{left: 45%;bottom:-10px;border-left: 5px solid transparent;
+    border-right: 5px solid transparent;border-top: 10px solid #000;}
+.data-tip-top:before{bottom:-11px;}
 
 /*-------------------------圆角-------------------------*/
 .bor-radius-upper{border-radius: 4px 4px 0px 0px;}
@@ -488,7 +488,6 @@ input::-ms-clear{display:none;}
 /*在线课堂*/
 .courseRefer{float:left; max-height:120px;margin-bottom:10px;overflow:auto; overflow-x:hidden;}
 .logo {width: 295px;height: 30px;border-style:none;position: absolute;top:50%;left:39%;}
-/*用户修改*/
-.user{border-top: 1px solid #ddd;padding-top: 30px}
-/*Fork*/
-.task-header-info .fork{font-weight:bold;font-size:14px;color:#666}
\ No newline at end of file
+
+
+
diff --git a/public/stylesheets/css/edu-popup.css b/public/stylesheets/css/edu-popup.css
index 6dd7ca7eb..768a702f8 100644
--- a/public/stylesheets/css/edu-popup.css
+++ b/public/stylesheets/css/edu-popup.css
@@ -13,13 +13,13 @@
 .task-popup-warp{ width: 100%; height:100%; background:black; position:fixed;}
 .task-popup-box{  position: relative; margin:150px auto 0px; }
 .task-box1{ width:428px; height:420px;background:url(/images/task/task-success.png) 0px 0px no-repeat;}
-.task-box2{ width:496px; height:373px;position: relative;}/*background:url(/images/task/task-success02.png) 0px 50px no-repeat;*/
+.task-box2{ width:496px; height:373px;background:url(/images/task/task-success02.png) 0px 50px no-repeat;}
 a.task-popup-close{ display: block; background:url(/images/task/task-close.png) 0px 0px no-repeat; width: 31px; height: 31px; position:absolute; right:5px; top:100px;}
 a:hover.task-popup-close{background:url(/images/task/task-close.png) -40px 0px no-repeat; }
 .task-su-con{  text-align: center; padding-top:285px;}
 .task-su-p{ font-size: 20px; color:#ee4a1f; font-weight: bold;}
-a.task-su-btn{display: block;background:url(/images/task/task-su-btn-jie.png) 0px -64px no-repeat; width: 138px; height: 53px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
-a:hover.task-su-btn{background:url(/images/task/task-su-btn-jie.png) 0px 0px no-repeat;height: 53px;}
+a.task-su-btn{display: block;background:url(/images/task/task-su-btn.png) 0px -64px no-repeat; width: 138px; height: 57px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
+a:hover.task-su-btn{background:url(/images/task/task-su-btn.png) 0px 0px no-repeat; }
 a.task-su-btn-white{ display: inline-block; padding:8px 25px; border:1px solid #fff; color:#fff; text-align: center; border-radius:5px; font-size:14px;}
 a:hover.task-su-btn-white{ color: #ee4a1f;  border:1px solid #ee4a1f; }
 
diff --git a/public/stylesheets/css/edu-public.css b/public/stylesheets/css/edu-public.css
index ece0de648..dda1482b1 100644
--- a/public/stylesheets/css/edu-public.css
+++ b/public/stylesheets/css/edu-public.css
@@ -381,3 +381,17 @@ input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
 /*-----课程名称下拉框--------*/
 .course_list_ul{display: none;position: absolute;top:40px;left: -1px;width: 100% !important;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px; max-height: 150px;z-index: 10}
 .course_list_ul li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0 !important;cursor: pointer;}
+
+/*-----试卷提交状态--------*/
+.post_status_btn{display: block;float: left;padding: 0px 5px;font-size: 12px;color: #FFFFFF;border-radius: 4px;height: 20px;line-height: 20px;;}
+.post_btn_green{background: #29bd8b;border: 1px solid #29bd8b!important;color: #fff;}
+.post_btn_green_q{background: #5ECFBA;border: 1px solid #5ECFBA!important;color: #fff;}
+.post_btn_orange{background: #FF7500;border: 1px solid #FF7500!important;color: #fff;}
+.post_btn_red{background: #ee4a1f;border: 1px solid #ee4a1f!important;color: #fff;}
+.post_btn_grey{background: #e4e4e3;border: 1px solid #e4e4e3!important;}
+.post_btn_white{background: #ffffff;}
+/*评阅状态*/
+.checkstatus_box_small{width: 10px;height: 10px;display: block;float: left;margin-right: 3px;}
+.checkstatus_box_big{cursor: default;width: 30px;height: 30px;line-height: 30px;text-align: center;margin-right: 10px;border:1px solid #CCCCCC;display: block;float: left;}
+.checkstatus_box_big i{position: absolute;top:18px;left: 10px;}
+
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index b7e252bd8..885a11ceb 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -70,7 +70,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
 .panel-inner-title{ font-size: 14px; color: #666; max-width:85%; line-height:30px;word-wrap: break-word; margin-bottom: 10px}
 .panel-footer{ min-width:1000px; height: 210px!important;}
 /* 弹框 */
-.task-popup-text-center{ text-align: center; color: #666;}
+.task-popup-text-center{ text-align: center; color: #333;}
 .task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
 .task-popup-content{ padding:0px 15px 15px 15px;}
 .task-popup-submit{ margin: 0 auto 15px; width: 120px;}
@@ -346,6 +346,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
 .searchFor .searchCon{width:240px;border-bottom:1px solid #cccccc;float: left;height: 30px;}
 .searchFor .searchCon input{border: none;outline: none;height: 29px;width:91%;}
 .searchFor .searchImg{margin:5px 10px 0px 0px;cursor: pointer;}
+.searchFor .search_close{font-size: 18px;float: right;color: #666;height: 29px;line-height: 29px;cursor: pointer;}
 
 .tab_color{color: #bfbfbf!important;}
 
@@ -416,15 +417,21 @@ html>body #ajax-indicator-base { position: fixed; }
 .save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}
 .empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
 .tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
-.nav_check_item li{padding: 0px 17px!important;}
 
 /*二次回复的提示语的样式*/
 .points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
-.data-tip-top{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
+.data-tip-top1{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
  text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
-.data-tip-top:after,.data-tip-top:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
+.data-tip-top1:after,.data-tip-top1:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
  border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top:before{bottom:-11px;}
+.data-tip-top1:before{bottom:-11px;}
 /*选择题tab切换*/
 .nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
-.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
\ No newline at end of file
+.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
+.nav_option li a{width: 100%;height: 100%;display: block;}
+
+/*---------------------试卷----------------------*/
+.question_item_con{font-weight: normal!important;border:1px solid #EEEEEE!important;color: #333!important;background: #FFFFff!important;position: relative}
+.exam_operator{cursor: pointer;position: absolute;right: 15px;top: 11px;}
+.question_item_con .write_answer{border:1px solid #EEEEEE;background:#EFF9FD;padding: 10px 15px;text-align:justify;}
+.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #CCCCCC;border-radius: 3px;margin-left: 15px;cursor: pointer;}
\ No newline at end of file