Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

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 => "删除")  %>
+            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>

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">

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;">

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>

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">

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>

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>