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] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E5=8D=B7=E5=A4=B4=E4=BC=9A=E4=BD=BF=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=A4=B4=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=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