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

Conflicts:
	app/views/poll/_show_head.html.erb

app/views/poll/_show_MCQ_result.html.erb

@@ -13,7 +13,7 @@
       <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
           <tr>
             <td>
-              <p class="ml20">
+              <p class="ml20 break_word">
               <%= answer.poll_answer.answer_text == "" ? (answer.vote_text.nil? ? "其他" : answer.vote_text) : answer.poll_answer.answer_text %>
               </p>
             </td>

app/views/poll/_show_MC_result.html.erb

@@ -13,7 +13,7 @@
       <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
           <tr>
             <td>
-              <p class="ml20">
+              <p class="ml20 break_word">
               <%= answer.poll_answer.answer_text == "" ? (answer.vote_text.nil? ? "其他" : answer.vote_text) : answer.poll_answer.answer_text %>
               </p>
             </td>

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();"></a>
+  <a href="javascript:" class="testEdit undis" id="poll_head_edit_pen" title="编辑" onclick="pollsEdit();" style="top:0;"></a>
 <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
   <h1 class="ur_page_title" id="polls_name_h"><%= poll.polls_name%></h1>
   <div class="testDesEdit mt5"><%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%></div>

app/views/poll/_show_mulit_result.html.erb

@@ -10,7 +10,7 @@
 <% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %>
   <div class="ml40 mb10">
     <p class="mb10"><%= i + 1 %>.<%= poll_answer.answer_text%></p>
-    <p class="ml20">
+    <p class="ml20 break_word">
       <%= get_anwser_vote_text(poll_question.id,User.current.id,poll_answer.id).html_safe%>
     </p>
   </div>

app/views/poll/_show_single_result.html.erb

@@ -8,7 +8,7 @@
   </div>
   <div class="cl"></div>
   <div class="ur_inputs">
-    <p class="ml20">
+    <p class="ml20 break_word">
       <%= get_anwser_vote_text poll_question.id,User.current.id%>
     </p>
   </div>