From 6dbf031d3bb75bfdbd9f6990a22607c91231f623 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 7 Nov 2016 16:03:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=BC=96=E8=BE=91icon?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_tool_bar.html.erb | 12 +++++++++++-
 app/views/poll/_show_MC.html.erb       |  2 +-
 app/views/poll/_show_MCQ.html.erb      |  2 +-
 app/views/poll/_show_head.html.erb     |  2 +-
 app/views/poll/_show_mulit.html.erb    |  2 +-
 app/views/poll/_show_single.html.erb   |  2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/_poll_tool_bar.html.erb b/app/views/poll/_poll_tool_bar.html.erb
index e598a9ff9..63647d1b6 100644
--- a/app/views/poll/_poll_tool_bar.html.erb
+++ b/app/views/poll/_poll_tool_bar.html.erb
@@ -4,6 +4,7 @@
       <span class="c_red questionLabel ml5" title="必答">*</span>
   <%end%>
 </p>
+<div id="toolbar" class="undis">
 <% poll = poll_question.poll %>
 <% count = poll.poll_questions.count %>
 <% unless poll_question.question_number == 1 %>
@@ -21,4 +22,13 @@
 </div>
 
 <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
-            method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "poll-delete", :title => "删除")  %>
\ No newline at end of file
+            method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "poll-delete", :title => "删除")  %>
+</div>
+<script>
+    $('.poll-container').mouseover(function(){
+        $(this).find("#toolbar, .poll-edit").show();
+    })
+    $('.poll-container').mouseout(function(){
+        $(this).find("#toolbar, .poll-edit").hide();
+    })
+</script>
\ No newline at end of file
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index c00522ed7..c610c07cd 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -7,7 +7,7 @@
       <span class="formatContainer m_w500"><%= poll_question.question_title %></span>
       <span class="fontBlue">[单选题]</span>
     </div>
-    <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <a class="poll-edit" style="display:none;" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
     <div class="cl"></div>
 
     <div class="ur_inputs">
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
index 6612a3bb6..ab77be241 100644
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -18,7 +18,7 @@
         </p>
         <% end %>
       </div>
-      <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+      <a class="poll-edit" style="display:none;" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
       <div class="cl"></div>
       <div class="ur_inputs">
         <table class="ur_table" style="width:647px;">
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index 44c560dfe..43941e1ce 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,5 +1,5 @@
 <div class="testStatus" onmouseover="$('#poll_head_edit_pen').show();" onmouseout="$('#poll_head_edit_pen').hide();"><!--头部显示 start-->
-  <a href="javascript:" class="testEdit undis" id="poll_head_edit_pen" title="编辑" onclick="pollsEdit();" style="top:0;"></a>
+  <a href="javascript:" class="testEdit"  id="poll_head_edit_pen" title="编辑" onclick="pollsEdit();" style="top:0;display:none"></a>
 <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
   <h1 class="ur_page_title" id="polls_name_h" style="width:668px; margin:0 auto;"><%= poll.polls_name%></h1>
   <div class="testDesEdit mt5"><%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%></div>
diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb
index e72682165..fca5a7818 100644
--- a/app/views/poll/_show_mulit.html.erb
+++ b/app/views/poll/_show_mulit.html.erb
@@ -8,7 +8,7 @@
       <span class="fontBlue">[多行主观题]</span>
     </div>
 
-    <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <a class="poll-edit" style="display:none;" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
     <div class="cl"></div>
     <% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %>
         <div class="ml20 mb10">
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index 88a14bccf..d3b00db55 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -8,7 +8,7 @@
       <span class="fontBlue">[主观题]</span>
     </div>
 
-    <a class="poll-edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <a class="poll-edit" style="display:none;" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
     <div class="cl"></div>
     <div class="ur_inputs">
       <textarea type="text" size="" maxlength="" value="" style="width:640px; border:1px solid #ddd;" rows="3" readonly="readonly"></textarea>

From 83c801878deb44990b3c390fd20ef2aea852eb98 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 7 Nov 2016 16:20:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8E=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=A2=84=E8=A7=88=E7=AD=94?=
 =?UTF-8?q?=E9=A2=98=E6=A1=86=E7=9A=84=E5=AE=BD=E5=BA=A6=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 104b30819..2ef7c4a26 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -241,7 +241,7 @@
                           }
                       }
                   </script>
-                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(pq.id, User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll ? "" : "disabled=disabled" %>>
+                  <textarea class="fillInput" placeholder="在此填入答案" type="text" style="height:54px" value="<%= get_anwser_vote_text(pq.id, User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll ? "" : "disabled=disabled" %>></textarea>
                 </div>
               </div>
             </div>