diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index adc955dee..fee35824b 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -30,7 +30,7 @@
           <li class="ur_item">
             <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-            <span class="ml10">标准答案：请点击正确选项前面单选按钮</span>
+            <span class="ml10">标准答案：请选择</span>
           </li>
           <div class="cl"></div>
           <div id="poll_answers_<%=exercise_question.id%>">
diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb
index 2b900d648..66bbe8a6f 100644
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@@ -1,63 +1,60 @@
-<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
-    <!--编辑单选start-->
-    <script type="text/javascript">
-        function resetQuestion<%=exercise_question.id%>()
-        {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
-            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
-            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
-            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
-                    "<li class='ur_item'>" +
-                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
-                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
-                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
-                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
-                    "</li>" +
-                    "<div class='cl'></div>" +
-                    "<% end%>");
-        }
-    </script>
-
-    <div class="questionContainer" style="width: 680px;">
-      <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
-        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
-      </div>
-      <div class="ur_editor_content">
-        <ul>
-          <li class="ur_item">
-            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
-          </li>
-          <div class="cl"></div>
-          <div id="poll_answers_<%=exercise_question.id%>">
-            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
-                <li class="ur_item">
-                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
-                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-                </li>
-                <div class="cl"></div>
-            <% end %>
-          </div>
-          <li class="ur_item">
-            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
-          </li>
-          <div class="cl"></div>
-        </ul>
-      </div>
-      <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
-          保存
-        </a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
-          <%= l(:button_cancel)%>
-        </a>
-      </div>
-      <div class="cl"></div>
-    </div>
-    <!--编辑单选 end-->
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+            <span class="ml10">标准答案：请选择</span>
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                <li class="ur_item">
+                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <input type="checkbox" style="width: 15px;" />
+                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                </li>
+                <div class="cl"></div>
+            <% end %>
+          </div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index f73c15eca..40e68ad61 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -1,219 +1,219 @@
-<%= stylesheet_link_tag  'polls', :media => 'all' %>
-<script type="text/javascript">
-    $(function(){
-        $("#RSide").removeAttr("id");
-        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
-        $("#Container").css("width","1000px");
-    });
-    //编辑问卷描述之后
-    var popWindow ; //弹出框的引用
-    var importPollPopWindow; //选择导入的弹出框引用
-    function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
-    }
-    $(function(){
-        //点击空白处
-        $(document).bind('click',function(e){
-            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
-            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
-                popWindow.css('display', 'none');
-            }
-            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
-                importPollPopWindow.css('display', 'none');
-            }
-        });
-    })
-
-    function dismiss(quest_type,quest_id){
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        if(popWindow){
-            popWindow.css('display', 'none');
-        }
-    }
-
-    function chooseQuestionType(quest_type,quest_id){
-        //quest_type 分为 mc mcq single multi
-        //quest_id 是quetion的id  下同
-        if(popWindow){
-            popWindow.css('display', 'none');
-        }
-        popWindow = $("#div_"+quest_type+"_"+quest_id);
-        $("#div_"+quest_type+"_"+quest_id).click(function(e){
-            e.stopPropagation(); //组织冒泡到document.body中去
-        });
-        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
-
-        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
-
-        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
-        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
-        }
-        else{
-            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
-        }
-    }
-
-    //选择导入调查问卷
-    function importPoll(){
-        importPollPopWindow = $("#import_poll");
-        $("#import_poll").css("position", "absolute");
-
-        $("#import_poll").css("top", $("#import_btn").offset().top+30);
-
-        $("#import_poll").css("left", $("#import_btn").offset().left-65);
-        $("#import_poll").css("display","block")
-    }
-
-    function remote_import(){
-        importPollPopWindow.css('display', 'none');
-        if($("#import_poll").val() === 0){
-            return;
-        }else{
-            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
-                $("#import_form").submit();
-            }else{
-                return;
-            }
-        }
-
-    }
-
-    //添加标题时确定按钮
-    function add_poll_question(doc,quest_type)
-    {
-        var title = $.trim($("#poll_questions_title").val());
-        var score = $.trim($("#question_score").val());
-        var standard_ans = $.trim($("#question_standard_ans").val());
-        if(title.length == 0 || score.length == 0){
-            alert("题目标题/分数不能为空");
-        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            alert("分数必须是非零开头的数字");
-        }else if(quest_type !=3 && standard_ans.length == 0) {
-            alert("标准答案不能为空");
-        }else{
-            doc.parent().parent().parent().submit();}
-    }
-    //修改标题时确定按钮
-    function edit_poll_question(doc,id,quest_type)
-    {
-        var title = $.trim($("#poll_questions_title_" + id).val());
-        var score = $.trim($("#poll_question_score_"+ id).val());
-        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
-        if(title.length == 0 || score.length == 0){
-            alert("题目标题/分数不能为空");
-        }else if(!/^[1-9][0-9]*$/.test(score)) {
-            alert("分数必须是非零开头的数字");
-        }else if(quest_type !=3 && standard_ans.length == 0) {
-            alert("标准答案不能为空");
-        }else if(quest_type ==3) {
-            var div = $("#poll_answers_" + id);
-            var candiate_answer = $(".candiate_answer",div);
-            if(candiate_answer.length > 0) {
-                for(i=0;i<candiate_answer.length;i++) {
-                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
-                        continue;
-                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
-                        alert("候选答案不能为空");
-                    } else if($.trim($(candiate_answer[i]).val()) != ""){
-                        doc.parent().parent().parent().submit();
-                        break;
-                    }
-
-                }
-            } else{
-                alert("候选答案不能为空");
-            }
-        }else{
-            doc.parent().parent().parent().submit();}
-    }
-
-    //问卷头
-    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
-    function pollsSubmit(doc){
-        var title = $.trim($("#exercise_name").val());
-        if(title.length == 0){
-            alert("测验标题不能为空");
-        } else if($.trim($("#exercise_end_time").val()) =="") {
-            alert("截止时间不能为空");
-        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
-            alert("截止时间不能小于当前时间");
-        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
-            alert("测验时长必须为非零开头的数字");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
-            alert("发布时间不能小于当前时间");
-        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
-            alert("截止时间必须大于发布时间");
-        } else {
-            doc.parent().parent().parent().submit();
-        }
-    }
-    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
-    //
-    function pollQuestionCancel(question_id){
-        $("#show_poll_questions_"+question_id).show();
-        $("#edit_poll_questions_"+question_id).hide();
-    }
-    function pollQuestionEdit(question_id){
-        $("#show_poll_questions_"+question_id).hide();
-        $("#edit_poll_questions_"+question_id).show();
-        $("#poll_questions_title_"+question_id).focus();
-    }
-    //单选题
-    function add_single_answer(doc)
-    {
-        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
-                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-                "</li><div class='cl'></div>");
-    }
-    function add_candidate_answer(doc)
-    {
-        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
-                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
-                "</li><div class='cl'></div>");
-    }
-    function remove_single_answer(doc)
-    {
-        if(doc.parent().siblings("li").length == 0)
-        {
-            alert("至少有一个选项或一个候选答案");
-        }
-        else
-        {
-            doc.parent().remove();
-        }
-    }
-</script>
-<div class="homepageRight mt0 ml10">
-  <div class="resources">
-    <!-- 头部 -->
-    <div id="polls_head_show" style="display: none;">
-      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
-    </div>
-    <div id="polls_head_edit">
-      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
-    </div>
-    <% current_score = get_current_score @exercise %>
-    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
-      分</span></div>
-    <!-- 问题 -->
-    <div id="poll_content">
-      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
-    </div>
-
-    <div class="testQuestion" id="new_exercise_question">
-      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
-    </div>
-    <!--选项 end-->
-
-    <!-- 新增问题 -->
-    <div id="new_poll_question">
-    </div>
-
-    <div id="exercise_submit">
-      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
-    </div>
-    <div class="cl"></div>
-    <!--contentbox end-->
-  </div>
-</div><!--编辑end-->
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+    //编辑问卷描述之后
+    var popWindow ; //弹出框的引用
+    var importPollPopWindow; //选择导入的弹出框引用
+    function edit_head(){
+        $("#polls_description").val($("#polls_description_div").html());
+    }
+    $(function(){
+        //点击空白处
+        $(document).bind('click',function(e){
+            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
+            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+                popWindow.css('display', 'none');
+            }
+            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
+                importPollPopWindow.css('display', 'none');
+            }
+        });
+    })
+
+    function dismiss(quest_type,quest_id){
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+    }
+
+    function chooseQuestionType(quest_type,quest_id){
+        //quest_type 分为 mc mcq single multi
+        //quest_id 是quetion的id  下同
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        $("#div_"+quest_type+"_"+quest_id).click(function(e){
+            e.stopPropagation(); //组织冒泡到document.body中去
+        });
+        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
+
+        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
+
+        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
+        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+        }
+        else{
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
+        }
+    }
+
+    //选择导入调查问卷
+    function importPoll(){
+        importPollPopWindow = $("#import_poll");
+        $("#import_poll").css("position", "absolute");
+
+        $("#import_poll").css("top", $("#import_btn").offset().top+30);
+
+        $("#import_poll").css("left", $("#import_btn").offset().left-65);
+        $("#import_poll").css("display","block")
+    }
+
+    function remote_import(){
+        importPollPopWindow.css('display', 'none');
+        if($("#import_poll").val() === 0){
+            return;
+        }else{
+            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
+                $("#import_form").submit();
+            }else{
+                return;
+            }
+        }
+
+    }
+
+    //添加标题时确定按钮
+    function add_poll_question(doc,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title").val());
+        var score = $.trim($("#question_score").val());
+        var standard_ans = $.trim($("#question_standard_ans").val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+    //修改标题时确定按钮
+    function edit_poll_question(doc,id,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title_" + id).val());
+        var score = $.trim($("#poll_question_score_"+ id).val());
+        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(!/^[1-9][0-9]*$/.test(score)) {
+            alert("分数必须是非零开头的数字");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else if(quest_type ==3) {
+            var div = $("#poll_answers_" + id);
+            var candiate_answer = $(".candiate_answer",div);
+            if(candiate_answer.length > 0) {
+                for(i=0;i<candiate_answer.length;i++) {
+                    if(i<candiate_answer.length-1 && $.trim($(candiate_answer[i]).val()) == "") {
+                        continue;
+                    } else if(i == (candiate_answer.length-1) && $.trim($(candiate_answer[i]).val()) == "") {
+                        alert("候选答案不能为空");
+                    } else if($.trim($(candiate_answer[i]).val()) != ""){
+                        doc.parent().parent().parent().submit();
+                        break;
+                    }
+
+                }
+            } else{
+                alert("候选答案不能为空");
+            }
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+
+    //问卷头
+    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+    function pollsSubmit(doc){
+        var title = $.trim($("#exercise_name").val());
+        if(title.length == 0){
+            alert("测验标题不能为空");
+        } else if($.trim($("#exercise_end_time").val()) =="") {
+            alert("截止时间不能为空");
+        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
+            alert("截止时间不能小于当前时间");
+        } else if($.trim($("#exercise_time").val()) !="" && !/^[1-9][0-9]*$/.test($.trim($("#exercise_time").val()))) {
+            alert("测验时长必须为非零开头的数字");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_publish_time").val()) < Date.now()) {
+            alert("发布时间不能小于当前时间");
+        } else if($.trim($("#exercise_publish_time").val()) !="" && Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
+            alert("截止时间必须大于发布时间");
+        } else {
+            doc.parent().parent().parent().submit();
+        }
+    }
+    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+    //
+    function pollQuestionCancel(question_id){
+        $("#show_poll_questions_"+question_id).show();
+        $("#edit_poll_questions_"+question_id).hide();
+    }
+    function pollQuestionEdit(question_id){
+        $("#show_poll_questions_"+question_id).hide();
+        $("#edit_poll_questions_"+question_id).show();
+        $("#poll_questions_title_"+question_id).focus();
+    }
+    //单选题
+    function add_single_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input type='radio' style='width: 15px;' /><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function add_candidate_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function remove_single_answer(doc)
+    {
+        if(doc.parent().siblings("li").length == 0)
+        {
+            alert("至少有一个选项或一个候选答案");
+        }
+        else
+        {
+            doc.parent().remove();
+        }
+    }
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="resources">
+    <!-- 头部 -->
+    <div id="polls_head_show" style="display: none;">
+      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <div id="polls_head_edit">
+      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <% current_score = get_current_score @exercise %>
+    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
+      分</span></div>
+    <!-- 问题 -->
+    <div id="poll_content">
+      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
+    </div>
+
+    <div class="testQuestion" id="new_exercise_question">
+      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+    </div>
+    <!--选项 end-->
+
+    <!-- 新增问题 -->
+    <div id="new_poll_question">
+    </div>
+
+    <div id="exercise_submit">
+      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+</div><!--编辑end-->
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index c5ae81fd6..eaf618c56 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -1,62 +1,62 @@
-<%= form_for(ExerciseQuestion.new,
-             :html => { :multipart => true },
-             :url=>create_exercise_question_exercise_path(exercise.id),
-             :remote=>true ) do |f| %>
-<div class="questionContainer">
-  <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
-    <input name="question_type" value="2" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
-  </div>
-  <div class="ur_editor_content">
-    <ul>
-      <li class="ur_item">
-        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
-        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
-      </li>
-      <div class="cl"></div>
-      <div>
-          <li class="ur_item">
-            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-          <div class="cl"></div>
-          <li class="ur_item">
-            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
-            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
-            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
-          </li>
-      </div>
-      <div class="cl"></div>
-      <li class="ur_item">
-        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
-        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
-      </li>
-      <div class="cl"></div>
-    </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_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
-  </div>
-  <div class="cl"></div>
-</div>
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="2" type="hidden">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
+        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+        <span class="ml10">标准答案：请选择</span>
+      </li>
+      <div class="cl"></div>
+      <div>
+          <li class="ur_item">
+            <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+          <div class="cl"></div>
+          <li class="ur_item">
+            <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="checkbox" style="width: 15px;" />
+            <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
+            <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+            <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+          </li>
+      </div>
+      <div class="cl"></div>
+    </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_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
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index a477303d7..3413007ae 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -52,9 +52,11 @@
                                 '<li class="ur_item">'+
                                 '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '<span class="ml10">标准答案：请选择</span>'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -62,6 +64,7 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -69,6 +72,7 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
@@ -76,16 +80,12 @@
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
                                 '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="checkbox" style="width: 15px;" />'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li></div>'+
                                 '<div class="cl"></div>'+
-                                '<li class="ur_item">'+
-                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
-                                '</li>'+
-                                '<div class="cl"></div>'+
                                 '</ul>'+
                                 '</div>'+
                                 '<div class="ur_editor_footer">'+