From fe3a84c8db35c648478d900bd2c1faa9433f5af9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 15:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_mulit.html.erb | 19 +++++++++++--------
 app/views/poll/_new_mulit.html.erb  | 21 ++++++++++++---------
 app/views/poll/_show_mulit.html.erb | 14 +++++++++++---
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index c4a9e0e0f..684a285e3 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,18 +1,21 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
 <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=""/>
+    <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 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>
+    <!--<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>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="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
+</div><!--编辑多行文字end-->
+<% 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
index 6c3528473..e034e54af 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -1,18 +1,21 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <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>
+    <input type="hidden" name="question_type" value="4"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行文字标题"/>
+    <input type="checkbox" name="is_necessary" value="true" checked/>
+    <label>必答</label>
   </div>
   <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>
+    <!--<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>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="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
+</div><!--编辑多行文字end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb
index 35e37ef06..23bdbe6eb 100644
--- a/app/views/poll/_show_mulit.html.erb
+++ b/app/views/poll/_show_mulit.html.erb
@@ -1,10 +1,18 @@
 <div class="ur_question_item textarea ur_editor02">
   <div class="ur_preview">
     <div class="ur_title">
-      <span class="title_index">第4题：</span> 多行主观
+      <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+      <%= poll_question.question_title %>
+      <%if poll_question.is_necessary == 1%>
+          <span class="ur_required" title="必答">*</span>
+      <%end%>
+      (多行主观)
     </div>
-    <a href="#" class="ur_icon_de" title="删除"></a>
-    <a href="#" class="ur_icon_edit" title="编辑"></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">
       <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>