From e58f5d4af591132600dfeaecdb9650a54b011e0a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 6 Mar 2015 14:56:27 +0800
Subject: [PATCH] =?UTF-8?q?#1941=20=E9=97=AE=E5=8D=B7=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=BD=93=E7=BC=96=E8=BE=91=E6=97=B6=E6=9C=89=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=A9=BA=E6=A0=BC=E8=A1=8C=E6=97=B6=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=A1=AE=E5=AE=9Ajs=E4=B8=8D=E4=BC=9A=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E8=80=8C=E4=B8=94=E4=B8=8D=E4=BC=9A=E5=AF=B9?=
 =?UTF-8?q?=E5=89=AA=E8=BE=91=E7=9A=84=E6=A0=BC=E5=BC=8F=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index dfa5b5cfc..c74453f6d 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -4,9 +4,14 @@
         <input type="text" maxlength="100" 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" maxlength="300" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
+        <div contenteditable="true" id="polls_description_div" class="ur_textbox" style="min-height: 150px;width: 100%;background-color: #ffffff" onkeyup="edit_head();">
+          <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
+        </div>
+        <textarea name="polls_description" maxlength="300" id="polls_description" class="textarea_editor" style="display: none">
+            <%= @poll.polls_description%>
+        </textarea>
       </div>
-      <div class="ur_editor_footer">
+      <div class="ur_editor_footer" style="padding-top: 10px;">
         <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">
           <%= l(:label_button_ok)%>
         </a>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 658d8a9b7..b73de94e0 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -7,6 +7,11 @@
   <%#= javascript_include_tag "polls" %>
 
   <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();
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index ce74dc10a..b4ecdd3d1 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -3,8 +3,6 @@
   <h1 class="ur_page_title" id="polls_name_h">
     <%= poll.polls_name%>
   </h1>
-  <p class="ur_prefix_content" id="polls_description_p">
-    <%= @poll.polls_description%>
-  </p>
+  <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 08c2608d0..ae2691a91 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -34,7 +34,7 @@
       <%= @poll.polls_name%>
     </h1>
     <p class="ur_prefix_content">
-      <%= @poll.polls_description %>
+      <%= @poll.polls_description.html_safe %>
     </p>
   </div>
 
diff --git a/app/views/poll/update.js.erb b/app/views/poll/update.js.erb
index 15d0fabd5..098d478ad 100644
--- a/app/views/poll/update.js.erb
+++ b/app/views/poll/update.js.erb
@@ -1,6 +1,4 @@
-$("#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_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
+$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:poll => @poll}) %>");
 $("#polls_head_edit").hide();
 $("#polls_head_show").show();
\ No newline at end of file