diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index bf402d4a2..331837329 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -30,13 +30,13 @@ class HomeworkCommonController < ApplicationController
       if @order.blank?
         @homework_commons = @course.homework_commons.where("name like '%#{@search}%'").order("created_at desc")
       else
-        @homework_commons = HomeworkCommon.find_by_sql("SELECT * FROM `homework_commons` hc, `homework_detail_manuals` hdm where hdm.homework_common_id = hc.id and hc.course_id=#{@course.id} and hc.name like '%#{@search}%' and hdm.comment_status='#{@order}';")
+        @homework_commons = @course.homework_commons.includes(:homework_detail_manual).where("name like '%#{@search}%' and homework_detail_manuals.comment_status = #{@order}").order("homework_commons.created_at desc")
       end
     else
       if @order.blank?
         @homework_commons = @course.homework_commons.where("name like '%#{@search}%' and publish_time <= '#{Time.now}'").order("created_at desc")
       else
-        @homework_commons = HomeworkCommon.find_by_sql("SELECT * FROM `homework_commons` hc, `homework_detail_manuals` hdm where hdm.homework_common_id = hc.id and hc.course_id=#{@course.id} and hc.name like '%#{@search}%' and hc.publish_time <= #{Time.now} and hdm.comment_status='#{@order}';")
+        @homework_commons = @course.homework_commons.includes(:homework_detail_manual).where("name like '%#{@search}%' and publish_time <= '#{Time.now}' and homework_detail_manuals.comment_status = #{@order}").order("homework_commons.created_at desc")
       end
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
@@ -221,6 +221,7 @@ class HomeworkCommonController < ApplicationController
   end
 
   def anon_setting
+    anonymous_comment = @homework.anonymous_comment
     if params[:homework_anonymous_comment]
       @homework.anonymous_comment = 0
       @homework_detail_manual.evaluation_start = params[:homework_evaluation_start]
@@ -234,6 +235,11 @@ class HomeworkCommonController < ApplicationController
       @homework_detail_manual.evaluation_num = 0
       @homework_detail_manual.absence_penalty = 0
     end
+    if anonymous_comment != @homework.anonymous_comment
+      @homework_detail_manual.te_proportion = 1
+      @homework_detail_manual.ta_proportion = 0
+      @homework_detail_program.te_proportion = 0 if @homework_detail_program
+    end
     if params[:homework_anonymous_appeal]
       @homework.anonymous_appeal = 1
       @homework_detail_manual.appeal_time = params[:homework_appeal_time]
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index c036d6fcc..1f1e55445 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1829,129 +1829,4 @@ class StudentWorkController < ApplicationController
     end
     JSON.parse(res.body)
   end
-
-  #成绩计算
-  def set_final_score homework,student_work
-    if homework && homework.homework_detail_manual
-      if homework.homework_type != 2 #非编程作业
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty
-          else
-            if student_work.teaching_asistant_score.nil?
-              student_work.final_score = student_work.student_score
-            elsif student_work.student_score.nil?
-              student_work.final_score = student_work.teaching_asistant_score
-            else
-              ta_proportion = homework.homework_detail_manual.ta_proportion
-              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_ta_score + final_s_score
-              student_work.final_score = format("%.2f",final_score.to_f)
-            end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-            else
-              student_work.work_score = nil
-            end
-          end
-        else  #不考虑教师评分
-          if student_work.teaching_asistant_score.nil?
-            student_work.final_score = student_work.student_score
-          elsif student_work.student_score.nil?
-            student_work.final_score = student_work.teaching_asistant_score
-          else
-            ta_proportion = homework.homework_detail_manual.ta_proportion
-            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-            final_score = final_ta_score + final_s_score
-            student_work.final_score = format("%.2f",final_score.to_f)
-          end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
-        end
-      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
-        if homework.teacher_priority == 1 #教师优先
-          if student_work.teacher_score
-            student_work.final_score = student_work.teacher_score
-            student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-          else
-            if student_work.teaching_asistant_score.nil? #教辅未评分
-              if student_work.student_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_st_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
-            elsif student_work.student_score.nil? #学生未评分
-              if student_work.teaching_asistant_score.nil?
-                student_work.final_score = student_work.system_score
-              else
-                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
-                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-                final_score = final_sy_score + final_ts_score
-                student_work.final_score = format("%.2f",final_score.to_f)
-              end
-            else
-              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
-              final_score = final_sy_score + final_ts_score + final_st_score
-              student_work.final_score = format("%.2f",final_score.to_f)
-            end
-            if student_work.final_score
-              score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-              student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-            else
-              student_work.work_score = nil
-            end
-          end
-        else  #不考虑教师评分
-          if student_work.teaching_asistant_score.nil? #教辅未评分
-            if student_work.student_score.nil?
-              student_work.final_score = student_work.system_score
-            else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
-              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_sy_score + final_st_score
-              student_work.final_score = format("%.2f",final_score.to_f)
-            end
-          elsif student_work.student_score.nil? #学生未评分
-            if student_work.teaching_asistant_score.nil?
-              student_work.final_score = student_work.system_score
-            else
-              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
-              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
-              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
-              final_score = final_sy_score + final_ts_score
-              student_work.final_score = format("%.2f",final_score.to_f)
-            end
-          else
-            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
-            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
-            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
-            final_score = final_sy_score + final_ts_score + final_st_score
-            student_work.final_score = format("%.2f",final_score.to_f)
-          end
-          if student_work.final_score
-            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
-            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
-          else
-            student_work.work_score = nil
-          end
-        end
-      end
-    end
-  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8353edd29..550a19834 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -328,58 +328,60 @@ module ApplicationHelper
     status = ""
     time = ""
     ho_detail_manual = homework_common.homework_detail_manual
-    case ho_detail_manual.comment_status
-      when 0
-        status = "挂起"
-        if homework_common.publish_time && homework_common.publish_time > Time.now
-          time = time_from_future(homework_common.publish_time).to_s + "后发布"
-        end
-      when 1
-        status = "提交中"
-        if homework_common.end_time && homework_common.end_time > Time.now
-          time = time_from_future(homework_common.end_time).to_s + "后结束"
-        elsif !homework_common.allow_late && homework_common.anonymous_comment == 0
-          if ho_detail_manual.evaluation_start && ho_detail_manual.evaluation_start >= Time.now
-            status = "匿评中"
-            time = time_from_future(ho_detail_manual.evaluation_start).to_s + "后开始"
+    if ho_detail_manual
+      case ho_detail_manual.comment_status
+        when 0
+          status = "挂起"
+          if homework_common.publish_time && homework_common.publish_time > Time.now
+            time = time_from_future(homework_common.publish_time).to_s + "后发布"
           end
-        elsif !homework_common.allow_late && homework_common.anonymous_comment == 1
-          if homework_common.archive_time && homework_common.archive_time >= Time.now
-            status = "评阅中"
+        when 1
+          status = "提交中"
+          if homework_common.end_time && homework_common.end_time > Time.now
+            time = time_from_future(homework_common.end_time).to_s + "后结束"
+          elsif !homework_common.allow_late && homework_common.anonymous_comment == 0
+            if ho_detail_manual.evaluation_start && ho_detail_manual.evaluation_start >= Time.now
+              status = "匿评中"
+              time = time_from_future(ho_detail_manual.evaluation_start).to_s + "后开始"
+            end
+          elsif !homework_common.allow_late && homework_common.anonymous_comment == 1
+            if homework_common.archive_time && homework_common.archive_time >= Time.now
+              status = "评阅中"
+              time = time_from_future(homework_common.archive_time).to_s + "后结束"
+            end
+          end
+        when 2
+          status = "补交中"
+          if homework_common.late_time && homework_common.late_time >= Time.now
+            time = time_from_future(homework_common.late_time).to_s + "后结束"
+          elsif homework_common.anonymous_comment == 0
+            if ho_detail_manual.evaluation_start && ho_detail_manual.evaluation_start >= Time.now
+              status = "匿评中"
+              time = time_from_future(ho_detail_manual.evaluation_start).to_s + "后开始"
+            end
+          end
+        when 3
+          status = "匿评中"
+          if ho_detail_manual.evaluation_end && ho_detail_manual.evaluation_end > Time.now
+            time = time_from_future(ho_detail_manual.evaluation_end).to_s + "后结束"
+          elsif homework_common.anonymous_appeal && ho_detail_manual.appeal_time && ho_detail_manual.appeal_time >= Time.now
+            status = "申诉"
+            time = time_from_future(ho_detail_manual.appeal_time).to_s + "后开始"
+          end
+        when 4
+          status = "申诉中"
+          if ho_detail_manual.appeal_time && ho_detail_manual.appeal_time > Time.now
+            time = time_from_future(ho_detail_manual.appeal_time).to_s + "后结束"
+          end
+        when 5
+          status = "评阅中"
+          if homework_common.archive_time && homework_common.archive_time > Time.now
             time = time_from_future(homework_common.archive_time).to_s + "后结束"
           end
-        end
-      when 2
-        status = "补交中"
-        if homework_common.late_time && homework_common.late_time >= Time.now
-          time = time_from_future(homework_common.late_time).to_s + "后结束"
-        elsif homework_common.anonymous_comment == 0
-          if ho_detail_manual.evaluation_start && ho_detail_manual.evaluation_start >= Time.now
-            status = "匿评中"
-            time = time_from_future(ho_detail_manual.evaluation_start).to_s + "后开始"
-          end
-        end
-      when 3
-        status = "匿评中"
-        if ho_detail_manual.evaluation_end && ho_detail_manual.evaluation_end > Time.now
-          time = time_from_future(ho_detail_manual.evaluation_end).to_s + "后结束"
-        elsif homework_common.anonymous_appeal && ho_detail_manual.appeal_time && ho_detail_manual.appeal_time >= Time.now
-          status = "申诉"
-          time = time_from_future(ho_detail_manual.appeal_time).to_s + "后开始"
-        end
-      when 4
-        status = "申诉中"
-        if ho_detail_manual.appeal_time && ho_detail_manual.appeal_time > Time.now
-          time = time_from_future(ho_detail_manual.appeal_time).to_s + "后结束"
-        end
-      when 5
-        status = "评阅中"
-        if homework_common.archive_time && homework_common.archive_time > Time.now
-          time = time_from_future(homework_common.archive_time).to_s + "后结束"
-        end
-      when 6
-        status = "已结束"
-        time = format_time homework_common.archive_time
+        when 6
+          status = "已结束"
+          time = format_time homework_common.archive_time
+      end
     end
     result[:status] = status
     result[:time] = time
@@ -4718,3 +4720,128 @@ def sy_homeworks syllabus
   homeworks
 end
 
+#成绩计算
+def set_final_score homework,student_work
+  if homework && homework.homework_detail_manual
+    if homework.homework_type != 2 #非编程作业
+      if homework.teacher_priority == 1 #教师优先
+        if student_work.teacher_score
+          student_work.final_score = student_work.teacher_score
+          student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty
+        else
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+          if student_work.final_score
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+          else
+            student_work.work_score = nil
+          end
+        end
+      else  #不考虑教师评分
+        if student_work.teaching_asistant_score.nil?
+          student_work.final_score = student_work.student_score
+        elsif student_work.student_score.nil?
+          student_work.final_score = student_work.teaching_asistant_score
+        else
+          ta_proportion = homework.homework_detail_manual.ta_proportion
+          final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+          final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+          final_score = final_ta_score + final_s_score
+          student_work.final_score = format("%.2f",final_score.to_f)
+        end
+        if student_work.final_score
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+        else
+          student_work.work_score = nil
+        end
+      end
+    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+      if homework.teacher_priority == 1 #教师优先
+        if student_work.teacher_score
+          student_work.final_score = student_work.teacher_score
+          student_work.work_score = student_work.teacher_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+        else
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+          if student_work.final_score
+            score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+            student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+          else
+            student_work.work_score = nil
+          end
+        end
+      else  #不考虑教师评分
+        if student_work.teaching_asistant_score.nil? #教辅未评分
+          if student_work.student_score.nil?
+            student_work.final_score = student_work.system_score
+          else
+            ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_sy_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        elsif student_work.student_score.nil? #学生未评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.system_score
+          else
+            ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_sy_score + final_ts_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        else
+          final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+          final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+          final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+          final_score = final_sy_score + final_ts_score + final_st_score
+          student_work.final_score = format("%.2f",final_score.to_f)
+        end
+        if student_work.final_score
+          score = student_work.final_score - student_work.absence_penalty - student_work.late_penalty - student_work.appeal_penalty
+          student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score
+        else
+          student_work.work_score = nil
+        end
+      end
+    end
+  end
+end
+
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 113478c16..987b8f32a 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -50,7 +50,8 @@
               <p id="login_error_notice" class="color-red mb5" style="margin-top: -15px;"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe  %></p>
               <li>
                 <% if Setting.autologin? %>
-                    <label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
+                    <input checked="checked" class="magic-checkbox" id="autologin" name="autologin" tabindex="4" type="checkbox" value="1">
+                    <label for="autologin"><%= l(:label_stay_logged_in) %></label>
                 <% end %>
                 <a href="<%= lost_password_path %>"  class="fr">
                   <% if Setting.lost_password? %>忘记密码?<% end %>
diff --git a/app/views/account/reset_psd.html.erb b/app/views/account/reset_psd.html.erb
index cd4a5536b..ba97e3107 100644
--- a/app/views/account/reset_psd.html.erb
+++ b/app/views/account/reset_psd.html.erb
@@ -21,7 +21,7 @@
             <input type="hidden" id="password_min_length" value="<%= Setting.password_min_length.to_i %>">
             <li class="new_loggin_users">
               <i class="fa fa-lock font-16 ml10 color-grey"></i>
-              <input type="password" class="new_loggin_input" name="new_password" id="new_password" placeholder="设置新密码">
+              <input type="password" class="new_loggin_input" name="new_password" id="new_password" placeholder="设置8-16位新密码，区分大小写字母">
               <div class="new-login-error" style="display: none;">
                 <p id="new_password_notice">至少8位由字母或特殊符号和数字结合</p>
               </div>
diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb
index f1e816f8f..3e9f3b257 100644
--- a/app/views/account/user_join.html.erb
+++ b/app/views/account/user_join.html.erb
@@ -37,7 +37,7 @@
               </li>
               <li class="new_loggin_users">
                 <i class="fa fa-lock font-16 ml10 color-grey"></i>
-                <input type="text" onfocus="this.type='password'" class="new_loggin_input" style="width: 292px;" name="user[password]" id="user_password_1" autocomplete="off" placeholder="密码至少由8位由字母或特殊符号和数字结合">
+                <input type="text" onfocus="this.type='password'" class="new_loggin_input" style="width: 292px;" name="user[password]" id="user_password_1" autocomplete="off" placeholder="8-16位密码，区分大小写字母">
                 <i class="fa font-16 mr5" id="user_password_1_check"></i>
                 <div class="new-login-error" style="display: none;">
                   <p id="user_password_1_notice"></p>
@@ -91,7 +91,7 @@
               </li>
               <li class="new_loggin_users">
                 <i class="fa fa-lock font-16 ml10 color-grey"></i>
-                <input type="text" onfocus="this.type='password'" class="new_loggin_input" style="width: 292px;" name="user[mail_password]" id="user_password_2" autocomplete="off" placeholder="密码至少由8位由字母或特殊符号和数字结合">
+                <input type="text" onfocus="this.type='password'" class="new_loggin_input" style="width: 292px;" name="user[mail_password]" id="user_password_2" autocomplete="off" placeholder="8-16位密码，区分大小写字母">
                 <i class="fa font-16 mr5" id="user_password_2_check"></i>
                 <div class="new-login-error" style="display: none;">
                   <p id="user_password_2_notice"></p>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index e4897923e..eefda4eef 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -61,13 +61,13 @@
       </li>
       <li class="pt20 clearfix">
         <label class="panel-form-label label fl">&nbsp;&nbsp;&nbsp;&nbsp;</label>
-        <input id="course_is_public" name="course[is_public]" class=" fl mt8 mr5" type="checkbox" value="1">
-        <span class="color-grey fl">公开（选中后所有用户可见，否则仅班级成员可见）</span>
+        <input id="course_is_public" name="course[is_public]" class="magic-radio fl mt8 mr5" type="checkbox" value="1">
+        <label for="course_is_public" class="color-grey fl">公开（选中后所有用户可见，否则仅班级成员可见）</label>
       </li>
       <li class=" clearfix pb20">
         <label class="panel-form-label label fl">&nbsp;&nbsp;&nbsp;&nbsp;</label>
         <a href="javascript:void(0);" class="task-btn task-btn-blue fl mr10" onclick="submit_new_course();">保存</a>
-        <%= link_to '取消', user_course_community_path(User.current), :class => 'task-btn fl' %>
+        <%= link_to '取消', courses_path, :class => 'task-btn fl' %>
       </li>
     </ul>
     <% end %>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 8dbda7408..49f1a542e 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -80,8 +80,9 @@
                   <span class="color-orange fl none" id="edit_course_end_date_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>结束日期必须早于当前日期</span>
                 </li>
                 <li class="pt20 clearfix ">
-                  <label class="panel-form-label label fl">&nbsp;&nbsp;</label>
-                  <input type="checkbox" name="course[is_public]" class="fl mt8 mr5" value="1" <%= @course.is_public == 1 ? 'checked' : '' %>/><span class="color-grey">公开（选中后所有用户可见，否则仅班级成员可见）</span>
+                  <label class="panel-form-label label fl">&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <input id="edit_course_public" type="checkbox" name="course[is_public]" class="fl mt8 mr5 magic-radio" value="1" <%= @course.is_public == 1 ? 'checked' : '' %>/>
+                  <label for="edit_course_public" class="color-grey fl">公开（选中后所有用户可见，否则仅班级成员可见）</label>
                 </li>
                 <li class=" clearfix pb20">
                   <label class="panel-form-label label fl">&nbsp;&nbsp;</label>
@@ -99,7 +100,7 @@
             <a href="javascript:void(0);" id="constration" onclick="add_new_group(<%= @course.id %>);" class="task-btn constration task-btn-green">＋ 添加分班</a>
           </p>
           <% if @course.course_groups.count > 0 %>
-              <input type="checkbox" class="check mt20" onclick="update_choose_group_allow(<%= @course.id %>);" <%= @course.choose_group_allow ? 'checked' : ''%> value="1"/>&nbsp;&nbsp;<span class="color-grey">允许选班（选中后学生可以自己选择分班，否则只有教师和助教可以为学生选择分班）</span>
+              <input type="checkbox" id="choose_group_allow" class="check mt20 magic-checkbox" onclick="update_choose_group_allow(<%= @course.id %>);" <%= @course.choose_group_allow ? 'checked' : ''%> value="1"/>&nbsp;&nbsp;<label for="choose_group_allow" class="color-grey">允许选班（选中后学生可以自己选择分班，否则只有教师和助教可以为学生选择分班）</label>
           <% end %>
         </div>
 
diff --git a/app/views/courses/settings/_add_teachers.html.erb b/app/views/courses/settings/_add_teachers.html.erb
index 85308edac..3ed0aacc9 100644
--- a/app/views/courses/settings/_add_teachers.html.erb
+++ b/app/views/courses/settings/_add_teachers.html.erb
@@ -7,7 +7,7 @@
   <div class="task_popup_con">
     <div class="newupload_conbox clearfix">
       <%= form_tag  url_for(course_memberships_path(@course)), :remote => true, :method => :post, :id => 'add_teacher_form' do |f| %>
-      <div class="left fl" style="width:430px;">
+      <div class="left fl" style="width:415px;">
         <div class="mb10 edu-position" style="width:400px;">
           <input type="hidden" value="<%= @course.id %>" id="course_search_not_teacher_id">
           <input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_teacher" placeholder="输入用户的真实姓名进行搜索" type="text">
@@ -27,16 +27,16 @@
             <!--<i class="fa fa-circle-o grey fl" aria-hidden="true"></i>-->
             <!--<i class="fa fa-dot-circle-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
             <label>
-                <input type="radio" value="9" name="membership[role_ids][]">
-                <span>教师</span>
+                <input id="role_9" type="radio" class="magic-radio" value="9" name="membership[role_ids][]">
+                <label for="role_9">教师</label>
             </label>
           </li>
           <li>
             <!--<i class="fa fa-circle-o grey fl" aria-hidden="true"></i>-->
             <!--<i class="fa fa-dot-circle-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
             <label>
-              <input type="radio" value="7" name="membership[role_ids][]">
-              <span>助教</span>
+              <input id="role_7" class="magic-radio" type="radio" value="7" name="membership[role_ids][]">
+              <label for="role_7">助教</label>
             </label>
           </li>
         </ul>
diff --git a/app/views/courses/settings/_change_manager.html.erb b/app/views/courses/settings/_change_manager.html.erb
index 2d58d7411..f252a0d03 100644
--- a/app/views/courses/settings/_change_manager.html.erb
+++ b/app/views/courses/settings/_change_manager.html.erb
@@ -17,9 +17,9 @@
                   <li class="clearfix">
                     <!--<i class="fa fa-circle-o grey fl" aria-hidden="true"></i>-->
                     <!--<i class="fa fa-dot-circle-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
-                    <label>
-                      <input type="radio" name="chooseteacher" value="<%=mem.id %>" class="mr5 mt7 fl" style="vertical-align:middle;" />
-                      <span class="edu-info-dark task-hide fl"><%=mem.user.show_name %></span><span class="mr15 fl">(<%= mem.user.login %>)</span>
+                    <input id="change_m_<%= mem.id %>" type="radio" name="chooseteacher" value="<%=mem.id %>" class="mr5 mt7 fl magic-radio" style="vertical-align:middle;" />
+                    <label for="change_m_<%= mem.id %>">
+                        <span class="edu-info-dark task-hide fl"><%=mem.user.show_name %></span><span class="mr15 fl">(<%= mem.user.login %>)</span>
                     </label>
                   </li>
               <% end %>
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 a17fbecac..84fe49fd9 100644
--- a/app/views/courses/settings/_no_group_student_list.html.erb
+++ b/app/views/courses/settings/_no_group_student_list.html.erb
@@ -59,8 +59,8 @@
                     <span class="span1 open-select">
                         <!--<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 type="checkbox" class="check" name="member_ids[]" value="<%= member.id %>"/>
-                      <%= index + 1 + (@page -1) * 20 %>
+                      <input id="no_group_member_<%= member.id %>" type="checkbox" class="check magic-checkbox" name="member_ids[]" value="<%= member.id %>"/>
+                      <label for="no_group_member_<%= member.id %>"><%= index + 1 + (@page -1) * 20 %></label>
                     </span>
                     <span class="span2"><%= link_to user.show_name, user_path(user), :target => '_blank' %></span>
                     <span><%= user.login %></span>
@@ -80,7 +80,7 @@
         <span class="selectjoin fl open-select" id="allselect">
             <!--<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 type="checkbox" id="all_member_select">
+          <input type="checkbox" class="magic-checkbox" id="all_member_select">
           <label for="all_member_select">全选</label>
         </span>
         <a href="javascript:void(0);" class="handle_no fl ml20">加入分班</a>
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 4cde2342d..5c273552a 100644
--- a/app/views/courses/settings/_search_not_students_list.html.erb
+++ b/app/views/courses/settings/_search_not_students_list.html.erb
@@ -4,10 +4,12 @@
             <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 type="checkbox" class="fl mt7 mr5" name="membership[user_ids][]" value="<%= user.id %>">
-              <a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1"><%= user.show_name %>(<%= user.login %>)</a>
-              <span class="fl color-grey span2 ml10"><%= user.user_extensions.user_technical_title %></span>
-              <span class="span3 fl ml10"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
+              <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 %>">
+                <a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1"><%= user.show_name %>(<%= user.login %>)</a>
+                <span class="fl color-grey span2 ml10"><%= user.user_extensions.user_technical_title %></span>
+                <span class="span3 fl ml10"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
+              </label>
             </li>
         <% end %>
     <% end %>
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 3234b1325..eab6be4e0 100644
--- a/app/views/courses/settings/_search_not_teachers_list.html.erb
+++ b/app/views/courses/settings/_search_not_teachers_list.html.erb
@@ -4,10 +4,12 @@
         <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 type="checkbox" class="fl mt7 mr5" name="membership[user_ids][]" value="<%= user.id %>">
+          <input id="choose_course_teacher_<%= user.id %>" type="checkbox" class="fl mt7 mr5 magic-checkbox" name="membership[user_ids][]" value="<%= user.id %>">
+          <label for="choose_course_teacher_<%= user.id %>">
           <a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1"><%= user.show_name %>(<%= user.login %>)</a>
           <span class="fl color-grey span2 ml10"><%= user.user_extensions.user_technical_title %></span>
           <span class="span3 fl ml10"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
+          </label>
         </li>
         <% end %>
     <% end %>
diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb
index eea28fd40..0d0e639c7 100644
--- a/app/views/homework_common/_homework_index_list.html.erb
+++ b/app/views/homework_common/_homework_index_list.html.erb
@@ -7,7 +7,7 @@
             <span class="edu-filter-btn <%= homework_status_color homework_curr_status[:status] %> ml10 fl mt3"><%= homework_curr_status[:status] %></span>
             <div class="cl"></div>
             <p class="color-grey font-12">
-              <span class=""># <%= index + 1 %></span>
+              <span class=""># <%= get_hw_index(homework_common, @is_teacher) + 1 %></span>
               <span class="ml30">创建于<%=time_from_now homework_common.created_at %></span>
               <span class="ml30"><%=homework_common.homework_type_ch %></span>
               <% if [1,2,3,4,5,6].include?(homework_common.homework_detail_manual.try(:comment_status)) %>
@@ -66,7 +66,7 @@
     <div style="text-align:center;">
       <div class="pages" style="width:auto; display:inline-block;">
         <ul  id="homework_pository_ref_pages">
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
+          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
         </ul>
         <div class="cl"></div>
       </div>
diff --git a/app/views/homework_common/_homework_index_tab.html.erb b/app/views/homework_common/_homework_index_tab.html.erb
index b15b21605..5805beace 100644
--- a/app/views/homework_common/_homework_index_tab.html.erb
+++ b/app/views/homework_common/_homework_index_tab.html.erb
@@ -1,5 +1,7 @@
 <a href="<%= homework_common_index_path(:course => @course.id) %>" class="<%= @order.nil? ? "active" : "" %> edu-filter-cir-grey mr5 " data-remote="true">全部</a>
+<% if @is_teacher %>
 <a href="<%= homework_common_index_path(:course => @course.id, :order => 0, :search => @search) %>" class="<%= @order == "0" ? "active" : "" %> edu-filter-cir-grey mr5" data-remote="true">挂起</a>
+<% end %>
 <a href="<%= homework_common_index_path(:course => @course.id, :order => 1, :search => @search) %>" class="<%= @order == "1" ? "active" : "" %> edu-filter-cir-grey mr5" data-remote="true">提交中</a>
 <a href="<%= homework_common_index_path(:course => @course.id, :order => 2, :search => @search) %>" class="<%= @order == "2" ? "active" : "" %> edu-filter-cir-grey mr5" data-remote="true">补交中</a>
 <a href="<%= homework_common_index_path(:course => @course.id, :order => 3, :search => @search) %>" class="<%= @order == "3" ? "active" : "" %> edu-filter-cir-grey mr5" data-remote="true">匿评中</a>
diff --git a/app/views/homework_common/anon_setting.js.erb b/app/views/homework_common/anon_setting.js.erb
index 47118c0f8..40c18ca51 100644
--- a/app/views/homework_common/anon_setting.js.erb
+++ b/app/views/homework_common/anon_setting.js.erb
@@ -1,2 +1,4 @@
 $("#show_anon_setting").html("<%= j(render :partial => 'show_anon_setting') %>").show();
-$("#edit_anon_setting").hide();
\ No newline at end of file
+$("#show_score_setting").html("<%= j(render :partial => 'show_score_setting') %>");
+$("#edit_score_setting").html("<%= j(render :partial => 'edit_score_setting') %>");
+$("#edit_anon_setting").html("<%= j(render :partial => 'edit_anon_setting') %>").hide();
\ No newline at end of file
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 8e3d8ed87..a15c5f855 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -3,8 +3,8 @@
     <div class="edu-con-top clearfix">
       <p class="ml15 color-grey fl">作业列表</p>
       <a href="javascript:void(0);" onclick="alert_choose_homework_type('<%= @course.id %>');" class="task-btn task-btn-blue fr mr20">新建</a>
-      <%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => defined?(@course)), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
-      <a href="<%= export_course_member_excel_course_path(@course) %>" class="edu-btn fr mr10">导出成绩</a>
+      <%#= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => defined?(@course)), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
+      <!--<a href="<%#= export_course_member_excel_course_path(@course) %>" class="edu-btn fr mr10">导出成绩</a>-->
     </div>
     <div class="edu-class-innner-conbox">
       <div class="edu-con-top clearfix" >
diff --git a/app/views/homework_common/late_setting.js.erb b/app/views/homework_common/late_setting.js.erb
index 2f3d372fe..54bfbca58 100644
--- a/app/views/homework_common/late_setting.js.erb
+++ b/app/views/homework_common/late_setting.js.erb
@@ -1,2 +1,2 @@
 $("#show_late_setting").html("<%= j(render :partial => 'show_late_setting') %>").show();
-$("#edit_late_setting").hide();
\ No newline at end of file
+$("#edit_late_setting").html("<%= j(render :partial => 'edit_late_setting') %>").hide();
\ No newline at end of file
diff --git a/app/views/homework_common/public_setting.js.erb b/app/views/homework_common/public_setting.js.erb
index 64125d097..9f3d3cd15 100644
--- a/app/views/homework_common/public_setting.js.erb
+++ b/app/views/homework_common/public_setting.js.erb
@@ -1,2 +1,2 @@
 $("#show_public_setting").html("<%= j(render :partial => 'show_public_setting') %>").show();
-$("#edit_public_setting").hide();
\ No newline at end of file
+$("#edit_public_setting").html("<%= j(render :partial => 'edit_public_setting') %>").hide();
\ No newline at end of file
diff --git a/app/views/homework_common/publish_setting.js.erb b/app/views/homework_common/publish_setting.js.erb
index 37a98109a..d135fa68b 100644
--- a/app/views/homework_common/publish_setting.js.erb
+++ b/app/views/homework_common/publish_setting.js.erb
@@ -1,5 +1,5 @@
 $("#show_publish_setting").html("<%= j(render :partial => 'show_publish_setting') %>").show();
-$("#edit_publish_setting").hide();
+$("#edit_publish_setting").html("<%= j(render :partial => 'edit_publish_setting') %>").hide();
 <% unless @homework.publish_time.nil? %>
 $("#homework_late_setting").html('<div id="show_late_setting"><%= j(render :partial => 'show_late_setting') %></div><div class="none" id="edit_late_setting"><%= j(render :partial => 'edit_late_setting') %></div>');
 $("#homework_anon_setting").html('<div id="show_anon_setting"><%= j(render :partial => 'show_anon_setting') %></div><div class="none" id="edit_anon_setting"><%= j(render :partial => 'edit_anon_setting') %></div>');
diff --git a/app/views/homework_common/score_setting.js.erb b/app/views/homework_common/score_setting.js.erb
index 3182f08bd..948e6e0cd 100644
--- a/app/views/homework_common/score_setting.js.erb
+++ b/app/views/homework_common/score_setting.js.erb
@@ -1,2 +1,2 @@
 $("#show_score_setting").html("<%= j(render :partial => 'show_score_setting') %>").show();
-$("#edit_score_setting").hide();
\ No newline at end of file
+$("#edit_score_setting").html("<%= j(render :partial => 'edit_score_setting') %>").hide();
\ No newline at end of file
diff --git a/app/views/homework_common/setting.html.erb b/app/views/homework_common/setting.html.erb
index 8d73a2be5..9fa649844 100644
--- a/app/views/homework_common/setting.html.erb
+++ b/app/views/homework_common/setting.html.erb
@@ -2,7 +2,7 @@
   <p class="mb10">
     <i class="fa fa-map-marker mr5 color-grey"></i>
     <%= link_to '班级首页', course_path(@course) %>
-    > <%= link_to '作业列表', homework_common_index_path(:course => @course.id) %> > #<%= get_hw_index(@homework, true) %>
+    > <%= link_to '作业列表', homework_common_index_path(:course => @course.id) %> > #<%= get_hw_index(@homework, true) + 1 %>
   </p>
 
   <div class="edu-con-top clearfix">
diff --git a/app/views/layouts/base_contests.html.erb b/app/views/layouts/base_contests.html.erb
index 2cd8df4a6..2ccef2065 100644
--- a/app/views/layouts/base_contests.html.erb
+++ b/app/views/layouts/base_contests.html.erb
@@ -98,7 +98,7 @@
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
 <% if hidden_unproject_infos %>
-    <%= render :partial => 'layouts/new_feedback' %>
+    <%#= render :partial => 'layouts/new_feedback' %>
 <% end %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index d5effe1b6..80f329f59 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -35,7 +35,7 @@
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
 <% if hidden_unproject_infos %>
-    <%= render :partial => 'layouts/new_feedback' %>
+    <%#= render :partial => 'layouts/new_feedback' %>
 <% end %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 316d10c4c..de1e119d4 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -299,7 +299,7 @@
 </div><!--Container end-->
 
 
-<%= render :partial => 'layouts/new_feedback' %>
+<%#= render :partial => 'layouts/new_feedback' %>
 
 <div id="ajax-modal" style="display:none;"></div>
 <div id="ajax-indicator" style="display:none;">
diff --git a/app/views/layouts/login_bigdata.html.erb b/app/views/layouts/login_bigdata.html.erb
index e24dfa0d1..3da89e41b 100644
--- a/app/views/layouts/login_bigdata.html.erb
+++ b/app/views/layouts/login_bigdata.html.erb
@@ -7,7 +7,7 @@
   <meta name="keywords" content="智能课堂，实训项目" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'css/edu-showpage','css/edu-index', 'css/font-awesome', 'css/edu-common', 'css/edu-login', 'css/edu-public', 'css/edu-popup' %>
+  <%= stylesheet_link_tag 'css/edu-showpage','css/edu-index', 'css/font-awesome', 'css/edu-common', 'css/edu-login', 'css/edu-public', 'css/edu-popup', 'css/magic-check' %>
   <%#= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap", "bigdata", 'edu/application' %>
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index 4274c6e4b..e14610acf 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -60,7 +60,7 @@
 <%= render :partial => 'layouts/footer' %>
 <div class="cl"></div>
 <% if hidden_unproject_infos %>
-    <%= render :partial => 'layouts/new_feedback' %>
+    <%#= render :partial => 'layouts/new_feedback' %>
 <% end %>
 <div id="ajax-indicator" style="display:none;">
   <span><%= l(:label_loading) %></span>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7412ca3c3..91ca49038 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -274,7 +274,7 @@
     </div>
   </div>
   <% if hidden_unproject_infos %>
-    <%= render :partial => 'layouts/new_feedback' %>
+    <%#= render :partial => 'layouts/new_feedback' %>
    <% end %>
 </div>
 <div class="cl"></div>
diff --git a/app/views/layouts/new_base_user_show.html.erb b/app/views/layouts/new_base_user_show.html.erb
index b40aa82dc..6279829ef 100644
--- a/app/views/layouts/new_base_user_show.html.erb
+++ b/app/views/layouts/new_base_user_show.html.erb
@@ -232,7 +232,7 @@
     </div>
   </div>
   <% if hidden_unproject_infos %>
-      <%= render :partial => 'layouts/forbidden_new_feedback' %>
+      <%#= render :partial => 'layouts/forbidden_new_feedback' %>
   <% end %>
 </div>
 <div class="cl"></div>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index b67e846f2..1e443504f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -24,12 +24,12 @@
           <label class=" panel-form-label fl mr18"><span class="color-red mr5">*</span>我的性别</label>
           <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
                 <span class="fl mt10 mr15">
-		            <input type="radio" name="sex" value="0">
-		            <label>男</label>
+		            <input id="sex_0" class="magic-radio" type="radio" name="sex" value="0">
+		            <label for="sex_0">男</label>
 	            </span>
 	            <span class="fl mt10 ">
-		            <input type="radio" name="sex" value="1" checked>
-		            <label>女</label>
+		            <input id="sex_1" class="magic-radio" type="radio" name="sex" value="1" checked>
+		            <label for="sex_1">女</label>
 	            </span>
           <% else %>
               <span class="fl mt10 mr15">
diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb
index 2e18b778c..b3073c2d0 100644
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@@ -22,7 +22,7 @@
 <div class="edu-class-container">
   <p class="mb10">
     <i class="fa fa-map-marker mr5 color-grey" ></i>
-    <%= link_to '班级首页', course_path(@course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @course) %> > #<%= get_hw_index(@homework, @is_teacher) %></p>
+    <%= link_to '班级首页', course_path(@course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @course) %> > #<%= get_hw_index(@homework, @is_teacher) + 1 %></p>
   <div class="edu-con-top clearfix mb15">
     <p class="ml15 fl color-grey"><i class="fa fa-lock mr5" ></i><%= @homework.name %></p>
     <%= link_to '返回', homework_common_index_path(:course => @homework.course_id), :class => 'fr font-12 mr15 mt3 link-color-grey' %>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index e878b3b21..f985cedaa 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -23,7 +23,7 @@
 <div class="edu-class-container">
 <p class="mb10">
   <i class="fa fa-map-marker mr5 color-grey"></i>
-  <%= link_to '班级首页', course_path(@homework.course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @homework.course_id) %> > #<%= get_hw_index(@homework, @is_teacher) %></p>
+  <%= link_to '班级首页', course_path(@homework.course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @homework.course_id) %> > #<%= get_hw_index(@homework, @is_teacher) + 1 %></p>
 <div class="edu-con-top clearfix">
   <p class="ml15 fl color-grey">
     <% unless @homework.is_public %>
diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb
index b946e5248..7fe556347 100644
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@@ -23,7 +23,7 @@
 <div class="edu-class-container">
   <p class="mb10">
     <i class="fa fa-map-marker mr5 color-grey" ></i>
-    <%= link_to '班级首页', course_path(@course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @course) %> > #<%= get_hw_index(@homework, @is_teacher) %></p>
+    <%= link_to '班级首页', course_path(@course) %> > <%= link_to '作业列表', homework_common_index_path(:course => @course) %> > #<%= get_hw_index(@homework, @is_teacher) + 1 %></p>
   <div class="edu-con-top clearfix mb15">
     <p class="ml15 fl color-grey"><i class="fa fa-lock mr5" ></i><%= @homework.name %></p>
     <%= link_to '返回', homework_common_index_path(:course => @homework.course_id), :class => 'fr font-12 mr15 mt3 link-color-grey' %>
diff --git a/app/views/student_work/show.html.erb b/app/views/student_work/show.html.erb
index a5d52cbb2..346e74408 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) %>">班级首页</a> > <a href="<%= homework_common_index_path(:course => @course.id) %>">作业列表</a> >
-  <a href="#">#<%= get_hw_index(@homework, @is_teacher) %></a> > <%= link_to @work.user.try(:show_name), user_path(@work.user) %></p>
+  <a href="#">#<%= get_hw_index(@homework, @is_teacher) + 1 %></a> > <%= link_to @work.user.try(:show_name), user_path(@work.user) %></p>
 <div class="edu-con-top clearfix ">
   <p class="ml15  fl color-grey"><i class="fa fa-lock mr5" ></i><%= @work.name %></p>
   <span class="edu-filter-btn edu-filter-btn-blue ml10 mt3"><%= get_status @work.work_status, @work.re_commit %></span>
diff --git a/app/views/syllabus_member/_sy_change_manager.html.erb b/app/views/syllabus_member/_sy_change_manager.html.erb
index 46ea94ba7..17ae3157a 100644
--- a/app/views/syllabus_member/_sy_change_manager.html.erb
+++ b/app/views/syllabus_member/_sy_change_manager.html.erb
@@ -15,8 +15,8 @@
           <% @members.each do |member| %>
               <% user = member.user %>
               <li class="clearfix">
-                <input type="radio" name="chooseteacher" id="chooseteacher_<%= member.id %>" value="<%= member.id %>" class="fl mt12">
-                <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey" for="chooseteacher_<%= member.id %>">
+                <input type="radio" name="chooseteacher" id="chooseteacher_<%= member.id %>" value="<%= member.id %>" class="fl mt12 magic-radio">
+                <label for="chooseteacher_<%= member.id %>" class="fl mt5 ml5 edu-class-pop-label edu-color-grey" for="chooseteacher_<%= member.id %>">
                   <div class="fl edu-name-dark task-hide"><span><%= user.show_name %>(<%= user.login %>)</span></div>
                   <span class="fl mr5 edu-user-title"><%= user.user_extensions.user_technical_title %></span>
                   <span class="fl edu-school-name task-hide" title="<%= user.user_extensions.school ? user.user_extensions.school.name : "" %>"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
diff --git a/app/views/syllabuses/_search_course_list.html.erb b/app/views/syllabuses/_search_course_list.html.erb
index d8fbfbec3..8f03f9c05 100644
--- a/app/views/syllabuses/_search_course_list.html.erb
+++ b/app/views/syllabuses/_search_course_list.html.erb
@@ -2,8 +2,8 @@
     <% @courses.each do |course| %>
         <li class="clearfix">
           <label class="fl mt5 ml5 edu-class-pop-label edu-color-grey">
-            <input type="radio" class="fl mt8 mr5" name="course_id" value="<%= course.id %>">
-            <span class="edu-info-dark task-hide fl" title="<%= course.name %>"><%= course.name %></span>
+            <input id="send_course_<%= course.id %>" type="radio" class="fl mt8 mr5 magic-radio" name="course_id" value="<%= course.id %>">
+            <label for="send_course_<%= course.id %>" class="edu-info-dark task-hide fl" title="<%= course.name %>"><%= course.name %></label>
           </label>
         </li>
     <% end %>
diff --git a/app/views/syllabuses/_syllabus_homeworks.html.erb b/app/views/syllabuses/_syllabus_homeworks.html.erb
index afaf1d17c..efb6917ed 100644
--- a/app/views/syllabuses/_syllabus_homeworks.html.erb
+++ b/app/views/syllabuses/_syllabus_homeworks.html.erb
@@ -17,8 +17,8 @@
           <input type="hidden" value="H" name="type">
           <% @homeworks.each do |homework| %>
               <ul class="sy_classlist clearfix">
-                <input class="fl mt5  magic-checkbox" type="checkbox" value="<%= homework.id %>" name="check_homework[]">
-                <label for="c1" class="fl"></label>
+                <input id="sy_homework_<%= homework.id %>" class="fl mt5 magic-checkbox" type="checkbox" value="<%= homework.id %>" name="check_homework[]">
+                <label for="sy_homework_<%= homework.id %>" class="fl"></label>
                 <div class="fl ml25">
                   <h3 class="resource_classlist_title fl">
                     <a href="javascript:void(0);"><%= homework.name %></a>
diff --git a/app/views/syllabuses/_syllabus_resources.html.erb b/app/views/syllabuses/_syllabus_resources.html.erb
index 39d266136..9709fe55c 100644
--- a/app/views/syllabuses/_syllabus_resources.html.erb
+++ b/app/views/syllabuses/_syllabus_resources.html.erb
@@ -17,8 +17,8 @@
           <input type="hidden" value="R" name="type">
       <% @resources.each do |resource| %>
           <ul class="sy_classlist clearfix">
-            <input class="fl mt8 magic-checkbox" type="checkbox" value="<%= resource.id %>" name="check_resource[]" >
-            <label for="c1" class="fl"></label>
+            <input id="sy_resource_<%= resource.id %>" class="fl mt8 magic-checkbox" type="checkbox" value="<%= resource.id %>" name="check_resource[]" >
+            <label for="sy_resource_<%= resource.id %>" class="fl"></label>
             <div class="fl ml25">
               <h3 class="resource_classlist_title fl">
                 <%= link_to resource.filename, download_resource_attachment_path(resource.id, resource.filename, :type => 'syllabus'), :title => resource.filename %>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index ac523ffa2..4bce6c9d4 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -54,10 +54,10 @@
     <i class="fa fa-upload mr5"></i>
     <span>上传附件</span>
   </a>
-  <a href="<%= user_ref_resource_search_user_path(User.current.id, :homework_id => container.id) %>" class="fl ml25" title="请从资源库中选择文件作为作业的附件" data-remote="true">
-    <i class="fa fa-cloud  mr5" ></i>
-    <span>资源库</span>
-  </a>
+  <!--<a href="<%#= user_ref_resource_search_user_path(User.current.id, :homework_id => container.id) %>" class="fl ml25" title="请从资源库中选择文件作为作业的附件" data-remote="true">-->
+    <!--<i class="fa fa-cloud  mr5" ></i>-->
+    <!--<span>资源库</span>-->
+  <!--</a>-->
 </div>
 
 <% content_for :header_tags do %>
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 83a65870c..5a4c536c5 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -529,16 +529,16 @@ $(function(){
 
     $("#score_setting_form_submit").live('click', function(){
         var result = true;
-       if($("input[name='homework_final_mode']:checked").val() == '1'){
-           var te_pro = parseFloat($("select[name='te_proportion']").val());
-           var ta_pro = parseFloat($("select[name='ta_proportion']").val());
-           var st_pro = parseFloat($("select[name='st_proportion']").val());
+       if($("input[name='homework_final_mode']:checked").val() == '0'){
+           var te_pro = (parseFloat($("select[name='te_proportion']").val()))*100;
+           var ta_pro = (parseFloat($("select[name='ta_proportion']").val()))*100;
+           var st_pro = (parseFloat($("select[name='st_proportion']").val()))*100;
            if($("select[name='sy_proportion']").length == 1){
-               var sy_pro = parseFloat($("select[name='sy_proportion']").val());
+               var sy_pro = (parseFloat($("select[name='sy_proportion']").val()))*100;
            } else{
                var sy_pro = 0;
            }
-           if(te_pro + ta_pro + st_pro + sy_pro != 1.0){
+           if(parseInt(te_pro + ta_pro + st_pro + sy_pro) != 100){
                result = false;
                $("#homework_final_mode_notice").html("<i class='fa fa-exclamation-circle mr5 color-orange'></i>各评分比例之和应为100%").show();
            } else{