Merge branch 'develop' into standalone_develop

app/views/admins/feedbacks/_list.html.erb

@@ -5,8 +5,8 @@
     <th width="10%">用户名</th>
     <th width="20%">用户邮箱</th>
     <th width="20%"><%= sort_tag('创建时间', name: 'created_at', path: admins_feedbacks_path) %></th>
-    <th width="20%">反馈意见</th>
-    <th width="25%">操作</th>
+    <th width="25%">反馈意见</th>
+    <th width="15%">操作</th>
   </tr>
   </thead>
   <tbody>
@@ -18,9 +18,11 @@
         <td><%= feedback&.user&.mail%></td>
         <td><%= feedback.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
         <td>
-          <a href="#" data-toggle="tooltip" data-placement="bottom" title="<%= feedback.content%>">
-            <%= feedback.content.truncate(20) %>
-          </a>
+          <span class="d-inline-block" tabindex="0" data-toggle="tooltip" data-placement="left" title="<%= feedback.content%>">
+            <a href="javascript:">
+              <%= feedback.content.truncate(20) %>
+            </a>
+          </span>
         </td>
         <td class="action-container">
           <%= link_to "发送邮件", new_history_admins_feedback_path(feedback), remote: true, class: "action" %>
@@ -34,4 +36,11 @@
   </tbody>
 </table>
 
-<%= render partial: 'admins/shared/paginate', locals: { objects: feedbacks } %>
+<%= render partial: 'admins/shared/paginate', locals: { objects: feedbacks } %>
+
+<style>
+.tooltip-inner {
+    max-width: 800px;
+    /* width: inherit; will take up least amount of space  */
+}
+</style>

app/views/admins/feedbacks/index.html.erb

@@ -2,7 +2,7 @@
   <% add_admin_breadcrumb('反馈意见') %>
 <% end %>
 
-<div class="box admin-list-container feedback-list-container">
+<div class="box admin-list-container feedback-list-container" style="min-height: 400px">
   <%= render partial: 'admins/feedbacks/list', locals: { feedbacks: @feedbacks } %>
 </div>
 <div id="feedback-modals">