From 20c160f03f5c633d45dd8c6363f27580ebbb21b8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 10:50:08 +0800
Subject: [PATCH 01/13] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=A4=B4=E3=80=81=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=A4=B4=E6=95=B0=E6=8D=AE=E7=9A=84=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=92=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  8 ++++---
 app/views/poll/_edit_head.html.erb | 36 +++++++++++++-----------------
 app/views/poll/_poll_form.html.erb | 10 ++++++++-
 app/views/poll/_show_head.html.erb | 12 +++++-----
 app/views/poll/update.js.erb       |  1 +
 config/locales/zh.yml              |  2 ++
 6 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 app/views/poll/update.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 52b4d8997..196b3c7ba 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -60,12 +60,14 @@ class PollController < ApplicationController
   end
 
   def update
-    @poll.polls_name = params[:polls_name]
+    @poll.polls_name = params[:polls_name].empty? ? l(:label_poll_title) : params[:polls_name]
+    @poll.polls_description = params[:polls_description].empty? ? l(:label_poll_description) : params[:polls_description]
     if @poll.save
       respond_to do |format|
-        format.html { redirect_to poll_index_url(:polls_type => @course.class.to_s, :polls_group_id => @course.id) }
+        format.js
       end
     else
+      render_404
     end
   end
 
@@ -98,7 +100,7 @@ class PollController < ApplicationController
         answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1]
         question_option = {
             :answer_position => i,
-            :answer_text => params[:question_answer].values[i-1]
+            :answer_text => answer
         }
         @poll_questions.poll_answers.new question_option
       end
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 759fe58a1..7662c12e0 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -1,21 +1,15 @@
-<script type="text/javascript">
-  function regexPollsTitle()
-  {
-      var polls_title = $.trim($("#polls_title").val());
-      alert(polls_title);
-  }
-</script>
-<div class="ur_editor ur_title_editor"> <!--编辑头部start-->
-  <div class="ur_title_editor_title">
-    <input type="text" name="title" id="polls_title" class="input_title" placeholder="问卷标题" onkeyup="regexPollsTitle();"/>
-  </div>
-  <div class="ur_title_editor_prefix">
-    <textarea name="prefix"  class="textarea_editor" placeholder="问卷描述">
-    </textarea>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑头部 end-->
\ No newline at end of file
+<%= form_for @poll,:remote => true do |f|%>
+    <div class="ur_editor ur_title_editor"> <!--编辑头部start-->
+      <div class="ur_title_editor_title">
+        <input type="text" name="polls_name" id="polls_title" value="<%= @poll.polls_name %>" class="input_title" placeholder="问卷标题"/>
+      </div>
+      <div class="ur_title_editor_prefix">
+        <textarea name="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div><!--编辑头部 end-->
+<% end%>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 473c1df83..474f3be29 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -10,6 +10,11 @@
       function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      //问卷头
+      function pollsCancel()
+      {
+          $("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
+      }
       //单选题
       function add_single_answer(doc)
       {
@@ -60,7 +65,10 @@
     <div class="cl"></div>
   </div><!--选项 end-->
 
-  <%= render :partial => 'edit_head'%>
+  <div id="polls_head">
+    <%#= render :partial => 'show_head', :locals => {:poll => @poll}  %>
+    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+  </div>
 
   <div>
     <% @poll.poll_questions.each do |poll_question|%>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index f8a2d58f0..28741843d 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,8 +1,10 @@
-<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
-  <h1 class="ur_page_title">标题标题标题标题标题标题标题</h1>
-  <p class="ur_prefix_content">描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
-    描述描述描述描述描述描述描述描述描述描述描述描述
-  </p>
+<div class="ur_page_head ur_editor02"><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <h1 class="ur_page_title">
+    <%= poll.polls_name%>
+  </h1>
+  <p class="ur_prefix_content">
+    <%= @poll.polls_description%>
+  </p>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/update.js.erb b/app/views/poll/update.js.erb
new file mode 100644
index 000000000..e83b1b9f0
--- /dev/null
+++ b/app/views/poll/update.js.erb
@@ -0,0 +1 @@
+$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9dae54818..95ab07d5d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2251,5 +2251,7 @@ zh:
   label_mulit: 多行文字
   label_enter_single_title: 请输入单选题标题
   label_new_answer: 新建选项
+  label_poll_title: 问卷标题
+  label_poll_description: 问卷描述
 
 

From 496ef94b97ac7073ec46159c9653ea96284165f1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 11:05:19 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=A4=B4=E9=A1=B5=E9=9D=A2js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 9 +++------
 app/views/poll/_show_head.html.erb | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 474f3be29..f32eabe8f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -11,10 +11,8 @@
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
       //问卷头
-      function pollsCancel()
-      {
-          $("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
-      }
+      function pollsCancel(){$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");}
+      function pollsEdit(){$("#polls_head").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:poll => @poll}) %>");}
       //单选题
       function add_single_answer(doc)
       {
@@ -66,8 +64,7 @@
   </div><!--选项 end-->
 
   <div id="polls_head">
-    <%#= render :partial => 'show_head', :locals => {:poll => @poll}  %>
-    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+    <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
   </div>
 
   <div>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index 28741843d..d279df64e 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,5 +1,5 @@
 <div class="ur_page_head ur_editor02"><!--头部显示 start-->
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
   <h1 class="ur_page_title">
     <%= poll.polls_name%>
   </h1>

From 517c3d1ca53ceff2006e9409c47f086f485b3b54 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 13:58:50 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=88=A0=E9=99=A4=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E9=A2=98=E9=80=89=E9=A1=B9=E5=90=8E=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E5=86=8D=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8E=E5=89=8D=E9=9D=A2=E5=8D=95=E9=80=89=E9=A2=98?=
 =?UTF-8?q?name=E6=9C=89=E9=87=8D=E5=A4=8D=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index f32eabe8f..d70829855 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -16,7 +16,7 @@
       //单选题
       function add_single_answer(doc)
       {
-          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input type='text' name='question_answer["+(doc.parent().siblings("li").length + 1)+"]' placeholder='新建选项'/>" +
+          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input 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>");
       }

From 4996b9a54694797a320a84b17d14f7b0880e0f92 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 14:09:27 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E5=8D=B7=E5=A4=B4=E4=BC=9A=E4=BD=BF?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A4=B4=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_head.html.erb |  2 +-
 app/views/poll/_poll_form.html.erb | 10 +++++++---
 app/views/poll/_show_head.html.erb |  4 ++--
 app/views/poll/update.js.erb       |  7 ++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 7662c12e0..ea36cbedf 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -4,7 +4,7 @@
         <input type="text" name="polls_name" id="polls_title" value="<%= @poll.polls_name %>" class="input_title" placeholder="问卷标题"/>
       </div>
       <div class="ur_title_editor_prefix">
-        <textarea name="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
+        <textarea name="polls_description" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
       </div>
       <div class="ur_editor_footer">
         <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index d70829855..cc951d07f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -11,8 +11,8 @@
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
       //问卷头
-      function pollsCancel(){$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");}
-      function pollsEdit(){$("#polls_head").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:poll => @poll}) %>");}
+      function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+      function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
       //单选题
       function add_single_answer(doc)
       {
@@ -63,9 +63,13 @@
     <div class="cl"></div>
   </div><!--选项 end-->
 
-  <div id="polls_head">
+  <!-- 头部 -->
+  <div id="polls_head_show">
     <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
   </div>
+  <div id="polls_head_edit" style="display: none;">
+    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+  </div>
 
   <div>
     <% @poll.poll_questions.each do |poll_question|%>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index d279df64e..ce74dc10a 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,9 +1,9 @@
 <div class="ur_page_head ur_editor02"><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
-  <h1 class="ur_page_title">
+  <h1 class="ur_page_title" id="polls_name_h">
     <%= poll.polls_name%>
   </h1>
-  <p class="ur_prefix_content">
+  <p class="ur_prefix_content" id="polls_description_p">
     <%= @poll.polls_description%>
   </p>
   <div class="cl"></div>
diff --git a/app/views/poll/update.js.erb b/app/views/poll/update.js.erb
index e83b1b9f0..15d0fabd5 100644
--- a/app/views/poll/update.js.erb
+++ b/app/views/poll/update.js.erb
@@ -1 +1,6 @@
-$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
\ No newline at end of file
+$("#polls_title").val("<%= @poll.polls_name%>");
+$("#polls_description").val("<%= @poll.polls_description %>");
+$("#polls_name_h").html("<%= @poll.polls_name %>");
+$("#polls_description_p").html("<%= @poll.polls_description %>");
+$("#polls_head_edit").hide();
+$("#polls_head_show").show();
\ No newline at end of file

From a99d7c514537762d25c6a04de1db310f5fed39e8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 14:40:17 +0800
Subject: [PATCH 05/13] =?UTF-8?q?1=E3=80=81=E5=88=86=E7=A6=BB=E5=87=BA?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E5=8D=B7=E9=97=AE=E9=A2=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1=E5=8F=8A?=
 =?UTF-8?q?action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb  |  7 ++++-
 app/views/poll/_edit_MC.html.erb    | 38 +++++++++---------------
 app/views/poll/_new_MC.html.erb     | 45 +++++++++++++++++++++++++++++
 app/views/poll/_new_MCQ.html.erb    | 33 +++++++++++++++++++++
 app/views/poll/_new_mulit.html.erb  | 18 ++++++++++++
 app/views/poll/_new_single.html.erb | 13 +++++++++
 app/views/poll/_poll_form.html.erb  | 19 +++++++-----
 config/routes.rb                    |  1 +
 8 files changed, 140 insertions(+), 34 deletions(-)
 create mode 100644 app/views/poll/_new_MC.html.erb
 create mode 100644 app/views/poll/_new_MCQ.html.erb
 create mode 100644 app/views/poll/_new_mulit.html.erb
 create mode 100644 app/views/poll/_new_single.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 196b3c7ba..a63f9e8f6 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,7 @@ class PollController < ApplicationController
   def create_poll_question
     question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
     option = {
-        :is_necessary => params[:is_necessary] || true,
+        :is_necessary => params[:is_necessary] || 1,
         :question_title => question_title,
         :question_type => params[:question_type] || 1,
         :question_number => @poll.poll_questions.count + 1
@@ -112,6 +112,11 @@ class PollController < ApplicationController
     end
   end
 
+  #修改单选题
+  def update_poll_question
+   a = 1
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 0f031f61c..cc52e7c6b 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,37 +1,25 @@
-<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
     <div>
       <!--编辑单选start-->
       <div class="ur_editor radio">
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="1"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
-          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+          <input type="checkbox" name="is_necessary" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input 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>
-              <input 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>
-              <input 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>
+            <% poll_question.poll_answers.reorder("answer_position") do |poll_answer| %>
+                <li class='ur_item'>
+                  <label>选项<span class='ur_index'></span>：</label>
+                  <input 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>
+                </li>
+                <div class='cl'></div>
+            <% end%>
           </ul>
         </div>
         <div class="ur_editor_footer">
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
new file mode 100644
index 000000000..0f031f61c
--- /dev/null
+++ b/app/views/poll/_new_MC.html.erb
@@ -0,0 +1,45 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div>
+      <!--编辑单选start-->
+      <div class="ur_editor radio">
+        <div class="ur_editor_title">
+          <label>问题：&nbsp;&nbsp;</label>
+          <input type="hidden" name="question_type" value="1"/>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
+          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <label>必答</label>
+        </div>
+        <div class="ur_editor_content">
+          <ul>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input 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>
+              <input 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>
+              <input 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>
+          </ul>
+        </div>
+        <div class="ur_editor_footer">
+          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <!--编辑单选 end-->
+    </div>
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
new file mode 100644
index 000000000..cf64e7f3e
--- /dev/null
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -0,0 +1,33 @@
+<div><!--编辑多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
+      <input type="checkbox" name="required" value="true" checked=""/>
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label>选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label >选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
new file mode 100644
index 000000000..c4a9e0e0f
--- /dev/null
+++ b/app/views/poll/_new_mulit.html.erb
@@ -0,0 +1,18 @@
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_toolbar">
+    <label>尺寸：</label>
+    <label>宽 <input name="cols" type="number" min="1" value="60"> 字</label>,
+    <label>高 <input name="rows" type="number" min="1" value="5"> 行</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
new file mode 100644
index 000000000..4e98babe4
--- /dev/null
+++ b/app/views/poll/_new_single.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
\ 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 cc951d07f..d15f5ed0a 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -6,10 +6,10 @@
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
 
   <script type="text/javascript">
-      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
-      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
-      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
-      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MC') %>");}
+      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
+      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
+      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
@@ -71,11 +71,14 @@
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 
-  <div>
-    <% @poll.poll_questions.each do |poll_question|%>
+  <% @poll.poll_questions.each do |poll_question|%>
+      <div id="show_polls_questions_<%= poll_question.id %>">
         <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-    <% end%>
-  </div>
+      </div>
+      <div id="edit_polls_questions_<%= poll_question.id %>" style="display: none;">
+        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+  <% end%>
   <div id="poll_content">
     <%#= render :partial => 'edit_MC'%>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index d2d0c73a8..5a533894c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,7 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
+      post 'update_poll_question'
     end
   end
 

From a1f21f3ebba86fe91cef13831bcbd769b3d03c55 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:10:24 +0800
Subject: [PATCH 06/13] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E9=A2=98=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=BB=BA=E9=A2=98=E7=9B=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=203=E3=80=81=E6=96=B0=E5=A2=9E=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8E=E9=A1=B5=E9=9D=A2=E4=BA=8B=E4=BB=B6=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_new_MC.html.erb            | 82 +++++++++++-----------
 app/views/poll/_new_MCQ.html.erb           |  2 +-
 app/views/poll/_new_mulit.html.erb         |  2 +-
 app/views/poll/_new_single.html.erb        |  2 +-
 app/views/poll/_poll_form.html.erb         | 44 ++++++++----
 app/views/poll/create_poll_question.js.erb |  1 +
 public/javascripts/polls.js                | 65 +++++++++++++++++
 7 files changed, 141 insertions(+), 57 deletions(-)
 create mode 100644 public/javascripts/polls.js

diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 0f031f61c..061105a77 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -1,45 +1,45 @@
 <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-    <div>
-      <!--编辑单选start-->
-      <div class="ur_editor radio">
-        <div class="ur_editor_title">
-          <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="1"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
-          <input type="checkbox" name="is_necessary" value="true" checked/>
-          <label>必答</label>
-        </div>
-        <div class="ur_editor_content">
-          <ul>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input 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>
-              <input 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>
-              <input 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>
-          </ul>
-        </div>
-        <div class="ur_editor_footer">
-          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
-        </div>
-        <div class="cl"></div>
+  <div>
+    <!--编辑单选start-->
+    <div class="ur_editor radio">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="1"/>
+        <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题标题"/>
+        <input type="checkbox" name="is_necessary" value="true" checked/>
+        <label>必答</label>
       </div>
-      <!--编辑单选 end-->
+      <div class="ur_editor_content">
+        <ul>
+          <li class='ur_item'>
+            <label>选项<span class='ur_index'></span>：</label>
+            <input 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>
+            <input 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>
+            <input 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>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().parent().remove();">取消</a>
+      </div>
+      <div class="cl"></div>
     </div>
+    <!--编辑单选 end-->
+  </div>
 <% end%>
\ 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 cf64e7f3e..6739c233e 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -2,7 +2,7 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
+      <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
       <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index c4a9e0e0f..6c3528473 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -1,7 +1,7 @@
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title" placeholder="请输入多行文字标题"/>
     <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index 4e98babe4..b7d5a9725 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -1,7 +1,7 @@
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
     <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index d15f5ed0a..a3020d62f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -4,12 +4,25 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>问卷调查_问卷编辑</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
+  <%#= javascript_include_tag "polls" %>
 
   <script type="text/javascript">
-      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MC') %>");}
-      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
-      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
-      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
+      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 pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
@@ -71,16 +84,21 @@
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 
-  <% @poll.poll_questions.each do |poll_question|%>
-      <div id="show_polls_questions_<%= poll_question.id %>">
-        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-      </div>
-      <div id="edit_polls_questions_<%= poll_question.id %>" style="display: none;">
-        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
-      </div>
-  <% end%>
+  <!-- 问题 -->
   <div id="poll_content">
-    <%#= render :partial => 'edit_MC'%>
+    <% @poll.poll_questions.each do |poll_question|%>
+        <div id="poll_questions_<%= poll_question.id%>">
+          <div id="show_poll_questions_<%= poll_question.id %>">
+            <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+          </div>
+          <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
+            <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+          </div>
+        </div>
+    <% end %>
+
+    <div id="new_poll_question">
+    </div>
   </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 e69de29bb..b788333ef 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -0,0 +1 @@
+$("#new_poll_question").html("");
diff --git a/public/javascripts/polls.js b/public/javascripts/polls.js
new file mode 100644
index 000000000..c10bf6d1f
--- /dev/null
+++ b/public/javascripts/polls.js
@@ -0,0 +1,65 @@
+function add_MC(){
+    var now = new Date().getTime();
+    $("#poll_content").append("<div id='new_poll_question_" + now + "'>"+
+        "<form accept-charset='UTF-8' action='/poll/2/create_poll_question' class='new_poll_question' data-remote='true' id='new_poll_question' method='post'>"+
+        "<div>" +
+        "<div class='ur_editor radio'>" +
+            "<div class='ur_editor_title'>" +
+                "<label>问题：&nbsp;&nbsp;</label>" +
+                "<input type='hidden' name='question_type' value='1'/>" +
+                "<input class='ur_question_title' type='text' name='poll_questions_title' placeholder='请输入单选题标题'/>" +
+                "<input type='checkbox' name='is_necessary' value='true' checked/>" +
+                "<label>必答</label>" +
+            "</div>" +
+            "<div class='ur_editor_content'>" +
+                "<ul>" +
+                    "<li class='ur_item'>" +
+                        "<label>选项<span class='ur_index'></span>：</label>" +
+                        "<input 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>" +
+                        "<input 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>" +
+                        "<input 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>" +
+                "</ul>" +
+            "</div>" +
+            "<div class='ur_editor_footer'>" +
+                "<a class='btn btn_dark btn_submit' data-button='ok' onclick='$(this).parent().parent().parent().parent().submit();'>确定</a>" +
+                "<a class='btn btn_light btn_cancel' data-button='cancel' onclick='$("+ '"#new_poll_question_'  + now + '"' +").remove();'>取消</a>" +
+            "</div>" +
+            "<div class='cl'></div>" +
+        "</div>" +
+    "</div>" +
+    "</form>" +
+    "</div>");
+}
+function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
+function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
+function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
+//问卷头
+function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+//单选题
+function add_single_answer(doc)
+{
+  doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input 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().parent().parent().parent().parent().parent().remove();}else{doc.parent().remove();}
+}
\ No newline at end of file

From 5792bd77e516da39102c659d87014ae8d9740786 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:31:40 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E9=A2=98=E6=97=B6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb         | 5 +++--
 app/views/poll/create_poll_question.js.erb | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index a3020d62f..edf74c965 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -96,9 +96,10 @@
           </div>
         </div>
     <% end %>
+  </div>
 
-    <div id="new_poll_question">
-    </div>
+  <!-- 新增问题 -->
+  <div id="new_poll_question">
   </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 b788333ef..18f999157 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1 +1,10 @@
 $("#new_poll_question").html("");
+$("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
+        "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
+            "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "</div>" +
+        "<div id='edit_poll_questions_<%= @poll_questions.id %>' style='display: none;'>" +
+            "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "</div>" +
+    "</div>");
+

From 4edd9fee6409cd8a7219c7e4a9e8c88bf6c304d0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:33:11 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E5=8F=96=E6=B6=88=E5=90=8E=E6=97=A0=E6=B3=95=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E5=8D=95=E9=80=89=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_new_MC.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 061105a77..013bf0ed0 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -36,7 +36,7 @@
       </div>
       <div class="ur_editor_footer">
         <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().parent().remove();">取消</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
       </div>
       <div class="cl"></div>
     </div>

From f78de71814b092678b4b1be20a65f10a23db60a1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:44:35 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E6=97=B6=E9=A1=B5=E9=9D=A2js=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb   |  6 +++---
 app/views/poll/_poll_form.html.erb | 10 ++++++++++
 app/views/poll/_show_MC.html.erb   |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index cc52e7c6b..9c34e1d51 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -5,13 +5,13 @@
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
           <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+          <input 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" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <% poll_question.poll_answers.reorder("answer_position") do |poll_answer| %>
+            <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
                 <li class='ur_item'>
                   <label>选项<span class='ur_index'></span>：</label>
                   <input type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
@@ -24,7 +24,7 @@
         </div>
         <div class="ur_editor_footer">
           <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
         </div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index edf74c965..1387bdd02 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -26,6 +26,16 @@
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       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)
       {
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index a33967ffd..93077b5b3 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -9,8 +9,8 @@
     <%end%>
 
   </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <a class="ur_icon_de" title="删除" onclick=""></a>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
   <div class="cl"></div>
   <div class="ur_inputs">
     <table class="ur_table" >

From 870f9bba986751f0061216b01670ec5911a1c4e9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:50:06 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=BF=85=E7=AD=94=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=98=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 2 +-
 app/views/poll/_edit_MC.html.erb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a63f9e8f6..2f8a26c2a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,7 @@ class PollController < ApplicationController
   def create_poll_question
     question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
     option = {
-        :is_necessary => params[:is_necessary] || 1,
+        :is_necessary => (params[:is_necessary]=="true" ? 1 : 0),
         :question_title => question_title,
         :question_type => params[:question_type] || 1,
         :question_number => @poll.poll_questions.count + 1
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 9c34e1d51..6010132fb 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -6,7 +6,7 @@
           <label>问题：&nbsp;&nbsp;</label>
           <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
           <input 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" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
+          <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">

From 3fab26214f9912f3f331a9a537e3b3fd2be0f041 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 17:15:29 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=9A=84=E8=B7=AF=E7=94=B1=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         | 15 +++++++++++++++
 app/views/poll/_show_MC.html.erb           |  3 ++-
 app/views/poll/delete_poll_question.js.erb |  1 +
 config/routes.rb                           |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/views/poll/delete_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 2f8a26c2a..191968183 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -117,6 +117,21 @@ class PollController < ApplicationController
    a = 1
   end
 
+  #删除单选题
+  def delete_poll_question
+    @poll_question = PollQuestion.find params[:poll_question]
+    poll_questions = @poll_question.poll.poll_questions.where("question_number > #{@poll_question.question_number}")
+    poll_questions.each do |question|
+      question.question_number -= 1
+      question.save
+    end
+    if @poll_question && @poll_question.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index 93077b5b3..f3fc9c8b5 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -9,7 +9,8 @@
     <%end%>
 
   </div>
-  <a class="ur_icon_de" title="删除" onclick=""></a>
+  <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
   <div class="cl"></div>
   <div class="ur_inputs">
diff --git a/app/views/poll/delete_poll_question.js.erb b/app/views/poll/delete_poll_question.js.erb
new file mode 100644
index 000000000..ad8fe7674
--- /dev/null
+++ b/app/views/poll/delete_poll_question.js.erb
@@ -0,0 +1 @@
+$("#poll_questions_<%= @poll_question.id%>").remove();
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5a533894c..14f23b5f4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,9 @@ RedmineApp::Application.routes.draw do
       post 'create_poll_question'
       post 'update_poll_question'
     end
+    collection do
+      delete 'delete_poll_question'
+    end
   end
 
   resources :contest_notification

From 5ec27898810c751942b2c229bc17e06318c54bc9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 17:26:56 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=90=E4=B8=80?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=90=8E=EF=BC=8C=E5=90=8E=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=BA=8F=E5=8F=B7=E8=87=AA=E5=8A=A8-1?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2js=E7=9A=84?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  3 ++-
 app/views/poll/_poll_content.html.erb      | 10 ++++++++++
 app/views/poll/_poll_form.html.erb         | 11 +----------
 app/views/poll/delete_poll_question.js.erb |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 app/views/poll/_poll_content.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 191968183..48b1af43a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -120,7 +120,8 @@ class PollController < ApplicationController
   #删除单选题
   def delete_poll_question
     @poll_question = PollQuestion.find params[:poll_question]
-    poll_questions = @poll_question.poll.poll_questions.where("question_number > #{@poll_question.question_number}")
+    @poll = @poll_question.poll
+    poll_questions = @poll.poll_questions.where("question_number > #{@poll_question.question_number}")
     poll_questions.each do |question|
       question.question_number -= 1
       question.save
diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb
new file mode 100644
index 000000000..6c2e61215
--- /dev/null
+++ b/app/views/poll/_poll_content.html.erb
@@ -0,0 +1,10 @@
+<% poll.poll_questions.each do |poll_question|%>
+    <div id="poll_questions_<%= poll_question.id%>">
+      <div id="show_poll_questions_<%= poll_question.id %>">
+        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+      <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
+        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+    </div>
+<% end %>
\ 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 1387bdd02..04d8e2f6e 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -96,16 +96,7 @@
 
   <!-- 问题 -->
   <div id="poll_content">
-    <% @poll.poll_questions.each do |poll_question|%>
-        <div id="poll_questions_<%= poll_question.id%>">
-          <div id="show_poll_questions_<%= poll_question.id %>">
-            <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-          </div>
-          <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
-            <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
-          </div>
-        </div>
-    <% end %>
+    <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
   </div>
 
   <!-- 新增问题 -->
diff --git a/app/views/poll/delete_poll_question.js.erb b/app/views/poll/delete_poll_question.js.erb
index ad8fe7674..85057e550 100644
--- a/app/views/poll/delete_poll_question.js.erb
+++ b/app/views/poll/delete_poll_question.js.erb
@@ -1 +1 @@
-$("#poll_questions_<%= @poll_question.id%>").remove();
\ No newline at end of file
+$("#poll_content").html("<%= escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll}) %>");
\ No newline at end of file

From d55492b07a183410dbbc05f2d1e264e7fd047f22 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 18:17:45 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E7=9A=84=E8=B7=AF=E7=94=B1=E3=80=81?=
 =?UTF-8?q?action=E3=80=81=E4=BB=A5=E5=8F=8Ajs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  7 ++-
 app/views/poll/_edit_MC.html.erb           | 58 +++++++++++-----------
 app/views/poll/update_poll_question.js.erb |  0
 config/routes.rb                           |  2 +-
 4 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 app/views/poll/update_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 48b1af43a..e94b0f132 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -114,7 +114,12 @@ class PollController < ApplicationController
 
   #修改单选题
   def update_poll_question
-   a = 1
+    @poll_question = PollQuestion.find params[:poll_question]
+    @poll = @poll_question.poll
+
+    respond_to do |format|
+      format.js
+    end
   end
 
   #删除单选题
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 6010132fb..fa0e8d802 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,33 +1,31 @@
-<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-    <div>
-      <!--编辑单选start-->
-      <div class="ur_editor radio">
-        <div class="ur_editor_title">
-          <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-          <input 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
-          <label>必答</label>
-        </div>
-        <div class="ur_editor_content">
-          <ul>
-            <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
-                <li class='ur_item'>
-                  <label>选项<span class='ur_index'></span>：</label>
-                  <input 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>
-                </li>
-                <div class='cl'></div>
-            <% end%>
-          </ul>
-        </div>
-        <div class="ur_editor_footer">
-          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
-        </div>
-        <div class="cl"></div>
+<%= form_for(poll_question,:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <div class="ur_editor radio">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+        <input 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <label>必答</label>
       </div>
-      <!--编辑单选 end-->
+      <div class="ur_editor_content">
+        <ul>
+          <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+              <li class='ur_item'>
+                <label>选项<span class='ur_index'></span>：</label>
+                <input 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>
+              </li>
+              <div class='cl'></div>
+          <% end%>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      </div>
+      <div class="cl"></div>
     </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index 14f23b5f4..e089e8420 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,10 +62,10 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
-      post 'update_poll_question'
     end
     collection do
       delete 'delete_poll_question'
+      post 'update_poll_question'
     end
   end