diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index ef504f7c0..deab2feb6 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -500,6 +500,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
 
     end
     @score = @b_sort == "desc" ? "asc" : "desc"
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2e1abdecf..6ce4807e1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -509,7 +509,7 @@ class UsersController < ApplicationController
 
   def choose_user_course
     homework = HomeworkCommon.find params[:send_id].to_i
-    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)
+    if homework.user != User.current && homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)
       ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:send_id].to_i)
       if ah.empty?
         @status = 2
@@ -630,9 +630,9 @@ class UsersController < ApplicationController
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "3" #申请题库
       none_visible_course = Course.where("is_delete = 1")
       none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
@@ -672,7 +672,7 @@ class UsersController < ApplicationController
 
   def show_homework_detail
     homework = HomeworkCommon.find params[:homework].to_i
-    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)
+    if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user
       ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i)
       if ah.empty?
         @status = 2
@@ -719,15 +719,15 @@ class UsersController < ApplicationController
         @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "2" #我的题库
-      courses = @user.courses.where("is_delete = 0")
+      courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     elsif params[:type] == "3" #申请题库
       apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index ec099cb09..f8fe7896c 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -87,10 +87,19 @@
         var standard_ans = $.trim($("#question_standard_ans").val());
         if(title.length == 0 || score.length == 0){
             alert("题目标题/分数不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(!/^[1-9][0-9]*$/.test(score)) {
             alert("分数必须是非零开头的数字");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else if(quest_type !=3 && standard_ans.length == 0) {
             alert("标准答案不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this),quest_type);
+            });
         }else{
             doc.parent().parent().parent().submit();}
     }
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 6fd6c201e..43628f104 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+  $(function(){
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this),1);
+      });
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index a24835fc1..875b9ec4c 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -54,9 +54,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),2);
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 6180dac8e..24a0ad047 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -42,9 +42,16 @@
     </ul>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);"> 保存 </a>
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question"> 保存 </a>
     <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
   </div>
   <div class="cl"></div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question").one('click', function(){
+            add_poll_question($(this),3);
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index eef7546e5..99c48a3ab 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -90,7 +90,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -102,6 +102,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),1);
+                });
                 }
        }
         else {
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 9e66f17f9..a7ee60aa3 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -89,7 +89,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -101,6 +101,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),2);
+                });
         }
         }else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index 90f604da1..e559805fe 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -65,7 +65,7 @@
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+
-                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                                 '保存'+
                                 '</a>'+
                                 '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -77,6 +77,9 @@
                                 '<% end%>'
                 );
                 $("#poll_questions_title").focus();
+                $("#add_new_question").one('click', function(){
+                    add_poll_question($(this),3);
+                });
             }
         } else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index e5f2a6b82..268ce18b1 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -5,7 +5,7 @@
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="1"/>
-        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题标题"/>
+        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_new" placeholder="请输入单选题标题"/>
         <input type="checkbox" name="is_necessary" value="true" checked/>
         <label>必答</label>
       </div>
@@ -35,7 +35,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question_new">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -45,4 +45,11 @@
       <div class="cl"></div>
     </div>
     <!--编辑单选 end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 43b41f95d..0fbb588c5 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -3,7 +3,7 @@
     <div class="ur_editor_title">
       <label>问题：&nbsp;&nbsp;</label>
       <input type="hidden" name="question_type" value="2"/>
-      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题标题"/>
+      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_new" placeholder="请输入多选题标题"/>
       <input type="checkbox" name="is_necessary" value="true" checked/>
       <label>必答</label>
     </div>
@@ -33,7 +33,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question_new">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -42,4 +42,11 @@
     </div>
     <div class="cl"></div>
   </div>
-<% end%><!--编辑多选 end-->
\ No newline at end of file
+<% end%><!--编辑多选 end-->
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 8a2205760..d25d34542 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="4"/>
-    <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
+    <input maxlength="250" id="poll_questions_title_new" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
     <input type="checkbox" name="is_necessary" value="true" checked/>
     <label>必答</label>
   </div>
@@ -13,7 +13,7 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+    <a class="btn_submit c_white" data-button="ok" id="add_new_question_new">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -22,4 +22,11 @@
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index 7588bf3b4..fe8e7b604 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,12 +3,12 @@
       <div class="ur_editor_title">
         <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
+        <input maxlength="250" id="poll_questions_title_new" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
         <input type="checkbox" name="is_necessary" value="true" checked/>
         <label for="ur_question_require">必答</label>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn_submit c_white" data-button="ok" id="add_new_question_new">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
@@ -17,4 +17,11 @@
       </div>
       <div class="cl"></div>
     </div><!--编辑单行文字end-->
-<% end%>
\ No newline at end of file
+<% end%>
+<script type="text/javascript">
+    $(function(){
+        $("#add_new_question_new").one('click', function(){
+            add_poll_question_new($(this));
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index e08b13033..73c783794 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -51,8 +51,8 @@ function chooseQuestionType(quest_type,quest_id){
 }
 
 function add_MC(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MC') %>");
+      $("#poll_questions_title_new").focus();
 }
 
   function insert_MC(quest_type,quest_num,quest_id){
@@ -94,7 +94,7 @@ function add_MC(){
                       '</ul>'+
                       '</div>'+
                       '<div class="ur_editor_footer">'+
-                      '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+                      '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                       '<%= l(:label_button_ok)%>'+
                       '</a>'+
                       '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -106,11 +106,14 @@ function add_MC(){
                       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
 }
 
 function add_MCQ(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
+      $("#poll_questions_title_new").focus();
 }
 
 function insert_MCQ(quest_type,quest_num,quest_id){
@@ -152,7 +155,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
         '</ul>'+
         '</div>'+
         '<div class="ur_editor_footer">'+
-                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+                '<a class="btn btn_dark btn_submit c_white" data-button="ok" id="add_new_question">'+
                 '<%= l(:label_button_ok)%>'+
                 '</a>'+
         '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -164,11 +167,14 @@ function insert_MCQ(quest_type,quest_num,quest_id){
         '<% end%>'
     );
     $("#poll_questions_title").focus();
+    $("#add_new_question").one('click', function(){
+        add_poll_question($(this));
+    });
   }
 
   function add_single(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_single') %>");
+      $("#poll_questions_title_new").focus();
   }
 
   function insert_SINGLE(quest_type,quest_num,quest_id){
@@ -185,7 +191,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<label for="ur_question_require">必答</label>'+
       '</div>'+
       '<div class="ur_editor_footer">'+
-              '<a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+              '<a class="btn_submit c_white" data-button="ok" id="add_new_question">'+
               '<%= l(:label_button_ok)%>'+
               '</a>'+
       '<a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -197,10 +203,13 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
   }
   function add_mulit(){
-      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
-      $("#poll_questions_title").focus();
+      $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
+      $("#poll_questions_title_new").focus();
   }
 
   function insert_MULIT(quest_type,quest_num,quest_id){
@@ -219,7 +228,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<div class="ur_editor_toolbar">'+
       '</div>'+
       '<div class="ur_editor_footer">'+
-              '<a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">'+
+              '<a class="btn_submit c_white" data-button="ok" id="add_new_question">'+
               '<%= l(:label_button_ok)%>'+
               '</a>'+
       '<a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
@@ -231,6 +240,9 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       '<% end%>'
       );
       $("#poll_questions_title").focus();
+      $("#add_new_question").one('click', function(){
+          add_poll_question($(this));
+      });
   }
 
   //选择导入调查问卷
@@ -262,8 +274,28 @@ function insert_MCQ(quest_type,quest_num,quest_id){
   function add_poll_question(doc)
   {
       var title = $.trim($("#poll_questions_title").val());
-      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+      if(title.length == 0){
+          alert("标题不能为空");
+          doc.one('click', function(){
+              add_poll_question($(this));
+          });
+      }else{
+          doc.parent().parent().parent().submit();
+      }
   }
+
+    function add_poll_question_new(doc)
+    {
+        var title = $.trim($("#poll_questions_title_new").val());
+        if(title.length == 0){
+            alert("标题不能为空");
+            doc.one('click', function(){
+                add_poll_question($(this));
+            });
+        }else{
+            doc.parent().parent().parent().submit();
+        }
+    }
   //修改标题时确定按钮
   function edit_poll_question(doc,id)
   {
@@ -373,7 +405,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
   </div><!--选项 end-->
 
   <!-- 新增问题 -->
-  <div id="new_poll_question">
+  <div id="new_poll_question_new">
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index 8a597514e..cbb9da3da 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1,7 +1,7 @@
 <% if @is_insert %>
     $("#poll_content").html('<%=  escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll})%>');
 <% else %>
-$("#new_poll_question").html("");
+$("#new_poll_question_new").html("");
 
 $("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
         "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 21b683a20..0721c9ff5 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -7,7 +7,7 @@
     <% if @homework.homework_type != 3 %>
         <!--<span class="c_dark f14 fb fl mr50">姓名</span>-->
     <li class="<%=@homework.anonymous_comment == 1 ? 'hworkList100' : 'hworkList60'%> hworkH30 mr10">
-        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml18" ,:remote => true%>
+        <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%>
         <% if @show_all && @order == "lastname"%>
             <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
         <% end%>
diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb
index 4e88249de..463d250f5 100644
--- a/app/views/users/_homework_repository.html.erb
+++ b/app/views/users/_homework_repository.html.erb
@@ -37,7 +37,8 @@
           <li class="subject-list-publisher fl hidden"><%= homework.user.show_name %></li>
           <li class="subject-list-count fl" id="subject_count_homework_<%=homework.id %>"><%= homework.quotes %></li>
           <li class="fl subject-list-date"><%=format_date homework.publish_time %></li>
-          <% if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) %>            <li class="fl subject-list-option" id="homework_apply_status_<%=homework.id %>">
+          <% if homework.user != User.current && (homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)) %>
+            <li class="fl subject-list-option" id="homework_apply_status_<%=homework.id %>">
               <% ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, homework.id).first %>
               <% if ah.nil? %>
                 <%= link_to("请求分享", apply_homework_user_path(User.current.id,:homework_id => homework.id), :class => 'green_btn_share c_white', :remote => true) %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9cd689bdd..b09a8a811 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1039,15 +1039,18 @@ function showNormalImage(id) {
             var image=$(description_images[i]);
             var _path = getRootPath();
             //如果图片是视频图片，不处理。
+
             if($(image).hasClass("mediaIco")){
                 var _src = _path+"/"+$(image).attr('src');
                 $(image).attr('src',_src);
                 return;
             }
-
-            var element=$("<a></a>").attr("href",image.attr('src'));
-            image.wrap(element);
-            $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+            var tmpsrc = image.attr('src');
+            if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {
+                var element = $("<a></a>").attr("href", image.attr('src'));
+                image.wrap(element);
+                $(image).parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false});
+            }
         }
         //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框
     }