diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 19a1e1e89..9209bf61d 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -7,7 +7,7 @@
           $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
           $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
               "<li class='ur_item'>" +
-              "<label>选项<span class='ur_index'></span>：</label>" +
+              "<label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
               "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
               "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
               "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -29,7 +29,7 @@
         <ul id="poll_answers_<%=poll_question.id%>">
           <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
               <li class='ur_item'>
-                <label>选项<span class='ur_index'></span>：</label>
+                <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
                 <input type='text'  maxlength="200" name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
                 <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
                 <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
@@ -39,7 +39,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 508835d7d..86e04106f 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -6,7 +6,7 @@
             $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
             $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
                     "<li class='ur_item'>" +
-                    "<label>选项<span class='ur_index'></span>：</label>" +
+                    "<label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
                     "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
                     "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
                     "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
@@ -17,6 +17,7 @@
     </script>
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
+      <label>问题：&nbsp;&nbsp;</label>
       <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
       <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多选题标题" value="<%= poll_question.question_title%>"/>
       <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
@@ -26,7 +27,7 @@
       <ul id="poll_answers_<%=poll_question.id%>">
         <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
             <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
+              <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
               <input  maxlength="200" type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
               <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
               <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
@@ -36,7 +37,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index c74453f6d..06e162f0d 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -12,7 +12,7 @@
         </textarea>
       </div>
       <div class="ur_editor_footer" style="padding-top: 10px;">
-        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">
+        <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index f3f121784..390be25f2 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -20,7 +20,7 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+    <a class="btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index eadf5b00d..2feeee949 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -16,7 +16,7 @@
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+    <a class="btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index b4624bbb5..8c47baa01 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -11,21 +11,21 @@
       <div class="ur_editor_content">
         <ul>
           <li class='ur_item'>
-            <label>选项<span class='ur_index'></span>：</label>
+            <label>选项<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>选项<span class='ur_index'></span>：</label>
+            <label>选项<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>选项<span class='ur_index'></span>：</label>
+            <label>选项<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>
@@ -34,7 +34,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 9cf6170c0..43b41f95d 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -10,21 +10,21 @@
     <div class="ur_editor_content">
       <ul>
         <li class='ur_item'>
-          <label>选项<span class='ur_index'></span>：</label>
+          <label>选项<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>选项<span class='ur_index'></span>：</label>
+          <label>选项<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>选项<span class='ur_index'></span>：</label>
+          <label>选项<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>
@@ -33,7 +33,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 48122bad0..8a2205760 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -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" data-button="ok" onclick="add_poll_question($(this));">
+    <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index f2137b348..7588bf3b4 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -8,7 +8,7 @@
         <label for="ur_question_require">必答</label>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index b73de94e0..b7a90b9a9 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -1,106 +1,97 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>问卷调查_问卷编辑</title>
-  <%= stylesheet_link_tag  'polls', :media => 'all' %>
-  <%#= javascript_include_tag "polls" %>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
 
-  <script type="text/javascript">
-    //编辑问卷描述之后
-    function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
-    }
+<script type="text/javascript">
+//编辑问卷描述之后
+function edit_head(){
+    $("#polls_description").val($("#polls_description_div").html());
+}
 
-      function add_MC(){
-          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>");
-          $("#poll_questions_title").focus();
-      }
-      function add_MCQ(){
-          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
-          $("#poll_questions_title").focus();
-      }
-      function add_single(){
-          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>");
-          $("#poll_questions_title").focus();
-      }
-      function add_mulit(){
-          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
-          $("#poll_questions_title").focus();
-      }
+  function add_MC(){
+      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>");
+      $("#poll_questions_title").focus();
+  }
+  function add_MCQ(){
+      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
+      $("#poll_questions_title").focus();
+  }
+  function add_single(){
+      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>");
+      $("#poll_questions_title").focus();
+  }
+  function add_mulit(){
+      $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
+      $("#poll_questions_title").focus();
+  }
 
-      //添加标题时确定按钮
-      function add_poll_question(doc)
-      {
-          var title = $.trim($("#poll_questions_title").val());
-          if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
-      }
-      //修改标题时确定按钮
-      function edit_poll_question(doc,id)
-      {
-          var title = $.trim($("#poll_questions_title_" + id).val());
-          if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
-      }
+  //添加标题时确定按钮
+  function add_poll_question(doc)
+  {
+      var title = $.trim($("#poll_questions_title").val());
+      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+  }
+  //修改标题时确定按钮
+  function edit_poll_question(doc,id)
+  {
+      var title = $.trim($("#poll_questions_title_" + id).val());
+      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+  }
 
-      //问卷头
-      function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
-      function pollsSubmit(doc){
-          var title = $.trim($("#polls_title").val());
-          if(title.length == 0){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)
+  //问卷头
+  function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+  function pollsSubmit(doc){
+      var title = $.trim($("#polls_title").val());
+      if(title.length == 0){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 remove_single_answer(doc)
+  {
+      if(doc.parent().siblings("li").length == 0)
       {
-          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</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>");
+          alert("选择题至少有一个选项");
       }
-      function remove_single_answer(doc)
+      else
       {
-          if(doc.parent().siblings("li").length == 0)
-          {
-              alert("选择题至少有一个选项");
-          }
-          else
-          {
-              doc.parent().remove();
-          }
+          doc.parent().remove();
       }
+  }
 
-      function poll_submit()
+  function poll_submit()
+  {
+      var title = $.trim($("#polls_name_h").html());
+      if(title.length == 0)
       {
-          var title = $.trim($("#polls_name_h").html());
-          if(title.length == 0)
-          {
-              alert("问卷标题不能为空");
-          }
-          else{
-              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
-              showModal('ajax-modal', '310px');
-              $('#ajax-modal').css('height','120px');
-              $('#ajax-modal').siblings().remove();
-              $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                      "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-              $('#ajax-modal').parent().removeClass("alert_praise");
-              $('#ajax-modal').parent().css("top","").css("left","");
-              $('#ajax-modal').parent().addClass("popbox_polls");
-          }
+          alert("问卷标题不能为空");
       }
-  </script>
-</head>
-
-<body>
+      else{
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+          showModal('ajax-modal', '310px');
+          $('#ajax-modal').css('height','120px');
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                  "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+          $('#ajax-modal').parent().removeClass("alert_praise");
+          $('#ajax-modal').parent().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("popbox_polls");
+      }
+  }
+</script>
 <div class=" polls_content polls_edit" id="polls">
 
   <!-- 头部 -->
@@ -116,7 +107,7 @@
     <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
   </div>
 
-  <div class="tabs_1">
+  <div class="tabs">
     <ul class="tabs_list">
       <li class="tab_item02 "  >
         <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
@@ -150,9 +141,11 @@
     <a class="ur_button_submit" onclick="poll_submit();">
       <%= l(:label_memo_create)%>
     </a>
+    <div class="polls_cha">
+      <input type="checkbox" name="" value="" >
+      <label for="">允许学生查看调查结果</label>
+    </div>
   </div>
   <div class="cl"></div>
 
 </div><!--编辑end-->
-</body>
-</html>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index b4ecdd3d1..7ece5d23c 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,8 +1,6 @@
-<div class="ur_page_head ur_editor02"><!--头部显示 start-->
+<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
-  <h1 class="ur_page_title" id="polls_name_h">
-    <%= poll.polls_name%>
-  </h1>
+  <h1 class="ur_page_title"><%= poll.polls_name%></h1>
   <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file